keynote 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4df088c95319b2d2eb5b3a78b5dab7422f55d1
-  data.tar.gz: 3e8c978c76994b426d8e225f03f24c86241c2735
+  metadata.gz: fe0ac56847bb40c91206e3e3e40854bf60efd579
+  data.tar.gz: b81181cb6d60f7cbf441d9724a809977e7293de2
 SHA512:
-  metadata.gz: b9d8d72594c5ba894db65e56b50ba87ee973e4f013d32ac8bffa7dc70a7c2cd351eb63092171f683a375aeeb116af5ddc19af7887401cd8306b0d0e27532ce70
-  data.tar.gz: cd9788601c845d6cc22b9bf81ea33fdabfc462fcd3e2cc673f20cd45f5e936637eb1ff2e462f7b9b59891e09007589a97e4c16565db1d47bc92984bf24da5c3d
+  metadata.gz: 3b11e1e2610c5f467911bb09a90bd2d98cb410a256033fa252e03eebb6797ac706739c4a23332312979bfc29824fe7d132493c890be0f4a5f6aa39fb98547ee0
+  data.tar.gz: 08927b3f127d54403e289798d728d88ba6a8b50085ef71f475308d6f34811f3c74ed1822914980e4b23f6b3e53820056a30ac84ed26a25f6d8f1bb15c6be44b5

data/.travis.yml

@@ -3,15 +3,20 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - rbx-19mode
+  - 2.1.0
+  - rbx
+  - jruby-19mode
 gemfile:
   - gemfiles/rails30.gemfile
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
-  - gemfiles/rails4.gemfile
+  - gemfiles/rails40.gemfile
+  - gemfiles/rails41.gemfile
 matrix:
   exclude:
     - rvm: 1.9.2
-      gemfile: gemfiles/rails4.gemfile
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails41.gemfile
 notifications:
   email: false

data/Appraisals

@@ -1,19 +1,24 @@
 appraise "rails30" do
   gem "rails", "3.0.20"
-  gem "keynote", path: "../"
+  gem "minitest", "< 5"
 end
 
 appraise "rails31" do
   gem "rails", "3.1.12"
-  gem "keynote", path: "../"
+  gem "minitest", "< 5"
 end
 
 appraise "rails32" do
-  gem "rails", "3.2.14"
-  gem "keynote", path: "../"
+  gem "rails", "3.2.16"
+  gem "minitest", "< 5"
 end
 
-appraise "rails4" do
+appraise "rails40" do
   gem "rails", "4.0.0"
-  gem "keynote", path: "../"
+  gem "minitest", "< 5"
+end
+
+appraise "rails41" do
+  gem "rails", "4.1.0.beta1"
+  gem "minitest", "~> 5.0"
 end

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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.
+* Fix issue #6, in which the order of dependencies in the Gemfile could keep
+  Keynote's RSpec integration from loading correctly.
+
 ## v0.2.0
 * Add `Keynote::Inline`, a module that presenters can extend to enable inline
   templating in any language supported by Rails.

data/gemfiles/rails30.gemfile

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

data/gemfiles/rails31.gemfile

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

data/gemfiles/rails32.gemfile

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

data/gemfiles/{rails4.gemfile → rails40.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "4.0.0"
-gem "keynote", :path=>"../"
+gem "minitest", "< 5"
 
 gemspec :path=>"../"

data/gemfiles/rails41.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.1.0.beta1"
+gem "minitest", "~> 5.0"
+
+gemspec :path=>"../"

data/keynote.gemspec

@@ -22,13 +22,22 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rails', '>= 3.0.0'
 
   gem.add_development_dependency 'appraisal'
-  gem.add_development_dependency 'minitest', '< 5'
-  gem.add_development_dependency 'mocha', '~> 0.13.3'
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'mocha', '~> 1.0.0'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'redcarpet'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'yard'
 
   gem.add_development_dependency 'slim'
   gem.add_development_dependency 'haml'
+
+  unless RbConfig::CONFIG['ruby_install_name'] == 'jruby'
+    gem.add_development_dependency 'redcarpet'
+  end
+
+  if RbConfig::CONFIG['ruby_install_name'] == 'rbx'
+    gem.add_development_dependency 'racc'
+    gem.add_development_dependency 'rubysl'
+    gem.add_development_dependency 'rubysl-test-unit'
+  end
 end

data/lib/keynote/inline.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+require "action_view"
 require "thread"
 
 module Keynote
@@ -89,7 +90,6 @@ module Keynote
     #     end
     #   end
     def inline(*formats)
-      require "action_view"
       require "action_view/context"
 
       Array(formats).each do |format|

data/lib/keynote/railtie.rb

@@ -37,7 +37,7 @@ module Keynote
     end
 
     def self.load_test_integration
-      if defined?(RSpec::Rails) && RSpec.respond_to?(:configure)
+      if defined?(RSpec::Rails)
         require 'keynote/testing/rspec'
       end
 

data/lib/keynote/testing/rspec.rb

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

data/lib/keynote/version.rb

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

data/spec/generator_spec.rb

@@ -66,41 +66,44 @@ describe "generators" do
     end
   end
 
-  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
-
-    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('test/presenters/post_presenter_test.rb').
-        must_match /describe PostPresenter do/
+  # 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
+
+      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('test/presenters/post_presenter_test.rb').
+          must_match /describe PostPresenter do/
+      end
     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 "should generate 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/
+        file_contents('test/presenters/post_presenter_test.rb').
+          must_match /class PostPresenterTest < Keynote::TestCase/
+      end
     end
   end
 end

data/spec/helper.rb

@@ -5,8 +5,8 @@ if ENV["COVERAGE"]
   SimpleCov.start
 end
 
-require 'minitest/spec'
 require 'minitest/autorun'
+require 'minitest/spec'
 require 'minitest/pride'
 require 'mocha/setup'
 

data/spec/keynote_spec.rb

@@ -3,26 +3,28 @@
 require 'helper'
 
 describe Keynote do
+  let(:view)  { Object.new }
+
   describe "with a normal presenter" do
     let(:model) { Normal.new }
 
     it "should find and instantiate implicitly" do
-      p = Keynote.present(:view, model)
+      p = Keynote.present(view, model)
 
       p.wont_be_nil
       p.must_be_instance_of NormalPresenter
 
-      p.view.must_equal  :view
+      p.view.must_equal  view
       p.model.must_equal model
     end
 
     it "should find and instantiate explicitly" do
-      p = Keynote.present(:view, :normal, 'hello')
+      p = Keynote.present(view, :normal, 'hello')
 
       p.wont_be_nil
       p.must_be_instance_of NormalPresenter
 
-      p.view.must_equal  :view
+      p.view.must_equal  view
       p.model.must_equal 'hello'
     end
 
@@ -30,19 +32,19 @@ describe Keynote do
       m = mock()
       m.expects(:block_yielded)
 
-      Keynote.present(:view, :normal, 'hello') do |p|
+      Keynote.present(view, :normal, 'hello') do |p|
         m.block_yielded
 
         p.wont_be_nil
         p.must_be_instance_of NormalPresenter
 
-        p.view.must_equal  :view
+        p.view.must_equal  view
         p.model.must_equal 'hello'
       end
     end
 
     it "should integrate with Rumble" do
-      p  = Keynote.present(:view, model)
+      p  = Keynote.present(view, model)
       rx = /<div>&lt;script&gt;alert\(/
 
       p.some_bad_html.scan(rx).count.must_equal 3
@@ -53,29 +55,28 @@ describe Keynote do
     let(:model) { Keynote::Nested.new }
 
     it "should find and instantiate implicitly" do
-      p = Keynote.present(:view, model)
+      p = Keynote.present(view, model)
 
       p.wont_be_nil
       p.must_be_instance_of Keynote::NestedPresenter
 
-      p.view.must_equal  :view
+      p.view.must_equal  view
       p.model.must_equal model
     end
 
     it "should find and instantiate explicitly" do
-      p = Keynote.present(:view, :"keynote/nested", 'hello')
+      p = Keynote.present(view, :"keynote/nested", 'hello')
 
       p.wont_be_nil
       p.must_be_instance_of Keynote::NestedPresenter
 
-      p.view.must_equal  :view
+      p.view.must_equal  view
       p.model.must_equal 'hello'
     end
   end
 
   describe "caching" do
     describe "when there is a view context" do
-      let(:view)   { Object.new }
       let(:view_2) { Object.new }
 
       it "should cache based on the models" do

data/spec/rumble_spec.rb

@@ -4,10 +4,14 @@
 
 require 'helper'
 
-Rumble = Keynote::Rumble
+if defined?(Minitest::Test)
+  klass = Minitest::Test
+else
+  klass = MiniTest::Unit::TestCase
+end
 
-class TestRumble < MiniTest::Unit::TestCase
-  include Rumble
+class TestRumble < klass
+  include Keynote::Rumble
 
   def assert_rumble(str, &blk)
     exp = str.gsub(/(\s+(<)|>\s+)/) { $2 || '>' }
@@ -167,13 +171,13 @@ class TestRumble < MiniTest::Unit::TestCase
   end
 
   def test_error_tags_outside_rumble_context
-    assert_raises Rumble::Error do
+    assert_raises Keynote::Rumble::Error do
       div "content"
     end
   end
 
   def test_error_selfclosing_content
-    assert_raises Rumble::Error do
+    assert_raises Keynote::Rumble::Error do
       build_html {
         br "content"
       }
@@ -181,7 +185,7 @@ class TestRumble < MiniTest::Unit::TestCase
   end
 
   def test_error_css_proxy_continue
-    assert_raises Rumble::Error do
+    assert_raises Keynote::Rumble::Error do
       build_html {
         p.one("test").two
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keynote
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,30 +42,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -172,7 +172,8 @@ files:
 - gemfiles/rails30.gemfile
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
-- gemfiles/rails4.gemfile
+- gemfiles/rails40.gemfile
+- gemfiles/rails41.gemfile
 - keynote.gemspec
 - lib/generators/presenter_generator.rb
 - lib/generators/templates/keynote_mini_test_spec.rb
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Flexible presenters for Rails.