datagrid 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22ba5c3d97717d9f5d236b7f8559346d8e2255ad
-  data.tar.gz: 6f80355aafcb9f54870d42f458d8f8c4aa152cd2
+  metadata.gz: bdb4b360ee72ca1cb7506bcc9cce315dfd3b8088
+  data.tar.gz: 48bea2ce4e237383bc9dae59cf34a6e8df40e6b8
 SHA512:
-  metadata.gz: 93798b31a87ed1c8f81e49da6293d996f3952f8db26eb387446f57d46c2507c00a78bd6e5fc6908c64b822f1cdfa175b13cdd875e3afb0021edba3f32c584c2a
-  data.tar.gz: 296aa0e6501289e986a9a0de697f1c2ae0fd068e631c358ce8dad7f7edae2e45a40881512199a37492d936ed0166503bbc46766bc258c40eb96a264fc0388a9e
+  metadata.gz: 528d0971df683ae4bef8e677f54d0b4344500bd3a8a560863135908cad2c56966bc96acdbe46563527cd30469717c459c88e53619e0912df241886674ecede49
+  data.tar.gz: 3d510e71bef9a64f68b7f09c3afca21d60f3c4187fe1634e8b31ade014a3843370a67dcee9d87e02c1c9b81cbb3e065d932861ef4a45db826d2a08ab67ca7e09

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

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

@@ -1,5 +1,5 @@
 <tr class="<%= options[:cycle] && cycle(*options[:cycle]) %>">
   <% grid.html_columns(*options[:columns]).each do |column| %>
-    <td class="<%= datagrid_column_classes(grid, column) %>"><%= datagrid_format_value(grid, column, asset) %></td>
+    <td class="<%= datagrid_column_classes(grid, column) %>"><%= datagrid_value(grid, column, asset) %></td>
   <% end %>
 </tr>

data/datagrid.gemspec

@@ -2,20 +2,21 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.3.5 ruby lib
+# stub: datagrid 1.3.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.3.5"
+  s.version = "1.3.6"
 
   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 = "2015-01-21"
+  s.date = "2015-02-05"
   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 = [
-    "LICENSE.txt"
+    "LICENSE.txt",
+    "Readme.markdown"
   ]
   s.files = [
     ".document",
@@ -120,7 +121,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then

data/lib/datagrid/filters/boolean_enum_filter.rb

@@ -5,7 +5,7 @@ class Datagrid::Filters::BooleanEnumFilter < Datagrid::Filters::EnumFilter #:nod
 
   def initialize(report, attribute, options = {}, &block)
     options[:select] = [YES, NO].map do |key, value|
-      [I18n.t("datagrid.filters.eboolean.#{key.downcase}"), key]
+      [I18n.t("datagrid.filters.eboolean.#{key.downcase}", :default => key.downcase.capitalize), key]
     end
     super(report, attribute, options, &block)
   end

data/lib/datagrid/form_builder.rb

@@ -202,5 +202,3 @@ module Datagrid
 
   end
 end
-
-

data/lib/datagrid/locale/en.yml

@@ -23,10 +23,6 @@ en:
         range_format:
           "%{from_input}<span class=\"separator float\"> - </span>%{to_input}"
 
-      eboolean:
-        "yes": "Yes"
-        "no": "No"
-
       xboolean:
         "yes": "Yes"
         "no": "No"

data/lib/datagrid/renderer.rb

@@ -22,7 +22,7 @@ module Datagrid
       if url
         @template.link_to(value, url)
       else
-        _safe(value)
+        value
       end
     end
 

data/spec/datagrid/form_builder_spec.rb

@@ -1,6 +1,6 @@
+# encoding: UTF-8
 require 'spec_helper'
 
-
 class MyFormBuilder
   include Datagrid::FormBuilder
 end

data/spec/datagrid/helper_spec.rb

@@ -365,6 +365,25 @@ describe Datagrid::Helper do
         )
       end
     end
+
+    it "should escape html" do
+      entry.update_attributes!(:name => "<div>hello</div>")
+      expect(subject.datagrid_rows(grid, [entry], :columns => [:name])).to equal_to_dom(<<-HTML)
+       <tr class=""><td class="name">&lt;div&gt;hello&lt;/div&gt;</td></tr>
+        HTML
+    end
+
+    it "should not escape safe html" do
+      entry.update_attributes!(:name => "<div>hello</div>")
+      grid.column(:safe_name) do |model|
+        model.name.html_safe
+      end
+      expect(subject.datagrid_rows(grid, [entry], :columns => [:safe_name])).to equal_to_dom(<<-HTML)
+       <tr class=""><td class="safe_name"><div>hello</div></td></tr>
+        HTML
+
+    end
+
   end
 
   describe ".datagrid_order_for" do
@@ -374,8 +393,8 @@ describe Datagrid::Helper do
         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)
+      object = OrderedGrid.new(:descending => true, :order => :category)
+      expect(subject.datagrid_order_for(object, object.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>
@@ -398,8 +417,8 @@ describe Datagrid::Helper do
         scope { Entry }
         filter(:category)
       end
-      grid = FormForGrid.new(:category => "hello")
-      expect(subject.datagrid_form_for(grid, :url => "/grid")).to match_css_pattern(
+      object = FormForGrid.new(:category => "hello")
+      expect(subject.datagrid_form_for(object, :url => "/grid")).to match_css_pattern(
         "form.datagrid-form.form_for_grid[action='/grid']" => 1,
         "form input[name=utf8]" => 1,
         "form .filter label" => "Category",
@@ -482,6 +501,7 @@ describe Datagrid::Helper do
           "<b>#{e.name}</b>"
         end
       end
+
       expect(subject.datagrid_value(report, :name, entry)).to eq("<b>Star</b>")
     end
     it "should support format in column" do
@@ -493,6 +513,7 @@ describe Datagrid::Helper do
           end
         end
       end
+      expect(subject.datagrid_value(report, :name, entry)).to be_html_safe
       expect(subject.datagrid_value(report, :name, entry)).to eq("<a href=\"/profile\">Star</a>")
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,6 +213,7 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
+- Readme.markdown
 files:
 - ".document"
 - ".rspec"
@@ -333,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids