kelredd-sinatra-helpers 0.2.3 → 0.2.4

data/lib/sinatra_helpers/erb/partials.rb

@@ -57,7 +57,8 @@ module SinatraHelpers::Erb::Partials
   def partial(path, locals={}, &subject_block)
     raise "locals must be specified with a Hash" unless locals.kind_of?(::Hash)
     params = _partial_params(path, locals, subject_block)
-    if params[:subject] && params[:subject].respond_to?(:collect)
+    # locals[:object] takes precedence over whatever calculated subject
+    if locals.delete(:object).nil? && params[:subject] && params[:subject].respond_to?(:collect)
       counter = 0
       params[:subject].collect do |subject|
         erb(params[:path], params[:options].merge({
@@ -87,7 +88,7 @@ module SinatraHelpers::Erb::Partials
         nil
       end ||
       locals.delete(:collection) ||
-      locals.delete(:object) ||
+      locals[:object] ||   # don't remove it from the locals hash just yet
       locals.delete(name),
       :locals => locals.delete(:locals) || locals,
       :options => { :layout => false },

data/lib/sinatra_helpers/generator/file_templates/config.ru.erb

@@ -1,4 +1,4 @@
-ENV["RACK_ENV"] ||= "development"
+ENV["RACK_ENV"] ||= "development" unless defined? RACK_ENV
 require 'app'
 set :app_file, File.join(root_path, 'app.rb')
 disable :run

data/lib/sinatra_helpers/version.rb

@@ -3,7 +3,7 @@ module SinatraHelpers
     
     MAJOR = 0
     MINOR = 2
-    TINY  = 3
+    TINY  = 4
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Kelly Redding
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -05:00
+date: 2010-04-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency