From 7c29d95b32a06721672ba67f122f4ba8faa799c8 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 1 Aug 2014 15:38:03 -0400 Subject: [PATCH 01/66] Add pinterest button and reorganize social sharing --- .../monologue/posts/_social_sharing.html.erb | 68 +++++-------------- .../monologue/posts/social/_facebook.html.erb | 12 ++++ .../monologue/posts/social/_gplus.html.erb | 16 +++++ .../posts/social/_pinterest.html.erb | 16 +++++ .../monologue/posts/social/_twitter.html.erb | 18 +++++ lib/monologue/configuration.rb | 3 + spec/dummy/config/initializers/monologue.rb | 2 + 7 files changed, 84 insertions(+), 51 deletions(-) create mode 100644 app/views/monologue/posts/social/_facebook.html.erb create mode 100644 app/views/monologue/posts/social/_gplus.html.erb create mode 100644 app/views/monologue/posts/social/_pinterest.html.erb create mode 100644 app/views/monologue/posts/social/_twitter.html.erb diff --git a/app/views/monologue/posts/_social_sharing.html.erb b/app/views/monologue/posts/_social_sharing.html.erb index 17fd7c60..d2340c52 100644 --- a/app/views/monologue/posts/_social_sharing.html.erb +++ b/app/views/monologue/posts/_social_sharing.html.erb @@ -1,51 +1,17 @@ - +
+ + +
diff --git a/app/views/monologue/posts/social/_facebook.html.erb b/app/views/monologue/posts/social/_facebook.html.erb new file mode 100644 index 00000000..6672d4d9 --- /dev/null +++ b/app/views/monologue/posts/social/_facebook.html.erb @@ -0,0 +1,12 @@ +<% if Monologue::Config.facebook_app_id.present? %> +
+ +
+<% end %> \ No newline at end of file diff --git a/app/views/monologue/posts/social/_gplus.html.erb b/app/views/monologue/posts/social/_gplus.html.erb new file mode 100644 index 00000000..4f6df5a1 --- /dev/null +++ b/app/views/monologue/posts/social/_gplus.html.erb @@ -0,0 +1,16 @@ +
+ + + +
\ No newline at end of file diff --git a/app/views/monologue/posts/social/_pinterest.html.erb b/app/views/monologue/posts/social/_pinterest.html.erb new file mode 100644 index 00000000..f2a097e1 --- /dev/null +++ b/app/views/monologue/posts/social/_pinterest.html.erb @@ -0,0 +1,16 @@ +<% if Monologue::Config.use_pinterest.presence %> +<%= link_to"Pin It", + "http://pinterest.com/pin/create/button/?url=#{@post.url}", + :class => "pin-it-button", + "count-layout" => "none" %> + + +<% end %> \ No newline at end of file diff --git a/app/views/monologue/posts/social/_twitter.html.erb b/app/views/monologue/posts/social/_twitter.html.erb new file mode 100644 index 00000000..ed6bcc1d --- /dev/null +++ b/app/views/monologue/posts/social/_twitter.html.erb @@ -0,0 +1,18 @@ +<% if Monologue::Config.twitter_username.present? %> + " + data-url="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//", "/") %>" + data-via="<%= Monologue::Config.twitter_username %>" + data-text="<%= @post.title %>" + data-count="horizontal">Tweet + + +<% end %> \ No newline at end of file diff --git a/lib/monologue/configuration.rb b/lib/monologue/configuration.rb index 7bd0c690..19136f62 100644 --- a/lib/monologue/configuration.rb +++ b/lib/monologue/configuration.rb @@ -17,14 +17,17 @@ class Configuration :facebook_like_locale, :facebook_url, :facebook_logo, #used in the open graph protocol to display an image when a post is liked + :facebook_app_id, :google_plus_account_url, :google_plusone_locale, + :use_pinterest, #display pinterest? :linkedin_url, :github_username, + :admin_force_ssl, :posts_per_page, :google_analytics_id, diff --git a/spec/dummy/config/initializers/monologue.rb b/spec/dummy/config/initializers/monologue.rb index bf5e6464..4f451b47 100644 --- a/spec/dummy/config/initializers/monologue.rb +++ b/spec/dummy/config/initializers/monologue.rb @@ -29,6 +29,8 @@ c.twitter_username = "jipiboily" c.facebook_url = "https://www.facebook.com/jipiboily" c.facebook_logo = 'logo.png' + c.facebook_app_id="123465" + c.use_pinterest= true c.google_plus_account_url = "https://plus.google.com/u/1/115273180419164295760/posts" c.linkedin_url = "http://www.linkedin.com/in/jipiboily" c.github_username = "jipiboily" From 4ff926e10dc5bde6fa3129148389f756692db1a5 Mon Sep 17 00:00:00 2001 From: Adrien Date: Mon, 1 Dec 2014 10:07:07 +0100 Subject: [PATCH 02/66] Correct typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6952b0f0..156fb7dd 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To know how to upgrade, see [UPGRADE.md](https://github.com/jipiboily/monologue/ - IRC channel (on Freenode): #monologue. ## Some features -- Rails mountable engine (fully named spaced and mountable in an already existing app) +- Rails mountable engine (fully namespaced and mountable in an already existing app) - tested - back to basics: few features - tags (or categories) From bb69a8ed3bb04d0bbb8c0def82046a9d941ec871 Mon Sep 17 00:00:00 2001 From: Anthony Lewis Date: Mon, 1 Dec 2014 13:43:29 -0600 Subject: [PATCH 03/66] Use binstubs in examples instead of bundle exec The preferred way of running `rake` and `rails` in Rails 4 is using the generated binstubs. This PR updates the README to use these commands. The associated Rails pull request is here: https://github.com/rails/rails/pull/15192 --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6952b0f0..405d064c 100644 --- a/README.md +++ b/README.md @@ -70,13 +70,13 @@ be available at `/monologue`. ### 3. Migrate Monologue's database tables Run these commands: -1. $`bundle exec rake monologue:install:migrations` -2. $`bundle exec rake db:create` (only if this is a new project) -3. $`bundle exec rake db:migrate` +1. $`bin/rake monologue:install:migrations` +2. $`bin/rake db:create` (only if this is a new project) +3. $`bin/rake db:migrate` ### 4. Create a user -Open your development console with `rails c`, then: +Open your development console with `bin/rails c`, then: ```ruby Monologue::User.create(name: "monologue", email:"monologue@example.com", password:"my-password", password_confirmation: "my-password") ``` @@ -124,9 +124,9 @@ Starting point: * Fork the repo * Clone your repo * Run `bundle install` -* Run `bundle exec rake test_app` to create the test application in `spec/dummy` +* Run `bin/rake test_app` to create the test application in `spec/dummy` * Make your changes -* Ensure specs pass by running `bundle exec rspec spec` +* Ensure specs pass by running `bin/rspec spec` * Submit your pull request From 6d2330644e368a0ad0b098eded1c7622f5e24f6c Mon Sep 17 00:00:00 2001 From: Nate Berkopec Date: Tue, 2 Dec 2014 20:15:39 -0500 Subject: [PATCH 04/66] Remove ruby version files --- .gitignore | 6 +++++- .rbenv-version | 1 - .rvmrc | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 .rbenv-version delete mode 100644 .rvmrc diff --git a/.gitignore b/.gitignore index f80f8803..e162d50e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,8 @@ coverage/ .idea/ .idea/**/* -Gemfile.lock \ No newline at end of file +Gemfile.lock + +.ruby-version +.rbenv-version +.rvmrc diff --git a/.rbenv-version b/.rbenv-version deleted file mode 100644 index 0ca8caf7..00000000 --- a/.rbenv-version +++ /dev/null @@ -1 +0,0 @@ -1.9.3-p327 diff --git a/.rvmrc b/.rvmrc deleted file mode 100644 index 90364e8e..00000000 --- a/.rvmrc +++ /dev/null @@ -1 +0,0 @@ -rvm use 1.9.3@monologue --create From 1df6f1174a2366f8739afb48cf5f0c69a26520d8 Mon Sep 17 00:00:00 2001 From: Kerri Miller Date: Wed, 3 Dec 2014 08:10:42 -0800 Subject: [PATCH 05/66] Update README.md --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 23aae043..b779646f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ - -Monologue is a basic mountable blogging engine in Rails built to be easily mounted in an already existing Rails app, but it can also be used alone. +Monologue is a basic, mountable blogging engine in Rails built to be easily mounted in an already existing Rails app, but it can also be used alone. ## Version @@ -16,7 +16,7 @@ This README is for a future Monologue version, that will be 0.4.X and be Rails 4 ## Upgrade and changes -To know how to upgrade, see [UPGRADE.md](https://github.com/jipiboily/monologue/blob/master/UPGRADE.md) file. If you want to know what changed since the last versions, see [CHANGELOG.md](https://github.com/jipiboily/monologue/blob/master/CHANGELOG.md). +To learn how to upgrade, see [UPGRADE.md](https://github.com/jipiboily/monologue/blob/master/UPGRADE.md) file. If you want to learn what changed since the last versions, see [CHANGELOG.md](https://github.com/jipiboily/monologue/blob/master/CHANGELOG.md). ## Questions? Problems? Documentation? @@ -46,9 +46,9 @@ To know how to upgrade, see [UPGRADE.md](https://github.com/jipiboily/monologue/ ## Installation -### 1. Add the gem to your `Gemfile`. This will get the latest version compatible with Rails 4 until we release a gem +### 1. Add the gem to your `Gemfile`. ```ruby -gem 'monologue', github: 'jipiboily/monologue' +gem 'monologue' ``` And run `bundle install` to fetch the gem and update your 'Gemfile.lock'. @@ -82,15 +82,15 @@ Monologue::User.create(name: "monologue", email:"monologue@example.com", passwor ``` ### 5. Configure Monologue. -This is all done in an initializer file, say `config/initializers/monologue.rb`. More on this in the [Wiki - Configuration](https://github.com/jipiboily/monologue/wiki/Configuration). +This is all done in an initializer file, typically `config/initializers/monologue.rb`. More on this in the [Wiki - Configuration](https://github.com/jipiboily/monologue/wiki/Configuration). ### 6. Ready -Start your server and head on [http://localhost:3000/monologue](http://localhost:3000/monologue) to log in the admin section. +Start your server and go to [http://localhost:3000/monologue](http://localhost:3000/monologue) to log in the admin section. ### Note to users -Monologue is using his own tables. If you want to use your own tables with monologue (for example the User table) -this might help you to monkey patch [Monkey Patch](https://gist.github.com/jipiboily/776d907fc932640ac59a) +Monologue is using its own tables. If you want to use your own tables with monologue (for example the User table) +this might help you to [monkey patch](https://gist.github.com/jipiboily/776d907fc932640ac59a). ## Customization See the [Wiki - Customizations](https://github.com/jipiboily/monologue/wiki/Customizations). From fc93c8cd2b61a121d928ce323ce09df38359b2ac Mon Sep 17 00:00:00 2001 From: Nate Berkopec Date: Tue, 2 Dec 2014 20:33:21 -0500 Subject: [PATCH 06/66] Fixup travis.yml, test Ruby 2.1 + Rails 4.1 --- .gitignore | 2 ++ .travis.yml | 12 +++++++++++- Gemfile | 2 +- spec/support/gemfiles/rails4_0.gemfile | 18 ++++++++++++++++++ spec/support/gemfiles/rails4_1.gemfile | 18 ++++++++++++++++++ 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 spec/support/gemfiles/rails4_0.gemfile create mode 100644 spec/support/gemfiles/rails4_1.gemfile diff --git a/.gitignore b/.gitignore index e162d50e..a373c1e4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,9 @@ coverage/ .idea/**/* Gemfile.lock +*.lock .ruby-version .rbenv-version .rvmrc + diff --git a/.travis.yml b/.travis.yml index 24ca7ee6..57f183f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,22 @@ language: ruby + before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - mv spec/dummy/config/database-travis.yml spec/dummy/config/database.yml - bundle exec rake db:create db:migrate + rvm: - 1.9.3 - 2.0.0 + - 2.1.0 + +gemfile: + - spec/support/gemfiles/rails4_0.gemfile + - spec/support/gemfiles/rails4_1.gemfile + +sudo: false + env: - DB=mysql DB_USERNAME=root - - DB=postgresql DB_USERNAME=postgres \ No newline at end of file + - DB=postgresql DB_USERNAME=postgres diff --git a/Gemfile b/Gemfile index 29865c5a..85621da1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source "http://rubygems.org" +source "https://rubygems.org" # Declare your gem's dependencies in monologue.gemspec. # Bundler will treat runtime dependencies like base dependencies, and diff --git a/spec/support/gemfiles/rails4_0.gemfile b/spec/support/gemfiles/rails4_0.gemfile new file mode 100644 index 00000000..24b43003 --- /dev/null +++ b/spec/support/gemfiles/rails4_0.gemfile @@ -0,0 +1,18 @@ +source "https://rubygems.org" + +gemspec :path => "../../../" + +group :development, :test do + gem "thin" + gem 'rails', '>= 4.0.4' + gem 'pry' + + if RUBY_PLATFORM.downcase.include?("darwin") + gem 'rb-fsevent' + gem 'growl' + end +end + +gem 'coveralls', require: false + +gem 'pg' diff --git a/spec/support/gemfiles/rails4_1.gemfile b/spec/support/gemfiles/rails4_1.gemfile new file mode 100644 index 00000000..c568229c --- /dev/null +++ b/spec/support/gemfiles/rails4_1.gemfile @@ -0,0 +1,18 @@ +source "https://rubygems.org" + +gemspec :path => "../../../" + +group :development, :test do + gem "thin" + gem 'rails', '>= 4.1.0' + gem 'pry' + + if RUBY_PLATFORM.downcase.include?("darwin") + gem 'rb-fsevent' + gem 'growl' + end +end + +gem 'coveralls', require: false + +gem 'pg' From 8a47f82112754d63a969ec4e660e37754e40d331 Mon Sep 17 00:00:00 2001 From: Carsten Wirth Date: Tue, 9 Dec 2014 00:33:48 +0100 Subject: [PATCH 07/66] update on readme contribution chapter --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b779646f..de3f2353 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,8 @@ Starting point: * Fork the repo * Clone your repo * Run `bundle install` -* Run `bin/rake test_app` to create the test application in `spec/dummy` +* Run `bundle exec rake db:migrate` +* Run `bundle exec rake db:setup` * Make your changes * Ensure specs pass by running `bin/rspec spec` * Submit your pull request From c32f7e1e2f222e38c6cdc46820e0b98404900ad5 Mon Sep 17 00:00:00 2001 From: Andy Brown Date: Tue, 9 Dec 2014 13:36:56 -0600 Subject: [PATCH 08/66] Add support for tag oriented feeds #213 --- app/controllers/monologue/posts_controller.rb | 4 +++ spec/requests/feed_spec.rb | 25 ++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/controllers/monologue/posts_controller.rb b/app/controllers/monologue/posts_controller.rb index f1d3c0b0..67f1e2d8 100644 --- a/app/controllers/monologue/posts_controller.rb +++ b/app/controllers/monologue/posts_controller.rb @@ -17,5 +17,9 @@ def show def feed @posts = Monologue::Post.published.limit(25) + if params[:tags].present? + tags = Monologue::Tag.where(name: params[:tags].split(',')).pluck(:id) + @posts = @posts.joins(:taggings).where('monologue_taggings.tag_id in (?)', tags) + end end end diff --git a/spec/requests/feed_spec.rb b/spec/requests/feed_spec.rb index d75a7ac5..8106d926 100644 --- a/spec/requests/feed_spec.rb +++ b/spec/requests/feed_spec.rb @@ -4,10 +4,33 @@ before(:each) do Factory(:post, url: "url/to/post") end - + # test to prevent regression for issue #72 it "should contain full" do visit feed_path page.should have_content "/monologue/url/to/post" end + + context 'with tags param' do + before do + create(:post, title: 'Feed Post').tag!(['feed']) + create(:post, title: 'Rss Post').tag!(['rss']) + end + + context 'with tags' do + it 'returns posts tagged with tags' do + visit feed_path(tags: 'feed,rss') + page.should have_content 'Feed Post' + page.should have_content 'Rss Post' + end + end + + context 'without tags' do + it 'returns all posts' do + visit feed_path(tags: '') + page.should have_content 'Feed Post' + page.should have_content 'Rss Post' + end + end + end end \ No newline at end of file From 2d0273f0aef027954868c10f7a07b34abfd7e801 Mon Sep 17 00:00:00 2001 From: Andy Brown Date: Tue, 9 Dec 2014 13:41:35 -0600 Subject: [PATCH 09/66] Change single quote to double per style guide --- app/controllers/monologue/posts_controller.rb | 4 +-- spec/requests/feed_spec.rb | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/controllers/monologue/posts_controller.rb b/app/controllers/monologue/posts_controller.rb index 67f1e2d8..78184864 100644 --- a/app/controllers/monologue/posts_controller.rb +++ b/app/controllers/monologue/posts_controller.rb @@ -18,8 +18,8 @@ def show def feed @posts = Monologue::Post.published.limit(25) if params[:tags].present? - tags = Monologue::Tag.where(name: params[:tags].split(',')).pluck(:id) - @posts = @posts.joins(:taggings).where('monologue_taggings.tag_id in (?)', tags) + tags = Monologue::Tag.where(name: params[:tags].split(",")).pluck(:id) + @posts = @posts.joins(:taggings).where("monologue_taggings.tag_id in (?)", tags) end end end diff --git a/spec/requests/feed_spec.rb b/spec/requests/feed_spec.rb index 8106d926..626e1066 100644 --- a/spec/requests/feed_spec.rb +++ b/spec/requests/feed_spec.rb @@ -11,25 +11,25 @@ page.should have_content "/monologue/url/to/post" end - context 'with tags param' do + context "with tags param" do before do - create(:post, title: 'Feed Post').tag!(['feed']) - create(:post, title: 'Rss Post').tag!(['rss']) + create(:post, title: "Feed Post").tag!(["feed"]) + create(:post, title: "Rss Post").tag!(["rss"]) end - context 'with tags' do - it 'returns posts tagged with tags' do - visit feed_path(tags: 'feed,rss') - page.should have_content 'Feed Post' - page.should have_content 'Rss Post' + context "with tags" do + it "returns posts tagged with tags" do + visit feed_path(tags: "feed,rss") + page.should have_content "Feed Post" + page.should have_content "Rss Post" end end - context 'without tags' do - it 'returns all posts' do - visit feed_path(tags: '') - page.should have_content 'Feed Post' - page.should have_content 'Rss Post' + context "without tags" do + it "returns all posts" do + visit feed_path(tags: "") + page.should have_content "Feed Post" + page.should have_content "Rss Post" end end end From 8fd3515fd703b2d9cf5f97db61884c2d72bd2828 Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Fri, 12 Dec 2014 18:32:14 -0800 Subject: [PATCH 10/66] Upgrade ckeditor gem to one that works properly with Rails 4+ asset pipeline --- app/assets/javascripts/monologue/admin/application.js | 1 - monologue.gemspec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/monologue/admin/application.js b/app/assets/javascripts/monologue/admin/application.js index 9fff8a52..fa7d9a21 100644 --- a/app/assets/javascripts/monologue/admin/application.js +++ b/app/assets/javascripts/monologue/admin/application.js @@ -11,7 +11,6 @@ //= require monologue/bootstrap/bootstrap-datepicker-fr //= require monologue/bootstrap/bootstrap-datepicker-pt //= require monologue/bootstrap/bootstrap-datepicker-es -//= require ckeditor/override //= require ckeditor/init //= require monologue/admin/ckeditor-config //= require monologue/admin/posts diff --git a/monologue.gemspec b/monologue.gemspec index e0486fa6..2a7ac428 100644 --- a/monologue.gemspec +++ b/monologue.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "sass-rails",'~> 4.0.0' s.add_dependency "truncate_html" s.add_dependency "jquery-rails" - s.add_dependency "ckeditor",'~> 4.0.11' + s.add_dependency "ckeditor",'~> 4.1.1' s.add_dependency 'select2-rails', '~> 3.2' s.add_development_dependency "rspec-rails", "~> 2.8" From 4e4ef65f58c83caf8845a68a86ec8312416fd9fb Mon Sep 17 00:00:00 2001 From: Ben Govero Date: Wed, 7 Jan 2015 15:14:47 -0600 Subject: [PATCH 11/66] Added post's tags as a data attribute on the section element --- app/views/monologue/posts/_post.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/monologue/posts/_post.html.erb b/app/views/monologue/posts/_post.html.erb index 14066fb2..71723bb2 100644 --- a/app/views/monologue/posts/_post.html.erb +++ b/app/views/monologue/posts/_post.html.erb @@ -1,4 +1,4 @@ -
+
<%= render partial: 'monologue/posts/post_header', locals: {post: post} %>
@@ -9,4 +9,4 @@ <%= render post.tags %>
<%= link_to t(".readmore"), post.full_url, class: "button" %> -
\ No newline at end of file +
From fa058192429afcf66a629b0a71ef1c33252bcdb5 Mon Sep 17 00:00:00 2001 From: Ben Govero Date: Wed, 7 Jan 2015 15:15:19 -0600 Subject: [PATCH 12/66] Classified tag names and added the class to the tag's span element --- app/views/monologue/tags/_tag.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/monologue/tags/_tag.html.erb b/app/views/monologue/tags/_tag.html.erb index 78a4065b..a15971fe 100644 --- a/app/views/monologue/tags/_tag.html.erb +++ b/app/views/monologue/tags/_tag.html.erb @@ -1 +1 @@ -<%=link_to tag.name, tag_url(tag) %> \ No newline at end of file +<%=link_to tag.name, tag_url(tag) %> From bb26bcbf2d12386af37c3c0a873022c760e16dc6 Mon Sep 17 00:00:00 2001 From: Jake Quain Date: Sat, 31 Jan 2015 11:48:36 -0700 Subject: [PATCH 13/66] Eager load users on blog & admin posts#index page --- app/controllers/monologue/admin/posts_controller.rb | 2 +- app/controllers/monologue/posts_controller.rb | 2 +- spec/requests/posts_spec.rb | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/controllers/monologue/admin/posts_controller.rb b/app/controllers/monologue/admin/posts_controller.rb index 3f842deb..7252c3b0 100644 --- a/app/controllers/monologue/admin/posts_controller.rb +++ b/app/controllers/monologue/admin/posts_controller.rb @@ -3,7 +3,7 @@ class Monologue::Admin::PostsController < Monologue::Admin::BaseController before_filter :load_post, only: [:edit, :update] def index - @posts = Monologue::Post.default + @posts = Monologue::Post.default.includes(:user) end def new diff --git a/app/controllers/monologue/posts_controller.rb b/app/controllers/monologue/posts_controller.rb index f1d3c0b0..8b3ab4e3 100644 --- a/app/controllers/monologue/posts_controller.rb +++ b/app/controllers/monologue/posts_controller.rb @@ -1,7 +1,7 @@ class Monologue::PostsController < Monologue::ApplicationController def index @page = params[:page].nil? ? 1 : params[:page] - @posts = Monologue::Post.page(@page).published + @posts = Monologue::Post.page(@page).includes(:user).published end def show diff --git a/spec/requests/posts_spec.rb b/spec/requests/posts_spec.rb index d423796c..b6d4356e 100644 --- a/spec/requests/posts_spec.rb +++ b/spec/requests/posts_spec.rb @@ -5,9 +5,11 @@ end it "lists posts" do + Factory(:post, title: "post Y") visit "/monologue" page.should have_content("post X") + page.should have_content("post Y") end it "should route to a post" do @@ -31,4 +33,10 @@ visit root_path page.should_not have_content "I am Marty McFly" end -end \ No newline at end of file + + it "should not show an unpublished post" do + Factory(:post, published:false, title: "I am Marty McFly") + visit root_path + page.should_not have_content "I am Marty McFly" + end +end From 2b820f751d298e661ffd7f152fe042f38679dc06 Mon Sep 17 00:00:00 2001 From: Jake Quain Date: Sat, 31 Jan 2015 11:52:54 -0700 Subject: [PATCH 14/66] Fix space for CI --- spec/requests/posts_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/requests/posts_spec.rb b/spec/requests/posts_spec.rb index b6d4356e..e44a440c 100644 --- a/spec/requests/posts_spec.rb +++ b/spec/requests/posts_spec.rb @@ -35,7 +35,7 @@ end it "should not show an unpublished post" do - Factory(:post, published:false, title: "I am Marty McFly") + Factory(:post, published: false, title: "I am Marty McFly") visit root_path page.should_not have_content "I am Marty McFly" end From c50ae3de7102fcd838d8e79e2e8de91ced032e10 Mon Sep 17 00:00:00 2001 From: Thomas Pinkney Barnwell IV Date: Wed, 11 Feb 2015 14:31:33 -0500 Subject: [PATCH 15/66] Updating gem spec for gem compatibility --- monologue.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monologue.gemspec b/monologue.gemspec index 2a7ac428..86db7d7e 100644 --- a/monologue.gemspec +++ b/monologue.gemspec @@ -17,8 +17,8 @@ Gem::Specification.new do |s| s.add_dependency "rails", ">= 4.0.4" s.add_dependency "bcrypt", '~> 3.1.7' - s.add_dependency "coffee-rails",'~> 4.0.0' - s.add_dependency "sass-rails",'~> 4.0.0' + s.add_dependency "coffee-rails",'>= 4.0.0' + s.add_dependency "sass-rails",'>= 4.0.0' s.add_dependency "truncate_html" s.add_dependency "jquery-rails" s.add_dependency "ckeditor",'~> 4.1.1' From 7ad7893e27630b26e95ec73056c9d9dee48b5d57 Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Thu, 12 Feb 2015 22:19:29 -0800 Subject: [PATCH 16/66] adds config options for number of posts per page in admin module --- lib/monologue/configuration.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/monologue/configuration.rb b/lib/monologue/configuration.rb index 7bd0c690..01eb1acf 100644 --- a/lib/monologue/configuration.rb +++ b/lib/monologue/configuration.rb @@ -27,6 +27,7 @@ class Configuration :admin_force_ssl, :posts_per_page, + :admin_posts_per_page, :google_analytics_id, :gauge_analytics_site_id, :layout, From f189b1fa8ee18fd1db2a876a45f19e613051e5bc Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Thu, 12 Feb 2015 22:20:09 -0800 Subject: [PATCH 17/66] adds method for paginated default post listing --- app/models/monologue/post.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models/monologue/post.rb b/app/models/monologue/post.rb index b9afb56e..3f5f17d0 100644 --- a/app/models/monologue/post.rb +++ b/app/models/monologue/post.rb @@ -44,6 +44,14 @@ def self.page p self.limit(per_page).offset(offset) end + def self.listing_page p + per_page = Monologue::Config.admin_posts_per_page || 50 + set_total_pages(per_page) + p = (p.nil? ? 0 : p.to_i - 1) + offset = p * per_page + self.default.limit(per_page).offset(offset) + end + def self.total_pages @number_of_pages end From 537fb6cae6af6450e76a64e138b906ac273ebbdb Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Thu, 12 Feb 2015 22:20:36 -0800 Subject: [PATCH 18/66] adds pagination route for posts in admin module --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index a8098464..e916f677 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,6 +7,7 @@ namespace :admin, path: "monologue" do get "/" => "posts#index", as: "" # responds to admin_url and admin_path + get "/page/:page", to: "posts#index", as: "posts_page" get "logout" => "sessions#destroy" get "login" => "sessions#new" resources :sessions From 80bde16d1cd9464e0f1b90ddc157143a244c82a7 Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Thu, 12 Feb 2015 22:21:00 -0800 Subject: [PATCH 19/66] adds use of new method for paginated post listing in admin --- app/controllers/monologue/admin/posts_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/monologue/admin/posts_controller.rb b/app/controllers/monologue/admin/posts_controller.rb index 3f842deb..2bb89063 100644 --- a/app/controllers/monologue/admin/posts_controller.rb +++ b/app/controllers/monologue/admin/posts_controller.rb @@ -3,7 +3,8 @@ class Monologue::Admin::PostsController < Monologue::Admin::BaseController before_filter :load_post, only: [:edit, :update] def index - @posts = Monologue::Post.default + @page = params[:page].nil? ? 1 : params[:page] + @posts = Monologue::Post.listing_page(@page) end def new From 8a3f893984d64f57ea4839250f43467cd703e448 Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Thu, 12 Feb 2015 22:21:21 -0800 Subject: [PATCH 20/66] adds pagination to admin post index --- app/views/monologue/admin/posts/_pagination.html.erb | 9 +++++++++ app/views/monologue/admin/posts/index.html.erb | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 app/views/monologue/admin/posts/_pagination.html.erb diff --git a/app/views/monologue/admin/posts/_pagination.html.erb b/app/views/monologue/admin/posts/_pagination.html.erb new file mode 100644 index 00000000..3d9b406b --- /dev/null +++ b/app/views/monologue/admin/posts/_pagination.html.erb @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/app/views/monologue/admin/posts/index.html.erb b/app/views/monologue/admin/posts/index.html.erb index d1871bde..e3c4869b 100644 --- a/app/views/monologue/admin/posts/index.html.erb +++ b/app/views/monologue/admin/posts/index.html.erb @@ -20,3 +20,7 @@ <% end %> + +<% if @page %> + <%= render partial: "pagination" %> +<% end %> \ No newline at end of file From 8e226958190328bf223efeb1fa6b432ffc58572a Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Thu, 12 Feb 2015 22:35:09 -0800 Subject: [PATCH 21/66] adds spec for paginated admin post route --- spec/requests/admin/posts_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/requests/admin/posts_spec.rb b/spec/requests/admin/posts_spec.rb index c89782f1..0adc94f0 100644 --- a/spec/requests/admin/posts_spec.rb +++ b/spec/requests/admin/posts_spec.rb @@ -10,6 +10,14 @@ visit admin_posts_path page.should have_content "Add a monologue" end + + it "can access post's admin with pagination" do + Factory(:post, title: "my first title") + Factory(:post, title: "my second title") + Monologue::Config.admin_posts_per_page = 1 + visit admin_posts_page_path page: 1 + page.should have_content "Older Posts" + end it "can create new post" do visit new_admin_post_path From 755ca7e3243caa47253a16bdbd4db3c0bf948e33 Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Thu, 12 Feb 2015 23:01:00 -0800 Subject: [PATCH 22/66] removes redundant self --- app/models/monologue/post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/monologue/post.rb b/app/models/monologue/post.rb index 3f5f17d0..4351bedb 100644 --- a/app/models/monologue/post.rb +++ b/app/models/monologue/post.rb @@ -49,7 +49,7 @@ def self.listing_page p set_total_pages(per_page) p = (p.nil? ? 0 : p.to_i - 1) offset = p * per_page - self.default.limit(per_page).offset(offset) + default.limit(per_page).offset(offset) end def self.total_pages From 2368eccdb14c068788f36a8959f840f91eea9bdd Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Thu, 12 Feb 2015 23:01:55 -0800 Subject: [PATCH 23/66] adds parens to method argument --- app/models/monologue/post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/monologue/post.rb b/app/models/monologue/post.rb index 4351bedb..aa9a34bf 100644 --- a/app/models/monologue/post.rb +++ b/app/models/monologue/post.rb @@ -44,7 +44,7 @@ def self.page p self.limit(per_page).offset(offset) end - def self.listing_page p + def self.listing_page(p) per_page = Monologue::Config.admin_posts_per_page || 50 set_total_pages(per_page) p = (p.nil? ? 0 : p.to_i - 1) From caf2947659ffd370adab45b20d56c1ed257cfff3 Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Thu, 12 Feb 2015 23:11:11 -0800 Subject: [PATCH 24/66] better aligns config params --- lib/monologue/configuration.rb | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/monologue/configuration.rb b/lib/monologue/configuration.rb index 01eb1acf..fd1b38dd 100644 --- a/lib/monologue/configuration.rb +++ b/lib/monologue/configuration.rb @@ -3,35 +3,35 @@ class Configuration include ConfigurationExtensions attr_accessor :disqus_shortname, - :site_name, - :site_subtitle, - :site_url, - :meta_description, - :meta_keyword, + :site_name, + :site_subtitle, + :site_url, + :meta_description, + :meta_keyword, - :show_rss_icon, + :show_rss_icon, - :twitter_username, - :twitter_locale, + :twitter_username, + :twitter_locale, - :facebook_like_locale, - :facebook_url, - :facebook_logo, #used in the open graph protocol to display an image when a post is liked + :facebook_like_locale, + :facebook_url, + :facebook_logo, #used in the open graph protocol to display an image when a post is liked - :google_plus_account_url, - :google_plusone_locale, + :google_plus_account_url, + :google_plusone_locale, - :linkedin_url, + :linkedin_url, - :github_username, + :github_username, - :admin_force_ssl, - :posts_per_page, - :admin_posts_per_page, - :google_analytics_id, - :gauge_analytics_site_id, - :layout, - :sidebar + :admin_force_ssl, + :posts_per_page, + :admin_posts_per_page, + :google_analytics_id, + :gauge_analytics_site_id, + :layout, + :sidebar end From 8b0ccc62878489c433c4608f35f706aa6cf94b42 Mon Sep 17 00:00:00 2001 From: Caitlin Goldman Date: Fri, 13 Feb 2015 09:20:33 -0800 Subject: [PATCH 25/66] refactors paging methods --- app/models/monologue/post.rb | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app/models/monologue/post.rb b/app/models/monologue/post.rb index aa9a34bf..8f11e69a 100644 --- a/app/models/monologue/post.rb +++ b/app/models/monologue/post.rb @@ -37,19 +37,11 @@ def published_in_future? end def self.page p - per_page = Monologue::Config.posts_per_page || 10 - set_total_pages(per_page) - p = (p.nil? ? 0 : p.to_i - 1) - offset = p * per_page - self.limit(per_page).offset(offset) + paged_results(p, Monologue::Config.posts_per_page || 10, false) end def self.listing_page(p) - per_page = Monologue::Config.admin_posts_per_page || 50 - set_total_pages(per_page) - p = (p.nil? ? 0 : p.to_i - 1) - offset = p * per_page - default.limit(per_page).offset(offset) + paged_results(p, Monologue::Config.admin_posts_per_page || 50, true) end def self.total_pages @@ -62,6 +54,17 @@ def self.set_total_pages per_page private + def self.paged_results(p, per_page, admin) + set_total_pages(per_page) + p = (p.nil? ? 0 : p.to_i - 1) + offset = p * per_page + if admin + default.limit(per_page).offset(offset) + else + limit(per_page).offset(offset) + end + end + def generate_url return unless self.url.blank? year = self.published_at.class == ActiveSupport::TimeWithZone ? self.published_at.year : DateTime.now.year @@ -71,5 +74,4 @@ def generate_url def url_do_not_start_with_slash errors.add(:url, I18n.t("activerecord.errors.models.monologue/post.attributes.url.start_with_slash")) if self.url.start_with?("/") end - end From 8efac3e566b86005b725985b453991b9deb2cd4f Mon Sep 17 00:00:00 2001 From: "Ashley Engelund (aenw / weedySeaDragon)" Date: Mon, 16 Feb 2015 12:40:26 -0800 Subject: [PATCH 26/66] added admin:posts:index:author key and values (used Google translate for "author" [English] to other languages) --- config/locales/de.yml | 2 +- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- config/locales/fr.yml | 1 + config/locales/it.yml | 1 + config/locales/pt.yml | 1 + config/locales/ro.yml | 1 + config/locales/tr.yml | 1 + 8 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 4df86f55..6a6c49eb 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -58,6 +58,7 @@ de: published: "Yes" not_published: "Nicht veröffentlicht" status: "Veröffentlichen ?" + author: "Autor" new: header: "Neuer Monologue" create: @@ -127,7 +128,6 @@ de: blank: "'Veröffentlichen am' wird benötigt" url: start_with_slash: "URL darf nicht mit einem Schrägstrich anfangen ('/')" - monologue/user: blank: "%{attribute} wird benötigt" taken: "%{attribute} wurde schon benutzt" diff --git a/config/locales/en.yml b/config/locales/en.yml index 87e0339a..48800b8c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -58,6 +58,7 @@ en: published: "Yes" not_published: "Not published" status: "Published ?" + author: "Author" new: header: "New monologue" create: @@ -127,7 +128,6 @@ en: blank: "'Published at' is required" url: start_with_slash: "URL can't start with a slash ('/')" - monologue/user: blank: "%{attribute} is required" taken: "%{attribute} has already been taken" diff --git a/config/locales/es.yml b/config/locales/es.yml index c93622b3..3753e9ed 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -58,6 +58,7 @@ es: published: "Sí" not_published: "No publicado" status: "Publicado?" + author: "Autor" new: header: "Nuevo artículo" create: @@ -139,7 +140,6 @@ es: blank: "'Publicado en' es obligatorio" url: start_with_slash: "URL no puede empezar con '/'" - monologue/user: blank: "%{attribute} es obligatorio" taken: "%{attribute} ya está en uso" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 937059a9..998a9c15 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -56,6 +56,7 @@ fr: published: "Oui" not_published: "Non publié" status: "Publié ?" + author: "Auteur" new: header: "Nouveau monologue" create: diff --git a/config/locales/it.yml b/config/locales/it.yml index 3bfcea9f..1735f0a1 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -58,6 +58,7 @@ it: published: "Sì" not_published: "Non pubblicato" status: "Pubblicato ?" + author: "Autore" new: header: "Nuovo monologue" create: diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 13857ae0..5e2547ac 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -58,6 +58,7 @@ pt_BR: published: "Sim" not_published: "Não publicado" status: "Publicado?" + author: "Autor" new: header: "Novo blog post" create: diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 6b81c842..a2c5a554 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -58,6 +58,7 @@ ro: published: "Da" not_published: "Nu e publicat" status: "Publicat ?" + author: "Autor" new: header: "Articol nou" create: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index c1185b2b..14354848 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -58,6 +58,7 @@ tr: published: "Evet" not_published: "Yayınlanmadı" status: "Yayınlandı mı?" + author: "Yazar" new: header: "Yeni monolog" create: From d7688e77ec8e001bf10dca87ec1eb08c0b811a9a Mon Sep 17 00:00:00 2001 From: "Ashley Engelund (aenw / weedySeaDragon)" Date: Mon, 16 Feb 2015 13:41:27 -0800 Subject: [PATCH 27/66] synchronized locale files: removed blank line(s); ensured all have the same keys; used Google Translate to add values --- config/locales/de.yml | 1 + config/locales/en.yml | 1 + config/locales/es.yml | 13 +------------ config/locales/fr.yml | 2 ++ config/locales/it.yml | 1 + config/locales/pt.yml | 19 ++++++++++--------- config/locales/ro.yml | 19 ++++++++++--------- config/locales/tr.yml | 2 +- 8 files changed, 27 insertions(+), 31 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 6a6c49eb..ed972832 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -128,6 +128,7 @@ de: blank: "'Veröffentlichen am' wird benötigt" url: start_with_slash: "URL darf nicht mit einem Schrägstrich anfangen ('/')" + unique: "URL wird bereits von einem anderen Beitrag verwendet" monologue/user: blank: "%{attribute} wird benötigt" taken: "%{attribute} wurde schon benutzt" diff --git a/config/locales/en.yml b/config/locales/en.yml index 48800b8c..b4ebb8f3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -128,6 +128,7 @@ en: blank: "'Published at' is required" url: start_with_slash: "URL can't start with a slash ('/')" + unique: "URL is already used by another post" monologue/user: blank: "%{attribute} is required" taken: "%{attribute} has already been taken" diff --git a/config/locales/es.yml b/config/locales/es.yml index 3753e9ed..dd845288 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -87,18 +87,6 @@ es: comments: show: recent_comments: "Comentarios recientes" - cache: - show: - title: "Gestioanr cache" - description: "Puedes borrar la cache aquí" - files_in_cache: "Estos son los ficheros en cache:" - no_files_are_cached: "No hay ningun fichero en cache" - delete: "Borrar la cache por completo?" - confirm: 'Estas seguro de que quieres borrar la cache por completo?' - cache_wiped: "La cache se ha borrado!" - how_to_enable: - warning: "No puedes gestionar la cache!" - explanations: "Hay ciertos ajustes que no estan correctamente definidos para usar la cache de Monologue. Por favor revisa la documentación de configuración" sessions: new: title: "Iniciar sesión" @@ -140,6 +128,7 @@ es: blank: "'Publicado en' es obligatorio" url: start_with_slash: "URL no puede empezar con '/'" + unique: "URL está en uso por otro artículo" monologue/user: blank: "%{attribute} es obligatorio" taken: "%{attribute} ya está en uso" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 998a9c15..5aa0bffc 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -39,6 +39,8 @@ fr: new: create: "Ajouter" header: "Ajouter un utilisateur" + create: + success: "L'utilisateur créé avec succès" delete: removed: "L'utilisateur '%{user}' a été supprimé" failed: "L'utilisateur '%{user}' n'a pas pu être supprimé" diff --git a/config/locales/it.yml b/config/locales/it.yml index 1735f0a1..d9b9a6be 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -122,6 +122,7 @@ it: full_messages: "%{message}" monologue/posts_revision: blank: "%{attribute} è richiesto" + taken: "%{attribute} è già utilizzato da un altro post" attributes: published_at: blank: "'Pubblicato il' è richiesto" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 5e2547ac..80ac59c9 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -37,19 +37,19 @@ pt_BR: header: "Editar configurações de usuário" save: "Salvar" new: - create: "TODO Create" - header: "TODO Add a user" + create: "Criar" + header: "Adicionar um usuárior" create: - success: "TODO User created" + success: "Usuário criado" delete: - removed: "TODO User '%{user}' removed successfully" - failed: "TODO Could not remove user '%{user}'" + removed: "Usuário '%{user}' removido com sucesso" + failed: "Não poderia remover o usuário '%{user}'" index: email: "Email" name: "Nome" edit: "Editar" delete: "Deletar" - create: "TODO Create" + create: "Criar" posts: index: title: "Título" @@ -108,11 +108,11 @@ pt_BR: edit_user_info: "Minha conta" settings: "Configurações" log_out: "Sair" - users: "TODO Users" + users: "Usuários" activerecord: attributes: monologue/user: - password_digest: "TODO Password confirmation" + password_digest: "Confirmação de senha" errors: format: "%{message}" errors: @@ -128,9 +128,10 @@ pt_BR: blank: "'Data de publicação' é obrigatório" url: start_with_slash: "URL não pode começar com '/'" + unique: "URL já é utilizado por outro post" monologue/user: blank: "%{attribute} é obrigatório" - taken: "TODO %{attribute} has already been taken" + taken: "%{attribute} já utilizada por outro post" attributes: password: confirmation: "Senha e confirmação diferem." diff --git a/config/locales/ro.yml b/config/locales/ro.yml index a2c5a554..37c2f107 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -37,19 +37,19 @@ ro: header: "Modificare cont" save: "Salvati" new: - create: "TODO Create" - header: "TODO Add a user" + create: "Crea" + header: "Adăugați un utilizator" create: - success: "TODO User created" + success: "Utilizatorul a fost creat." delete: - removed: "TODO User '%{user}' removed successfully" - failed: "TODO Could not remove user '%{user}'" + removed: "Utilizatorul '%{user}' a fost eliminat cu succes." + failed: "Nu a putut fi elimina utilizatorul '%{user}'" index: email: "Email" name: "Nume" edit: "Modificati" delete: "Stergeti" - create: "TODO Create" + create: "Crea" posts: index: title: "Titlu" @@ -108,11 +108,11 @@ ro: edit_user_info: "Contul meu" settings: "Preferinte" log_out: "Iesire" - users: "TODO Users" + users: "Utilizatorii" activerecord: attributes: monologue/user: - password_digest: "TODO Password confirmation" + password_digest: "Confirmarea parolei" errors: format: "%{message}" errors: @@ -128,9 +128,10 @@ ro: blank: "'Published at' este necesar" url: start_with_slash: "URL-ul nu poate incepe cu slash ('/')" + unique: "URL-ul este deja utilizat de un alt post" monologue/user: blank: "%{attribute} este necesar" - taken: "TODO %{attribute} has already been taken" + taken: "%{attribute} a fost deja luată" attributes: password: confirmation: "Parola si confirmarea acesteia nu sunt identice." diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 14354848..097246f6 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -128,7 +128,7 @@ tr: blank: "'Gönderi tarihi' gerekli" url: start_with_slash: "URL ('/') ile başlayamaz" - + unique: "URL zaten başka bir yazı tarafından kullanılan" monologue/user: blank: "%{attribute} gereklidir" taken: "%{attribute} zaten kullanılmakta" From 00b31cc217be4c4408bb841552f4995255379736 Mon Sep 17 00:00:00 2001 From: "Ashley Engelund (aenw / weedySeaDragon)" Date: Mon, 16 Feb 2015 13:58:12 -0800 Subject: [PATCH 28/66] git line normalization so windows end of line is OK added .gitattributes to handle line normalization --- .gitattributes | 2 ++ config/locales/de.yml | 1 - config/locales/en.yml | 1 - config/locales/es.yml | 13 ++++++++++++- config/locales/fr.yml | 2 -- config/locales/it.yml | 1 - config/locales/pt.yml | 19 +++++++++---------- config/locales/ro.yml | 19 +++++++++---------- config/locales/tr.yml | 2 +- 9 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..dfe07704 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/config/locales/de.yml b/config/locales/de.yml index ed972832..6a6c49eb 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -128,7 +128,6 @@ de: blank: "'Veröffentlichen am' wird benötigt" url: start_with_slash: "URL darf nicht mit einem Schrägstrich anfangen ('/')" - unique: "URL wird bereits von einem anderen Beitrag verwendet" monologue/user: blank: "%{attribute} wird benötigt" taken: "%{attribute} wurde schon benutzt" diff --git a/config/locales/en.yml b/config/locales/en.yml index b4ebb8f3..48800b8c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -128,7 +128,6 @@ en: blank: "'Published at' is required" url: start_with_slash: "URL can't start with a slash ('/')" - unique: "URL is already used by another post" monologue/user: blank: "%{attribute} is required" taken: "%{attribute} has already been taken" diff --git a/config/locales/es.yml b/config/locales/es.yml index dd845288..3753e9ed 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -87,6 +87,18 @@ es: comments: show: recent_comments: "Comentarios recientes" + cache: + show: + title: "Gestioanr cache" + description: "Puedes borrar la cache aquí" + files_in_cache: "Estos son los ficheros en cache:" + no_files_are_cached: "No hay ningun fichero en cache" + delete: "Borrar la cache por completo?" + confirm: 'Estas seguro de que quieres borrar la cache por completo?' + cache_wiped: "La cache se ha borrado!" + how_to_enable: + warning: "No puedes gestionar la cache!" + explanations: "Hay ciertos ajustes que no estan correctamente definidos para usar la cache de Monologue. Por favor revisa la documentación de configuración" sessions: new: title: "Iniciar sesión" @@ -128,7 +140,6 @@ es: blank: "'Publicado en' es obligatorio" url: start_with_slash: "URL no puede empezar con '/'" - unique: "URL está en uso por otro artículo" monologue/user: blank: "%{attribute} es obligatorio" taken: "%{attribute} ya está en uso" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 5aa0bffc..998a9c15 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -39,8 +39,6 @@ fr: new: create: "Ajouter" header: "Ajouter un utilisateur" - create: - success: "L'utilisateur créé avec succès" delete: removed: "L'utilisateur '%{user}' a été supprimé" failed: "L'utilisateur '%{user}' n'a pas pu être supprimé" diff --git a/config/locales/it.yml b/config/locales/it.yml index d9b9a6be..1735f0a1 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -122,7 +122,6 @@ it: full_messages: "%{message}" monologue/posts_revision: blank: "%{attribute} è richiesto" - taken: "%{attribute} è già utilizzato da un altro post" attributes: published_at: blank: "'Pubblicato il' è richiesto" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 80ac59c9..5e2547ac 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -37,19 +37,19 @@ pt_BR: header: "Editar configurações de usuário" save: "Salvar" new: - create: "Criar" - header: "Adicionar um usuárior" + create: "TODO Create" + header: "TODO Add a user" create: - success: "Usuário criado" + success: "TODO User created" delete: - removed: "Usuário '%{user}' removido com sucesso" - failed: "Não poderia remover o usuário '%{user}'" + removed: "TODO User '%{user}' removed successfully" + failed: "TODO Could not remove user '%{user}'" index: email: "Email" name: "Nome" edit: "Editar" delete: "Deletar" - create: "Criar" + create: "TODO Create" posts: index: title: "Título" @@ -108,11 +108,11 @@ pt_BR: edit_user_info: "Minha conta" settings: "Configurações" log_out: "Sair" - users: "Usuários" + users: "TODO Users" activerecord: attributes: monologue/user: - password_digest: "Confirmação de senha" + password_digest: "TODO Password confirmation" errors: format: "%{message}" errors: @@ -128,10 +128,9 @@ pt_BR: blank: "'Data de publicação' é obrigatório" url: start_with_slash: "URL não pode começar com '/'" - unique: "URL já é utilizado por outro post" monologue/user: blank: "%{attribute} é obrigatório" - taken: "%{attribute} já utilizada por outro post" + taken: "TODO %{attribute} has already been taken" attributes: password: confirmation: "Senha e confirmação diferem." diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 37c2f107..a2c5a554 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -37,19 +37,19 @@ ro: header: "Modificare cont" save: "Salvati" new: - create: "Crea" - header: "Adăugați un utilizator" + create: "TODO Create" + header: "TODO Add a user" create: - success: "Utilizatorul a fost creat." + success: "TODO User created" delete: - removed: "Utilizatorul '%{user}' a fost eliminat cu succes." - failed: "Nu a putut fi elimina utilizatorul '%{user}'" + removed: "TODO User '%{user}' removed successfully" + failed: "TODO Could not remove user '%{user}'" index: email: "Email" name: "Nume" edit: "Modificati" delete: "Stergeti" - create: "Crea" + create: "TODO Create" posts: index: title: "Titlu" @@ -108,11 +108,11 @@ ro: edit_user_info: "Contul meu" settings: "Preferinte" log_out: "Iesire" - users: "Utilizatorii" + users: "TODO Users" activerecord: attributes: monologue/user: - password_digest: "Confirmarea parolei" + password_digest: "TODO Password confirmation" errors: format: "%{message}" errors: @@ -128,10 +128,9 @@ ro: blank: "'Published at' este necesar" url: start_with_slash: "URL-ul nu poate incepe cu slash ('/')" - unique: "URL-ul este deja utilizat de un alt post" monologue/user: blank: "%{attribute} este necesar" - taken: "%{attribute} a fost deja luată" + taken: "TODO %{attribute} has already been taken" attributes: password: confirmation: "Parola si confirmarea acesteia nu sunt identice." diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 097246f6..14354848 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -128,7 +128,7 @@ tr: blank: "'Gönderi tarihi' gerekli" url: start_with_slash: "URL ('/') ile başlayamaz" - unique: "URL zaten başka bir yazı tarafından kullanılan" + monologue/user: blank: "%{attribute} gereklidir" taken: "%{attribute} zaten kullanılmakta" From d82ecffba24f8378dcd5061991f249bc95635a59 Mon Sep 17 00:00:00 2001 From: Mateus Azis Date: Wed, 25 Feb 2015 06:58:31 -0300 Subject: [PATCH 29/66] Issue #122: renamed pt.yml localization file to pt-BR.yml and changed language from pt_BR to pt-BR. --- config/locales/{pt.yml => pt-BR.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename config/locales/{pt.yml => pt-BR.yml} (99%) diff --git a/config/locales/pt.yml b/config/locales/pt-BR.yml similarity index 99% rename from config/locales/pt.yml rename to config/locales/pt-BR.yml index 13857ae0..6024f937 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt-BR.yml @@ -1,4 +1,4 @@ -pt_BR: +pt-BR: monologue: posts: pagination: From 2d1ad1600b1f6466cfacc60a7012ce8dcc5296d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcolas=20Iensen?= Date: Tue, 3 Mar 2015 18:37:58 -0300 Subject: [PATCH 30/66] Fix testing dummy Gemfile --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 85621da1..a04e1555 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ gemspec group :development, :test do gem "thin" gem 'rails', '>= 4.0.4' + gem 'responders', '~> 2.0' gem 'pry' if RUBY_PLATFORM.downcase.include?("darwin") From 17587de8ad520136929c8878101c46bc22469f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcolas=20Iensen?= Date: Tue, 3 Mar 2015 18:49:48 -0300 Subject: [PATCH 31/66] Fix application_helper tests --- monologue.gemspec | 1 + spec/helpers/application_helper_spec.rb | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/monologue.gemspec b/monologue.gemspec index 2a7ac428..67340635 100644 --- a/monologue.gemspec +++ b/monologue.gemspec @@ -23,6 +23,7 @@ Gem::Specification.new do |s| s.add_dependency "jquery-rails" s.add_dependency "ckeditor",'~> 4.1.1' s.add_dependency 'select2-rails', '~> 3.2' + s.add_dependency 'responders', '~> 2.0' s.add_development_dependency "rspec-rails", "~> 2.8" s.add_development_dependency 'factory_girl_rails', '~> 1.4.0' diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index a9688909..8ad51d9f 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -43,31 +43,31 @@ describe "social icons+links" do context "render if enabled" do it "generate rss tag for " do - helper.rss_head_link.should eq "" + helper.rss_head_link.should eq "" end it "generate rss icon" do - helper.rss_icon.should eq "" + helper.rss_icon.should eq "" end it "generate github" do - helper.github_icon.should eq "" + helper.github_icon.should eq "" end it "generate twitter" do - helper.twitter_icon.should eq "" + helper.twitter_icon.should eq "" end it "generate linkedin" do - helper.linkedin_icon.should eq "" + helper.linkedin_icon.should eq "" end it "generate googleplus" do - helper.googleplus_icon.should eq "" + helper.googleplus_icon.should eq "" end it "generate facebook" do - helper.facebook_icon.should eq "" + helper.facebook_icon.should eq "" end end @@ -147,4 +147,4 @@ end end -end \ No newline at end of file +end From 42ca6a1982f3ce91fe61523821dc6800aeabd1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcolas=20Iensen?= Date: Tue, 3 Mar 2015 19:23:36 -0300 Subject: [PATCH 32/66] Refactoring application_helper_spec file --- spec/helpers/application_helper_spec.rb | 33 +++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 8ad51d9f..79a7876a 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -43,31 +43,50 @@ describe "social icons+links" do context "render if enabled" do it "generate rss tag for " do - helper.rss_head_link.should eq "" + helper.rss_head_link.should have_css("link", href: "http://test.host/feed", rel: "alternate", + title: "RSS", type: "application/rss+xml") end it "generate rss icon" do - helper.rss_icon.should eq "" + helper.rss_icon.should have_css("a", href: "http://test.host/feed", class: "social", + target: "_blank") + + helper.rss_icon.should have_css("i", class: "foundicon-rss") end it "generate github" do - helper.github_icon.should eq "" + helper.github_icon.should have_css("a", + href: "http://github.com/#{Monologue::Config.github_username}", class: "social", target: "_blank") + + helper.github_icon.should have_css("i", class: "foundicon-github") end it "generate twitter" do - helper.twitter_icon.should eq "" + helper.twitter_icon.should have_css("a", + href: "http://twitter.com/#{Monologue::Config.twitter_username}", class: "social", target: "_blank") + + helper.twitter_icon.should have_css("i", class: "foundicon-twitter") end it "generate linkedin" do - helper.linkedin_icon.should eq "" + helper.linkedin_icon.should have_css("a", href: "#{Monologue::Config.linkedin_url}", class: "social", + target: "_blank") + + helper.linkedin_icon.should have_css("i", class: "foundicon-linkedin") end it "generate googleplus" do - helper.googleplus_icon.should eq "" + helper.googleplus_icon.should have_css("a", href: "#{Monologue::Config.google_plus_account_url}", + class: "social", target: "_blank") + + helper.googleplus_icon.should have_css("i", class: "foundicon-google-plus") end it "generate facebook" do - helper.facebook_icon.should eq "" + helper.facebook_icon.should have_css("a", href: "#{Monologue::Config.facebook_url}", class: "social", + target: "_blank") + + helper.facebook_icon.should have_css("i", class: "foundicon-facebook") end end From 6a98c30c55188c50307c33b841eef818135a5441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcolas=20Iensen?= Date: Tue, 3 Mar 2015 19:28:25 -0300 Subject: [PATCH 33/66] Refactoring application_helper_spec file --- spec/helpers/application_helper_spec.rb | 46 ++++++++++++++++++------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 79a7876a..8bfae062 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -43,48 +43,70 @@ describe "social icons+links" do context "render if enabled" do it "generate rss tag for " do - helper.rss_head_link.should have_css("link", href: "http://test.host/feed", rel: "alternate", - title: "RSS", type: "application/rss+xml") + helper.rss_head_link.should have_css("link", + href: "http://test.host/feed", + rel: "alternate", + title: "RSS", + type: "application/rss+xml" + ) end it "generate rss icon" do - helper.rss_icon.should have_css("a", href: "http://test.host/feed", class: "social", - target: "_blank") + helper.rss_icon.should have_css("a", + href: "http://test.host/feed", + class: "social", + target: "_blank" + ) helper.rss_icon.should have_css("i", class: "foundicon-rss") end it "generate github" do helper.github_icon.should have_css("a", - href: "http://github.com/#{Monologue::Config.github_username}", class: "social", target: "_blank") + href: "http://github.com/#{Monologue::Config.github_username}", + class: "social", + target: "_blank" + ) helper.github_icon.should have_css("i", class: "foundicon-github") end it "generate twitter" do helper.twitter_icon.should have_css("a", - href: "http://twitter.com/#{Monologue::Config.twitter_username}", class: "social", target: "_blank") + href: "http://twitter.com/#{Monologue::Config.twitter_username}", + class: "social", + target: "_blank" + ) helper.twitter_icon.should have_css("i", class: "foundicon-twitter") end it "generate linkedin" do - helper.linkedin_icon.should have_css("a", href: "#{Monologue::Config.linkedin_url}", class: "social", - target: "_blank") + helper.linkedin_icon.should have_css("a", + href: "#{Monologue::Config.linkedin_url}", + class: "social", + target: "_blank" + ) helper.linkedin_icon.should have_css("i", class: "foundicon-linkedin") end it "generate googleplus" do - helper.googleplus_icon.should have_css("a", href: "#{Monologue::Config.google_plus_account_url}", - class: "social", target: "_blank") + helper.googleplus_icon.should have_css("a", + href: "#{Monologue::Config.google_plus_account_url}", + class: "social", + target: "_blank" + ) helper.googleplus_icon.should have_css("i", class: "foundicon-google-plus") end it "generate facebook" do - helper.facebook_icon.should have_css("a", href: "#{Monologue::Config.facebook_url}", class: "social", - target: "_blank") + helper.facebook_icon.should have_css("a", + href: "#{Monologue::Config.facebook_url}", + class: "social", + target: "_blank" + ) helper.facebook_icon.should have_css("i", class: "foundicon-facebook") end From 467c8d8e6fe086d8bb48f7ca7deccc1cc4753253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcolas=20Iensen?= Date: Tue, 3 Mar 2015 19:30:01 -0300 Subject: [PATCH 34/66] Refactoring application_helper_spec file --- spec/helpers/application_helper_spec.rb | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 8bfae062..7fdd63ac 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -43,7 +43,8 @@ describe "social icons+links" do context "render if enabled" do it "generate rss tag for " do - helper.rss_head_link.should have_css("link", + helper.rss_head_link.should have_css( + "link", href: "http://test.host/feed", rel: "alternate", title: "RSS", @@ -52,7 +53,8 @@ end it "generate rss icon" do - helper.rss_icon.should have_css("a", + helper.rss_icon.should have_css( + "a", href: "http://test.host/feed", class: "social", target: "_blank" @@ -62,7 +64,8 @@ end it "generate github" do - helper.github_icon.should have_css("a", + helper.github_icon.should have_css( + "a", href: "http://github.com/#{Monologue::Config.github_username}", class: "social", target: "_blank" @@ -72,7 +75,8 @@ end it "generate twitter" do - helper.twitter_icon.should have_css("a", + helper.twitter_icon.should have_css( + "a", href: "http://twitter.com/#{Monologue::Config.twitter_username}", class: "social", target: "_blank" @@ -82,7 +86,8 @@ end it "generate linkedin" do - helper.linkedin_icon.should have_css("a", + helper.linkedin_icon.should have_css( + "a", href: "#{Monologue::Config.linkedin_url}", class: "social", target: "_blank" @@ -92,7 +97,8 @@ end it "generate googleplus" do - helper.googleplus_icon.should have_css("a", + helper.googleplus_icon.should have_css( + "a", href: "#{Monologue::Config.google_plus_account_url}", class: "social", target: "_blank" @@ -102,7 +108,8 @@ end it "generate facebook" do - helper.facebook_icon.should have_css("a", + helper.facebook_icon.should have_css( + "a", href: "#{Monologue::Config.facebook_url}", class: "social", target: "_blank" From e923b815eaf0edea66c90377063e0cb9cdb39562 Mon Sep 17 00:00:00 2001 From: Steven Nunez Date: Wed, 25 Mar 2015 10:58:27 -0400 Subject: [PATCH 35/66] Update path to routes file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index de3f2353..14533bfe 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ And run `bundle install` to fetch the gem and update your 'Gemfile.lock'. ### 2. Route to Monologue -Add this to your route file (`config/route.rb`) +Add this to your route file (`config/routes.rb`) ```ruby # This line mounts Monologue's routes at the root of your application. # This means, any requests to URLs such as /my-post, will go to Monologue::PostsController. From 23c987ddb7683cd5b51bf8a3fa142f832816f43a Mon Sep 17 00:00:00 2001 From: Wu Date: Mon, 6 Apr 2015 21:50:54 +0800 Subject: [PATCH 36/66] add monologue:views generator --- lib/generators/monologue/views_generator.rb | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 lib/generators/monologue/views_generator.rb diff --git a/lib/generators/monologue/views_generator.rb b/lib/generators/monologue/views_generator.rb new file mode 100644 index 00000000..5934bf96 --- /dev/null +++ b/lib/generators/monologue/views_generator.rb @@ -0,0 +1,27 @@ +require 'rails/generators/base' + +module Monologue + module Generators + class ViewsGenerator < Rails::Generators::Base + desc "Copies Monologue views to your application." + argument :scope, required: false, default: nil, + desc: "The scope to copy views to" + source_root File.expand_path("../../../../app/views", __FILE__) + + def copy_views + view_directory :layouts + view_directory :monologue + end + + protected + + def view_directory(name) + directory name.to_s,"#{target_path}/#{name}" + end + + def target_path + @target_path ||= "app/views/#{scope || :monologue}" + end + end + end +end From 78d7720c233825a57291fb7d5d92e54dcb2cfd39 Mon Sep 17 00:00:00 2001 From: Wu Date: Mon, 6 Apr 2015 22:33:33 +0800 Subject: [PATCH 37/66] Update views_generator.rb file --- lib/generators/monologue/views_generator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/generators/monologue/views_generator.rb b/lib/generators/monologue/views_generator.rb index 5934bf96..7e0804b8 100644 --- a/lib/generators/monologue/views_generator.rb +++ b/lib/generators/monologue/views_generator.rb @@ -1,4 +1,4 @@ -require 'rails/generators/base' +require "rails/generators/base" module Monologue module Generators @@ -16,7 +16,7 @@ def copy_views protected def view_directory(name) - directory name.to_s,"#{target_path}/#{name}" + directory name.to_s, "#{target_path}/#{name}" end def target_path From 7d54af366a0a6cf872796e5f9db497d6f83b4d5b Mon Sep 17 00:00:00 2001 From: James Date: Fri, 1 May 2015 01:43:43 -0300 Subject: [PATCH 38/66] Add responders gem to allow the engine to be run in rails 4.2 --- lib/monologue/engine.rb | 1 + monologue.gemspec | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/monologue/engine.rb b/lib/monologue/engine.rb index 846bb762..0c9c5089 100644 --- a/lib/monologue/engine.rb +++ b/lib/monologue/engine.rb @@ -4,6 +4,7 @@ require "jquery-rails" require "sass-rails" require "coffee-rails" +require "responders" module Monologue class Engine < Rails::Engine diff --git a/monologue.gemspec b/monologue.gemspec index 2a7ac428..3d74382f 100644 --- a/monologue.gemspec +++ b/monologue.gemspec @@ -18,11 +18,12 @@ Gem::Specification.new do |s| s.add_dependency "rails", ">= 4.0.4" s.add_dependency "bcrypt", '~> 3.1.7' s.add_dependency "coffee-rails",'~> 4.0.0' - s.add_dependency "sass-rails",'~> 4.0.0' s.add_dependency "truncate_html" s.add_dependency "jquery-rails" s.add_dependency "ckeditor",'~> 4.1.1' s.add_dependency 'select2-rails', '~> 3.2' + s.add_dependency "sass-rails",'~> 5.0.0' + s.add_dependency "responders", '~> 2.0.0' s.add_development_dependency "rspec-rails", "~> 2.8" s.add_development_dependency 'factory_girl_rails', '~> 1.4.0' From a4f0a673b89fcdfd9ba4ed8955406d0d8ca44bad Mon Sep 17 00:00:00 2001 From: James Date: Fri, 1 May 2015 02:01:06 -0300 Subject: [PATCH 39/66] Add font files to assets precompile --- lib/monologue/engine.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/monologue/engine.rb b/lib/monologue/engine.rb index 0c9c5089..7033a64c 100644 --- a/lib/monologue/engine.rb +++ b/lib/monologue/engine.rb @@ -21,6 +21,7 @@ class Engine < Rails::Engine app.config.assets.precompile += %w[ monologue/admin/ckeditor-config.js ckeditor/* + *.eot* *.woff *.ttf ] end From ea1660534b22d5e0b310aed54d4ccac43a37935a Mon Sep 17 00:00:00 2001 From: Michal Hantl Date: Thu, 7 May 2015 08:23:56 +0200 Subject: [PATCH 40/66] layout: false for feed --- app/controllers/monologue/posts_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/monologue/posts_controller.rb b/app/controllers/monologue/posts_controller.rb index 8b3ab4e3..ceb35ceb 100644 --- a/app/controllers/monologue/posts_controller.rb +++ b/app/controllers/monologue/posts_controller.rb @@ -17,5 +17,6 @@ def show def feed @posts = Monologue::Post.published.limit(25) + render 'feed', layout: false end end From f4041f3952b25475ca4b6743c49c587cf819395a Mon Sep 17 00:00:00 2001 From: JorgeMBP Date: Thu, 7 May 2015 10:28:50 +0200 Subject: [PATCH 41/66] Improved performance on tag frequency calculation --- app/controllers/monologue/application_controller.rb | 2 +- app/models/monologue/tag.rb | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/controllers/monologue/application_controller.rb b/app/controllers/monologue/application_controller.rb index b2c7e445..2e9a14e6 100644 --- a/app/controllers/monologue/application_controller.rb +++ b/app/controllers/monologue/application_controller.rb @@ -10,7 +10,7 @@ def recent_posts end def all_tags - @tags = Monologue::Tag.order("name").select{|t| t.frequency>0} + @tags = Monologue::Tag.with_frequency.order("name") #could use minmax here but it's only supported with ruby > 1.9' @tags_frequency_min = @tags.map{|t| t.frequency}.min @tags_frequency_max = @tags.map{|t| t.frequency}.max diff --git a/app/models/monologue/tag.rb b/app/models/monologue/tag.rb index 84d15279..2d970c21 100644 --- a/app/models/monologue/tag.rb +++ b/app/models/monologue/tag.rb @@ -7,7 +7,18 @@ def posts_with_tag self.posts.published end + def self.with_frequency + self + .select("name, COUNT(*) as frequency") + .joins("INNER JOIN monologue_taggings ON monologue_taggings.tag_id = monologue_tags.id") + .joins("INNER JOIN monologue_posts ON monologue_posts.id = monologue_taggings.post_id") + .where("monologue_posts.published = 't'") + .group("name") + .having("COUNT(*) > 0") + end + def frequency - posts_with_tag.size + self.attributes["frequency"].nil? ? posts_with_tag.size : self.attributes["frequency"].to_i end + end From bbecb3de6a562ef1990faabaf5bfafb1486f14fe Mon Sep 17 00:00:00 2001 From: Kyle Annen Date: Thu, 30 Jul 2015 10:09:47 -0700 Subject: [PATCH 42/66] customize layout for personal purposes --- app/views/layouts/monologue/application.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/monologue/application.html.erb b/app/views/layouts/monologue/application.html.erb index 4d624d93..7f2c1b4e 100644 --- a/app/views/layouts/monologue/application.html.erb +++ b/app/views/layouts/monologue/application.html.erb @@ -6,6 +6,9 @@ <%= render 'layouts/monologue/application/head' %> +
+ <%= render 'main_app.layouts/header' %> +
@@ -35,4 +38,4 @@ <%= render 'layouts/monologue/application/disqus' %> <%= render 'layouts/monologue/application/gauge_analytics' %> - \ No newline at end of file + From b2009af100dcdc76f7ea95aa64776581404f3e79 Mon Sep 17 00:00:00 2001 From: Kyle Annen Date: Thu, 30 Jul 2015 10:19:52 -0700 Subject: [PATCH 43/66] fix partial --- app/views/layouts/monologue/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/monologue/application.html.erb b/app/views/layouts/monologue/application.html.erb index 7f2c1b4e..f15e1a73 100644 --- a/app/views/layouts/monologue/application.html.erb +++ b/app/views/layouts/monologue/application.html.erb @@ -7,7 +7,7 @@ <%= render 'layouts/monologue/application/head' %>
- <%= render 'main_app.layouts/header' %> + <%= render partial: 'main_app.layouts/header' %>
From b4617956a4fcbf48a53a77e9d6b77277fdeaf890 Mon Sep 17 00:00:00 2001 From: Kyle Annen Date: Thu, 30 Jul 2015 10:26:23 -0700 Subject: [PATCH 44/66] Revert "fix partial" This reverts commit b2009af100dcdc76f7ea95aa64776581404f3e79. --- app/views/layouts/monologue/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/monologue/application.html.erb b/app/views/layouts/monologue/application.html.erb index f15e1a73..7f2c1b4e 100644 --- a/app/views/layouts/monologue/application.html.erb +++ b/app/views/layouts/monologue/application.html.erb @@ -7,7 +7,7 @@ <%= render 'layouts/monologue/application/head' %>
- <%= render partial: 'main_app.layouts/header' %> + <%= render 'main_app.layouts/header' %>
From 4bbc2c28c5e6dcc2610aad491f4f5aa92dacfb31 Mon Sep 17 00:00:00 2001 From: Kyle Annen Date: Thu, 30 Jul 2015 10:27:19 -0700 Subject: [PATCH 45/66] revert --- app/views/layouts/monologue/application.html.erb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/layouts/monologue/application.html.erb b/app/views/layouts/monologue/application.html.erb index 7f2c1b4e..c6b052c3 100644 --- a/app/views/layouts/monologue/application.html.erb +++ b/app/views/layouts/monologue/application.html.erb @@ -6,9 +6,6 @@ <%= render 'layouts/monologue/application/head' %> -
- <%= render 'main_app.layouts/header' %> -
From e486a3d3a05af2fbeb14bbab49d42a812c1de344 Mon Sep 17 00:00:00 2001 From: Scootin Date: Tue, 4 Aug 2015 11:24:59 -0700 Subject: [PATCH 46/66] fixed view getting error notice when post saved successfully --- app/views/layouts/monologue/admin.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/monologue/admin.html.erb b/app/views/layouts/monologue/admin.html.erb index e05d28af..8c691ac6 100644 --- a/app/views/layouts/monologue/admin.html.erb +++ b/app/views/layouts/monologue/admin.html.erb @@ -12,7 +12,7 @@ <% end %>
<% flash.each do |name, msg| %> - <%= content_tag :div, msg, id: "flash_#{name}", class: (name == :notice ? "alert alert-info" : "alert alert-error") %> + <%= content_tag :div, msg, id: "flash_#{name}", class: (name == 'notice' ? "alert alert-info" : "alert alert-error") %> <% end %> <%= yield %> From d1b19c3da05f58a8a7c567e0b3dd8bb5b58759db Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 12 Aug 2015 16:00:13 -0400 Subject: [PATCH 47/66] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 14533bfe..ae0985af 100644 --- a/README.md +++ b/README.md @@ -95,6 +95,10 @@ this might help you to [monkey patch](https://gist.github.com/jipiboily/776d907f ## Customization See the [Wiki - Customizations](https://github.com/jipiboily/monologue/wiki/Customizations). +## Copy views +copy views like devise `rails g monologue:views` +or use scope: `rails g monologue:views blog` + ## Requirements - Rails 4.0.4 + - Database: MySQL & Postgres are supported but other databases might work too. From 9a11bf4025972fc9f3eeb20ab6720c674c354618 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 12 Aug 2015 17:18:27 -0400 Subject: [PATCH 48/66] Revert "Improved performance on tag frequency calculation" --- app/controllers/monologue/application_controller.rb | 2 +- app/models/monologue/tag.rb | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/controllers/monologue/application_controller.rb b/app/controllers/monologue/application_controller.rb index 2e9a14e6..b2c7e445 100644 --- a/app/controllers/monologue/application_controller.rb +++ b/app/controllers/monologue/application_controller.rb @@ -10,7 +10,7 @@ def recent_posts end def all_tags - @tags = Monologue::Tag.with_frequency.order("name") + @tags = Monologue::Tag.order("name").select{|t| t.frequency>0} #could use minmax here but it's only supported with ruby > 1.9' @tags_frequency_min = @tags.map{|t| t.frequency}.min @tags_frequency_max = @tags.map{|t| t.frequency}.max diff --git a/app/models/monologue/tag.rb b/app/models/monologue/tag.rb index 2d970c21..84d15279 100644 --- a/app/models/monologue/tag.rb +++ b/app/models/monologue/tag.rb @@ -7,18 +7,7 @@ def posts_with_tag self.posts.published end - def self.with_frequency - self - .select("name, COUNT(*) as frequency") - .joins("INNER JOIN monologue_taggings ON monologue_taggings.tag_id = monologue_tags.id") - .joins("INNER JOIN monologue_posts ON monologue_posts.id = monologue_taggings.post_id") - .where("monologue_posts.published = 't'") - .group("name") - .having("COUNT(*) > 0") - end - def frequency - self.attributes["frequency"].nil? ? posts_with_tag.size : self.attributes["frequency"].to_i + posts_with_tag.size end - end From f7d7f894b264233ed52349c59a53b5601382e84a Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 12 Aug 2015 17:23:42 -0400 Subject: [PATCH 49/66] use responders 2.1 --- monologue.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monologue.gemspec b/monologue.gemspec index 4889e13c..3b0f0a6a 100644 --- a/monologue.gemspec +++ b/monologue.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.add_dependency "ckeditor",'~> 4.1.1' s.add_dependency 'select2-rails', '~> 3.2' s.add_dependency "sass-rails",'~> 5.0.0' - s.add_dependency "responders", '~> 2.0.0' + s.add_dependency "responders", '~> 2.1.0' s.add_development_dependency "rspec-rails", "~> 2.8" s.add_development_dependency 'factory_girl_rails', '~> 1.4.0' From 39b04c57a17beb10be807e22fa1d09127971dec6 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 12 Aug 2015 21:19:25 -0400 Subject: [PATCH 50/66] Change coffee rails version depedencies --- monologue.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monologue.gemspec b/monologue.gemspec index 3b0f0a6a..df6f1f54 100644 --- a/monologue.gemspec +++ b/monologue.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.add_dependency "rails", ">= 4.0.4" s.add_dependency "bcrypt", '~> 3.1.7' - s.add_dependency "coffee-rails",'~> 4.0.0' + s.add_dependency "coffee-rails",'>= 4.0.0' s.add_dependency "truncate_html" s.add_dependency "jquery-rails" s.add_dependency 'rails-i18n' From 9e3eea8318987e44faaff63e1bf10bcfc50555e8 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 12 Aug 2015 21:44:00 -0400 Subject: [PATCH 51/66] Bump version to 0.4.2 compatible with rails 4.2 --- lib/monologue/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/monologue/version.rb b/lib/monologue/version.rb index 46f8e3ef..352d470c 100644 --- a/lib/monologue/version.rb +++ b/lib/monologue/version.rb @@ -1,3 +1,3 @@ module Monologue - VERSION = "0.4.1" + VERSION = "0.4.2" end From a0198eb9bb21efb1c694adcd8b68f4229c68dac2 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 12 Aug 2015 21:48:46 -0400 Subject: [PATCH 52/66] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ae0985af..b972e58a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Monologue is a basic, mountable blogging engine in Rails built to be easily moun ## Version -This README is for a future Monologue version, that will be 0.4.X and be Rails 4 specific. See other branches for other versions (0-3-stable being the latest stable version). +This README is for a future Monologue version, that will be 0.4.2 and be compatible with Rails 4.2.x. See other branches for other versions (0-4-stable being the latest stable version). ## Upgrade and changes @@ -100,7 +100,7 @@ copy views like devise `rails g monologue:views` or use scope: `rails g monologue:views blog` ## Requirements -- Rails 4.0.4 + +- Rails 4.2.1 + - Database: MySQL & Postgres are supported but other databases might work too. ## Authors From 4ca70ab1c6f9d55db004379d2943d6e7d3e09957 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 23 Nov 2015 12:20:51 -0500 Subject: [PATCH 53/66] Ensure view generates viewsby default under the views folder and fixes #266 --- lib/generators/monologue/views_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generators/monologue/views_generator.rb b/lib/generators/monologue/views_generator.rb index 7e0804b8..9849db73 100644 --- a/lib/generators/monologue/views_generator.rb +++ b/lib/generators/monologue/views_generator.rb @@ -20,7 +20,7 @@ def view_directory(name) end def target_path - @target_path ||= "app/views/#{scope || :monologue}" + @target_path ||= "app/views/#{scope || ''}" end end end From a89714e2ce4b0ef3eb412a48c9e18eec3155d44f Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 23 Nov 2015 12:44:57 -0500 Subject: [PATCH 54/66] Add new config setting preview_size and fixes #268 --- app/views/monologue/posts/_post.html.erb | 2 +- lib/monologue/configuration.rb | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/monologue/posts/_post.html.erb b/app/views/monologue/posts/_post.html.erb index 71723bb2..64396c21 100644 --- a/app/views/monologue/posts/_post.html.erb +++ b/app/views/monologue/posts/_post.html.erb @@ -2,7 +2,7 @@ <%= render partial: 'monologue/posts/post_header', locals: {post: post} %>
- <%= truncate_html(post.content, length: 1000, omission: '...') %> + <%= truncate_html(post.content, length: Monologue::Config.preview_size, omission: '...') %>
diff --git a/lib/monologue/configuration.rb b/lib/monologue/configuration.rb index 5d622944..259ed97e 100644 --- a/lib/monologue/configuration.rb +++ b/lib/monologue/configuration.rb @@ -34,7 +34,13 @@ class Configuration :google_analytics_id, :gauge_analytics_site_id, :layout, - :sidebar + :sidebar, + :preview_size + + def initialize + @preview_size = 1000; + end + end def self.config(&block) From 3d8d6c4653fe2db3bebf5de13fe098ba77f92952 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 10 Dec 2015 14:08:14 -0500 Subject: [PATCH 55/66] Bump to version 0.5.0 --- README.md | 2 +- UPGRADE.md | 3 +++ lib/monologue/version.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b972e58a..8fbfe402 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Monologue is a basic, mountable blogging engine in Rails built to be easily moun ## Version -This README is for a future Monologue version, that will be 0.4.2 and be compatible with Rails 4.2.x. See other branches for other versions (0-4-stable being the latest stable version). +This README is for the latest version of Monologue (0-5-stable being the latest stable version). ## Upgrade and changes diff --git a/UPGRADE.md b/UPGRADE.md index 3c1f6027..d425b093 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,4 +1,7 @@ # Upgrade Monologue +## 0.4.0 to 0.5.0 + - No update required + ## 0.3.0 to 0.4.0 - Change of syntax for configuration. Please use Monologue::Config instead of the old Monologue module diff --git a/lib/monologue/version.rb b/lib/monologue/version.rb index 352d470c..ec480612 100644 --- a/lib/monologue/version.rb +++ b/lib/monologue/version.rb @@ -1,3 +1,3 @@ module Monologue - VERSION = "0.4.2" + VERSION = "0.5.0" end From e418a877100e4443f497857c08a6ce1c5db2f7a0 Mon Sep 17 00:00:00 2001 From: Roger Jin Date: Mon, 21 Nov 2016 10:56:24 -0600 Subject: [PATCH 56/66] Adds ButterCMS sponsorship --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 8fbfe402..5d790dd4 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,12 @@ Monologue is a basic, mountable blogging engine in Rails built to be easily mounted in an already existing Rails app, but it can also be used alone. +## Sponsor + +[ButterCMS](https://buttercms.com/?utm_source=github&utm_medium=sponsorship-link&utm_campaign=monologue) is an API-based CMS and blogging platform built for developers: + +[![ButterCMS](https://dl.dropboxusercontent.com/u/598519/buttercms-banners/b-on-y.png)](https://buttercms.com/?utm_source=github&utm_medium=sponsorship-banner&utm_campaign=monologue) + ## Version This README is for the latest version of Monologue (0-5-stable being the latest stable version). From fe905b3fcfe9887d44ce5a8e5093626d114eb9d9 Mon Sep 17 00:00:00 2001 From: Ben Nelson Date: Sat, 26 Nov 2016 19:23:53 -0700 Subject: [PATCH 57/66] updating documentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d790dd4..5714ec04 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ Starting point: * Run `bundle exec rake db:migrate` * Run `bundle exec rake db:setup` * Make your changes -* Ensure specs pass by running `bin/rspec spec` +* Ensure specs pass by running `bundle exec rspec spec` * Submit your pull request From dbf17089686de07c1b68933889ad966daba3eb48 Mon Sep 17 00:00:00 2001 From: Ben Nelson Date: Sat, 26 Nov 2016 19:39:04 -0700 Subject: [PATCH 58/66] updating to rails specific version fixes #303 --- Gemfile | 2 +- monologue.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a04e1555..2b18afcd 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gemspec group :development, :test do gem "thin" - gem 'rails', '>= 4.0.4' + gem 'rails', '= 4.2.7' gem 'responders', '~> 2.0' gem 'pry' diff --git a/monologue.gemspec b/monologue.gemspec index df6f1f54..7eb214e6 100644 --- a/monologue.gemspec +++ b/monologue.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md", "deprecations.rb"] - s.add_dependency "rails", ">= 4.0.4" + s.add_dependency "rails", "= 4.2.7" s.add_dependency "bcrypt", '~> 3.1.7' s.add_dependency "coffee-rails",'>= 4.0.0' s.add_dependency "truncate_html" From 042047fe8ef90805a2503fb740a27721e1271d6e Mon Sep 17 00:00:00 2001 From: Ben Nelson Date: Sat, 26 Nov 2016 20:02:29 -0700 Subject: [PATCH 59/66] refs #303 fixing turbolinks spec error --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2b18afcd..98f4b88e 100644 --- a/Gemfile +++ b/Gemfile @@ -27,5 +27,5 @@ group :development, :test do end gem 'coveralls', require: false - gem 'pg' +gem 'turbolinks' From 9f60d331e1b38d92088def020cc64d0b449fd450 Mon Sep 17 00:00:00 2001 From: Ben Nelson Date: Sat, 26 Nov 2016 22:04:52 -0700 Subject: [PATCH 60/66] fixes #302 --- app/assets/javascripts/monologue/admin/ckeditor-config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/monologue/admin/ckeditor-config.js b/app/assets/javascripts/monologue/admin/ckeditor-config.js index d5918dc0..74d7c3ec 100644 --- a/app/assets/javascripts/monologue/admin/ckeditor-config.js +++ b/app/assets/javascripts/monologue/admin/ckeditor-config.js @@ -18,4 +18,5 @@ $(function() { { name: 'colors', items : [ 'TextColor','BGColor' ] }, { name: 'tools', items : [ 'Maximize', 'ShowBlocks' ] } ]; -}); \ No newline at end of file + CKEDITOR.config.disableNativeSpellChecker = false; +}()); \ No newline at end of file From b4bbdbb38e8d6b3398ea893d774ce2d4c890f698 Mon Sep 17 00:00:00 2001 From: pete_t Date: Wed, 22 Feb 2017 15:43:43 -0800 Subject: [PATCH 61/66] Add twitter support --- app/views/monologue/sidebar/_latest_tweets.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/monologue/sidebar/_latest_tweets.html.erb b/app/views/monologue/sidebar/_latest_tweets.html.erb index a7de6ba1..9c598e55 100644 --- a/app/views/monologue/sidebar/_latest_tweets.html.erb +++ b/app/views/monologue/sidebar/_latest_tweets.html.erb @@ -3,6 +3,6 @@
- + <% end %> -<% end %> \ No newline at end of file +<% end %> From c5df49ee2cb79a0888ace48a8381224e50432674 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 2 Mar 2017 16:57:02 -0500 Subject: [PATCH 62/66] Update .travis.yml It seems that ruby 1.9.x creates issue with travis. Time to move on --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 57f183f3..f8244a11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ before_script: - bundle exec rake db:create db:migrate rvm: - - 1.9.3 - 2.0.0 - 2.1.0 From e496d7f871ee90400af277d22de18e0e51aa4125 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Boily Date: Tue, 7 Mar 2017 17:27:06 -0500 Subject: [PATCH 63/66] remove IRC from README has there is no one there anymore --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 5714ec04..3f18cd95 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,6 @@ To learn how to upgrade, see [UPGRADE.md](https://github.com/jipiboily/monologue - [Mailing list for questions](http://groups.google.com/forum/#!forum/monologue-rb) - [Issues and bugs](http://github.com/jipiboily/monologue/issues) - [Wiki](https://github.com/jipiboily/monologue/wiki/_pages) -- IRC channel (on Freenode): #monologue. ## Some features - Rails mountable engine (fully namespaced and mountable in an already existing app) From a684f15142eef3fcf6426d98a82a455eaacc34d5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Boily Date: Tue, 7 Mar 2017 21:35:58 -0500 Subject: [PATCH 64/66] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 3f18cd95..cd0c2f49 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,9 @@ **THIS README IS FOR THE MASTER BRANCH AND REFLECTS THE WORK CURRENTLY EXISTING ON THE MASTER BRANCH. IF YOU ARE WISHING TO USE A NON-MASTER BRANCH OF MONOLOGUE, PLEASE CONSULT THAT BRANCH'S README AND NOT THIS ONE.** + +** LOOKING FOR HELP TO UPGRADE TO RAILS 5 AND FIX EVERYTHING ** See issue https://github.com/jipiboily/monologue/issues/314. Happy to pay $100 to get back on track and get it working with Rails 5 and clean. + - Monologue is a basic, mountable blogging engine in Rails built to be easily mounted in an already existing Rails app, but it can also be used alone. From f0a7e8153868571aacb20c4fa40ed29b0279ba1e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Boily Date: Sun, 2 Jul 2017 19:21:23 -0400 Subject: [PATCH 65/66] Revert "Adds ButterCMS sponsorship" --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index cd0c2f49..56771b0a 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,6 @@ Monologue is a basic, mountable blogging engine in Rails built to be easily mounted in an already existing Rails app, but it can also be used alone. -## Sponsor - -[ButterCMS](https://buttercms.com/?utm_source=github&utm_medium=sponsorship-link&utm_campaign=monologue) is an API-based CMS and blogging platform built for developers: - -[![ButterCMS](https://dl.dropboxusercontent.com/u/598519/buttercms-banners/b-on-y.png)](https://buttercms.com/?utm_source=github&utm_medium=sponsorship-banner&utm_campaign=monologue) - ## Version This README is for the latest version of Monologue (0-5-stable being the latest stable version). From e7c787b1381785fa1153ca9c3c1d2542b0605ee0 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Boily Date: Sat, 21 Oct 2017 22:18:16 -0400 Subject: [PATCH 66/66] update README with status of the project --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 56771b0a..44642eba 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,7 @@ **THIS README IS FOR THE MASTER BRANCH AND REFLECTS THE WORK CURRENTLY EXISTING ON THE MASTER BRANCH. IF YOU ARE WISHING TO USE A NON-MASTER BRANCH OF MONOLOGUE, PLEASE CONSULT THAT BRANCH'S README AND NOT THIS ONE.** - -** LOOKING FOR HELP TO UPGRADE TO RAILS 5 AND FIX EVERYTHING ** See issue https://github.com/jipiboily/monologue/issues/314. Happy to pay $100 to get back on track and get it working with Rails 5 and clean. - -- +**NOT MAINTAINED ANYMORE**: This project hasn't been maintained for a while. It's pretty basic and should still work. Chances are issues and PRs might not receive the attention they deserve, at least, not quickly, if at all. Monologue is a basic, mountable blogging engine in Rails built to be easily mounted in an already existing Rails app, but it can also be used alone.