proclaim 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b89023e12c547a4adfbf485a94090fa7ba52e9c
-  data.tar.gz: 0712ac5bbfc97c8c8d54f40dcab600bdb61bd004
+  metadata.gz: 8bce2e7e2311f573903511a372524c9f096a0870
+  data.tar.gz: 57f23111baf862cbd0de4f1fa0f3e7c2814ae7b1
 SHA512:
-  metadata.gz: 21fe8c94f44b4201c59ab720b39caf5bef7aa1281867f06cd1b4e3b8c2fd5bddd1254ac4a3139a8983c29d83adc25dca30fa84754cb2cf08a57b273111ce6488
-  data.tar.gz: 3d685aee7c7d901ca0b272487eb48c658f2ed2f67d112a5d515b4b22799534be804ca82b22286fd27ff07f044fd4cb98441607a34042959833d7c6ef4512478d
+  metadata.gz: 9219b01cd666a5d4c118c5c038ff11e04178c44ca71de009684ab8f88a189b1ab7a846d4b05d142f02610c8f26173206ad5ca4200c84e1e9b0d5a1542066ef05
+  data.tar.gz: a16ecba90c52f4e95cfd4e6dc795f4a0d9f9c449d2228e43faa7f7afee6e75fa12565cef31685b43d74aa3566ca8f0fbe9842d69c2b7a95e57d207a27599a1b9

data/CHANGELOG

@@ -1,3 +1,9 @@
+v 0.5.5
+  - Add comment count to Post index
+
+v 0.5.4
+  - Integrate with Travis CI, Sauce Labs, and Code Climate
+
 v 0.5.3
   - Fixed bug causing initial slugs to not be generated
 

data/README.md

@@ -1,5 +1,9 @@
 # Proclaim
 
+[![Build Status](https://travis-ci.org/kyle-f/proclaim.svg?branch=master)](https://travis-ci.org/kyle-f/proclaim)
+[![Code Climate](https://codeclimate.com/github/kyle-f/proclaim/badges/gpa.svg)](https://codeclimate.com/github/kyle-f/proclaim)
+[![Test Coverage](https://codeclimate.com/github/kyle-f/proclaim/badges/coverage.svg)](https://codeclimate.com/github/kyle-f/proclaim/coverage)
+
 Most Rails blogging tools include everything you could ever want, including
 things you don't. Proclaim tries to provide the simplest (yet beautiful)
 implementation of a blog you could want-- posts, comments, and subscriptions.
@@ -29,7 +33,7 @@ Proclaim 0.5 works with Rails 4.2 and on, with Ruby 1.9.3 and on. Add it to your
 Gemfile with:
 
 ```ruby
-gem 'proclaim', "~> 0.5.3"
+gem 'proclaim', "~> 0.5.5"
 ```
 
 Run `bundle install` to install it.

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.5

data/app/views/proclaim/posts/index.html.erb

@@ -33,7 +33,12 @@
 						<% end %>
 					</div>
 					<%= post.author.send(Proclaim.author_name_method) %><br />
-					<%= timeago_tag post.published_at, format: "%B %d, %Y" %>
+					<%= timeago_tag post.published_at, format: "%B %d, %Y" %><br />
+					<% if post.comments.empty? %>
+						No comments
+					<% else %>
+						<%= pluralize post.comments.count, "comment" %>
+					<% end %>
 				</div>
 			<% end %>
 			</td>

data/lib/proclaim/version.rb

@@ -1,3 +1,3 @@
 module Proclaim
-  VERSION = "0.5.3"
+  VERSION = "0.5.5"
 end

data/proclaim.gemspec

@@ -31,20 +31,21 @@ Gem::Specification.new do |s|
 	s.add_dependency "nokogiri", "~> 1.6"
 	s.add_dependency "premailer", "~> 1.8"
 	s.add_dependency "closure_tree", "~> 5.2"
-	s.add_dependency "font-awesome-rails", "~> 4.2"
-	s.add_dependency "medium-editor-rails", "~> 1.0"
+	s.add_dependency "font-awesome-rails", "~> 4.3"
+	s.add_dependency "medium-editor-rails", "~> 2.0"
 	s.add_dependency "carrierwave", "~> 0.10"
-	s.add_dependency "aasm", "~> 4.0"
-	s.add_dependency "rails-timeago", "~> 2.11"
-	s.add_dependency "pundit", "~> 0.3"
+	s.add_dependency "aasm", "~> 4.2"
+	s.add_dependency "rails-timeago", "~> 2.12"
+	s.add_dependency "pundit", "~> 1.0"
 
 	s.add_development_dependency "sqlite3", "~> 1.3"
 	s.add_development_dependency "factory_girl_rails", "~> 4.5"
 	s.add_development_dependency "mocha", "~> 1.1"
 	s.add_development_dependency "annotate", "~> 2.6"
 	s.add_development_dependency "capybara", "~> 2.4"
-	s.add_development_dependency "selenium-webdriver", "~> 2.44"
-	s.add_development_dependency "database_cleaner", "~> 1.3"
+	s.add_development_dependency "selenium-webdriver", "~> 2.46"
+	s.add_development_dependency "database_cleaner", "~> 1.4"
 	s.add_development_dependency "faker", "~> 1.4"
 	s.add_development_dependency "test_after_commit", "~> 0.4"
+	s.add_development_dependency "codeclimate-test-reporter", "~> 0.4"
 end

data/test/factories/proclaim/comment.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
 	factory :comment, class: Proclaim::Comment do
-		sequence(:author) {|n| "author#{n}"}
-		sequence(:body) {|n| "body#{n}"}
+		sequence(:author) {|n| "comment#{n} author"}
+		sequence(:body) {|n| "comment#{n} body"}
 		post
 
 		factory :published_comment do

data/test/factories/proclaim/post.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
 	factory :post, class: Proclaim::Post do
-		sequence(:title) {|n| "title#{n}"}
-		sequence(:body) {|n| "body#{n}"}
+		sequence(:title) {|n| "post#{n} title"}
+		sequence(:body) {|n| "post#{n} body"}
 		association :author, factory: :user
 
 		factory :published_post do

data/test/integration/with_javascript/comment_test.rb

@@ -265,8 +265,8 @@ class CommentTest < ActionDispatch::IntegrationTest
 		@show_page.comment_delete_link(comment).click
 		page.accept_alert
 
-		assert page.has_no_text? comment.author
-		assert page.has_no_text? comment.body
+		assert page.has_no_text?(comment.author), "Comment author should be gone!"
+		assert page.has_no_text?(comment.body), "Comment body should be gone!"
 
 		assert(wait_until { Proclaim::Comment.count == current_count - 1 },
 		      "Root comment should have been deleted!")

data/test/integration/with_javascript/post_form_test.rb

@@ -33,10 +33,10 @@ class PostFormTest < ActionDispatch::IntegrationTest
 
 		within('#new_post') do
 			element = find('h1.editable')
-			#element.click()
+			element.click()
 			element.set("Post Title") # Set the title text
 			element = find('div.editable')
-			#element.click() # Select the element
+			element.click() # Select the element
 			element.set("Paragraph 1\nParagraph 2") # Set the body text
 		end
 
@@ -147,7 +147,7 @@ class PostFormTest < ActionDispatch::IntegrationTest
 
 		within('#new_post') do
 			element = find('h1.editable')
-			#element.click()
+			element.click()
 			element.set("\"quotes\"") # Set the title text
 			# Don't fill in body
 		end
@@ -168,10 +168,10 @@ class PostFormTest < ActionDispatch::IntegrationTest
 
 		within('#new_post') do
 			element = find('h1.editable')
-			#element.click()
+			element.click()
 			element.set("\"quotes\"") # Set the title text
 			element = find('div.editable')
-			#element.click() # Select the element
+			element.click() # Select the element
 			element.set("Paragraph 1\nParagraph 2") # Set the body text
 		end
 
@@ -190,7 +190,7 @@ class PostFormTest < ActionDispatch::IntegrationTest
 		within('#new_post') do
 			# Don't fill in title
 			element = find('div.editable')
-			#element.click() # Select the element
+			element.click() # Select the element
 			element.set("Paragraph 1\nParagraph 2") # Set the text
 		end
 
@@ -211,7 +211,7 @@ class PostFormTest < ActionDispatch::IntegrationTest
 
 		within('#new_post') do
 			element = find('h1.editable')
-			#element.click()
+			element.click()
 			element.set("Post Title") # Set the title text
 			# Don't fill in the body
 		end

data/test/integration/without_javascript/post_test.rb

@@ -145,6 +145,39 @@ class PostTest < ActionDispatch::IntegrationTest
 		       "Post 3 draft should be shown before post 1 draft!"
 	end
 
+	test "index should not show comment count for drafts" do
+		user = FactoryGirl.create(:user)
+		sign_in user
+
+		comment = FactoryGirl.create(:comment)
+
+		visit proclaim.posts_path
+
+		assert page.has_no_text? "1 comment"
+	end
+
+	test "index should show comment count for published post" do
+		user = FactoryGirl.create(:user)
+		sign_in user
+
+		# Verify no comments
+		post = FactoryGirl.create(:published_post)
+		visit proclaim.posts_path
+		assert page.has_text?("No comments"),
+		       "Comment count should indicate no comments"
+
+		# Verify that single comment count shows up.
+		comment = FactoryGirl.create(:published_comment, post: post)
+		visit proclaim.posts_path
+		assert page.has_text?("1 comment"), "Comment count should be shown"
+
+		# Also verify that the comment count is properly pluralized.
+		comment = FactoryGirl.create(:published_comment, post: comment.post)
+		visit proclaim.posts_path
+		assert page.has_text?("2 comments"),
+		       "Comment count should be shown and pluralized"
+	end
+
 	test "show should include author name" do
 		post = FactoryGirl.create(:published_post)
 

data/test/test_helper.rb

@@ -1,8 +1,12 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
+require 'selenium-webdriver'
 require "factory_girl_rails"
 require "faker"
 require "mocha/mini_test"
@@ -13,28 +17,34 @@ require 'coffee_script'
 require 'sass'
 
 Rails.backtrace_cleaner.remove_silencers!
+Capybara.default_wait_time = 5 # 5 seconds instead of 2, since we use fades.
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-#FactoryGirl.definition_file_paths << "test/dummy/test/factories"
-#FactoryGirl.reload
-
-#class ActionController::TestCase
-#	include Proclaim::Engine.routes.url_helpers
-#end
-
-# Selenium isn't working with Firefox 35 (01/16/14). Use Chrome instead, for
-# now. Too bad, really... I hate Chrome.
-Capybara.register_driver :selenium do |app|
-	Capybara::Selenium::Driver.new(app, :browser => :chrome)
-end
-
 class ActionDispatch::IntegrationTest
 	# Make the Capybara DSL available in all integration tests
 	include Capybara::DSL
 end
 
+if ENV['TRAVIS']
+	capabilities = Selenium::WebDriver::Remote::Capabilities.send ENV["BROWSER"]
+	capabilities.version = ENV["VERSION"]
+	capabilities.platform = ENV["PLATFORM"]
+
+	capabilities['tunnel-identifier'] = ENV['TRAVIS_JOB_NUMBER']
+	capabilities['name'] = "Travis ##{ENV['TRAVIS_JOB_NUMBER']}"
+	capabilities['deviceName'] = ENV['DEVICE_NAME']
+	capabilities['deviceOrientation'] = ENV['DEVICE_ORIENTATION']
+
+	Capybara.register_driver :selenium do |app|
+		Capybara::Selenium::Driver.new(app,
+			browser: :remote,
+			url: "http://#{ENV['SAUCE_USERNAME']}:#{ENV['SAUCE_ACCESS_KEY']}@ondemand.saucelabs.com/wd/hub",
+			desired_capabilities: capabilities)
+	end
+end
+
 def sign_in(user)
 	ApplicationController.any_instance.stubs(:current_user).returns(user)
 	ApplicationController.any_instance.stubs(:authenticate_user).returns(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proclaim
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Kyle Fazzari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: medium-editor-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -184,42 +184,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rails-timeago
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -296,28 +296,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.44'
+        version: '2.46'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.44'
+        version: '2.46'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +346,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: "\t\tMost Rails blogging tools include everything you could ever want,\n\t\tincluding
   things you don't. Proclaim tries to provide the simplest (yet\n\t\tbeautiful) implementation
   of a blog via a mountable engine; if more\n\t\tfunctionality is desired, it can
@@ -542,79 +556,79 @@ signing_key:
 specification_version: 4
 summary: A Rails blogging engine that simplifies your life.
 test_files:
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
+- test/integration/with_javascript/post_form_test.rb
+- test/integration/with_javascript/comment_test.rb
+- test/integration/with_javascript/post_subscription_test.rb
+- test/integration/with_javascript/post_show_test.rb
+- test/integration/without_javascript/subscription_email_test.rb
+- test/integration/without_javascript/blog_subscription_test.rb
+- test/integration/without_javascript/manage_subscriptions_test.rb
+- test/integration/without_javascript/post_test.rb
+- test/integration/without_javascript/unsubscribe_test.rb
+- test/dummy/Rakefile
 - test/dummy/public/422.html
+- test/dummy/public/favicon.ico
 - test/dummy/public/404.html
-- test/dummy/README.rdoc
-- test/dummy/bin/rake
-- test/dummy/bin/rails
+- test/dummy/public/500.html
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/models/user.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/config.ru
 - test/dummy/db/schema.rb
 - test/dummy/db/migrate/20141117214323_create_users.rb
-- test/dummy/config.ru
-- test/dummy/Rakefile
-- test/dummy/config/locales/en.yml
-- test/dummy/config/secrets.yml
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/routes.rb
+- test/dummy/config/secrets.yml
 - test/dummy/config/application.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/test.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/database.yml
 - test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/user.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/integration/with_javascript/comment_test.rb
-- test/integration/with_javascript/post_subscription_test.rb
-- test/integration/with_javascript/post_form_test.rb
-- test/integration/with_javascript/post_show_test.rb
-- test/integration/without_javascript/post_test.rb
-- test/integration/without_javascript/subscription_email_test.rb
-- test/integration/without_javascript/unsubscribe_test.rb
-- test/integration/without_javascript/manage_subscriptions_test.rb
-- test/integration/without_javascript/blog_subscription_test.rb
-- test/unit/proclaim/new_comment_callback_test.rb
-- test/unit/proclaim/post_published_callback_test.rb
-- test/unit/proclaim/new_subscription_callback_test.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/README.rdoc
+- test/policies/proclaim/subscription_policy_test.rb
+- test/policies/proclaim/post_policy_test.rb
+- test/policies/proclaim/image_policy_test.rb
+- test/policies/proclaim/comment_policy_test.rb
 - test/proclaim_test.rb
-- test/support/pages/posts/edit_page.rb
-- test/support/pages/posts/show_page.rb
-- test/support/images/test.jpg
-- test/support/wait_for_ajax.rb
-- test/test_helper.rb
-- test/helpers/proclaim/subscriptions_helper_test.rb
-- test/helpers/proclaim/comments_helper_test.rb
-- test/helpers/proclaim/posts_helper_test.rb
 - test/factories/user.rb
-- test/factories/proclaim/image.rb
+- test/factories/proclaim/post.rb
 - test/factories/proclaim/comment.rb
 - test/factories/proclaim/subscription.rb
-- test/factories/proclaim/post.rb
+- test/factories/proclaim/image.rb
+- test/test_helper.rb
+- test/controllers/proclaim/posts_controller_test.rb
+- test/controllers/proclaim/images_controller_test.rb
+- test/controllers/proclaim/comments_controller_test.rb
+- test/controllers/proclaim/subscriptions_controller_test.rb
+- test/support/images/test.jpg
+- test/support/wait_for_ajax.rb
+- test/support/pages/posts/edit_page.rb
+- test/support/pages/posts/show_page.rb
+- test/models/proclaim/comment_test.rb
 - test/models/proclaim/subscription_test.rb
 - test/models/proclaim/post_test.rb
-- test/models/proclaim/comment_test.rb
 - test/models/proclaim/image_test.rb
 - test/mailers/previews/proclaim/subscription_mailer_preview.rb
 - test/mailers/proclaim/subscription_mailer_test.rb
-- test/controllers/proclaim/comments_controller_test.rb
-- test/controllers/proclaim/images_controller_test.rb
-- test/controllers/proclaim/subscriptions_controller_test.rb
-- test/controllers/proclaim/posts_controller_test.rb
-- test/policies/proclaim/image_policy_test.rb
-- test/policies/proclaim/post_policy_test.rb
-- test/policies/proclaim/subscription_policy_test.rb
-- test/policies/proclaim/comment_policy_test.rb
+- test/helpers/proclaim/comments_helper_test.rb
+- test/helpers/proclaim/posts_helper_test.rb
+- test/helpers/proclaim/subscriptions_helper_test.rb
+- test/unit/proclaim/new_comment_callback_test.rb
+- test/unit/proclaim/post_published_callback_test.rb
+- test/unit/proclaim/new_subscription_callback_test.rb