datagrid 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de0a49e930204781d435c0511d30f851660187e
-  data.tar.gz: b078647180e79a1b9bbcb2f76af728f39c2af9ea
+  metadata.gz: 6ddccc0241fe7be8d5b6cce9fc48cdf20a5d9d29
+  data.tar.gz: d6f33446081c20970effc047a14a1b147dd17e55
 SHA512:
-  metadata.gz: eaa488b20a9949bbb4e94876b376bdcdea83560ff1e254509e464f7087d6e3bc07e77f0b024bd758fa163f5e81fdd28732b26e68e4059dc460f2761015bd7a01
-  data.tar.gz: ad2ea23cbf87bb2ec73fdf776904c524b8444e16db9df85a7be20aed445c4e15be624ce9d198f66f4b84168dcff5a91f9df402a4872dbef2c572f0fb1ac9477c
+  metadata.gz: 5120028296554128bae6a4614a1ac7a021a6c14cb4c107f55d01efb2b11493fe96db1cf9db1e589a6e9318e966ca7ba09aa628d7ba2467594d08d1a6daa333da
+  data.tar.gz: 4b23c861a07ded0fb42a89a6a5142e6e17372d55581e8f3b527a95060f8c397eeb5b17266c5a527341c3f070db7a4c359869fb1eb04f4202fc26969eafea5551

data/Readme.markdown

@@ -21,10 +21,10 @@ Ruby library that helps you to build and represent table-like data with:
 
 ### Live Demo
 
-[Datagrid DEMO application](http://datagrid.heroku.com) is available live!
+[Datagrid DEMO application](http://datagrid.herokuapp.com) is available live!
 [Demo source code](https://github.com/bogdan/datagrid-demo).
 
-<img src="http://datagrid.heroku.com/datagrid_demo_screenshot.png" style="margin: 7px; border: 1px solid black">
+<img src="http://datagrid.herokuapp.com/datagrid_demo_screenshot.png" style="margin: 7px; border: 1px solid black">
 
 ### Example
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/app/views/datagrid/_table.html.erb

@@ -9,10 +9,10 @@ Local variables:
     <%= datagrid_header(grid, options) %>
   </thead>
   <tbody>
-    <% if assets.empty? %>
-    <tr><td class="noresults" colspan="100%"><%= I18n.t('datagrid.no_results').html_safe %></td></tr>
+    <% if assets.any? %>
+      <%= datagrid_rows(grid, assets, options) %>
     <% else %>
-    <%= datagrid_rows(grid, assets, options) %>
+      <tr><td class="noresults" colspan="100%"><%= I18n.t('datagrid.no_results').html_safe %></td></tr>
     <% end %>
   </tbody>
 <% end %>

data/datagrid.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.3.0 ruby lib
+# stub: datagrid 1.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2014-07-23"
+  s.date = "2014-08-21"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [

data/lib/datagrid/columns.rb

@@ -415,8 +415,8 @@ module Datagrid
 
       def initialize(*) #:nodoc:
         self.columns_array = self.class.columns_array.clone
-        instance_eval(&dynamic_block) if dynamic_block
         super
+        instance_eval(&dynamic_block) if dynamic_block
       end
 
       # Returns all columns available for current grid configuration

data/lib/datagrid/drivers/array.rb

@@ -3,7 +3,7 @@ module Datagrid
     class Array < AbstractDriver #:nodoc:
 
       def self.match?(scope)
-        !Datagrid::Drivers::ActiveRecord.match?(scope) && scope.is_a?(::Array)
+        !Datagrid::Drivers::ActiveRecord.match?(scope) && (scope.is_a?(::Array) || scope.is_a?(Enumerator))
       end
 
       def to_scope(scope)

data/lib/datagrid/renderer.rb

@@ -65,13 +65,14 @@ module Datagrid
 
     def rows(grid, assets, options = {})
       result = assets.map do |asset|
-        _render_partial('row', options[:partials],
-                        {
-                          :grid => grid,
-                          :options => options,
-                          :asset => asset
-                        })
-      end.join
+        _render_partial(
+          'row', options[:partials],
+          {
+            :grid => grid,
+            :options => options,
+            :asset => asset
+          })
+      end.to_a.join
 
       _safe(result)
     end

data/spec/datagrid/columns_spec.rb

@@ -386,6 +386,19 @@ describe Datagrid::Columns do
       expect(grid.column_by_name(:id)).not_to be_nil
       expect(grid.column_by_name(:name)).not_to be_nil
     end
+
+    it "has access to attributes" do
+      grid = test_report(:attribute_name => 'value') do
+        scope {Entry}
+        datagrid_attribute :attribute_name
+        dynamic {
+          value = attribute_name
+          column(:name) { value }
+        }
+      end
+
+      expect(grid.data_value(:name, Entry.create!)).to eq('value')
+    end
   end
 
   describe ".data_value" do

data/spec/datagrid/drivers/array_spec.rb

@@ -89,5 +89,18 @@ describe Datagrid::Drivers::Array do
         it {should == [third, first, second]}
       end
     end
+
   end
+    describe "when using enumerator scope" do
+
+      it "should work fine" do
+        grid = test_report(to_enum: true) do
+          scope {[]}
+          filter(:to_enum, :boolean) do |_, scope|
+            scope.to_enum
+          end
+        end
+        grid.assets.should_not be_any
+      end
+    end
 end

data/spec/datagrid/helper_spec.rb

@@ -75,7 +75,7 @@ describe Datagrid::Helper do
     end
 
     it "should support giving assets explicitly" do
-      other_entry = Entry.create!(entry.attributes)
+      Entry.create!(entry.attributes)
       datagrid_table = subject.datagrid_table(grid, [entry])
 
       expect(datagrid_table).to match_css_pattern({
@@ -148,293 +148,328 @@ describe Datagrid::Helper do
       end
     end
 
-
-    describe ".datagrid_rows" do
-      it "should support urls" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :url => lambda {|model| model.name})
+    context "when scope is enumerator" do
+      let(:grid) do
+        test_report do
+          scope { ['a', 'b'].to_enum }
+          column(:name) do |value|
+            value
+          end
         end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name a[href=Star]" => "Star"
-        )
       end
-
-      it "should support conditional urls" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :url => lambda {|model| false})
-        end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name" => "Star"
-        )
-      end
-
-      it "should add ordering classes to column" do
-        rp = test_report(:order => :name) do
-          scope { Entry }
-          column(:name)
-        end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name.ordered.asc" => "Star"
+      it "should render table" do
+        expect(subject.datagrid_table(grid)).to match_css_pattern(
+          "table.datagrid th.name" => 1,
+          "table.datagrid td.name" => 2,
         )
       end
-
-      it "should add ordering classes to column" do
-        rp = test_report(:order => :name, :descending => true) do
-          scope { Entry }
-          column(:name)
-        end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name.ordered.desc" => "Star"
-        )
+    end
+    context "when scope is lazy enumerator" do
+      before(:each) do
+        pending("not supported by ruby < 2.0") if RUBY_VERSION < '2.0'
       end
-
-      it "should render html columns" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :html => true) do |model|
-            content_tag(:span, model.name)
+      let(:grid) do
+        test_report do
+          scope { ['a', 'b'].lazy }
+          column(:name) do |value|
+            value
           end
         end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name span" => "Star"
+      end
+      it "should render table" do
+        expect(subject.datagrid_table(grid)).to match_css_pattern(
+          "table.datagrid th.name" => 1,
+          "table.datagrid td.name" => 2,
         )
       end
+    end
+  end
 
-      it "should render argument-based html columns" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :html => lambda {|data| content_tag :h1, data})
-        end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name h1" => "Star"
-        )
+  describe ".datagrid_rows" do
+    it "should support urls" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :url => lambda {|model| model.name})
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name a[href=Star]" => "Star"
+      )
+    end
 
-      it "should render argument-based html columns with custom data" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :html => lambda {|data| content_tag :em, data}) do
-            self.name.upcase
-          end
-        end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name em" => "STAR"
-        )
+    it "should support conditional urls" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :url => lambda {|model| false})
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name" => "Star"
+      )
+    end
 
-      it "should render html columns with double arguments for column" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :html => true) do |model, grid|
-            content_tag(:span, "#{model.name}-#{grid.assets.klass}" )
-          end
-        end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name span" => "Star-Entry"
-        )
+    it "should add ordering classes to column" do
+      rp = test_report(:order => :name) do
+        scope { Entry }
+        column(:name)
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name.ordered.asc" => "Star"
+      )
+    end
 
-      it "should render argument-based html blocks with double arguments" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :html => lambda { |data, model|
-            content_tag :h1, "#{data}-#{model.name.downcase}"
-          })
-        end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name h1" => "Star-star"
-        )
+    it "should add ordering classes to column" do
+      rp = test_report(:order => :name, :descending => true) do
+        scope { Entry }
+        column(:name)
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name.ordered.desc" => "Star"
+      )
+    end
 
-      it "should render argument-based html blocks with triple arguments" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :html => lambda { |data, model, grid|
-            content_tag :h1, "#{data}-#{model.name.downcase}-#{grid.assets.klass}"
-          })
+    it "should render html columns" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => true) do |model|
+          content_tag(:span, model.name)
         end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name h1" => "Star-star-Entry"
-        )
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name span" => "Star"
+      )
+    end
 
-      it "should render argument-based html blocks with double arguments and custom data" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :html => lambda { |data, model|
-            content_tag :h1, "#{data}-#{model.name}"
-          }) do
-            self.name.upcase
-          end
-        end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name h1" => "STAR-Star"
-        )
+    it "should render argument-based html columns" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => lambda {|data| content_tag :h1, data})
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name h1" => "Star"
+      )
+    end
 
-      it "should render argument-based html blocks with triple arguments and custom data" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :html => lambda { |data, model, grid|
-            content_tag :h1, "#{data}-#{model.name}-#{grid.assets.klass}"
-          }) do
-            self.name.upcase
-          end
+    it "should render argument-based html columns with custom data" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => lambda {|data| content_tag :em, data}) do
+          self.name.upcase
         end
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name h1" => "STAR-Star-Entry"
-        )
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name em" => "STAR"
+      )
+    end
 
-      it "should support columns option" do
-        rp = test_report do
-          scope { Entry }
-          column(:name)
-          column(:category)
+    it "should render html columns with double arguments for column" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => true) do |model, grid|
+          content_tag(:span, "#{model.name}-#{grid.assets.klass}" )
         end
-        expect(subject.datagrid_rows(rp, [entry], :columns => [:name])).to match_css_pattern(
-          "tr td.name" => "Star"
-        )
-        expect(subject.datagrid_rows(rp, [entry], :columns => [:name])).to match_css_pattern(
-          "tr td.category" => 0
-        )
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name span" => "Star-Entry"
+      )
+    end
 
-      it "should allow CSS classes to be specified for a column" do
-        rp = test_report do
-          scope { Entry }
-          column(:name, :class => 'my_class')
-        end
+    it "should render argument-based html blocks with double arguments" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => lambda { |data, model|
+          content_tag :h1, "#{data}-#{model.name.downcase}"
+        })
+      end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name h1" => "Star-star"
+      )
+    end
 
-        expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
-          "tr td.name.my_class" => "Star"
-        )
+    it "should render argument-based html blocks with triple arguments" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => lambda { |data, model, grid|
+          content_tag :h1, "#{data}-#{model.name.downcase}-#{grid.assets.klass}"
+        })
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name h1" => "Star-star-Entry"
+      )
+    end
 
-      context "when grid has complicated columns" do
-        let(:grid) do
-          test_report(:name => 'Hello') do
-            scope {Entry}
-            filter(:name)
-            column(:name) do |model, grid|
-              "'#{model.name}' filtered by '#{grid.name}'"
-            end
-          end
-        end
-        it "should ignore them" do
-          expect(subject.datagrid_rows(grid, [entry])).to match_css_pattern(
-            "td.name" => 1
-          )
+    it "should render argument-based html blocks with double arguments and custom data" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => lambda { |data, model|
+          content_tag :h1, "#{data}-#{model.name}"
+        }) do
+          self.name.upcase
         end
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name h1" => "STAR-Star"
+      )
     end
 
-    describe ".datagrid_order_for" do
-      it "should render ordering layout" do
-        class OrderedGrid
-          include Datagrid
-          scope { Entry }
-          column(:category)
+    it "should render argument-based html blocks with triple arguments and custom data" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => lambda { |data, model, grid|
+          content_tag :h1, "#{data}-#{model.name}-#{grid.assets.klass}"
+        }) do
+          self.name.upcase
         end
-        grid = OrderedGrid.new(:descending => true, :order => :category)
-        expect(subject.datagrid_order_for(grid, grid.column_by_name(:category))).to equal_to_dom(<<-HTML)
-<div class="order">
-  <a href="/location?ordered_grid%5Bdescending%5D=false&amp;ordered_grid%5Border%5D=category" class="asc">&uarr;</a>
-  <a href="/location?ordered_grid%5Bdescending%5D=true&amp;ordered_grid%5Border%5D=category" class="desc">&darr;</a>
-</div>
-        HTML
       end
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name h1" => "STAR-Star-Entry"
+      )
     end
-    describe ".datagrid_form_for" do
-      it 'returns namespaced partial if partials options is passed' do
-        rendered_form = subject.datagrid_form_for(grid, {
-          :url => '',
-          :partials => 'client/datagrid'
-        })
-        expect(rendered_form).to include 'Namespaced form partial.'
+
+    it "should support columns option" do
+      rp = test_report do
+        scope { Entry }
+        column(:name)
+        column(:category)
       end
-      it "should render form and filter inputs" do
-        class FormForGrid
-          include Datagrid
-          scope { Entry }
-          filter(:category)
-        end
-        grid = FormForGrid.new(:category => "hello")
-        expect(subject.datagrid_form_for(grid, :url => "/grid")).to match_css_pattern(
-          "form.datagrid-form.form_for_grid[action='/grid']" => 1,
-          "form input[name=utf8]" => 1,
-          "form .filter label" => "Category",
-          "form .filter input.category.default_filter[name='form_for_grid[category]'][value=hello]" => 1,
-          "form input[name=commit][value=Search]" => 1,
-          "form a.datagrid-reset[href='/location']" => 1
-        )
+      expect(subject.datagrid_rows(rp, [entry], :columns => [:name])).to match_css_pattern(
+        "tr td.name" => "Star"
+      )
+      expect(subject.datagrid_rows(rp, [entry], :columns => [:name])).to match_css_pattern(
+        "tr td.category" => 0
+      )
+    end
+
+    it "should allow CSS classes to be specified for a column" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :class => 'my_class')
       end
-      it "should support html classes for grid class with namespace" do
-        module ::Ns22
-          class TestGrid
-            include Datagrid
-            scope { Entry }
-            filter(:id)
+
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name.my_class" => "Star"
+      )
+    end
+
+    context "when grid has complicated columns" do
+      let(:grid) do
+        test_report(:name => 'Hello') do
+          scope {Entry}
+          filter(:name)
+          column(:name) do |model, grid|
+            "'#{model.name}' filtered by '#{grid.name}'"
           end
         end
-        expect(subject.datagrid_form_for(::Ns22::TestGrid.new, :url => "grid")).to match_css_pattern(
-          "form.datagrid-form.ns22_test_grid" => 1,
-          "form.datagrid-form label[for=ns22_test_grid_id]" => 1,
-          "form.datagrid-form input#ns22_test_grid_id[name='ns22_test_grid[id]']" => 1,
+      end
+      it "should ignore them" do
+        expect(subject.datagrid_rows(grid, [entry])).to match_css_pattern(
+          "td.name" => 1
         )
       end
+    end
+  end
 
-      it "should have overridable param_name method" do
-        class ParamNameGrid81
+  describe ".datagrid_order_for" do
+    it "should render ordering layout" do
+      class OrderedGrid
+        include Datagrid
+        scope { Entry }
+        column(:category)
+      end
+      grid = OrderedGrid.new(:descending => true, :order => :category)
+      expect(subject.datagrid_order_for(grid, grid.column_by_name(:category))).to equal_to_dom(<<-HTML)
+<div class="order">
+<a href="/location?ordered_grid%5Bdescending%5D=false&amp;ordered_grid%5Border%5D=category" class="asc">&uarr;</a>
+<a href="/location?ordered_grid%5Bdescending%5D=true&amp;ordered_grid%5Border%5D=category" class="desc">&darr;</a>
+</div>
+      HTML
+    end
+  end
+  describe ".datagrid_form_for" do
+    it 'returns namespaced partial if partials options is passed' do
+      rendered_form = subject.datagrid_form_for(grid, {
+        :url => '',
+        :partials => 'client/datagrid'
+      })
+      expect(rendered_form).to include 'Namespaced form partial.'
+    end
+    it "should render form and filter inputs" do
+      class FormForGrid
+        include Datagrid
+        scope { Entry }
+        filter(:category)
+      end
+      grid = FormForGrid.new(:category => "hello")
+      expect(subject.datagrid_form_for(grid, :url => "/grid")).to match_css_pattern(
+        "form.datagrid-form.form_for_grid[action='/grid']" => 1,
+        "form input[name=utf8]" => 1,
+        "form .filter label" => "Category",
+        "form .filter input.category.default_filter[name='form_for_grid[category]'][value=hello]" => 1,
+        "form input[name=commit][value=Search]" => 1,
+        "form a.datagrid-reset[href='/location']" => 1
+      )
+    end
+    it "should support html classes for grid class with namespace" do
+      module ::Ns22
+        class TestGrid
           include Datagrid
           scope { Entry }
           filter(:id)
-          def param_name
-            'g'
-          end
         end
-        expect(subject.datagrid_form_for(::ParamNameGrid81.new, :url => "/grid")).to match_css_pattern(
-          "form.datagrid-form input[name='g[id]']" => 1,
-        )
       end
+      expect(subject.datagrid_form_for(::Ns22::TestGrid.new, :url => "grid")).to match_css_pattern(
+        "form.datagrid-form.ns22_test_grid" => 1,
+        "form.datagrid-form label[for=ns22_test_grid_id]" => 1,
+        "form.datagrid-form input#ns22_test_grid_id[name='ns22_test_grid[id]']" => 1,
+      )
     end
 
-
-    describe ".datagrid_row" do
-      let(:grid) do
-        test_report do
-          scope { Entry }
-          column(:name)
-          column(:category)
+    it "should have overridable param_name method" do
+      class ParamNameGrid81
+        include Datagrid
+        scope { Entry }
+        filter(:id)
+        def param_name
+          'g'
         end
       end
+      expect(subject.datagrid_form_for(::ParamNameGrid81.new, :url => "/grid")).to match_css_pattern(
+        "form.datagrid-form input[name='g[id]']" => 1,
+      )
+    end
+  end
 
-      let(:entry) do
-        Entry.create!(:name => "Hello", :category => "greetings")
-      end
 
-      it "should provide access to row data" do
-        r = subject.datagrid_row(grid, entry)
-        expect(r.name).to eq("Hello")
-        expect(r.category).to eq("greetings")
+  describe ".datagrid_row" do
+    let(:grid) do
+      test_report do
+        scope { Entry }
+        column(:name)
+        column(:category)
       end
-      it "should yield block" do
-        subject.datagrid_row(grid, entry) do |row|
-          expect(row.name).to eq("Hello")
-          expect(row.category).to eq("greetings")
-        end
+    end
+
+    let(:entry) do
+      Entry.create!(:name => "Hello", :category => "greetings")
+    end
+
+    it "should provide access to row data" do
+      r = subject.datagrid_row(grid, entry)
+      expect(r.name).to eq("Hello")
+      expect(r.category).to eq("greetings")
+    end
+    it "should yield block" do
+      subject.datagrid_row(grid, entry) do |row|
+        expect(row.name).to eq("Hello")
+        expect(row.category).to eq("greetings")
       end
+    end
 
-      it "should output data from block" do
-        name = subject.datagrid_row(grid, entry) do |row|
-          subject.concat(row.name)
-          subject.concat(",")
-          subject.concat(row.category)
-        end
-        expect(name).to eq("Hello,greetings")
+    it "should output data from block" do
+      name = subject.datagrid_row(grid, entry) do |row|
+        subject.concat(row.name)
+        subject.concat(",")
+        subject.concat(row.category)
       end
+      expect(name).to eq("Hello,greetings")
     end
   end
 

data/spec/support/matchers.rb

@@ -83,7 +83,11 @@ class CssPattern
   end
 
   def failure_message
-    "Expected do not match dom pattern. But it was"
+    "Expected to match dom pattern. But it wasn't."
+  end
+
+  def failure_message_when_negated
+    "Expected to not match dom pattern. But it was."
   end
 
   def description

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails