keynote 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db51baa66be9c4cbbce4723f556826bdf5cdf1e6
-  data.tar.gz: 8d90665dc6a5cb0d604fbabef3399169d8b24b8a
+  metadata.gz: 5580937686785fe2aed29d208952f1273be81215
+  data.tar.gz: a4e7781866312b33d3d32013f994e385bb3f7bbe
 SHA512:
-  metadata.gz: 7b05cbcae3d9faac3fc259ad2457b2cbbeabc148511992a9d2fab8f7d13d6056a8006d39a69afedfcd54df29d756312c9f053a4be1c5b3e6c202b60f896728a4
-  data.tar.gz: 37695c36a41203f443ad7381199429c66811391fb09a8717f85782e72774642a01cac7887e5f15e819b2eac3ef490e9ec25ce360272da541543d3aacf8b3abe4
+  metadata.gz: 4e14e73225a31a0952a2873ec55457899fa2c11b80731ed4a19c59edfb10f7d99a9a2a14f8bcdcee243f292ad9024a90ae11f1b3ff591397d36f5a4d4b2e39b6
+  data.tar.gz: fa5e14539c2ba3e4ee8e1e0b76577e20079b450eba4c41217aa656b76afbbf7708537f389ce2e9a211a176b83226d4c408989e16fb577a137ca6faf3fba50251

data/.travis.yml

@@ -1,22 +1,15 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - rbx-2
   - jruby-19mode
 gemfile:
-  - gemfiles/rails30.gemfile
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
   - gemfiles/rails40.gemfile
   - gemfiles/rails41.gemfile
-matrix:
-  exclude:
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails41.gemfile
+  - gemfiles/rails42.gemfile
 notifications:
   email: false

data/Appraisals

@@ -1,24 +1,24 @@
-appraise "rails30" do
-  gem "rails", "3.0.20"
-  gem "minitest", "< 5"
-end
-
 appraise "rails31" do
   gem "rails", "3.1.12"
   gem "minitest", "< 5"
 end
 
 appraise "rails32" do
-  gem "rails", "3.2.17"
+  gem "rails", "3.2.21"
   gem "minitest", "< 5"
 end
 
 appraise "rails40" do
-  gem "rails", "4.0.4"
+  gem "rails", "4.0.13"
   gem "minitest", "< 5"
 end
 
 appraise "rails41" do
-  gem "rails", "4.1.0"
+  gem "rails", "4.1.9"
+  gem "minitest", "~> 5.0"
+end
+
+appraise "rails42" do
+  gem "rails", "4.2.0"
   gem "minitest", "~> 5.0"
 end

data/CHANGELOG.md

@@ -1,11 +1,17 @@
+## v0.3.0
+* Drop support for Rails 3.0 and Ruby 1.9.2; add support for Rails 4.2.
+* Drop support for MiniTest::Rails versions older than 2.0; add support for 2.0
+  and higher. (@kirs)
+
 ## v0.2.3
 * Allow user to pass the string version of the presenter name into
   `Keynote.present` as an alternative to passing a symbol. This makes it less
   awkward to use namespaced presenters, but it does remove the possibility of
   defining a `StringPresenter` and using it with code like
   `k('some string').format_as_markdown`. It seems unlikely that anyone is
-  actually doing that though.
+  actually doing that though. (@outpunk)
 * Update RSpec integration to not print deprecation warnings with RSpec 3.
+  (@DarthSim)
 
 ## v0.2.2
 * Fix another RSpec integration bug, which happened in cases where the app's

data/README.md

@@ -186,11 +186,9 @@ though:
 
 ### Why not use decorators?
 
-The biggest distinction between Keynote and similar libraries like
-[Draper](https://github.com/drapergem/draper) and
-[DisplayCase](https://github.com/avdi/display-case) is that Keynote
-presenters aren't decorators -- undefined method calls don't
-fall through to an underlying model.
+The biggest distinction between Keynote and similar libraries like [Draper] and
+[DisplayCase] is that Keynote presenters aren't decorators – undefined method
+calls don't fall through to an underlying model.
 
 Applying the Decorator pattern to generating views is a reasonable thing to do.
 However, this practice also has some downsides.
@@ -227,8 +225,8 @@ Test::Unit or MiniTest::Rails if applicable.
 
 ## Compatibility
 
-Keynote is supported on Rails 3.0, 3.1, 3.2, and 4.0. Keynote presenters are
-testable with Test::Unit, RSpec, and MiniTest::Rails.
+Keynote is supported on Rails 3.1, 3.2, 4.0, 4.1, and 4.2. Keynote presenters
+are testable with Test::Unit, RSpec, and MiniTest::Rails (>= 2.0).
 
 If you find problems with any of the above integrations, please open an issue.
 
@@ -244,3 +242,6 @@ $ bundle exec rake appraisal
 
 Feel free to submit pull requests according to the usual conventions for Ruby
 projects.
+
+[DisplayCase]: https://github.com/objects-on-rails/display-case
+[Draper]: https://github.com/drapergem/draper

data/gemfiles/rails32.gemfile

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

data/gemfiles/rails40.gemfile

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

data/gemfiles/rails41.gemfile

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

data/gemfiles/{rails30.gemfile → rails42.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "3.0.20"
-gem "minitest", "< 5"
+gem "rails", "4.2.0"
+gem "minitest", "~> 5.0"
 
 gemspec :path => "../"

data/keynote.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Keynote::VERSION
 
-  gem.add_dependency 'rails', '>= 3.0.0'
+  gem.add_dependency 'rails', '>= 3.1.0'
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'minitest'

data/lib/generators/presenter_generator.rb

@@ -65,13 +65,5 @@ module Rails::Generators
     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
-      def module_namespacing
-        yield if block_given?
-      end
-    end
   end
 end

data/lib/keynote/inline.rb

@@ -187,6 +187,10 @@ module Keynote
         unindent result.chomp
       end
 
+      def handler_for_format(format)
+        ActionView::Template.handler_for_extension(format.to_s)
+      end
+
       # Borrowed from Pry, which borrowed it from Python.
       def unindent(text, left_padding = 0)
         margin = text.scan(/^[ \t]*(?=[^ \t\n])/).inject do |current_margin, next_indent|
@@ -201,20 +205,10 @@ module Keynote
 
         text.gsub(/^#{margin}/, ' ' * left_padding)
       end
-
-      if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
-        def handler_for_format(format)
-          ActionView::Template.handler_class_for_extension(format.to_s)
-        end
-      else
-        def handler_for_format(format)
-          ActionView::Template.handler_for_extension(format.to_s)
-        end
-      end
     end
 
     # @private
-    class Template < ActionView::Template
+    class TemplateFor41AndLower < ActionView::Template
       # Older versions of Rails don't have this mutex, but we probably want it,
       # so let's make sure it's there.
       def initialize(*)
@@ -239,5 +233,33 @@ module Keynote
         end
       end
     end
+
+    # @private
+    class TemplateFor42AndHigher < ActionView::Template
+      # The only difference between this #compile! and the normal one is that
+      # we call `view.class` instead of `view.singleton_class`, so that the
+      # template method gets defined as an instance method on the presenter
+      # and therefore sticks around between presenter instances.
+      def compile!(view)
+        return if @compiled
+
+        @compile_mutex.synchronize do
+          return if @compiled
+
+          compile(view.class)
+
+          @source = nil if @virtual_path
+          @compiled = true
+        end
+      end
+    end
+
+    if Rails.version.to_f < 4.2
+      # @private
+      Template = TemplateFor41AndLower
+    else
+      # @private
+      Template = TemplateFor42AndHigher
+    end
   end
 end

data/lib/keynote/testing/minitest_rails.rake

@@ -1,18 +1,7 @@
 # encoding: UTF-8
 
-require "rake/testtask"
-require "minitest/rails/testing"
-require "minitest/rails/tasks/sub_test_task"
-
-MiniTest::Rails::Testing.default_tasks << "presenters"
-
-namespace "minitest" do
-  unless Rake::Task.task_defined? "minitest:presenters"
-    desc "Runs tests under test/presenters"
-    MiniTest::Rails::Tasks::SubTestTask.new("presenters" => "test:prepare") do |t|
-      t.libs.push "test"
-      t.pattern = "test/presenters/**/*_test.rb"
-      t.options = MiniTest::Rails::Testing.task_opts["presenters"] if MiniTest::Rails::Testing.task_opts["presenters"]
-    end
-  end
+Rails::TestTask.new("test:presenters" => "test:prepare") do |t|
+  t.pattern = "test/presenters/**/*_test.rb"
 end
+
+Rake::Task["test:run"].enhance ["test:presenters"]

data/lib/keynote/version.rb

@@ -2,5 +2,5 @@
 
 module Keynote
   # @private
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/generator_spec.rb

@@ -15,7 +15,10 @@ describe "generators" do
       :destination_root => output_path
 
     assert retval, 'Generator must succeed'
-    yield retval.drop(2)
+
+    output_files = Dir["#{output_path}/**/*.rb"]
+
+    yield output_files.map { |path| path.sub("#{output_path}/", '') }.sort
   ensure
     FileUtils.rm_rf(output_path)
   end

metadata

@@ -1,179 +1,179 @@
 --- !ruby/object:Gem::Specification
 name: keynote
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ' A presenter is an object that encapsulates view logic. Like Rails helpers,
+description: " A presenter is an object that encapsulates view logic. Like Rails helpers,
   presenters help you keep complex logic out of your templates. Keynote provides a
-  consistent interface for defining and instantiating presenters. '
+  consistent interface for defining and instantiating presenters. "
 email:
 - rwfitzge@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .editorconfig
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".editorconfig"
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails30.gemfile
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
 - gemfiles/rails40.gemfile
 - gemfiles/rails41.gemfile
+- gemfiles/rails42.gemfile
 - keynote.gemspec
 - lib/generators/presenter_generator.rb
 - lib/generators/templates/keynote_mini_test_spec.rb
@@ -213,17 +213,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Flexible presenters for Rails.