blocks 0.3 → 0.4

data/app/helpers/blocks/helper.rb

@@ -1,11 +1,18 @@
 module Blocks
   module Helper
+    def blocks
+      options = {}
+      options[:view] = self
+      
+      @blocks ||= Blocks::Context.new(options)
+    end
+    
+    def evaluated_content_options(options={})
+      evaluated_options = {}
+      options.each_pair { |k, v| evaluated_options[k] = (v.is_a?(Proc) ? v.call : v)}
+      evaluated_options
+    end
     
-    # def self.included(base)
-    #   base.extend Helper
-    #   # base.helper_method :table_for, :evaluated_content_options, :request_blocks
-    # end
-
     def table_for(records, options={}, &block)
       options[:view] = self
       options[:records] = records
@@ -14,18 +21,15 @@ module Blocks
       
       Blocks::TableFor.new(options).render
     end
-
-    def evaluated_content_options(options={})
-      evaluated_options = {}
-      options.each_pair { |k, v| evaluated_options[k] = (v.is_a?(Proc) ? v.call : v)}
-      evaluated_options
-    end
-
-    def request_blocks
-      options = {}
+    
+    def list_for(*args, &block)
+      options = args.extract_options! 
+      
       options[:view] = self
+      options[:records] = args.first
+      options[:block] = block
       
-      @request_blocks ||= Blocks::Context.new(options)
+      Blocks::ListFor.new(options).render
     end
   end
 end

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

@@ -0,0 +1,35 @@
+<%= 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 %>
+  <% end %>
+<% 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 %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% list.items.each do |item| %>
+  <%= list.define item.name, :item => item do |options| %>
+    <%= item.name %>
+  <% end %>
+<% end %>
+
+<%= list.use :list do |options| %>
+  <%= content_tag :ul, options[:list_html] do %>
+    <%= list.use :list_items %>
+  <% end %>
+<% end %>

data/lib/blocks.rb

@@ -1,8 +1,5 @@
-module Blocks;  end
-
+require 'blocks/container'
 require 'blocks/context'
 require 'blocks/table_for'
-require 'blocks/engine'
-# require 'blocks/helper'
-
-
+require 'blocks/list_for'
+require 'blocks/engine'

data/lib/blocks/container.rb

@@ -0,0 +1,5 @@
+module Blocks
+  class Container
+    attr_accessor :name, :options, :block
+  end
+end

data/lib/blocks/context.rb

@@ -1,8 +1,4 @@
 module Blocks
-  class Container
-    attr_accessor :name, :options, :block
-  end
-
   class Context
     
     attr_accessor :view, :blocks, :block_positions, :anonymous_block_number,
@@ -142,8 +138,8 @@ module Blocks
       if blocks[name]
         block_container = blocks[name]
         ret.concat(view.capture shared_options.merge(block_container.options).merge(render_options), &block_container.block)
-      elsif view.request_blocks.blocks[name]
-        block_container = view.request_blocks.blocks[name]
+      elsif view.blocks.blocks[name]
+        block_container = view.blocks.blocks[name]
         ret.concat(view.capture shared_options.merge(block_container.options).merge(render_options), &block_container.block)
       else
         begin
@@ -166,8 +162,8 @@ module Blocks
         end
       end
       
-      unless view.request_blocks.blocks[name].nil?
-        view.request_blocks.blocks[name].each do |block_container|
+      unless view.blocks.blocks[name].nil?
+        view.blocks.blocks[name].each do |block_container|
           ret.concat(view.capture shared_options.merge(block_container.options).merge(options), &block_container.block)
         end
       end
@@ -185,8 +181,8 @@ module Blocks
         end
       end
       
-      unless view.request_blocks.blocks[name].nil?
-        view.request_blocks.blocks[name].each do |block_container|
+      unless view.blocks.blocks[name].nil?
+        view.blocks.blocks[name].each do |block_container|
           ret.concat(view.capture shared_options.merge(block_container.options).merge(options), &block_container.block)
         end
       end

data/lib/blocks/engine.rb

@@ -3,11 +3,10 @@ require "rails"
 
 module Blocks
   class Engine < Rails::Engine
-    engine_name :blocks
-    initializer "blocks.initialize_helpers" do      
-      ActionView::Base.class_eval do
+    initializer "blocks.initialize" do
+      ActiveSupport.on_load(:action_view) do
         include Blocks::Helper
-      end      
+      end
     end
   end
 end

data/lib/blocks/list_for.rb

@@ -0,0 +1,18 @@
+module Blocks
+  class ListFor < Blocks::Context
+    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"
+      options[:record_variable] = "records"
+      options[:variable] = "list"
+      super
+    end
+  end
+end

data/lib/blocks/table_for.rb

@@ -8,8 +8,8 @@ module Blocks
     end
     
     def initialize(options)
-      options[:template] = "blocks/tables/table"
-      options[:templates_folder] = "tables"
+      options[:template] = "blocks/table"
+      options[:templates_folder] = "blocks/tables"
       options[:record_variable] = "records"
       options[:variable] = "table"
       super

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: blocks
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -05:00
+date: 2010-12-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Blocks makes it easy to create advanced ERB helpers
+description: content_for with parameters, with advanced options such as a table generator (table_for)
 email: andrew@captico.com
 executables: []
 
@@ -29,12 +29,15 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
+- lib/blocks/container.rb
 - lib/blocks/context.rb
 - lib/blocks/engine.rb
+- lib/blocks/list_for.rb
 - lib/blocks/table_for.rb
 - lib/blocks.rb
 - app/helpers/blocks/helper.rb
-- app/views/blocks/tables/_table.html.erb
+- app/views/blocks/_list.html.erb
+- app/views/blocks/_table.html.erb
 - README
 - LICENSE
 has_rdoc: true
@@ -71,6 +74,6 @@ rubyforge_project: blocks
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: blocks makes erb fun again
+summary: content_for with parameters, with advanced options such as a table generator (table_for)
 test_files: []