blocks 0.6 → 0.7

data/app/helpers/blocks/helper_methods.rb

@@ -4,14 +4,12 @@ module Blocks
       options = {}
       options[:view] = self
       
-      @blocks ||= Blocks::Context.new(options)
+      @blocks ||= Blocks::Builder.new(options)
     end
     
-    def evaluated_content_options(options={})
-      puts "Checking evaluated_content_options #{options.inspect}"
-      
+    def evaluated_content_options(options={}, parameters={})
       evaluated_options = {}
-      options.each_pair { |k, v| evaluated_options[k] = (v.is_a?(Proc) ? v.call(options) : v)}
+      options.each_pair { |k, v| evaluated_options[k] = (v.is_a?(Proc) ? v.call(parameters) : v)}
       evaluated_options
     end
     
@@ -19,7 +17,7 @@ module Blocks
       options[:view] = self
       options[:records] = records
       options[:block] = block
-      options[:row_html] = {:class => lambda { cycle('odd', 'even')}} if options[:row_html].nil?
+      options[:row_html] = {:class => lambda { |parameters| cycle('odd', 'even')}} if options[:row_html].nil?
       
       Blocks::TableFor.new(options).render
     end

data/app/views/blocks/_table.html.erb

@@ -49,7 +49,7 @@
 <% end %>
 
 <%= table.define :row do |options| %>
-  <%= content_tag :tr, evaluated_content_options(options[:row_html].merge({:record => options[:record]})) do %>
+  <%= content_tag :tr, evaluated_content_options(options[:row_html], options) do %>
     <%= table.use :data_columns, options %>
   <% end %>
 <% end %>

data/lib/blocks.rb

@@ -1,5 +1,5 @@
 require 'blocks/container'
-require 'blocks/context'
+require 'blocks/builder'
 require 'blocks/table_for'
 require 'blocks/list_for'
 require 'blocks/engine'

data/lib/blocks/{context.rb → builder.rb}

@@ -1,5 +1,5 @@
 module Blocks
-  class Context
+  class Builder
     
     attr_accessor :view, :blocks, :block_positions, :anonymous_block_number,
                   :start_rendering_blocks, :block_groups, :shared_options
@@ -148,7 +148,7 @@ module Blocks
         begin
           view.concat(view.render "#{shared_options[:templates_folder]}/#{name.to_s}", shared_options.merge(render_options))
         rescue
-          
+          puts "Could not render template #{name} in directory #{shared_options[:templates_folder]}"
         end
       end
       

data/lib/blocks/list_for.rb

@@ -1,5 +1,5 @@
 module Blocks
-  class ListFor < Blocks::Context
+  class ListFor < Blocks::Builder
     alias items block_positions
     alias item use
     

data/lib/blocks/table_for.rb

@@ -1,5 +1,5 @@
 module Blocks
-  class TableFor < Blocks::Context
+  class TableFor < Blocks::Builder
     alias columns block_positions
     alias column use
     

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: blocks
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
-  - 6
-  version: "0.6"
+  - 7
+  version: "0.7"
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -05:00
+date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -29,8 +29,8 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
+- lib/blocks/builder.rb
 - lib/blocks/container.rb
-- lib/blocks/context.rb
 - lib/blocks/engine.rb
 - lib/blocks/list_for.rb
 - lib/blocks/table_for.rb