curly-templates 0.7.0 → 0.8.0

data/Gemfile

@@ -7,4 +7,5 @@ platform :ruby do
   gem 'yard-tomdoc'
   gem 'redcarpet'
   gem 'github-markup'
+  gem 'coveralls', require: false
 end

data/README.md

@@ -87,6 +87,13 @@ render collection: post.comments
 ```
 
 
+Is it ready to use in production?
+---------------------------------
+
+Yes! While still a young project, it's being used in a rather large Rails app
+at Zendesk, where it performs admirably.
+
+
 Examples
 --------
 
@@ -256,6 +263,12 @@ Thanks
 Thanks to [Zendesk](http://zendesk.com/) for sponsoring the work on Curly.
 
 
+Build Status
+------------
+
+[![Build Status](https://travis-ci.org/zendesk/curly.png?branch=master)](https://travis-ci.org/zendesk/curly)
+
+
 Copyright and License
 ---------------------
 

data/curly-templates.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'curly-templates'
-  s.version           = '0.7.0'
-  s.date              = '2013-05-03'
+  s.version           = '0.8.0'
+  s.date              = '2013-05-22'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."

data/lib/curly.rb

@@ -26,7 +26,7 @@
 # See Curly::Presenter for more information on presenters.
 #
 module Curly
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 
   # Compiles a Curly template to Ruby code.
   #

data/lib/curly/presenter.rb

@@ -45,7 +45,13 @@ module Curly
     def initialize(context, options = {})
       @_context = context
       self.class.presented_names.each do |name|
-        instance_variable_set("@#{name}", options.fetch(name))
+        value = options.fetch(name) do
+          default_values.fetch(name) do
+            raise ArgumentError.new("required parameter `#{name}` missing")
+          end
+        end
+
+        instance_variable_set("@#{name}", value)
       end
     end
 
@@ -209,14 +215,26 @@ module Curly
       end
 
       def presents(*args)
+        options = args.extract_options!
+
         self.presented_names += args
+
+        if options.key?(:default)
+          default_values = args.each_with_object(Hash.new) do |arg, hash|
+            hash[arg] = options.fetch(:default)
+          end
+
+          self.default_values = self.default_values.merge(default_values)
+        end
       end
     end
 
     private
 
-    class_attribute :presented_names
+    class_attribute :presented_names, :default_values
+
     self.presented_names = [].freeze
+    self.default_values = {}.freeze
 
     # Delegates private method calls to the current view context.
     #

data/lib/curly/railtie.rb

@@ -1,3 +1,5 @@
+require 'curly/dependency_tracker'
+
 module Curly
   class Railtie < Rails::Railtie
     config.app_generators.template_engine :curly
@@ -6,9 +8,12 @@ module Curly
       ActionView::Template.register_template_handler :curly, Curly::TemplateHandler
 
       if defined?(CacheDigests::DependencyTracker)
-        require 'curly/dependency_tracker'
         CacheDigests::DependencyTracker.register_tracker :curly, Curly::DependencyTracker
       end
+
+      if defined?(ActionView::DependencyTracker)
+        ActionView::DependencyTracker.register_tracker :curly, Curly::DependencyTracker
+      end
     end
   end
 end

data/lib/curly/template_handler.rb

@@ -28,7 +28,6 @@ class Curly::TemplateHandler
       presenter_class = Curly::Presenter.presenter_for_path(path)
 
       source = Curly.compile(template.source, presenter_class)
-      template_digest = Digest::MD5.hexdigest(template.source)
 
       <<-RUBY
       if local_assigns.empty?
@@ -46,8 +45,6 @@ class Curly::TemplateHandler
       if key = presenter.cache_key
         @output_buffer = ActiveSupport::SafeBuffer.new
 
-        template_digest = #{template_digest.inspect}
-
         if #{presenter_class}.respond_to?(:cache_key)
           presenter_key = #{presenter_class}.cache_key
         else
@@ -58,7 +55,7 @@ class Curly::TemplateHandler
           expires_in: presenter.cache_duration
         }
 
-        cache([template_digest, key, presenter_key].compact, options) do
+        cache([key, presenter_key].compact, options) do
           safe_concat(view_function.call)
         end
 

data/spec/presenter_spec.rb

@@ -9,8 +9,14 @@ describe Curly::Presenter do
 
     include MonkeyComponents
 
-    presents :midget, :clown
-    attr_reader :midget, :clown
+    presents :midget, :clown, default: nil
+    presents :elephant, default: "Dumbo"
+
+    attr_reader :midget, :clown, :elephant
+  end
+
+  class FrenchCircusPresenter < CircusPresenter
+    presents :elephant, default: "Babar"
   end
 
   it "sets the presented parameters as instance variables" do
@@ -25,6 +31,18 @@ describe Curly::Presenter do
     presenter.clown.should == "Bubbles"
   end
 
+  it "allows specifying default values for parameters" do
+    context = double("context")
+
+    # Make sure subclasses can change default values.
+    french_presenter = FrenchCircusPresenter.new(context)
+    french_presenter.elephant.should == "Babar"
+
+    # The subclass shouldn't change the superclass' defaults, though.
+    presenter = CircusPresenter.new(context)
+    presenter.elephant.should == "Dumbo"
+  end
+
   describe ".presenter_for_path" do
     it "returns the presenter class for the given path" do
       presenter = double("presenter")
@@ -47,6 +65,26 @@ describe Curly::Presenter do
     end
   end
 
+  describe ".available_methods" do
+    it "includes the methods on the presenter" do
+      CircusPresenter.available_methods.should include(:midget)
+    end
+
+    it "does not include methods on the Curly::Presenter base class" do
+      CircusPresenter.available_methods.should_not include(:cache_key)
+    end
+  end
+
+  describe ".method_available?" do
+    it "returns true if the method is available" do
+      CircusPresenter.method_available?(:midget).should be_true
+    end
+
+    it "returns false if the method is not available" do
+      CircusPresenter.method_available?(:bear).should be_false
+    end
+  end
+
   describe ".version" do
     it "sets the version of the presenter" do
       presenter1 = Class.new(Curly::Presenter) do

data/spec/spec_helper.rb

@@ -1,2 +1,12 @@
 require 'active_support/all'
+
+if ENV['CI']
+  begin
+    require 'coveralls'
+    Coveralls.wear!
+  rescue LoadError
+    STDERR.puts "Failed to load Coveralls"
+  end
+end
+
 require 'curly'

data/spec/template_handler_spec.rb

@@ -123,16 +123,6 @@ describe Curly::TemplateHandler do
       output.should == "BAZ"
     end
 
-    it "adds a digest of the template source to the cache key" do
-      context.assigns[:cache_key] = "x"
-
-      template.stub(:source) { "{{bar}}" }
-      output.should == "BAR"
-
-      template.stub(:source) { "FOO{{bar}}" }
-      output.should == "FOOBAR"
-    end
-
     it "adds the presenter class' cache key to the instance's cache key" do
       # Make sure caching is enabled
       context.assigns[:cache_key] = "x"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1185334728510665354
+      hash: 2436310145351861333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: