the_grid 1.1.6 → 1.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzE3MTZmMzNjMjc3MjI2MDg5YTM5ODQzOWQwMzNmYmRlOGM2ODRhNw==
+    MTM1NmQ4NWY0NzU5NmEyMjg0Y2NiYjAxMGFkNjY3ZmY1OTZhNzJmZQ==
   data.tar.gz: !binary |-
-    ZjgwNzUxMjdhZGEzYzFkYmZmNjQ0YjdjMjMyZjcxYTNhYjUzZjJjNQ==
+    NTZkOWU3Y2NlOWY1NTlhM2M1OTBhMTc4M2Y5NTdiOWQzZWJjNzM0MQ==
 SHA512:
   metadata.gz: !binary |-
-    NjEyNDEwYTIwZDI4YjRlNGJkOTk4OWM2YmYxYWUyN2Q0NTQ2ZjJmMTY1Yzc4
-    MTVhMmZkNTIzZGQ2MDUyZTlkNmNhZjg1ZjA4ODc5Y2ExN2JkNGYzZWVjOTQ4
-    ZDA2M2VmZGZjZTZmYzRmNTdjY2I2NmU3MDgwNzAzZDM3ODc2ODk=
+    MjE4MGZmZmZiMjRmZTU3ZjJiN2I3ZjE0OGE0MDhiNGU2ZGZkZWIwNWM0MDNk
+    MThhODdlNDI0YTI2YzRlMzM0OTA1YmIyZThiMzdiODE2ZjE4ZDJmNWQ5MGMw
+    MjA0NTgwYjM0MTc1NzY5MGM3ZmJjNWRiNDRiYTNjNDY5ZGVlYTE=
   data.tar.gz: !binary |-
-    MTRhNDI4MDRiOGQ0ZjllOTYzY2U0ZWY0MTE0NTBhNWUyN2Q3OTZlMzhlZDJl
-    NTk2MjY3NjI0NjJhMGM3NWU3MWRhZTEwYzcxNDZjZWNjZjZkNjc5ZjVkMjA4
-    NTQ2NmJhMWMyOWIyYjA1ZDE0YzM2YTJkYzQ3MzRjNWI5Y2YwZGM=
+    YTk5MDMwY2UwYWRjOGM5ZDFiNjgyNmI0MjUxZjc5OTZkMDBlMDYyODhlMmZh
+    YmFjNWQ2MTUwMzBkMmI1MDg2Njg2YTZhYmI1ZTYzMzFhY2EwNTRjY2VmZTI4
+    N2RjZDdhOWJhMDFmN2M4YzE2YmFkNmM2ZjIwOWM2ZjEwNmM2ODA=

data/lib/the_grid/api/command/sort.rb

@@ -3,7 +3,7 @@ module TheGrid
     def configure(relation, params)
       {}.tap do |o|
         o[:field] = params[:field]
-        o[:field] = "#{relation.table_name}.#{o[:field]}" if relation.table[o[:field]].present?
+        o[:field] = "#{relation.table_name}.#{o[:field]}" if relation.column_names.include?(params[:field])
 
         o[:order] = params[:order]
         o[:order] = 'asc' unless %w{ asc desc }.include?(o[:order])

data/lib/the_grid/version.rb

@@ -1,3 +1,3 @@
 module TheGrid
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/spec/api/command/sort_spec.rb

@@ -1,23 +1,22 @@
 require 'spec_helper'
 
 describe TheGrid::Api::Command::Sort do
-  let(:table)    { double(:name => "table_for_sort", :present? => true).as_null_object }
-  let(:relation) { double(:table_name => table.name, :table => table) }
+  let(:relation) { double(:table_name => "table_for_sort", :column_names => %w{id name}) }
   let(:options)  { {:field => "name", :order => "desc" } }
 
   after(:each){ subject.execute_on(relation, options) }
 
   it "sort by asc if order invalid" do
     options[:order] = 'wrong order'
-    relation.should_receive(:order).with("#{table.name}.#{options[:field]} asc")
+    relation.should_receive(:order).with("#{relation.table_name}.#{options[:field]} asc")
   end
 
   it "sort by specified order" do
-    relation.should_receive(:order).with("#{table.name}.#{options[:field]} #{options[:order]}")
+    relation.should_receive(:order).with("#{relation.table_name}.#{options[:field]} #{options[:order]}")
   end
 
   it "does not prepend field with table name if field is an alias" do
-    table.stub(:present? => false)
+    options[:field] = 'title'
     relation.should_receive(:order).with("#{options[:field]} #{options[:order]}")
   end
 end

data/the_grid.gemspec

@@ -19,11 +19,6 @@ Gem::Specification.new do |s|
     Tags: json, csv, grid, api, grid builder, activerecord relation builder, relation
   EOF
 
-  s.post_install_message = <<-_MSG_
-    Columns' definition in json response is changed
-    because javascript does not remember the order of properties in object.
-  _MSG_
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -31,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activerecord', '>= 3.0'
   s.add_dependency 'json'
-  
+
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", "~> 2.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_grid
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Sergiy Stotskiy
@@ -118,8 +118,7 @@ homepage: http://github.com/stalniy/grid
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! "    Columns' definition in json response is changed\n    because
-  javascript does not remember the order of properties in object.\n"
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib