blocks 2.1.0 → 2.2.0

data/lib/blocks.rb

@@ -4,6 +4,7 @@ require "action_controller"
 module Blocks
   autoload :Base,          "blocks/base"
   autoload :Container,     "blocks/container"
+  autoload :ProcWithArgs,     "blocks/proc_with_args"
   autoload :ViewAdditions, "blocks/view_additions"
   autoload :ControllerAdditions, "blocks/controller_additions"
 

data/lib/blocks/base.rb

@@ -57,7 +57,7 @@ module Blocks
 
       if collection
         collection.each do |object|
-          define(evaluated_proc(name, object, options), options, &block)
+          define(view.call_if_proc(name, object, options), options, &block)
         end
       else
         self.define_block_container(name, options, &block)
@@ -155,7 +155,7 @@ module Blocks
           cloned_options = cloned_options.merge(object.options) if object.is_a?(Blocks::Container)
           cloned_args.push(cloned_options)
 
-          block_name = evaluated_proc(name_or_container, *cloned_args)
+          block_name = view.call_if_proc(name_or_container, *cloned_args)
           as_name = (as.presence || block_name).to_sym
           cloned_options[as_name] = object
 
@@ -484,21 +484,6 @@ module Blocks
       nil
     end
 
-    def evaluated_procs(*args)
-      options = args.shift.presence || {}
-      if options.is_a?(Proc)
-        evaluated_proc(options, *args)
-      else
-        options.inject({}) { |hash, (k, v)| hash[k] = evaluated_proc(v, *args); hash}
-      end
-    end
-
-    def evaluated_proc(*args)
-      return nil unless args.present?
-      v = args.shift
-      v.is_a?(Proc) ? v.call(*(args[0, v.arity])) : v
-    end
-
     protected
 
     # If a method is missing, we'll assume the user is starting a new block group by that missing method name
@@ -663,7 +648,7 @@ module Blocks
 
     def content_tag(tag, tag_html, *args, &block)
       if tag
-        view.content_tag(tag, block.call, evaluated_procs(tag_html, *args))
+        view.content_tag(tag, block.call, view.call_each_hash_value_if_proc(tag_html, *args))
       else
         block.call
       end

data/lib/blocks/proc_with_args.rb

@@ -0,0 +1,18 @@
+module Blocks
+  class ProcWithArgs
+    def self.call(*args)
+      return nil unless args.present?
+      v = args.shift
+      v.is_a?(Proc) ? v.call(*(args[0, v.arity])) : v
+    end
+
+    def self.call_each_hash_value(*args)
+      options = args.shift.presence || {}
+      if options.is_a?(Proc)
+        call(options, *args)
+      else
+        options.inject({}) { |hash, (k, v)| hash[k] = call(v, *args); hash}
+      end
+    end
+  end
+end

data/lib/blocks/view_additions.rb

@@ -7,6 +7,14 @@ module Blocks
         @blocks.blocks.merge! @controller_blocks.blocks if @controller_blocks
         @blocks
       end
+
+      def call_if_proc(*args)
+        Blocks::ProcWithArgs.call(*args)
+      end
+
+      def call_each_hash_value_if_proc(*args)
+        Blocks::ProcWithArgs.call_each_hash_value(*args)
+      end
     end
   end
 end

data/spec/blocks/base_spec.rb

@@ -613,47 +613,4 @@ describe Blocks::Base do
       @builder.queued_blocks.should eql []
     end
   end
-
-  describe "evaluated_procs method" do
-    it "should evaluate any proc options" do
-      proc1 = lambda {@view.cycle("even", "odd")}
-      proc2 = lambda {@view.cycle("one", "two")}
-      evaluated_procs = @builder.evaluated_procs(:class => proc1, :id => proc2, :style => "color:red")
-      evaluated_procs[:class].should eql "even"
-      evaluated_procs[:id].should eql "one"
-      evaluated_procs[:style].should eql "color:red"
-    end
-
-    it "should pass any additional arguments to evaluated procs" do
-      proc1 = lambda { |param1, param2| "user_#{param1}_#{param2}"}
-      evaluated_procs = @builder.evaluated_procs({:class => proc1}, 1, 2)
-      evaluated_procs[:class].should eql "user_1_2"
-    end
-  end
-
-  describe "evaluated_proc method" do
-    it "should evaluate a proc" do
-      proc = lambda {@view.cycle("even", "odd")}
-      @builder.evaluated_proc(proc).should eql "even"
-      @builder.evaluated_proc(proc).should eql "odd"
-      @builder.evaluated_proc(proc).should eql "even"
-    end
-
-    it "should just return the value if it is not a proc" do
-      @builder.evaluated_proc("1234").should eql "1234"
-    end
-
-    it "should return nil if no arguments are specified" do
-      @builder.evaluated_proc.should be_nil
-    end
-
-    it "should treat the first argument as the potential proc to evaluate" do
-      @builder.evaluated_proc(1, 2, 3).should eql 1
-    end
-
-    it "should pass any additional arguments to the evaluated proc" do
-      proc1 = lambda { |param1, param2| "user_#{param1}_#{param2}"}
-      @builder.evaluated_proc(proc1, 1, 2).should eql "user_1_2"
-    end
-  end
 end

data/spec/blocks/proc_with_args_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe Blocks::ProcWithArgs do
+  before :each do
+    @view = ActionView::Base.new
+  end
+
+  describe "call_each_hash_value method" do
+    it "should evaluate any proc options" do
+      proc1 = lambda {@view.cycle("even", "odd")}
+      proc2 = lambda {@view.cycle("one", "two")}
+      evaluated_procs = Blocks::ProcWithArgs.call_each_hash_value(:class => proc1, :id => proc2, :style => "color:red")
+      evaluated_procs[:class].should eql "even"
+      evaluated_procs[:id].should eql "one"
+      evaluated_procs[:style].should eql "color:red"
+    end
+
+    it "should pass any additional arguments to evaluated procs" do
+      proc1 = lambda { |param1, param2| "user_#{param1}_#{param2}"}
+      evaluated_procs = Blocks::ProcWithArgs.call_each_hash_value({:class => proc1}, 1, 2)
+      evaluated_procs[:class].should eql "user_1_2"
+    end
+  end
+
+  describe "call method" do
+    it "should evaluate a proc" do
+      proc = lambda {@view.cycle("even", "odd")}
+      Blocks::ProcWithArgs.call(proc).should eql "even"
+      Blocks::ProcWithArgs.call(proc).should eql "odd"
+      Blocks::ProcWithArgs.call(proc).should eql "even"
+    end
+
+    it "should just return the value if it is not a proc" do
+      Blocks::ProcWithArgs.call("1234").should eql "1234"
+    end
+
+    it "should return nil if no arguments are specified" do
+      Blocks::ProcWithArgs.call.should be_nil
+    end
+
+    it "should treat the first argument as the potential proc to evaluate" do
+      Blocks::ProcWithArgs.call(1, 2, 3).should eql 1
+    end
+
+    it "should pass any additional arguments to the evaluated proc" do
+      proc1 = lambda { |param1, param2| "user_#{param1}_#{param2}"}
+      Blocks::ProcWithArgs.call(proc1, 1, 2).should eql "user_1_2"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blocks
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-06 00:00:00 Z
+date: 2013-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -51,26 +51,30 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        - 5
+        version: 1.1.5
   requirement: *id003
   prerelease: false
-  name: jeweler
+  name: bundler
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   requirement: *id004
   prerelease: false
   name: jeweler
@@ -87,32 +91,36 @@ dependencies:
         version: "0"
   requirement: *id005
   prerelease: false
-  name: jeweler
+  name: rcov
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        - 5
+        version: 1.1.5
   requirement: *id006
   prerelease: false
-  name: jeweler
+  name: bundler
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   requirement: *id007
   prerelease: false
   name: jeweler
@@ -129,32 +137,36 @@ dependencies:
         version: "0"
   requirement: *id008
   prerelease: false
-  name: jeweler
+  name: rcov
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        - 5
+        version: 1.1.5
   requirement: *id009
   prerelease: false
-  name: jeweler
+  name: bundler
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   requirement: *id010
   prerelease: false
   name: jeweler
@@ -171,105 +183,7 @@ dependencies:
         version: "0"
   requirement: *id011
   prerelease: false
-  name: jeweler
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id012
-  prerelease: false
-  name: jeweler
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id013
-  prerelease: false
-  name: jeweler
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id014
-  prerelease: false
-  name: jeweler
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id015
-  prerelease: false
-  name: jeweler
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id016
-  prerelease: false
-  name: jeweler
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id017
-  prerelease: false
-  name: jeweler
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id018
-  prerelease: false
-  name: jeweler
+  name: rcov
   type: :development
 description: Blocks goes beyond blocks and partials
 email: hunterae@gmail.com
@@ -280,23 +194,30 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .rspec
 - CHANGELOG.rdoc
+- Gemfile
 - README.rdoc
 - Rakefile
 - VERSION
+- blocks.gemspec
+- blocks_render_order.graffle
+- blocks_render_order.png
 - lib/blocks.rb
 - lib/blocks/base.rb
 - lib/blocks/container.rb
 - lib/blocks/controller_additions.rb
+- lib/blocks/proc_with_args.rb
 - lib/blocks/view_additions.rb
 - rails/init.rb
 - spec/blocks/base_spec.rb
 - spec/blocks/blocks_spec.rb
+- spec/blocks/proc_with_args_spec.rb
 - spec/blocks/view_additions_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/hunterae/blocks
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -326,6 +247,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Blocks is an intricate way of rendering blocks of code, while combining some of the best features of content blocks and partials, and adding several new features that go above and beyond what a simple content_for with yield or a render :partial is capable of doing.
+summary: Blocks is an intricate way of rendering blocks of code and adding several new features that go above and beyond what a simple content_for with yield is capable of doing.
 test_files: []