the_grid 1.1.5 → 1.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzg5ZTNhZWI2OTc2ZWFjMjk3NzNlZTRhMzA0NTQzMTFlYzBhOTFlMw==
+    NzE3MTZmMzNjMjc3MjI2MDg5YTM5ODQzOWQwMzNmYmRlOGM2ODRhNw==
   data.tar.gz: !binary |-
-    MDM0ZWEwMWMzZGEwNzllNDY5YmY0ZDVmMmZhYjBlYmJjZGEyMGUyNA==
-!binary "U0hBNTEy":
+    ZjgwNzUxMjdhZGEzYzFkYmZmNjQ0YjdjMjMyZjcxYTNhYjUzZjJjNQ==
+SHA512:
   metadata.gz: !binary |-
-    ODc4YjY5NzNmNmZlOGEwM2ZjZDBmNTVlYmY3MDJiODY0ODFjOTIyMjYxMzYw
-    NTExZGZlYjQzMWZiMDUzOGEwZjI5MWE3YmQwMjNmYWU1YmM0ZjJiYjYyNWFh
-    MTZkZTdjOTYzZTEyNTZhNjIzYmI2OTA5NTBmNDVmYjJjNTExYTI=
+    NjEyNDEwYTIwZDI4YjRlNGJkOTk4OWM2YmYxYWUyN2Q0NTQ2ZjJmMTY1Yzc4
+    MTVhMmZkNTIzZGQ2MDUyZTlkNmNhZjg1ZjA4ODc5Y2ExN2JkNGYzZWVjOTQ4
+    ZDA2M2VmZGZjZTZmYzRmNTdjY2I2NmU3MDgwNzAzZDM3ODc2ODk=
   data.tar.gz: !binary |-
-    YTgwODM3MzZhMDhmNWNiYTQ0OTU4MjhkMjAxOGViMjYxOGE2NGI0ODhkZTU4
-    N2M5ODJlMWVmZGNkMjE3NzllNDRhMTRlMmJmYjc5MzNmYTE4YTRhYWI1ZmZl
-    MDlkNjg5ZjRiMDExNjFhNThjYTgxZGVjMjczYTMxYzM1NjljMTI=
+    MTRhNDI4MDRiOGQ0ZjllOTYzY2U0ZWY0MTE0NTBhNWUyN2Q3OTZlMzhlZDJl
+    NTk2MjY3NjI0NjJhMGM3NWU3MWRhZTEwYzcxNDZjZWNjZjZkNjc5ZjVkMjA4
+    NTQ2NmJhMWMyOWIyYjA1ZDE0YzM2YTJkYzQ3MzRjNWI5Y2YwZGM=

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

@@ -14,15 +14,17 @@ module TheGrid
 
     def build_conditions_for(relation, filters)
       conditions = filters.map do |name, filter|
+        column = column_for(relation, name)
+
         if filter.kind_of?(Array)
-          relation.table[name].in(filter)
+          column.in(filter)
         elsif filter.kind_of?(Hash)
           expr = []
-          expr << relation.table[name].gteq(prepare_value filter, :from) if filter.has_key?(:from)
-          expr << relation.table[name].lteq(prepare_value filter, :to)   if filter.has_key?(:to)
+          expr << column.gteq(prepare_value filter, :from) if filter.has_key?(:from)
+          expr << column.lteq(prepare_value filter, :to)   if filter.has_key?(:to)
           expr.inject(:and)
         else
-          relation.table[name].eq(filter)
+          column.eq(filter)
         end
       end
       conditions.compact.inject(:and)

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

@@ -11,7 +11,7 @@ module TheGrid
     end
 
     def run_on(relation, params)
-      relation.order("#{params[:field]} #{params[:order]}")
+      relation.order("#{params[:field]} #{params[:order]}") if params[:field]
     end
   end
 end

data/lib/the_grid/api/command.rb

@@ -52,5 +52,17 @@ module TheGrid
       params
     end
 
+    def column_for(relation, field_name)
+      table, field = field_name.to_s.split('.')
+
+      if field.blank?
+        relation.table[field_name]
+      elsif relation.reflections[table.to_sym]
+        relation.reflections[table.to_sym].klass.arel_table[field]
+      else
+        raise "Unable to find column for #{field_name}"
+      end
+    end
+
   end
 end

data/lib/the_grid/builder/context.rb

@@ -104,16 +104,15 @@ module TheGrid
     end
 
     def may_assemble?(record, options)
-      condition = options[:if] || options[:unless]
+      column_or_proc = options[:if] || options[:unless]
 
-      if condition.is_a? Symbol
-        result = assemble_column_for(record, condition, columns[condition])
-      elsif condition.respond_to?(:call)
-        result = condition.call(record)
-      else
-        result = true
+      result = true
+      if column_or_proc.is_a? Symbol
+        result = assemble_column_for(record, column_or_proc, columns[column_or_proc])
+      elsif column_or_proc.respond_to?(:call)
+        result = column_or_proc.call(record)
       end
-      options[:unless].present? ? !result : result
+      result.present? ^ options.has_key?(:unless)
     end
 
   end

data/lib/the_grid/version.rb

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

data/spec/api/command/filter_spec.rb

@@ -44,6 +44,16 @@ describe TheGrid::Api::Command::Filter do
 
   after(:each) { subject.execute_on(relation, :filters => filters) }
 
+  context "when filters contain association's column" do
+    let(:filters){ { 'user.email' => 'test@i.ua' } }
+
+    it "filters by using correct columns" do
+      relation.stub_chain(:reflections, :[], :klass, :arel_table).and_return(table)
+      relation.reflections.should_receive(:[]).with(:user)
+      table.should_receive(:[]).with('email')
+    end
+  end
+
   context "when filters are missed" do
     let(:filters){ Hash.new }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_grid
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Sergiy Stotskiy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Yet another grid api.