blocks 0.5 → 0.6

data/app/helpers/blocks/{helper.rb → helper_methods.rb}

@@ -1,5 +1,5 @@
 module Blocks
-  module Helper
+  module HelperMethods
     def blocks
       options = {}
       options[:view] = self
@@ -8,8 +8,10 @@ module Blocks
     end
     
     def evaluated_content_options(options={})
+      puts "Checking evaluated_content_options #{options.inspect}"
+      
       evaluated_options = {}
-      options.each_pair { |k, v| evaluated_options[k] = (v.is_a?(Proc) ? v.call : v)}
+      options.each_pair { |k, v| evaluated_options[k] = (v.is_a?(Proc) ? v.call(options) : v)}
       evaluated_options
     end
     

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

@@ -1,13 +1,3 @@
-<%= list.define :list_items do %>
-  <% if records %>
-    <% records.each do |record| %>
-      <%= list.use :item, :record => record %>
-    <% end %>
-  <% else %>
-    <%= list.use :items %>
-  <% end %>
-<% end %>
-
 <%= list.define :item do |options| %>
   <%= content_tag :li, options[:item_html] do %>
     <%= options[:field] ? options[:record].send(:field) : options[:record].to_s %>
@@ -15,9 +5,17 @@
 <% end %>
 
 <%= list.define :items do |options| %>
-  <% list.items.each do |item| %>
-    <%= content_tag :li, options.merge(item.options)[:item_html] do %>
-      <%= list.use item.name %>
+  <% if records %>
+    <% records.each do |record| %>
+      <%= content_tag :li, options[:item_html] do %>
+        <%= list.use :item, :record => record %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <% list.items.each do |item| %>
+      <%= content_tag :li, options.merge(item.options)[:item_html] do %>
+        <%= list.use item.name %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>
@@ -30,6 +28,6 @@
 
 <%= list.use :list do |options| %>
   <%= content_tag :ul, options[:list_html] do %>
-    <%= list.use :list_items %>
+    <%= list.use :items %>
   <% end %>
 <% 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]) do %>
+  <%= content_tag :tr, evaluated_content_options(options[:row_html].merge({:record => options[:record]})) do %>
     <%= table.use :data_columns, options %>
   <% end %>
 <% end %>

data/lib/blocks/engine.rb

@@ -3,9 +3,9 @@ require "rails"
 
 module Blocks
   class Engine < Rails::Engine
-    initializer "blocks.initialize" do
+    initializer "blocks.initialize_helpers" do
       ActiveSupport.on_load(:action_view) do
-        include Blocks::Helper
+        include Blocks::HelperMethods
       end
     end
   end

data/lib/blocks/list_for.rb

@@ -3,10 +3,6 @@ module Blocks
     alias items block_positions
     alias item use
     
-    def header(name, options={}, &block)
-      define("#{name.to_s}_header", options, &block)
-    end
-    
     def initialize(options)
       options[:template] = "blocks/list"
       options[:templates_folder] = "blocks/lists"

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: blocks
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -05:00
+date: 2010-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,7 @@ files:
 - lib/blocks/list_for.rb
 - lib/blocks/table_for.rb
 - lib/blocks.rb
-- app/helpers/blocks/helper.rb
+- app/helpers/blocks/helper_methods.rb
 - app/views/blocks/_list.html.erb
 - app/views/blocks/_table.html.erb
 - README