sinatra_more 0.2.8 → 0.2.9

data/README.rdoc

@@ -51,7 +51,7 @@ Here is a small list of what sinatra_more contains:
 * Generally useful formatting extensions (<tt>relative_time_ago</tt>, <tt>js_escape_html</tt>, <tt>sanitize_html</tt>)
 * Simple 'mailer' support for sinatra (akin to <tt>ActionMailer</tt> but simpler and powered by <tt>pony</tt>)
 * Plug and play setup for the excellent Warden authentication system
-* Code generators for creating a new sinatra application (COMING SOON)
+* Code generators for creating new sinatra applications (COMING SOON)
 
 Keep in mind, the user will be able to pull in these components seperately and leave out those that are not required.
 
@@ -557,6 +557,11 @@ or perhaps we want to have a short body without the need for a template file:
 
 * No serious issues known
 
+== Links and Resources
+
+* EnvyCasts - <http://railsenvy.com/2009/10/28/episode-098>
+* Ruby5     - <http://ruby5.envylabs.com/episodes/24-episode-23-october-30-2009/stories/183-sinatra-more>
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/TODO

@@ -1,6 +1,5 @@
 = UNFINISHED
 
-* Add support for a MailerPlugin which will make sending emails a breeze (http://github.com/hiroshi/pony)
 * Add support for fields_for tag in formbuilder
 * Add support for button tag method, mail_to helper
 * Add support for check_box_group, radio_button_group which create a set of checkboxes or radio buttons
@@ -15,6 +14,7 @@
 
 = COMPLETED
 
+* Add support for a MailerPlugin which will make sending emails a breeze (http://github.com/hiroshi/pony)
 * Add support for missing formbuilder fields (select, and standard_form_builder methods i.e check_box_group)
 * Add support for missing formhelpers/fields (radio_button_tag, select_tag)
 * Add support for select_tag :multiple => true

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/lib/sinatra_more/render_plugin/render_helpers.rb

@@ -31,15 +31,18 @@ module SinatraMore
       template_path = File.join(path)
       raise 'Partial collection specified but is nil' if options.has_key?(:collection) && options[:collection].nil?
       if collection = options.delete(:collection)
+        options.delete(:object)
         counter = 0
         collection.inject([]) do |buffer, member|
           counter += 1
-          current_options = options.merge(:locals => { object_name => member, "#{object_name}_counter".to_sym => counter })
-          buffer << render_template(template_path, current_options)
+          options[:locals] ||= {}
+          options[:locals].merge!(object_name => member, "#{object_name}_counter".to_sym => counter)
+          buffer << render_template(template_path, options)
         end.join("\n")
       else
         if member = options.delete(:object)
-          options.merge!(:locals => {object_name => member})
+          options[:locals] ||= {}
+          options[:locals].merge!(object_name => member)
         end
         render_template(template_path, options)
       end

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2009-11-06}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [

data/test/fixtures/render_app/app.rb

@@ -39,16 +39,16 @@ class RenderDemo < Sinatra::Base
   
   # partial with object
   get '/partial/object' do
-    partial 'template/user', :object => RenderUser.new('John')
+    partial 'template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }
   end
   
   # partial with collection
   get '/partial/collection' do
-    partial 'template/user', :collection => [RenderUser.new('John'), RenderUser.new('Billy')]
+    partial 'template/user', :collection => [RenderUser.new('John'), RenderUser.new('Billy')], :locals => { :extra => "bar" }
   end
   
   # partial with locals
   get '/partial/locals' do
-    partial 'template/user', :locals => { :user => RenderUser.new('John') }
+    partial 'template/user', :locals => { :user => RenderUser.new('John'), :extra => "bar" }
   end
 end

data/test/fixtures/render_app/views/template/_user.haml

@@ -1,4 +1,7 @@
 %h1 User name is #{user.name}
 
+- if defined?(extra)
+  %p Extra is #{extra}
+
 - if defined?(user_counter)
   %p My counter is #{user_counter} 

data/test/test_render_plugin.rb

@@ -42,6 +42,9 @@ class TestRenderPlugin < Test::Unit::TestCase
     should "have no counter index for single item" do
       assert_have_no_selector "p", :content => "My counter is 1", :count => 1
     end
+    should "include extra locals information" do
+      assert_have_selector 'p', :content => "Extra is bar"
+    end
   end
   
   context 'for #partial method and collection' do
@@ -54,6 +57,9 @@ class TestRenderPlugin < Test::Unit::TestCase
       assert_have_selector "p", :content => "My counter is 1"
       assert_have_selector "p", :content => "My counter is 2"
     end
+    should "include extra locals information" do
+      assert_have_selector 'p', :content => "Extra is bar"
+    end
   end
   
   context 'for #partial method and locals' do
@@ -64,6 +70,9 @@ class TestRenderPlugin < Test::Unit::TestCase
     should "have no counter index for single item" do
       assert_have_no_selector "p", :content => "My counter is 1", :count => 1
     end
+    should "include extra locals information" do
+      assert_have_selector 'p', :content => "Extra is bar"
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -08:00
+date: 2009-11-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency