curly-templates 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f038cf925ee66f41bb273477733836d3be22594
-  data.tar.gz: 8d39cf352d8638c847154ce3fdccbcbfca9ae4a7
+  metadata.gz: 771f76ff2fc6fc4e3947ee8a205897a9930a02cc
+  data.tar.gz: 98c36121c84ad15081e32868ca1c8613365ea6ed
 SHA512:
-  metadata.gz: 8616749a1fe10664053e2048059a19618ad2b5d6878fce96587b39cc7322565349099ece2e40737f55404ee84de4e041227270f0be18e02de0fd2a2627d42979
-  data.tar.gz: 59036f8b9086a6196ba1c99291e6701f2f99735cc45dbc23b80c00123662618b71ae7f233cd814a66a8ef93a15bdd70341ee2cafb463b46be8f9a39e4cec120c
+  metadata.gz: 9893fb5b0c90b082c462128dd4bbd889d375f2913c703ae52b9d97cdb6dcf2de54f92e08032d8efd1007815a50672820bc5902a71fc5001723213719575bac29
+  data.tar.gz: 6ba0441db8486cdf248debd4e9d7f95d5ef8eafb2cbb53153684b5367679ada012206b289285a8c65eb94455c3a33b91209457814cf46829faf76f77f179bfc3

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ### Unreleased
 
+### Curly 2.5.0 (May 19, 2015)
+
+* Allow passing a block as the `default:` option to `presents`.
+
+  ```ruby
+  class CommentPresenter < Curly::Presenter
+    presents :comment
+    presents(:author) { @comment.author }
+  end
+  ```
+  
+  *Steven Davidovitz & Jeremy Rodi*
+
 ### Curly 2.4.0 (February 24, 2015)
 
 * Add an `exposes_helper` class methods to Curly::Presenter. This allows exposing

data/README.md

@@ -702,6 +702,7 @@ Thanks to [Zendesk](http://zendesk.com/) for sponsoring the work on Curly.
 - Alisson Cavalcante Agiani ([@thelinuxlich](https://github.com/thelinuxlich))
 - Łukasz Niemier ([@hauleth](https://github.com/hauleth))
 - Cristian Planas ([@Gawyn](https://github.com/Gawyn))
+- Steven Davidovitz ([@steved](https://github.com/steved))
 
 
 Build Status

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           = '2.4.1'
-  s.date              = '2015-04-27'
+  s.version           = '2.5.0'
+  s.date              = '2015-05-19'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."

data/lib/curly.rb

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

data/lib/curly/presenter.rb

@@ -48,7 +48,11 @@ module Curly
       self.class.presented_names.each do |name|
         value = options.fetch(name) do
           default_values.fetch(name) do
-            raise ArgumentError.new("required identifier `#{name}` missing")
+            block = default_blocks.fetch(name) do
+              raise ArgumentError.new("required identifier `#{name}` missing")
+            end
+
+            instance_exec(name, &block)
           end
         end
 
@@ -281,17 +285,23 @@ module Curly
         [name, version, dependency_cache_keys].flatten.join("/")
       end
 
-      def presents(*args)
-        options = args.extract_options!
+      def presents(*args, **options, &block)
+        if options.key?(:default) && block_given?
+          raise ArgumentError,  "Cannot provide both `default:` and block"
+        end
 
         self.presented_names += args.map(&:to_s)
 
         if options.key?(:default)
-          default_values = args.each_with_object(Hash.new) do |arg, hash|
-            hash[arg.to_s] = options.fetch(:default)
+          args.each do |arg|
+            self.default_values = default_values.merge(arg.to_s => options[:default]).freeze
           end
+        end
 
-          self.default_values = self.default_values.merge(default_values)
+        if block_given?
+          args.each do |arg|
+            self.default_blocks = default_blocks.merge(arg.to_s => block).freeze
+          end
         end
       end
 
@@ -308,10 +318,11 @@ module Curly
 
     private
 
-    class_attribute :presented_names, :default_values
+    class_attribute :presented_names, :default_values, :default_blocks
 
     self.presented_names = [].freeze
     self.default_values = {}.freeze
+    self.default_blocks = {}.freeze
 
     delegate :render, to: :@_context
 

data/spec/presenter_spec.rb

@@ -11,8 +11,11 @@ describe Curly::Presenter do
 
     presents :midget, :clown, default: nil
     presents :elephant, default: "Dumbo"
+    presents :puma, default: -> { 'block' }
+    presents(:lion) { @elephant.upcase }
+    presents(:something) { self }
 
-    attr_reader :midget, :clown, :elephant
+    attr_reader :midget, :clown, :elephant, :puma, :lion, :something
   end
 
   class FrenchCircusPresenter < CircusPresenter
@@ -49,10 +52,25 @@ describe Curly::Presenter do
       # Make sure subclasses can change default values.
       french_presenter = FrenchCircusPresenter.new(context)
       french_presenter.elephant.should == "Babar"
+      french_presenter.lion.should == 'BABAR'
+      french_presenter.puma.should be_a Proc
 
       # The subclass shouldn't change the superclass' defaults, though.
       presenter = CircusPresenter.new(context)
       presenter.elephant.should == "Dumbo"
+      presenter.lion.should == 'DUMBO'
+      presenter.puma.should be_a Proc
+    end
+
+    it "doesn't call a block if given as a value for identifiers" do
+      lion = proc { 'Simba' }
+      presenter = CircusPresenter.new(context, lion: lion)
+      presenter.lion.should be lion
+    end
+
+    it "calls default blocks in the instance of the presenter" do
+      presenter = CircusPresenter.new(context)
+      presenter.something.should be presenter
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack