css_grid 2.2.1 → 2.3.1

data/README.md

@@ -156,6 +156,21 @@ You can also pass 'prepend' or 'append as an argument for the '*_span' helpers.
 	</div>
 ```
 
+Note that 'prepend' accept negative values
+
+```erb
+	<%= four_span :prepend=>-1 do %>
+		<!-- some html -->
+	<% end %>
+```
+
+```html
+	<div class="four_span minus_one">
+		<!-- some html -->
+	</div>
+```
+
+
 --
 
 If you want to use rows inside *_spans tags, you can use :nested option.
@@ -254,11 +269,13 @@ Here is a list of options you can use. Following exemples.
 * :class => String or Symbol - set the class attribute for the container.
 * :nested => :spans - allow to use *_span tags directly inside the block passed by.
 * :disable => :spans or :container or [:spans, :container] - disable automatic creation of *_spans tags, or container tag, or both, allow you to handle this part manually.
-* :spans => Hash (authorized keys are :class, :prepend, :append) - pass by options to automatic created *_spans tags.
-* :rows => Hash (authorized keys are :class and :nested) - pass by options to automatic created rows tags.
+* :spans => Hash (authorized keys are :id, :class, :prepend, :append) - pass by options to automatic created *_spans tags.
+* :rows => Hash (authorized keys are :id, :class and :nested) - pass by options to automatic created rows tags.
 
+Note :
+* You can use procs in :spans/:id, :spans/:class, :rows/:id and :rows/:class
 
-Note that : 
+Also : 
 * :nested also accept :container as a value (works the same way as :disable). It allows to use *_col_container inside a *_span tag. :nested_with => Integer must be informed in that case, telling the width of the span you'r in.
 * the GridHelper automaticly calculate if you are in a nested container and pass options :nested=>:container and :nested_width on his own. So you normaly don't have to care about that.
 
@@ -268,6 +285,37 @@ Shortcuts :
 * options :disable and :rows will be ignore, and options :id and :class will be directly applied to the row tag.
 
 Examples : 
+```erb
+	<%= three_cols_container :collection=>@collection, :rows=>{:id => Proc.new{ |elt| elt[:name].downcase }} do |elt| %>
+		<%= four_span do %>
+			Class : <%= elt[:name] %><br/>
+			Detail : <%= elt[:methods] %>
+		<% end %>
+	<% end %>
+```
+
+```html
+	<section class="container " id="nested">
+		<div class="row " id="enumerable">
+			<div class="four_span ">
+				Class : Enumerable<br/>
+				Detail : 163 methods
+			</div>
+			<div class="four_span " id="array">
+				Class : Array<br/>
+				Detail : 178 methods
+			</div>
+			<div class="four_span " id="string">
+				Class : String<br/>
+				Detail : 177 methods
+			</div>
+		</div>
+	</section>
+```
+
+--
+
+
 ```erb
 	<%= three_cols_container :id=>"nested", :collection=>@collection, :nested=>:spans do |elt| %>
 		<%= two_span do %>

data/lib/assets/stylesheets/grid.css.scss

@@ -42,6 +42,19 @@ $gutter_width: 1.041666666666;
 			.prepend_eleven { @include prepend($grid_width, 11); }
 			.prepend_twelve { @include prepend($grid_width, 12); }
 			
+			.minus_one { @include prepend($grid_width, -1) }
+			.minus_two { @include prepend($grid_width, -2) }
+			.minus_three { @include prepend($grid_width, -3); }
+			.minus_four { @include prepend($grid_width, -4); }
+			.minus_five { @include prepend($grid_width, -5); }
+			.minus_six { @include prepend($grid_width, -6); }
+			.minus_seven { @include prepend($grid_width, -7); }
+			.minus_eight { @include prepend($grid_width, -8); }
+			.minus_nine { @include prepend($grid_width, -9); }
+			.minus_ten { @include prepend($grid_width, -10); }
+			.minus_eleven { @include prepend($grid_width, -11); }
+			.minus_twelve { @include prepend($grid_width, -12); }
+			
 			.append_one { @include append($grid_width, 1) }
 			.append_two { @include append($grid_width, 2) }
 			.append_three { @include append($grid_width, 3); }

data/lib/css_grid/version.rb

@@ -1,3 +1,3 @@
 module CssGrid
-  VERSION = "2.2.1"
+  VERSION = "2.3.1"
 end

data/lib/css_grid.rb

@@ -16,7 +16,11 @@ module GridHelper
   end
   
   def grid tag, options = {}, &block
-    prepend = TWELVE_STRING_INTS_INVERT[options.delete :prepend]
+    prepend = if options[:prepend] > 0
+      TWELVE_STRING_INTS_INVERT[options.delete :prepend]
+    else
+      "minus_#{ TWELVE_STRING_INTS_INVERT[options.delete :prepend] }"
+    end
     append = TWELVE_STRING_INTS_INVERT[options.delete :append]
     
     warn "WARNING : argument ':nested' is not supported for '#{ tag }'" if options[:nested].present? and tag != :row
@@ -75,7 +79,11 @@ module GridHelper
           capture(elt, &block)
           
         else
-          grid("#{ span_width }_span".to_sym, options[:spans].clone) do
+          spans_options = options[:spans].clone
+          spans_options[:id] = spans_options[:id].call elt if spans_options[:id].class == Proc
+          spans_options[:class] = spans_options[:class].call elt if spans_options[:class].class == Proc
+          
+          grid("#{ span_width }_span".to_sym, spans_options) do
             safe_buffer = capture(elt, &block)
             safe_buffer = grid(:row, :nested=>true){ safe_buffer } if nested.include? :spans
             
@@ -84,7 +92,11 @@ module GridHelper
         end
       end
       
-      grid(:row, options[:rows].clone){ cols.reduce(:safe_concat) }
+      rows_options = options[:rows].clone
+      rows_options[:id] = rows_options[:id].call elt if rows_options[:id].class == Proc
+      rows_options[:class] = rows_options[:class].call elt if rows_options[:class].class == Proc
+      
+      grid(:row, rows_options){ cols.reduce(:safe_concat) }
     end
     
     safe_buffer = rows.reduce(:safe_concat)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_grid
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -70,18 +70,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 752044027004310920
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 752044027004310920
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24