auto_define_scope 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42e8a3b1c3c38245055e738d04f307e116eee4d42aadd0684c90ebfd9c8be46
-  data.tar.gz: 35f1fd2627d06df0bba793f5e79a9720478384107c2128691fba8ec44b96dd5f
+  metadata.gz: 6b411e8fbe13d8df01d64c0eed8ac40eab0e88d8bd079a6fb95478a169ee260a
+  data.tar.gz: 9c24148854615f854cd18f5f3fb6f485e2b729341ec25e7bd7a4c08768cee1e3
 SHA512:
-  metadata.gz: 815358fcdb359d595eb7c0b39c501dd7fbe9243b21b7dc735568b76d9c55638ec439ed43eb652ae1de3eb3179dcbd04f61d59d7e38a53704fafded3de42497c7
-  data.tar.gz: f7c9b4e7e8e3a89a8827e85de649b7b5c7b9267ac75ee6405f23dc6e6679bd8771e64bf3585df86e15392ffb915b8f80620e37e0441bfb0d353c6b350a4432b6
+  metadata.gz: 18d5a5df81ad4188fb132a47abd51e5940632742676b46e071d890a259231430e7966e5fbe2a2968c9a9a8f36da2be5c6d1dba06886a6094cbe47dd4dfc02f25
+  data.tar.gz: 2de98abcb378d8245acf94c1495897402454c4f36e56de7d0e2d74c7d758c739139bfbf7f90d2971c1765f220a6766b3a6a011f911e8dca626bbfbc46440374b

data/lib/auto_define_scope/active_record_extension.rb

@@ -5,11 +5,11 @@ module AutoDefineScope
 
     # For example, CustomerAgentHistory include this
     # columns is a array like ["status", "p_way", {customer_agent: ["code", "name", agent: :province_id]}]
-    def search_columns *columns
+    def search_columns(*columns)
       generate_cope columns, :search
     end
 
-    def with_columns *columns
+    def with_columns(*columns)
       generate_cope columns, :with
     end
 
@@ -26,7 +26,7 @@ module AutoDefineScope
     end
 
     protected
-    def generate_cope columns, type, klass = self, joins_params_array = []
+    def generate_cope(columns, type, klass = self, joins_params_array = [])
       columns.each do |c|
         if c.is_a?(Hash)
           c.keys.each do |k|
@@ -45,17 +45,29 @@ module AutoDefineScope
           end
           next
         end
+        column_type = columns_hash[c.to_s]&.type
+        raise "scopes defined error, not found column('#{c}') for table #{klass.table_name}" if column.nil?
         joins_params = joins_params_array.reverse.inject() { |a, n| { n => a } }
         table_name = klass.table_name
         @auto_define_scopes ||= []
         scope_name = "#{type}_#{joins_params_array.last&.to_s&.+ '_'}#{c}"
         @auto_define_scopes << scope_name
         scope scope_name, ->(v) do
-          value = type == :with ? v : "%#{v}%"
+          value = case column_type
+          when :integer
+            value.to_i
+          when :string
+            value.to_s
+          end
+          value = type == :with ? value : "%#{value}%"
           joins(joins_params).where("#{table_name}.#{c} #{OPERATE_SQL[type]}", value) 
         end
       end
       nil
     end
+
+    def convert_type(obj, type)
+
+    end
   end
 end

data/lib/auto_define_scope/version.rb

@@ -1,3 +1,3 @@
 module AutoDefineScope
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auto_define_scope
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - tinyfeng.hou
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler