css_grid 2.5.1 → 2.6.0

data/README.md

@@ -172,6 +172,22 @@ Note that 'prepend' accept negative values
 
 --
 
+You can add any attributes just like in content_tag. For example new html5 deta-* attributes.
+
+```erb
+	<%= six_span :'data-name'=>"Thomas Petrachi" do %>
+		<!-- some html -->
+	<% end %>
+```
+
+```html
+	<div class="six_span" data-name="Thomas Petrachi">
+		<!-- some html -->
+	</div>
+```
+
+--
+
 You can use the 'element' option to specify the html element wich will be created
 
 ```erb
@@ -288,7 +304,7 @@ Here is a list of options you can use. Following exemples.
 * :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
+* You can use procs in any option.
 
 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.
@@ -631,16 +647,8 @@ Need to test it with the most commons versions of grid stylesheets (twitter boot
 
 --
 
-Add option to insert specified attributes in tags. Like 'itemprop', 'itemscope' or personal attribute, 'data-remote' for me ;) 
-
---
-
 Preprend and Append are not fully handled by the GRID_CONFIG constant. Specialy prepend negative values.
 
---
-
-Add ArgumentErrors in helpers.
-
 ## Contributing
 
 1. Fork it

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

@@ -3,7 +3,7 @@ $gutter_width: 1.041666666666;
 @mixin span($full, $col_num) { 
 	width: (($col_num / 12) * 100 - $gutter_width * 2) / 100 * $full; 
 	margin: 0 ($gutter_width / 100 * $full); 
-	float: left; min-height: 1px;
+	float: left;
 }
 
 @mixin prepend($full, $col_num) { margin-left: (($col_num / 12) * 100 - $gutter_width * 2) / 100 * $full + ($gutter_width * 3 / 100 * $full); }

data/lib/css_grid/version.rb

@@ -1,3 +1,3 @@
 module CssGrid
-  VERSION = "2.5.1"
+  VERSION = "2.6.0"
 end

data/lib/css_grid.rb

@@ -16,6 +16,10 @@ module GridHelper
   end
   
   def grid tag, options = {}, &block
+    options.map_values! do |value|        
+      value.class == Proc ? value.call(@elt) : value 
+    end
+    
     prepend = if options[:prepend].present? 
       if options[:prepend] > 0
         TWELVE_STRING_INTS_INVERT[options.delete :prepend]
@@ -42,8 +46,9 @@ module GridHelper
     content_class << "#{ GRID_CONFIG[:classes][:prepend] }_#{ prepend }" if prepend
     content_class << "#{ GRID_CONFIG[:classes][:append] }_#{ append }" if append
     content_class << GRID_CONFIG[:classes][:nested] if options.delete(:nested)
-    
-    safe_buffer = content_tag(options.delete(:element) || GRID_CONFIG[:elements][tag], nil, :id => options.delete(:id), :class => content_class.join(" ") , &block)
+    options.merge! :class => content_class.join(" ")
+                                 
+    safe_buffer = content_tag(options.delete(:element) || GRID_CONFIG[:elements][tag], options, &block)
     
     @nested_stack.pop if unstack
     safe_buffer
@@ -76,16 +81,13 @@ module GridHelper
     
     rows = recollect(collection_length, options.delete(:collection) || [1]).map do |collection_mini|
       cols = collection_mini.map do |elt|
-
+        @elt = elt
+        
         if disable.include? :spans
           capture(elt, &block)
           
         else
-          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
+          grid("#{ span_width }_span".to_sym, options[:spans].clone) do
             safe_buffer = capture(elt, &block)
             safe_buffer = grid(:row, :nested=>true){ safe_buffer } if nested.include? :spans
             
@@ -93,16 +95,13 @@ module GridHelper
           end
         end
       end
-      
-      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) }
+      @elt = nil
+
+      grid(:row, options[:rows].clone){ cols.reduce(:safe_concat) }
     end
     
     safe_buffer = rows.reduce(:safe_concat)
-    safe_buffer = grid(:container, :id=>options.delete(:id), :class=>options.delete(:class), :element=>options.delete(:element)){ safe_buffer } unless disable.delete :container
+    safe_buffer = grid(:container, options.except!(:spans, :rows)){ safe_buffer } unless disable.delete :container
     safe_buffer
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_grid
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-17 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties