keynote 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe0ac56847bb40c91206e3e3e40854bf60efd579
-  data.tar.gz: b81181cb6d60f7cbf441d9724a809977e7293de2
+  metadata.gz: 9102d39344eda42029696b7429377d8f810ce744
+  data.tar.gz: 23184e1d37ce25d16d59c4cca69a328fee4ef1d0
 SHA512:
-  metadata.gz: 3b11e1e2610c5f467911bb09a90bd2d98cb410a256033fa252e03eebb6797ac706739c4a23332312979bfc29824fe7d132493c890be0f4a5f6aa39fb98547ee0
-  data.tar.gz: 08927b3f127d54403e289798d728d88ba6a8b50085ef71f475308d6f34811f3c74ed1822914980e4b23f6b3e53820056a30ac84ed26a25f6d8f1bb15c6be44b5
+  metadata.gz: 8bf61eefce03db8ae56df92f06b194893885b72de489319dcbd07fd755f3882744d0c992af77c80dbff634d1b09f3858f01b61e8becc7135f7374fc8e25f1dd1
+  data.tar.gz: 0a626ab8db8b839edecbe915b16709b75860b716c067e6fc951288d4bc8b71a5d6ad3c053b5539d3c0d800ea7a19cc6f0cf8ae12e796aad9df4318d21a84a634

data/Appraisals

@@ -9,16 +9,16 @@ appraise "rails31" do
 end
 
 appraise "rails32" do
-  gem "rails", "3.2.16"
+  gem "rails", "3.2.17"
   gem "minitest", "< 5"
 end
 
 appraise "rails40" do
-  gem "rails", "4.0.0"
+  gem "rails", "4.0.4"
   gem "minitest", "< 5"
 end
 
 appraise "rails41" do
-  gem "rails", "4.1.0.beta1"
+  gem "rails", "4.1.0"
   gem "minitest", "~> 5.0"
 end

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.2.2
+* Fix another RSpec integration bug, which happened in cases where the app's
+  Gemfile included rspec-rails but not the rspec gem itself.
+* Fix a bug in the generation of specs for zero-arg presenters.
+
 ## v0.2.1
 * Update configuration to test across MRI 1.9.2/1.9.3/2.0.0/2.1.0, Rubinius,
   JRuby, Rails 3.0/3.1/3.2/4.0/4.1.

data/README.md

@@ -238,9 +238,8 @@ You can run Keynote's tests across all supported versions of Rails as follows:
 
 ``` bash
 $ bundle install
-$ rake appraisal:gemfiles
-$ rake appraisal:install
-$ rake appraisal
+$ bundle exec appraisal install
+$ bundle exec rake appraisal
 ```
 
 Feel free to submit pull requests according to the usual conventions for Ruby

data/gemfiles/rails30.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "rails", "3.0.20"
 gem "minitest", "< 5"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails31.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "rails", "3.1.12"
 gem "minitest", "< 5"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails32.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "3.2.16"
+gem "rails", "3.2.17"
 gem "minitest", "< 5"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails40.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.0.0"
+gem "rails", "4.0.4"
 gem "minitest", "< 5"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails41.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.1.0.beta1"
+gem "rails", "4.1.0"
 gem "minitest", "~> 5.0"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/lib/generators/presenter_generator.rb

@@ -50,18 +50,22 @@ module Rails::Generators
         'test/presenters', class_path, "#{file_name}_presenter_test.rb")
     end
 
-    def target_list
-      targets.map { |t| ":#{t}" }.join(', ')
+    def presenter_name_and_target_list
+      [presenter_name, *target_names].join(', ')
     end
 
-    def presenter_name_and_target_list
-      [presenter_name, *target_list].join(', ')
+    def target_list
+      target_names.join(', ')
     end
 
     def presenter_name
       class_name.sub(/Presenter$/, '').underscore.to_sym.inspect
     end
 
+    def target_names
+      targets.map { |t| ":#{t}" }
+    end
+
     if ::Rails.version.to_f < 3.1
       protected
       # This method doesn't exist in Rails 3.0

data/lib/keynote/testing/rspec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require "rspec"
+require "rspec/core"
 require "keynote/testing/test_present_method"
 
 module Keynote

data/lib/keynote/version.rb

@@ -2,5 +2,5 @@
 
 module Keynote
   # @private
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/generator_spec.rb

@@ -28,26 +28,76 @@ describe "generators" do
     file_contents = File.read(File.join(output_path, path))
   end
 
-  it "should generate a presenter and Test::Unit file" do
-    Rails.application.config.generators do |g|
-      g.test_framework :test_unit, :spec => true
+  describe "when the test_framework is :test_unit" do
+    before do
+      Rails.application.config.generators do |g|
+        g.test_framework :test_unit
+      end
     end
 
-    invoke_generator 'post' do |files|
-      files.must_equal %w(
-        app/presenters/post_presenter.rb
-        test/unit/presenters/post_presenter_test.rb
-      )
+    it "generates a presenter and Test::Unit file" do
+      invoke_generator 'post' do |files|
+        files.must_equal %w(
+          app/presenters/post_presenter.rb
+          test/unit/presenters/post_presenter_test.rb
+        )
 
-      file_contents('app/presenters/post_presenter.rb').
-        must_match /class PostPresenter < Keynote::Presenter/
+        file_contents('app/presenters/post_presenter.rb').
+          must_match /class PostPresenter < Keynote::Presenter/
 
-      file_contents('test/unit/presenters/post_presenter_test.rb').
-        must_match /class PostPresenterTest < Keynote::TestCase/
+        file_contents('test/unit/presenters/post_presenter_test.rb').
+          must_match /class PostPresenterTest < Keynote::TestCase/
+      end
+    end
+
+    it "does not add a 'presents' line" do
+      invoke_generator 'post' do |files|
+        file_contents('app/presenters/post_presenter.rb').
+          wont_match /presents/
+      end
+    end
+
+    it "generates an appropriate present() call" do
+      invoke_generator 'post' do |files|
+        file_contents('test/unit/presenters/post_presenter_test.rb').
+          must_match /present\(:post\)/
+      end
+    end
+
+    describe "when the presenter has one parameter" do
+      it "adds a 'presents' line" do
+        invoke_generator 'post', 'foo' do |files|
+          file_contents('app/presenters/post_presenter.rb').
+            must_match /presents :foo$/
+        end
+      end
+
+      it "generates an appropriate present() call" do
+        invoke_generator 'post', 'foo' do |files|
+          file_contents('test/unit/presenters/post_presenter_test.rb').
+            must_match /present\(:post, :foo\)/
+        end
+      end
+    end
+
+    describe "when the presenter has two parameters" do
+      it "adds a 'presents' line" do
+        invoke_generator 'post', 'foo', 'bar' do |files|
+          file_contents('app/presenters/post_presenter.rb').
+            must_match /presents :foo, :bar$/
+        end
+      end
+
+      it "generates an appropriate present() call" do
+        invoke_generator 'post', 'foo', 'bar' do |files|
+          file_contents('test/unit/presenters/post_presenter_test.rb').
+            must_match /present\(:post, :foo, :bar\)/
+        end
+      end
     end
   end
 
-  it "should generate a presenter and RSpec file" do
+  it "generates a presenter and RSpec file" do
     Rails.application.config.generators do |g|
       g.test_framework :rspec
     end
@@ -66,44 +116,41 @@ describe "generators" do
     end
   end
 
-  # Temporary workaround until MT::R supports MT5 and Rails 4.1
-  unless Rails::VERSION.to_s.start_with? "4.1.0"
-    it "should generate a presenter and MiniTest::Rails spec file" do
-      Rails.application.config.generators do |g|
-        g.test_framework :mini_test, :spec => true
-      end
+  it "generates a presenter and MiniTest::Rails spec file" do
+    Rails.application.config.generators do |g|
+      g.test_framework :mini_test, :spec => true
+    end
 
-      invoke_generator 'post' do |files|
-        files.must_equal %w(
-          app/presenters/post_presenter.rb
-          test/presenters/post_presenter_test.rb
-        )
+    invoke_generator 'post' do |files|
+      files.must_equal %w(
+        app/presenters/post_presenter.rb
+        test/presenters/post_presenter_test.rb
+      )
 
-        file_contents('app/presenters/post_presenter.rb').
-          must_match /class PostPresenter < Keynote::Presenter/
+      file_contents('app/presenters/post_presenter.rb').
+        must_match /class PostPresenter < Keynote::Presenter/
 
-        file_contents('test/presenters/post_presenter_test.rb').
-          must_match /describe PostPresenter do/
-      end
+      file_contents('test/presenters/post_presenter_test.rb').
+        must_match /describe PostPresenter do/
     end
+  end
 
-    it "should generate a presenter and MiniTest::Rails unit file" do
-      Rails.application.config.generators do |g|
-        g.test_framework :mini_test, :spec => false
-      end
+  it "generates a presenter and MiniTest::Rails unit file" do
+    Rails.application.config.generators do |g|
+      g.test_framework :mini_test, :spec => false
+    end
 
-      invoke_generator 'post' do |files|
-        files.must_equal %w(
-          app/presenters/post_presenter.rb
-          test/presenters/post_presenter_test.rb
-        )
+    invoke_generator 'post' do |files|
+      files.must_equal %w(
+        app/presenters/post_presenter.rb
+        test/presenters/post_presenter_test.rb
+      )
 
-        file_contents('app/presenters/post_presenter.rb').
-          must_match /class PostPresenter < Keynote::Presenter/
+      file_contents('app/presenters/post_presenter.rb').
+        must_match /class PostPresenter < Keynote::Presenter/
 
-        file_contents('test/presenters/post_presenter_test.rb').
-          must_match /class PostPresenterTest < Keynote::TestCase/
-      end
+      file_contents('test/presenters/post_presenter_test.rb').
+        must_match /class PostPresenterTest < Keynote::TestCase/
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keynote
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Flexible presenters for Rails.