greentable 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab7fc7fd46a84a628011ff51b74236e79ff0b955
-  data.tar.gz: be5fed0b18e72f26045b59bbf71463c4ad592f57
+  metadata.gz: dfd49c2ae156aa0a4335574aba4a6315ede741ec
+  data.tar.gz: b35fd583be07e1eb3700495b8475e5a57b96cf75
 SHA512:
-  metadata.gz: 5d9a8c4242e2f4a1c6f281f066b6d0677410fdaf4b12b59e4be82d2da9760080841ed06dcab9aceb58277afe2771138a10f3a315b0ac51c3d3a1d5b33cc698a7
-  data.tar.gz: 67b6e500f29b6e2a5d682fb48cb1b2161d6d9728372007009936a71ffe732f3586f1b6644973e932ee33d3e517dc83e3fd96d5ec468e42b6bccf576881c8425b
+  metadata.gz: 10971a531679fadbbcbe7d5139e998a5163cb8e371b197ebc81961a719141d9c27047801d4f464f6ea77a3796f03bacbcf886e4100f81b78624b721b455d4f5b
+  data.tar.gz: 076534cbb4412afeb2e3614c4c46fc2d0b62e119fdfa6c645c5e2fa51ca077a0386d4bdc52f187a93598791644939399b36821f8a662c61960a4379a35b6efaf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    greentable (0.9.5)
+    greentable (0.9.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -371,6 +371,8 @@ Add a couple of http query parameters in your view and your done:
 <% end %>
 ```
 
+Green Export and Green Printing requires *Nokogiri* to be installed. Add 'nokogiri' as a gem dependency to your project if you want to use greentable's export or printing feature
+
 ### Available Query Parameters
 
 * **greentable_id**=*any string* [REQUIRED]. A unique html tag id to tell the rack middleware which greentable to extract.

data/lib/greentable/greentable_table.rb

@@ -119,6 +119,13 @@ module Greentable
 
     def do_attributes(i, o)
       row = i.nil? ? nil : @records[i]
+      o = if o.is_a?(Proc) && row
+            row.instance_eval(&o)
+          elsif o.is_a?(Proc) && row.nil?
+            nil
+          else
+            o
+          end
       return "" if o.nil? || o.empty?
       ret = o.map{|k,v| "#{k.is_a?(Proc) ? row.instance_eval(&k).to_s : k.to_s}=\"#{v.is_a?(Proc) ? row.instance_eval(&v).to_s : v.to_s}\""}.join(" ").strip
       ret = " " + ret unless ret.empty?
@@ -131,6 +138,7 @@ module Greentable
 
     def deep_merge!(source_hash, specialized_hash)
       #this code is originally from the gem hash-deep-merge, but has been modified slightly
+      return specialized_hash unless specialized_hash.is_a?(Hash)
       specialized_hash.each_pair do |rkey, rval|
         if source_hash.has_key?(rkey) then
           lval = source_hash[rkey]

data/lib/greentable/version.rb

@@ -1,3 +1,3 @@
 module Greentable
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/test/greentable_table_test.rb

@@ -214,4 +214,15 @@ class GreentableTableTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test "tr proc" do
+    gt = Greentable::Table.new(self, [0], {tr: Proc.new{{foo: 'bar'}}})
+    gt.process do |gt, x|
+      gt.col('col') do
+        x
+      end
+    end
+    assert_equal "<table><thead><tr><th>col</th></tr></thead><tbody><tr foo=\"bar\"><td>0</td></tr></tbody></table>", gt.to_s
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greentable
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Wael Chatila
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails