blocks 2.2.1 → 2.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+2.3.0 (August 27, 2013)
+* Moved all of the call call_if_proc and call_each_hash_value_if_proc and ProcWithArgs class into a separate gem (https://github.com/hunterae/call_with_params), now a dependency.
+
 2.2.0 (August 16, 2013)
 * Moved evaluated_procs and evaulated_proc into their own class and renamed to call_each_hash_value and call and created view helpers called call_each_hash_value_if_proc and call_if_proc
 

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "rails", ">= 3.0.0"
+gem "call_with_params"
 
 group :development do
   gem "bundler", "~> 1.1.5"

data/README.rdoc

@@ -1 +1,7 @@
-Note: I am going to be completely rewriting this documentation, and what was here may have been invalid so stay tuned.
+= Blocks
+
+How do you render your blocks of code?
+
+The idea of this gem is simple (yet difficult to see the practical application for): blocks of code, regardless of code, whether they are a ruby block or a rails partial, are, or should be, completely interchangeable.
+
+This gem seeks to set an order of precedence for how rails determines how to render a block of code.

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.3.0

data/blocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "blocks"
-  s.version = "2.2.1"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Hunter"]
-  s.date = "2013-08-20"
+  s.date = "2013-08-27"
   s.description = "Blocks goes beyond blocks and partials"
   s.email = "hunterae@gmail.com"
   s.extra_rdoc_files = [
@@ -29,12 +29,10 @@ Gem::Specification.new do |s|
     "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"
   ]
@@ -49,17 +47,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<call_with_params>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.5"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<call_with_params>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.1.5"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<call_with_params>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.1.5"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/blocks.rb

@@ -1,5 +1,6 @@
 require "action_view"
 require "action_controller"
+require "call_with_params"
 
 module Blocks
   autoload :Base,          "blocks/base"

data/lib/blocks/base.rb

@@ -1,5 +1,7 @@
 module Blocks
   class Base
+    include CallWithParams
+
     # a pointer to the ActionView that called Blocks
     attr_accessor :view
 
@@ -57,7 +59,7 @@ module Blocks
 
       if collection
         collection.each do |object|
-          define(view.call_if_proc(name, object, options), options, &block)
+          define(call_with_params(name, object, options), options, &block)
         end
       else
         self.define_block_container(name, options, &block)
@@ -155,7 +157,7 @@ module Blocks
           cloned_options = cloned_options.merge(object.options) if object.is_a?(Blocks::Container)
           cloned_args.push(cloned_options)
 
-          block_name = view.call_if_proc(name_or_container, *cloned_args)
+          block_name = call_with_params(name_or_container, *cloned_args)
           as_name = (as.presence || block_name).to_sym
           cloned_options[as_name] = object
 
@@ -657,7 +659,7 @@ module Blocks
 
     def content_tag(tag, tag_html, *args, &block)
       if tag
-        view.content_tag(tag, block.call, view.call_each_hash_value_if_proc(tag_html, *args))
+        view.content_tag(tag, block.call, call_each_hash_value_with_params(tag_html, *args))
       else
         block.call
       end

data/lib/blocks/view_additions.rb

@@ -7,14 +7,6 @@ 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blocks
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
-  - 2
-  - 1
-  version: 2.2.1
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-20 00:00:00 Z
+date: 2013-08-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -35,6 +35,20 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  prerelease: false
+  name: call_with_params
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +59,12 @@ dependencies:
         - 1
         - 5
         version: 1.1.5
-  requirement: *id002
+  requirement: *id003
   prerelease: false
   name: bundler
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +75,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  requirement: *id003
+  requirement: *id004
   prerelease: false
   name: jeweler
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,7 +89,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  requirement: *id005
   prerelease: false
   name: rcov
   type: :development
@@ -101,12 +115,10 @@ files:
 - 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

data/lib/blocks/proc_with_args.rb

@@ -1,18 +0,0 @@
-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/spec/blocks/proc_with_args_spec.rb

@@ -1,50 +0,0 @@
-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