tablets 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d046e5a6fa2f522b63f13c69f724ff82473387c
-  data.tar.gz: 8587012faa26256221152719f81b85456d8621de
+  metadata.gz: fabd1f1477cd295cede4c19f5401f3200a19dd2d
+  data.tar.gz: 7dbfdf2ae6f5e4ee8c7fc40c351ef4b1130e3d50
 SHA512:
-  metadata.gz: aa268e7dc0dd793dfcacbbfefef99d90889f37664edb250745caa05d81a8fe00b88bc66d26a60c96f9e8df5e8052f783984efddfb4a02a84215bd75f6d2ac871
-  data.tar.gz: 884625f076e9e455246648e4d8858c8677940acedaa6dc9b62d9468fbf40fcc0b465bcbb4662a6ae322abbaca01340e2433370a467ac9ed815ec61884c256b7b
+  metadata.gz: 96286ea703337dd2e0123835c8fc9a41c35455a1c3b1680e178ec0bcab57d1292fd91cce2e0026e15c96c07ad6e962947bdfb461568741cd38107e7d6d9f1da3
+  data.tar.gz: 3ea819cbd7b92d3d0ffb38f9ac3bc77333877e7515c9af05df0d9bcb5a56d06525f97461eb3df1e472613ca682ac3c7d0e3e50120be3c6c8739efdee2c4386a3

data/README.md

@@ -58,7 +58,13 @@ Tablets.register :posts do
       options: { className: 'post-title' }
     }, {
       title: 'User',
-      data: proc { |user, controller| user == controller.current_user ? 'It is you' : [user.first_name, user.last_name].compact.join(' ') },
+      data: proc do |post, controller|
+        if post.user == controller.current_user
+          'It is you'
+        else
+          [post.user.first_name, post.user.last_name].compact.join(' ')
+        end
+      end,
       order: ['users.first_name', 'users.last_name'],
       search: ['users.first_name', 'users.last_name']
     }]

data/lib/tablets/data/processing/filter.rb

@@ -1,6 +1,6 @@
 require 'active_support/core_ext/object'
 
-require 'tablets/utils/arel'
+require 'tablets/utils/search_condition'
 
 require 'tablets/data/processing/base'
 
@@ -28,10 +28,8 @@ module Tablets
         # Builds search conditions.
         def build_conditions_for(query)
           query.split(' ').map do |value|
-            searchable_columns.map do |column|
-              search_condition(column, value)
-            end.reduce(:or)
-          end.reduce(:and)
+            '(' + search_conditions(value) + ')'
+          end.join(' AND ')
         end
 
         # Returns searchable columns.
@@ -39,9 +37,11 @@ module Tablets
           columns.map { |column| column[:search] }.flatten.compact
         end
 
-        # Returs search condition.
-        def search_condition(column, value)
-          Tablets::Utils::Arel.column(column).matches("%#{value}%")
+        # Returs search conditions for each searchable column.
+        def search_conditions(value)
+          searchable_columns.map do |column|
+            Tablets::Utils::SearchCondition.build(column, value)
+          end.join(' OR ')
         end
       end
     end

data/lib/tablets/utils/search_condition.rb

@@ -0,0 +1,56 @@
+module Tablets
+  module Utils
+    # Resposible for building database specific search conditions.
+    module SearchCondition
+      class << self
+        # Builds search condition for specific db type.
+        def build(column, query)
+          sanitize "(#{casted_column(column)} #{like} ?)", "%#{query}%"
+        end
+
+        private
+
+        # Sanitizes sql expression with params.
+        def sanitize(sql, *params)
+          ActiveRecord::Base.send(:sanitize_sql_array, [sql, *params])
+        end
+
+        # Casyt column to string.
+        def casted_column(column)
+          "CAST (#{quoted_column(column)} AS #{string_type})"
+        end
+
+        # Quotes column name.
+        def quoted_column(column)
+          column.split('.').map do |component|
+            ActiveRecord::Base.connection.quote_column_name component
+          end.join('.')
+        end
+
+        # Returns database specific like operator.
+        def like
+          case db_adapter
+            when :postgresql then 'ILIKE'
+            when :mysql2 then 'LIKE'
+            when :sqlite3 then 'LIKE'
+          end
+        end
+
+        # Returns database specific string type.
+        def string_type
+          case db_adapter
+            when :postgresql then 'VARCHAR'
+            when :mysql2 then 'CHAR'
+            when :sqlite3 then 'TEXT'
+          end
+        end
+
+        # Retrieves rails database adapter.
+        def db_adapter
+          @db_adapter ||=
+          ActiveRecord::Base.configurations[Rails.env]['adapter'].to_sym
+        end
+      end
+    end
+  end
+end

data/lib/tablets/version.rb

@@ -1,3 +1,3 @@
 module Tablets
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tablets
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Yevhen Shemet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,8 +126,8 @@ files:
 - lib/tablets/railtie.rb
 - lib/tablets/renderer.rb
 - lib/tablets/tablet.rb
-- lib/tablets/utils/arel.rb
 - lib/tablets/utils/config.rb
+- lib/tablets/utils/search_condition.rb
 - lib/tablets/version.rb
 - lib/tablets/view_helpers.rb
 - spec/lib/tablets/data/processing/base_spec.rb

data/lib/tablets/utils/arel.rb

@@ -1,34 +0,0 @@
-module Tablets
-  module Utils
-    # Arel related utils.
-    module Arel
-      class << self
-        # Casting arel column using db specific type.
-        def column(column)
-          model, column = column.split('.')
-          model = model.singularize.titleize.gsub(/ /, '').constantize
-
-          ::Arel::Nodes::NamedFunction.new(
-            'CAST', [model.arel_table[column.to_sym].as(typecast)]
-          )
-        end
-
-        private
-
-        # Returns database specific string type.
-        def typecast
-          case db_adapter
-            when :postgresql then 'VARCHAR'
-            when :mysql2 then 'CHAR'
-            when :sqlite3 then 'TEXT'
-          end
-        end
-
-        # Retrieves rails database adapter.
-        def db_adapter
-          ActiveRecord::Base.configurations[Rails.env]['adapter'].to_sym
-        end
-      end
-    end
-  end
-end