keynote 0.2.0pre2 → 0.2.0pre3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGI0NGI2NzM1NTYwNDk0YTEyNmIxMDNmMTQxMTBmZDFiNGQ1ZTU4ZA==
+    MzFlYTA4N2M3ZDE3NjA0MGNlZTgxYjI2YTJiZjAyNWYyMTMwODUyMQ==
   data.tar.gz: !binary |-
-    MzhjMjY0ZDBlNmY2NGYxNTE5ODI4YTBhZGMwYmYxZDUzNzJmZTVkNA==
+    MzgwNTJmNzhiMjZjOTBmMTkxZDg0MWE0NzVkZDE0NzhmNDA3NjAwNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGY2ZmRiYzZmNmQ2NDY0NzdlN2QwMzczY2IyYTAzN2Q5NDkxYmJhYjk1ZjZh
-    MmZkNWU5NDFkNjE4NTFkYzc0MDliZGVmZWFjZmVhMTJmYjhhMjgwMjhhYWYx
-    ZTZjZTI1NzAwOGJjYmY1YWNhM2E4ZThkOWNiYzFkMjdiOGI0MjI=
+    YmIzNThlN2FhNWM0OGZjNTdjZmQ5MTJjYWZmMTAzZjAwYjBjYzA3MWM4Nzdh
+    NDJhZDg5NjgxNjY2NTI0MTNjMDc0ZjdkYzNlYjFhNmVlMTNmNTYwZjM5OWQ0
+    YjVmZWVmODMwYTQ4ZDNkMTgxM2QyZDllOTU3MGRlODI3YjFjZjU=
   data.tar.gz: !binary |-
-    MjQ5NzdmYjAxYmUxNzA1NTE4M2E1YTc2Y2Y2NDQ0NDNiNTA4ZDA4MTM4M2U2
-    MjBlOWI1OTVhNWU1ZDU2YzY1ODA4ZjYzMTZiOWE3NGI5M2Y0NWFiODUzOTgy
-    OWY0ZDEwMGVlMWVlY2ViMjI0NWZhYjMzN2Q1N2NmYjYyNGE3ZTc=
+    OTczZjU0ZDlhNzRiZWJmMTNmOGViYjViOGIyZWQ5YTJmYWY3N2EzOTVhMmZk
+    YTA5ZTUzYTBmNzlkZTc4ODQzMzIxYWFkYmU4MDZkYmEzZTJiZTI1ZWFjNmE5
+    ODYxNjkyZTkyNTUxMzhlMGI4NjAwYTVjMTE4MTYxNTFmNDEzMjI=

data/gemfiles/rails30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/rfitz/src/keynote
   specs:
-    keynote (0.2.0pre1)
+    keynote (0.2.0pre2)
       rails (>= 3.0.0)
 
 GEM

data/gemfiles/rails31.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/rfitz/src/keynote
   specs:
-    keynote (0.2.0pre1)
+    keynote (0.2.0pre2)
       rails (>= 3.0.0)
 
 GEM

data/gemfiles/rails32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/rfitz/src/keynote
   specs:
-    keynote (0.2.0pre1)
+    keynote (0.2.0pre2)
       rails (>= 3.0.0)
 
 GEM

data/gemfiles/rails4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/rfitz/src/keynote
   specs:
-    keynote (0.2.0pre1)
+    keynote (0.2.0pre2)
       rails (>= 3.0.0)
 
 GEM

data/lib/keynote/inline.rb

@@ -7,32 +7,10 @@ module Keynote
   # body of a presenter method. You can use any template language supported by
   # Rails.
   #
-  # ## The `inline` method
-  #
-  # First, you have to declare what template languages you want to use by
-  # calling the {Keynote::Inline#inline} method on a presenter class:
-  #
-  #     class MyPresenter < Keynote::Presenter
-  #       presents :user, :account
-  #       inline :haml
-  #     end
-  #
-  # This defines a `#haml` instance method on the `MyPresenter` class.
-  #
-  # If you want to make inline templates available to all of your presenters,
-  # you can add an initializer like this to your application:
-  #
-  #     class Keynote::Presenter
-  #       inline :erb, :haml, :slim
-  #     end
-  #
-  # This will add `#erb`, `#haml`, and `#slim` instance methods to all of your
-  # presenters.
-  #
   # ## Basic usage
   #
-  # After defining one or more instance methods by calling `inline`, you can
-  # generate HTML by calling one of those methods and immediately following it
+  # After extending the `Keynote::Inline` module in your presenter class, you
+  # can generate HTML by calling the `erb` method and immediately following it
   # with a block of comments containing your template:
   #
   #     def link
@@ -67,6 +45,31 @@ module Keynote
   #       erb x: 1, y: 2
   #       # <%= x + y %>
   #     end
+  #
+  # ## The `inline` method
+  #
+  # If you want to use template languages other than ERB, you have to define
+  # methods for them by calling the {Keynote::Inline#inline} method on a
+  # presenter class:
+  #
+  #     class MyPresenter < Keynote::Presenter
+  #       extend Keynote::Inline
+  #       presents :user, :account
+  #       inline :haml
+  #     end
+  #
+  # This defines a `#haml` instance method on the `MyPresenter` class.
+  #
+  # If you want to make inline templates available to all of your presenters,
+  # you can add an initializer like this to your application:
+  #
+  #     class Keynote::Presenter
+  #       extend Keynote::Inline
+  #       inline :haml, :slim
+  #     end
+  #
+  # This will add `#erb`, `#haml`, and `#slim` instance methods to all of your
+  # presenters.
   module Inline
     # For each template format given as a parameter, add an instance method
     # that can be called to render an inline template in that format. Any
@@ -96,6 +99,12 @@ module Keynote
       end
     end
 
+    # Extending `Keynote::Inline` automatically creates an `erb` method on the
+    # base class.
+    def self.extended(base)
+      base.inline :erb
+    end
+
     # @private
     class Renderer
       def initialize(presenter, locals, caller_line, format)
@@ -153,7 +162,7 @@ module Keynote
         if new_mtime != mtime
           source = read_template(source_file, line)
 
-          template = ActionView::Template.new(source, cache_key[0],
+          template = Template.new(source, cache_key[0],
             handler_for_format(format), locals: local_names)
 
           @cache[cache_key] = [template, new_mtime]
@@ -169,13 +178,13 @@ module Keynote
 
         File.foreach(source_file).drop(line).each do |line|
           if line =~ COMMENTED_LINE
-            result << $1
+            result << $1 << "\n"
           else
             break
           end
         end
 
-        unindent result
+        unindent result.chomp
       end
 
       # Borrowed from Pry, which borrowed it from Python.
@@ -203,5 +212,32 @@ module Keynote
         end
       end
     end
+
+    # @private
+    class Template < 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(*)
+        super
+        @compile_mutex = Mutex.new
+      end
+
+      # 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, view.class)
+
+          @source = nil if @virtual_path
+          @compiled = true
+        end
+      end
+    end
   end
 end

data/lib/keynote/railtie.rb

@@ -6,23 +6,8 @@ module Keynote
   # @private
   class Railtie < Rails::Railtie
     config.after_initialize do |app|
-      if ::Rails.version.to_f >= 4
-        app.config.paths.add 'app/presenters'
-      else
-        app.config.paths.add 'app/presenters', :eager_load => true
-      end
-
-      if defined?(RSpec::Rails) && RSpec.respond_to?(:configure)
-        require 'keynote/testing/rspec'
-      end
-
-      if defined?(MiniTest::Rails)
-        require 'keynote/testing/minitest_rails'
-      end
-
-      if !defined?(MiniTest::Rails)
-        require "keynote/testing/test_unit"
-      end
+      add_presenters_to_paths(app)
+      load_test_integration
     end
 
     ActiveSupport.on_load(:action_view) do
@@ -42,5 +27,27 @@ module Keynote
         load File.expand_path("../testing/minitest_rails.rake", __FILE__)
       end
     end
+
+    def self.add_presenters_to_paths(app)
+      if ::Rails.version.to_f >= 4
+        app.config.paths.add 'app/presenters'
+      else
+        app.config.paths.add 'app/presenters', :eager_load => true
+      end
+    end
+
+    def self.load_test_integration
+      if defined?(RSpec::Rails) && RSpec.respond_to?(:configure)
+        require 'keynote/testing/rspec'
+      end
+
+      if defined?(MiniTest::Rails)
+        require 'keynote/testing/minitest_rails'
+      end
+
+      if !defined?(MiniTest::Rails)
+        require "keynote/testing/test_unit"
+      end
+    end
   end
 end

data/lib/keynote/version.rb

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

data/spec/benchmarks.rb

@@ -8,6 +8,7 @@ require "keynote"
 require "benchmark"
 
 class MyPresenter < Keynote::Presenter
+  extend Keynote::Inline
   inline :erb
 
   def my_string

data/spec/inline_spec.rb

@@ -16,7 +16,7 @@ module Keynote
 
     class InlineUser < Keynote::Presenter
       extend Keynote::Inline
-      inline :erb, :slim, :haml
+      inline :slim, :haml
 
       def simple_template
         erb
@@ -53,8 +53,9 @@ module Keynote
 
       def fix_indentation
         slim
-        # div.indented_slightly
-        #   = "hello"
+        # .indented_slightly
+        #   - (2..4).each do |i|
+        #     ' #{i} times
       end
 
       def erb_escaping
@@ -100,7 +101,7 @@ module Keynote
     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"
+      presenter.method_calls.strip.squeeze(" ").must_equal "Local H\nLocal H"
     end
 
     it "should handle errors relatively gracefully" do
@@ -116,7 +117,7 @@ module Keynote
 
     it "should remove leading indentation" do
       presenter.fix_indentation.must_equal \
-        "<div class=\"indented_slightly\">hello</div>"
+        "<div class=\"indented_slightly\">2 times 3 times 4 times </div>"
     end
 
     it "should escape HTML by default" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keynote
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre2
+  version: 0.2.0pre3
 platform: ruby
 authors:
 - Ryan Fitzgerald