datagrid 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89f8357208d93d460caef785e2ebaa7ebbb36280
-  data.tar.gz: 32723d7e2ca88ff415c6686d073672e78cb32742
+  metadata.gz: 3cf5af4041b5836e7938747ba830e28bda894965
+  data.tar.gz: 44863f33c721396345e89a6d32f4d1030a1d0128
 SHA512:
-  metadata.gz: 111f4e212572c21a899ab428e0a4fea23b7a106bcec089508c36b68349384d76e6bdb94fe9ebf1045791a9b9b9f5f0a2423f328853bff0b5df5b47f0ec6c3626
-  data.tar.gz: d396415dd9f0d3743ed552fddccb1926e3737f7b5a0a7264414fa51a73abe9c8e43520e5e941a201d2093fd7ded8e16e8f67efc814cc2a36d732f736983bc820
+  metadata.gz: a651f92eb381d9f9d268ffe20cfa2d2c8aa559adc7b1a11840e86ca1b0ed2e296e45a1471e7c47b9b8692b6cdc51b8180e960594eb99e33ba6a5f9de43b3e810
+  data.tar.gz: da1cc6b18029502799af4395a0c9b846a87449272292543121668fc916c2f841d9bc7c1368d4a8cbc50bac10eaa3a590fe9639f415e6f2f3befab424e45a1ff2

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/datagrid.gemspec

@@ -2,16 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.1.0 ruby lib
+# stub: datagrid 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.1.0"
+  s.version = "1.1.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-03-07"
+  s.date = "2014-03-08"
   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 = [
@@ -111,7 +110,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.1.10"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then

data/lib/datagrid/columns.rb

@@ -172,7 +172,7 @@ module Datagrid
     module InstanceMethods
 
       def assets
-        driver.append_column_queries(super, columns.map(&:query).compact)
+        driver.append_column_queries(super, columns.select(&:query))
       end
 
       # Returns <tt>Array</tt> of human readable column names. See also "Localization" section

data/lib/datagrid/drivers/active_record.rb

@@ -31,6 +31,7 @@ module Datagrid
           if assets.select_values.empty?
             assets = assets.select(Arel.respond_to?(:star) ? assets.klass.arel_table[Arel.star] : "#{assets.quoted_table_name}.*")
           end
+          columns = columns.map {|c| "#{c.query} AS #{c.name}"}
           assets = assets.select(*columns)
         end
         assets

data/spec/datagrid/columns_spec.rb

@@ -88,7 +88,7 @@ describe Datagrid::Columns do
         scope {Entry}
         filter(:name)
         column(:id)
-        column(:sum_group_id, 'sum(group_id) sum_group_id')
+        column(:sum_group_id, 'sum(group_id)')
       end
       report.assets.first.sum_group_id.should == group.id
     end

data/spec/datagrid/drivers/active_record_spec.rb

@@ -17,8 +17,7 @@ describe Datagrid::Drivers::ActiveRecord do
   end
 
   it "should support append_column_queries" do
-    scope = subject.append_column_queries(Entry.scoped, ['sum(entries.group_id) sum_group_id'])
-    scope.select_values.length.should == 2
-    scope.select_values.should == ["#{Entry.quoted_table_name}.*", 'sum(entries.group_id) sum_group_id']
+    scope = subject.append_column_queries(Entry.scoped, [Datagrid::Columns::Column.new(SimpleReport, :sum_group_id, 'sum(entries.group_id)')])
+    scope.to_sql.should == 'SELECT "entries".*, sum(entries.group_id) AS sum_group_id FROM "entries" '
   end
 end

data/spec/datagrid/form_builder_spec.rb

@@ -25,7 +25,9 @@ describe Datagrid::FormBuilder do
       end
     end
 
-    subject { view.datagrid_filter(_filter, _filter_options)}
+    subject do
+      view.datagrid_filter(_filter, _filter_options)
+    end
     let(:_filter_options) { {} }
     context "with default filter type" do
       let(:_grid) {
@@ -245,7 +247,7 @@ describe Datagrid::FormBuilder do
           end
         end
         let(:_filter) { :category }
-        if Rails.version >= "4.0"
+        if true || Rails.version >= "4.0"
           it { should equal_to_dom(
             '
 <label class="category enum_filter checkboxes" for="report_category_first"><input id="report_category_first" name="report[category][]" type="checkbox" value="first" />first</label>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids