keynote 0.2.0pre1 → 0.2.0pre2

data/spec/helper.rb

@@ -2,7 +2,8 @@
 
 require 'minitest/spec'
 require 'minitest/autorun'
-require 'mocha'
+require 'minitest/pride'
+require 'mocha/setup'
 
 require 'pry'
 
@@ -82,13 +83,3 @@ end
 class CombinedPresenter < Keynote::Presenter
   presents :model_1, :model_2
 end
-
-class Html5Presenter < Keynote::Presenter
-  def generate_h3(content)
-    build_html { h3 content }
-  end
-
-  def generate_small(content)
-    build_html { small content }
-  end
-end

data/spec/inline_spec.rb

@@ -0,0 +1,147 @@
+# encoding: UTF-8
+
+require "helper"
+require "fileutils"
+require "slim"
+require "haml"
+require "haml/template"
+
+module Keynote
+  describe Inline do
+    let(:presenter) { InlineUser.new(:view) }
+
+    def clean_whitespace(str)
+      str.gsub(/\s/, "")
+    end
+
+    class InlineUser < Keynote::Presenter
+      extend Keynote::Inline
+      inline :erb, :slim, :haml
+
+      def simple_template
+        erb
+        # Here's some math: <%= 2 + 2 %>
+      end
+
+      def ivars
+        @greetee = "world"
+        erb
+        # Hello <%= @greetee %>!
+      end
+
+      def locals_from_hash
+        erb local: "H"
+        # Local <%= local %>
+      end
+
+      def locals_from_binding
+        local = "H"
+        erb binding
+        # Local <%= local %>
+      end
+
+      def method_calls
+        erb
+        # <%= locals_from_hash %>
+        # <%= locals_from_binding %>
+      end
+
+      def error_handling
+        erb
+        # <% raise "UH OH" %>
+      end
+
+      def fix_indentation
+        slim
+        # div.indented_slightly
+        #   = "hello"
+      end
+
+      def erb_escaping
+        erb +
+        # <%= "<script>alert(1);</script>" %>
+        erb
+        # <%= "<script>alert(1);</script>".html_safe %>
+      end
+
+      def slim_escaping
+        slim +
+        # = "<script>alert(1);</script>"
+        slim
+        # = "<script>alert(1);</script>".html_safe
+      end
+
+      def haml_escaping
+        haml +
+        # = "<script>alert(1);</script>"
+        haml
+        # = "<script>alert(1);</script>".html_safe
+      end
+    end
+
+    before do
+      Keynote::Inline::Cache.reset
+    end
+
+    it "should render a template" do
+      presenter.simple_template.strip.must_equal "Here's some math: 4"
+    end
+
+    it "should see instance variables from the presenter" do
+      presenter.ivars.strip.must_equal "Hello world!"
+    end
+
+    it "should see locals passed in as a hash" do
+      presenter.locals_from_hash.strip.must_equal "Local H"
+    end
+
+    it "should see locals passed in as a binding" do
+      presenter.locals_from_binding.strip.must_equal "Local H"
+    end
+
+    it "should be able to call other methods from the same object" do
+      presenter.method_calls.strip.squeeze(" ").must_equal "Local H Local H"
+    end
+
+    it "should handle errors relatively gracefully" do
+      begin
+        presenter.error_handling
+      rescue => e
+      end
+
+      e.must_be_instance_of ActionView::Template::Error
+      e.original_exception.must_be_instance_of RuntimeError
+      e.original_exception.message.must_equal "UH OH"
+    end
+
+    it "should remove leading indentation" do
+      presenter.fix_indentation.must_equal \
+        "<div class=\"indented_slightly\">hello</div>"
+    end
+
+    it "should escape HTML by default" do
+      unescaped = "<script>alert(1);</script>"
+      escaped   = unescaped.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+      escaped2  = escaped.gsub(/\//, "&#47;") # for Slim w/ Rails > 3.0 (??)
+
+      clean_whitespace(presenter.erb_escaping).must_equal escaped + unescaped
+      clean_whitespace(presenter.haml_escaping).must_equal escaped + unescaped
+
+      [escaped + unescaped, escaped2 + unescaped].must_include \
+        clean_whitespace(presenter.slim_escaping)
+    end
+
+    it "should see updates after the file is reloaded" do
+      presenter.simple_template.strip.must_equal "Here's some math: 4"
+
+      Keynote::Inline::Cache.
+        any_instance.stubs(:read_template).returns("HELLO")
+
+      presenter.simple_template.strip.must_equal "Here's some math: 4"
+
+      FileUtils.touch __FILE__
+
+      presenter.simple_template.must_equal "HELLO"
+    end
+  end
+end

data/spec/presenter_spec.rb

@@ -63,19 +63,49 @@ describe Keynote::Presenter do
   end
 
   describe ".use_html5_tags" do
+    let(:klass) do
+      Class.new(TestPresenter) do
+        def generate_h3(content)
+          build_html { h3 content }
+        end
+
+        def generate_small(content)
+          build_html { small content }
+        end
+      end
+    end
+
     it "should add Rumble tags like `small` while preserving existing tags" do
-      presenter = Html5Presenter.new(nil)
+      presenter = klass.new(nil)
 
       presenter.generate_h3("hi").must_equal "<h3>hi</h3>"
       proc { presenter.generate_small("uh-oh") }.must_raise NoMethodError
 
-      Html5Presenter.use_html_5_tags
+      klass.use_html_5_tags
 
       presenter.generate_h3("hi").must_equal "<h3>hi</h3>"
       presenter.generate_small("hi").must_equal "<small>hi</small>"
     end
   end
 
+  describe ".object_names" do
+    it "doesn't leak between classes" do
+      c1 = Class.new(Keynote::Presenter)
+      c2 = Class.new(Keynote::Presenter)
+
+      c1.object_names << :foo
+      c1.object_names.must_equal [:foo]
+      c2.object_names.must_equal []
+    end
+
+    it "matches the list of presented objects" do
+      c = Class.new(Keynote::Presenter)
+      c.object_names.must_equal []
+      c.presents :biff, :bam, :pow
+      c.object_names.must_equal [:biff, :bam, :pow]
+    end
+  end
+
   describe "#present" do
     it "should pass its view context through to the new presenter" do
       mock = mock()
@@ -89,6 +119,25 @@ describe Keynote::Presenter do
     end
   end
 
+  describe "#inspect" do
+    it "includes the class name" do
+      CombinedPresenter.new(:view, :a, :b).inspect.
+        must_match /^#<CombinedPresenter /
+    end
+
+    it "shows .inspect output for each presented object" do
+      c1 = Class.new(Object) { def inspect; "c1"; end }
+      c2 = Class.new(Object) { def inspect; "c2"; end }
+      p  = CombinedPresenter.new(:view, c1.new, c2.new)
+
+      p.inspect.must_equal "#<CombinedPresenter model_1: c1, model_2: c2>"
+    end
+
+    it "shouldn't leave extra padding for zero-arg presenters" do
+      EmptyPresenter.new(:view).inspect.must_equal "#<EmptyPresenter>"
+    end
+  end
+
   describe "#method_missing" do
     it "should pass unknown method calls through to the view" do
       mock = mock()
@@ -124,7 +173,7 @@ describe Keynote::Presenter do
       end
 
       err.wont_be_nil
-      err.message.must_match /#<Keynote::Presenter:/
+      err.message.must_match /#<Keynote::Presenter/
     end
   end
 end

metadata

@@ -1,128 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: keynote
 version: !ruby/object:Gem::Version
-  prerelease: 5
-  version: 0.2.0pre1
+  version: 0.2.0pre2
 platform: ruby
 authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
+  name: rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-  type: :runtime
-  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   prerelease: false
+  name: appraisal
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
-  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
 - !ruby/object:Gem::Dependency
   prerelease: false
+  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
 - !ruby/object:Gem::Dependency
   prerelease: false
+  name: mocha
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.3
+  type: :development
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
-  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
 - !ruby/object:Gem::Dependency
   prerelease: false
+  name: redcarpet
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
 - !ruby/object:Gem::Dependency
   prerelease: false
+  name: yard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
-  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
 - !ruby/object:Gem::Dependency
   prerelease: false
+  name: slim
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: yard
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: haml
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
 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. '
@@ -132,7 +145,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .editorconfig
 - .gitignore
+- .travis.yml
 - .yardopts
 - Appraisals
 - CHANGELOG.md
@@ -140,6 +155,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails30.gemfile
+- gemfiles/rails30.gemfile.lock
+- gemfiles/rails31.gemfile
+- gemfiles/rails31.gemfile.lock
+- gemfiles/rails32.gemfile
+- gemfiles/rails32.gemfile.lock
+- gemfiles/rails4.gemfile
+- gemfiles/rails4.gemfile.lock
 - keynote.gemspec
 - lib/generators/presenter_generator.rb
 - lib/generators/templates/keynote_mini_test_spec.rb
@@ -151,6 +174,7 @@ files:
 - lib/keynote/cache.rb
 - lib/keynote/controller.rb
 - lib/keynote/helper.rb
+- lib/keynote/inline.rb
 - lib/keynote/presenter.rb
 - lib/keynote/railtie.rb
 - lib/keynote/rumble.rb
@@ -160,8 +184,10 @@ files:
 - lib/keynote/testing/test_present_method.rb
 - lib/keynote/testing/test_unit.rb
 - lib/keynote/version.rb
+- spec/benchmarks.rb
 - spec/generator_spec.rb
 - spec/helper.rb
+- spec/inline_spec.rb
 - spec/keynote_spec.rb
 - spec/presenter_spec.rb
 - spec/railtie_spec.rb
@@ -169,6 +195,7 @@ files:
 - spec/test_case_spec.rb
 homepage: https://github.com/rf-/keynote
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -178,22 +205,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Flexible presenters for Rails.
 test_files:
+- spec/benchmarks.rb
 - spec/generator_spec.rb
 - spec/helper.rb
+- spec/inline_spec.rb
 - spec/keynote_spec.rb
 - spec/presenter_spec.rb
 - spec/railtie_spec.rb