default_where 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4925afe89ab55b52bb5945813486b4aeefaa3f29e9a2ed93ca0ca3982076df39
-  data.tar.gz: 9b564d353c2b3e7f578e3773aac664294ccd4d08d092d6b71ecc2aa92d247d31
+  metadata.gz: 9860242afa48f1b00939bf840ab9c905891a664498082c3596853b856a6014df
+  data.tar.gz: df25ea89826f20d10291780ae4e9f90770a1627bbef83a7f9cf82bc3447a7549
 SHA512:
-  metadata.gz: ae9e5b07c2b5b8fb269370c98d2a8c3d772d263f646a7fa2b229e1b338436c7a55a1ba6448ff44d39381171d42d0e615b1dd204eabbaa0cd634c350615f293e2
-  data.tar.gz: eaa3827a022d87f95a5ecbea489bb87e07b5e6a051981ee21cc94dd130fc115574a8f3e212bb0352619a038bdf8ab4997e0d177ce4ad511115ea22dfee483980
+  metadata.gz: 3a4542d9ccc386102203d62ae0aadcdadc4c688f09365b96d7a620ade26050bd872f7f399f12d5e5e0cb6c3f40aa0e4feb19c844872e8d4819f927c85240862a
+  data.tar.gz: 37dab845591f27c34813b29d0cf1b4139568de7670b6b56ae0faefcc32c9d8be09e71f0117060df667a760f0b59c2db6984d5ac2d286ff0cf5fac4e32a92cf53

data/README.md

@@ -1,10 +1,19 @@
 ## DefaultWhere
 
+
 This Library set default params process for where query in ActiveRecord
 
 It's a wise decision to use `default_where` with [default_form](https://github.com/qinmingyuan/default_form) to replace `ransack`
 
-## Features and Usage
+## 使用说明
+
+
+### 语法概览
+
+* 等于：key: value
+* 范围：key-gte: value, 
+* 排序：key-asc: 1, key-desc: 2
+* 排除：key-not: value
 
 ### Normal equal params
 
@@ -117,4 +126,4 @@ User.includes(:role).where(name: params[:name], 'roles.id': params[:'role.id']).
 * After use `default_where`
 ```ruby
 User.default_where(params)
-```
+```

data/lib/default_where/like.rb

@@ -6,7 +6,7 @@ module DefaultWhere
       where_string = []
       where_hash = {}
 
-      params.select{ |k, _| k.end_with?(*PATTERN) }.each do |key, value|
+      params.each do |key, value|
         real_key = key.sub(/-like$/, '')
         agent_key = key.gsub(/[-.]/, '_')
 
@@ -17,11 +17,11 @@ module DefaultWhere
         where_string << "#{real_key} like :#{agent_key}"
 
         if key.end_with?('-ll')
-          like_value = value.to_s + '%'
+          like_value = "#{value}%"
         elsif key.end_with?('-rl')
-          like_value = '%' + value.to_s
+          like_value = "%#{value}"
         else
-          like_value = '%' + value.to_s + '%'
+          like_value = "%#{value}%"
         end
 
         where_hash.merge! agent_key.to_sym => like_value

data/lib/default_where/order.rb

@@ -4,12 +4,8 @@ module DefaultWhere
     def order_scope(params)
       order_array = []
 
-      params.select{ |key, _| key.end_with?('-asc') }.each do |k, _|
-        order_array << k.sub(/-asc$/, ' ASC')
-      end
-
-      params.select{ |key, _| key.end_with?('-desc') }.each do |k, _|
-        order_array << k.sub(/-desc$/, ' DESC')
+      params.sort_by{ |_, v| v.to_i }.each do |i|
+        order_array << i[0].sub(/-(asc|desc)$/, '-asc' => ' ASC', '-desc' => ' DESC')
       end
 
       order(order_array)
@@ -17,7 +13,7 @@ module DefaultWhere
 
     def filter_order(params)
       params.select do |k, v|
-        k.end_with?('-asc', '-desc') && v =~ /^[1-9]$/
+        k.end_with?('-asc', '-desc') && String(v) =~ /^[1-9]$/
       end
     end
 

data/lib/default_where/range.rb

@@ -12,22 +12,19 @@ module DefaultWhere
       where_string = []
       where_hash = {}
 
-      PATTERN.each do |char, sign|
-        options = params.select{ |key, _| key.end_with?(char) }
-
-        options.each do |key, value|
-          exp = Regexp.new(char + '$')
-          real_key = key.sub(exp, '')
-          agent_key = key.gsub(/[-.]/, '_')
-
-          if column_names.include?(real_key)
-            real_key = "#{table_name}.#{real_key}"
-          end
+      params.each do |key, value|
+        exp = /-(gt|gte|lt|lte)$/
+        real_key = key.sub(exp, '')
+        sign_str = key.match(exp).to_s
+        agent_key = key.gsub(/[-.]/, '_')
+
+        if column_names.include?(real_key)
+          real_key = "#{table_name}.#{real_key}"
+        end
 
-          where_string << "#{real_key} #{sign} :#{agent_key}"
+        where_string << "#{real_key} #{PATTERN[sign_str]} :#{agent_key}"
 
-          where_hash.merge! agent_key.to_sym => value
-        end
+        where_hash.merge! agent_key.to_sym => value
       end
 
       where_string = where_string.join ' AND '

data/lib/default_where/version.rb

@@ -1,3 +1,3 @@
 module DefaultWhere
-  VERSION = '2.2.2'
-end
+  VERSION = '2.2.3'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: default_where
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - qinmingyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: default process params for where