blockpile 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/blockpile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blockpile}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Flint"]
-  s.date = %q{2010-08-16}
+  s.date = %q{2010-08-20}
   s.description = %q{This module attempts to create structured view helpers. Essentially, a blockpile consists of a ruby class file, and a template. This allows for isolated blocks of view logic, that can maintain a clean separation of markup language from ruby code. Blocks can be inherited from to DRY up view logic.}
   s.email = %q{tylerflint@gmail.com}
   s.extra_rdoc_files = [
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
      "blockpile.gemspec",
      "lib/blockpile.rb",
      "lib/blockpile/base.rb",
-     "lib/blockpile/paths.rb",
      "lib/blockpile/setup.rb",
      "lib/generators/blockpile/USAGE",
      "lib/generators/blockpile/blockpile_generator.rb",

data/lib/blockpile/base.rb

@@ -1,17 +1,22 @@
 class Blockpile::Base
   
-  def initialize(helper, session, params, template, *args)
+  def initialize(helper, session, params, template, *args, &block)
     @helper = helper
     @session = session
     @params = params
     @template = template
     build *args
+    @content = capture(self, &block) if block_given?
   end
   
   def to_html
     render_template
   end
   
+  def get_content
+    @content
+  end
+  
   def build
     # override this method to build your block
   end
@@ -20,13 +25,14 @@ protected
   
   # Assumes /views/helper/ as base
   def render_template
-    ERB.new( File.read( get_template ) ).result binding
+    render( :partial => @template, :locals => {:pile => self, :p => self})
   end
   
   def get_template
     get_paths.each do |path|
       if File::exists?( path + "/" + @template + ".html.erb")
-        return path +  "/" + @template + ".html.erb"
+        return path +  "/" + @template
+        puts path +  "/" + @template
       end
     end
     raise "Unable to find template for this blockpile"

data/lib/blockpile/setup.rb

@@ -1,14 +1,13 @@
 module Blockpile
   module Setup
     def self.add_load_path(path)
-      Dir.glob(path + "/**/*.rb") do |file|
+      Dir.glob(path + "/**/*_pile.rb") do |file|
         ActiveSupport::Dependencies.autoload_paths << File.dirname(file)
-        file_name   = file.split(/\//).pop.gsub(/.rb/, '')
+        file_name   = file.split(/\//).pop.gsub(/\.rb/, '')
         class_name  = file_name.classify
         ActionView::Base.class_eval %{
-          def #{file_name}(*args, &block)
-              blockpile = #{class_name}.new(self, session, params, '#{file_name}', *args)
-              yield blockpile if block_given?
+          def #{file_name.gsub(/\_pile/, '')}(*args, &block)
+              blockpile = #{class_name}.new(self, session, params, '#{file_name}', *args, &block)
               raw blockpile.to_html
           end
         }

data/lib/blockpile.rb

@@ -1,15 +1,13 @@
 require 'rails'
 require 'blockpile/setup'
 require 'blockpile/base'
-require 'blockpile/paths'
 
 module Blockpile
   class Railtie < Rails::Railtie
     initializer "blockpile.setup default directories" do
       Blockpile.setup do |config|
-        config.add_load_path Rails.root.to_s + '/app/helpers/blockpiles'
+        config.add_load_path Rails.root.to_s + '/app/helpers'
       end
-      Blockpile::Paths.add_template_path Rails.root.to_s + '/app/views/blockpiles/'
     end
   end
   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tyler Flint
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -06:00
+date: 2010-08-20 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,6 @@ files:
 - blockpile.gemspec
 - lib/blockpile.rb
 - lib/blockpile/base.rb
-- lib/blockpile/paths.rb
 - lib/blockpile/setup.rb
 - lib/generators/blockpile/USAGE
 - lib/generators/blockpile/blockpile_generator.rb

data/lib/blockpile/paths.rb

@@ -1,15 +0,0 @@
-module Blockpile
-  module Paths
-    
-    @@paths = []
-    
-    def self.add_template_path(path)
-      @@paths << path
-    end
-    
-    def self.get_paths
-      @@paths
-    end
-    
-  end
-end