kelredd-sinatra-helpers 0.2.2 → 0.2.3

data/lib/sinatra_helpers/erb/partials.rb

@@ -6,37 +6,106 @@ module SinatraHelpers::Erb; end
 
 module SinatraHelpers::Erb::Partials
   
-  # helper to emulate rails' 'render :partial' helper, using erb
-  # => taken from the sinatra book, http://sinatra-book.gittr.com/#implemention_of_rails_style_partials
-  # Render the partial once:
-  # Usage: partial :foo
-  # 
-  # foo partial will be rendered once for each element in the array, passing in a local variable named "foo"
-  # Usage: partial :foo, :collection => @my_foos    
-  def partial(template, options={})
-    options.merge!(:layout => false)
-    path = template.to_s.split(File::SEPARATOR)
-    object = path[-1].to_sym
-    path[-1] = "_#{path[-1]}"
-    template = File.join(path).to_sym
-    raise 'partial collection specified but is nil' if options.has_key?(:collection) && options[:collection].nil?
-    if collection = options.delete(:collection)
-      options.delete(:object)  # ignore any object passed in when using :collection
-      options[:locals] ||= {}
+  # helper to somewhat emulate rails' 'render :partial' helper, using erb
+  # => originally taken from the sinatra book:
+  #    http://sinatra-book.gittr.com/#implemention_of_rails_style_partials
+  # => updated: pass a block to specify the partial subject (ie object or collection)
+  # => updated: pass a hash to specify locals directly
+  # => if a block is passed, will look for template in a path relative to
+  #    to the calling template path.  Specify template with a leading '/'
+  #    to force the path to be relative to the views directory.
+  #
+  # Render the partial once (no subject) with no locals:
+  # Usage: partial :item
+  # => looks for template at <views>/_item.erb
+  # Render a nested template
+  # Usage: partial '/items/item'
+  # => looks for template at <views>/items/_item.erb
+  #
+  # Render the partial once (no subject) WITH locals:
+  # Usage: partial :item, :user => @me
+  #
+  # Render the partial once on an object:
+  # Implicit usage: partial :item { @item }
+  # => knows subject should be treated as an object (and not a collection)
+  #    b/c @item is not enumerable
+  # Explicit usage: partial :item, :item => @item_set
+  #       -- or --: partial :item, :object => @item_set
+  # => use a local if your subject is enumerable and you want
+  #    it treated as a single object
+  #
+  # Render the partial over a collection:
+  # => knows subject should be treated as a collection (and not a single object)
+  #    b/c @items is enumerable
+  # Implicit usage: partial :item { @items }
+  # Explicit usage: partial :item, :collection => @items
+  #
+  # Generally, passing a block is the preferred method b/c
+  # you can specify templates relative to the calling template's
+  # path, for example:
+  # => if in template <views>/items/_item_list.erb
+  # => partial :item { @items }
+  # => will look for the template at <views>/items/_item.erb
+  # => however
+  # => partial :item, :collection => @items
+  # => will look for the template at <views>/_item.erb
+  # => you can force this behavior in the block version
+  # => by prepending a '/' to the template
+  # => partial '/item' { @items }
+  # => will look for the template at <views>/_item.erb
+  
+  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)
       counter = 0
-      collection.inject([]) do |buffer, member|
-        counter += 1
-        erb_opts = options.dup
-        erb_opts[:locals].merge!({object => member, "#{object}_counter".to_sym => counter})
-        buffer << erb(template, erb_opts)
+      params[:subject].collect do |subject|
+        erb(params[:path], params[:options].merge({
+          :locals => params[:locals].merge({
+            params[:name].to_sym => subject,
+            "#{params[:name]}_counter".to_sym => counter += 1
+          })
+        }))
       end.join("\n")
     else
-      if member = options.delete(:object)
-        options[:locals] ||= {}
-        options[:locals].merge!({object => member})
-      end
-      erb(template, options)
+      erb(params[:path], params[:options].merge({
+        :locals => params[:locals].merge({
+          params[:name].to_sym => params[:subject]
+        })
+      }))
+    end
+  end
+  
+  private
+  
+  def _partial_params(path, locals, subject_block)
+    {
+      :name => name = File.basename(path.to_s).split(".").first.to_sym,
+      :subject => begin
+        subject_block.call
+      rescue
+        nil
+      end ||
+      locals.delete(:collection) ||
+      locals.delete(:object) ||
+      locals.delete(name),
+      :locals => locals.delete(:locals) || locals,
+      :options => { :layout => false },
+      :path => _partial_path(path, subject_block).to_sym
+    }
+  end
+
+  def _partial_path(path, subject_block)
+    partial_path = if path.to_s =~ /\A\// || subject_block.nil?
+      path.to_s
+    else
+      File.join(*[
+        eval("File.expand_path(File.dirname(__FILE__))", subject_block).
+        gsub(File.expand_path(Sinatra::Application.views), ''),
+        path.to_s
+      ])
     end
+    File.join(File.dirname(partial_path), "_#{File.basename(partial_path)}")
   end
 
 end

data/lib/sinatra_helpers/generator/file_templates/reset-fonts.less.erb

@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}
+

data/lib/sinatra_helpers/generator/file_templates/reset.less.erb

@@ -1,24 +1,13 @@
-/*
-Copyright (c) 2009, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.7.0
-*/
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}
-
 /*
 Copyright (c) 2009, Kelly Redding.  All rights reserved.
 See http://github.com/kelredd/sinatra-helpers for license details
 */
-UL {
-  margin: 0;
-  padding: 0;
-}
-UL LI {
-  list-style-image: none;
-  list-style-position: outside;
-  list-style-type: none;
-}
+@import "reset-fonts.less";
+
+@base_font_family: 'Lucida Grande',arial,helvetica,clean,sans-serif;
+@base_font_size: 10pt;
+@base_font_size_adjust: 1em;
+
 UL.bulleted LI {
   list-style-position: inside !important;
   list-style-type: disc !important;
@@ -29,12 +18,12 @@ OL LI {
 }
 
 HTML {
-  font-size:10pt;
+  font-size: @base_font_size;
 }
 BODY {
   width: 100%;
-	font-family: "Lucida Grande", Verdana, sans-serif;
-	font-size: 1em;
+	font-family: @base_font_family;
+	font-size: @base_font_size_adjust;
 	font-size-adjust: none;
 	font-variant: normal;
 }
@@ -46,8 +35,8 @@ A, IMG, FORM, FIELDSET {
 INPUT, SELECT, TEXTAREA, BUTTON {
   margin: 0;
   padding: .2em .3em;
-	font-family : 'Lucida Grande', sans-serif;
-	font-size: 9px;
+	font-family : @base_font_family;
+	font-size: @base_font_size_adjust;
 	font-size-adjust: none;
 	font-variant: normal;
 }

data/lib/sinatra_helpers/generator/template.rb

@@ -27,6 +27,7 @@ module SinatraHelpers::Generator
       },
       :stylesheets => {
         'reset.less.erb' => 'reset.less',
+        'reset-fonts.less.erb' => 'reset-fonts.less',
         'app.less.erb' => 'app.less'
       }
     },

data/lib/sinatra_helpers/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -06:00
+date: 2010-04-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,7 @@ files:
 - lib/sinatra_helpers/generator/file_templates/model_test.rb.erb
 - lib/sinatra_helpers/generator/file_templates/production.ru.erb
 - lib/sinatra_helpers/generator/file_templates/Rakefile.erb
+- lib/sinatra_helpers/generator/file_templates/reset-fonts.less.erb
 - lib/sinatra_helpers/generator/file_templates/reset.less.erb
 - lib/sinatra_helpers/generator/file_templates/staging.ru.erb
 - lib/sinatra_helpers/generator/file_templates/test_helper.rb.erb