cast_about_for 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a49119ec5a7172e8ee08ea954f8b5463856f8bde
-  data.tar.gz: 611350d0aa629f2cd032ddc41f05f532192b5593
+  metadata.gz: 767ed28a1c4419971645523dc4f7c806995eea5b
+  data.tar.gz: 65fe5b3fbc32d318f17a987a75b076e9412c2b72
 SHA512:
-  metadata.gz: d960f66b2d079f0c6dc7a333c3e4277982e4ac60ba93c5ab9faf8d24ab8911df1dec868df8e156fb0a64fe77acea3a7739c12aac5ef708d3dcd42a2f27b3e91e
-  data.tar.gz: 2f2c07a76b98c4b165866ac73e9dc9bce4cbfedf9ed2e29202fb011248683cc7c392205a6e4c66fb7d9ef4f23508ae81f01f78177117b09a15fecbc9fd7ea9e3
+  metadata.gz: e8f7def0a88a6d6e7f368faa94eaa80400cc735012c60a37ade4c9c2e1cb4f094754d23a1ee51b51cdab3998b5b49870a374801f66f8f689bf2ad934f6e81431
+  data.tar.gz: a4953ee1aaf64abb56975d115871dc2e21d2ad23f8173137ecd0dcf63d23688de4287aa83c1c88cfc06b9d9f1689c3ae2ea1ecaa15d88d52101e33ad017f291b

data/Gemfile

@@ -1,5 +1,4 @@
-# source 'https://rubygems.org'
-source 'https://ruby.taobao.org/'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cast_about_for.gemspec
 gemspec

data/README.md

@@ -38,14 +38,14 @@ You can always use the `#cast_about_for` class method to query:
 
 ``` ruby
 def index
-  @products = Product.cast_about_for(params, jsonapi: true)
+  @products = Product.cast_about_for(params)
 end
 ```
 
 Want to count records? Simple:
 
 ```ruby
-  Product.cast_about_for(params, jsonapi: true).count
+  Product.cast_about_for(params).count
 ```
 
 ## cast_about_for_params Configure
@@ -56,7 +56,7 @@ If you want to use a column query the SQL look like `SELECT "products".* FROM "p
 
 ``` ruby
 # params = {name: 'iPhone'}
-# Product.cast_about_for(params, jsonapi: false)
+# Product.cast_about_for(params)
 
 class Product < ActiveRecord::Base
   cast_about_for_params equal: ['name']
@@ -64,11 +64,11 @@ class Product < ActiveRecord::Base
   # ...
 end
 ```
-OR you want to alias of the 'name' column
+Or you want to alias of the `name` argument in `params`
 
 ``` ruby
 # params = { nick_name: "iPhone"}
-# User.cast_about_for(params, jsonapi: false)
+# Product.cast_about_for(params)
 
 class Product < ActiveRecord::Base
   cast_about_for_params equal: [{name: "nick_name"}]
@@ -77,13 +77,11 @@ class Product < ActiveRecord::Base
 end
 ```
 
-!Your `name` of the `params` must be instead of `nick_name`.
-
-AND you have other columns, you can do it like below.
+And you have other alias arguments , you can do it like below.
 
 ``` ruby
 # params = { nick_name: "iPhone", info: "sales", price: "600"}
-# User.cast_about_for(params, jsonapi: false)
+# Product.cast_about_for(params)
 
 class Product < ActiveRecord::Base
   cast_about_for_params equal: [{name: "nick_name"}, {information: "info"}, price]
@@ -99,7 +97,7 @@ If you want to use a column query the SQL look like `SELECT "products".* FROM "p
 
 ``` ruby
 # params = {introduce: 'To'}
-# Product.cast_about_for(params, jsonapi: false)
+# Product.cast_about_for(params)
 
 class Product < ActiveRecord::Base
   cast_about_for_params like: ['introduce']
@@ -108,7 +106,7 @@ class Product < ActiveRecord::Base
 end
 ```
 
-Suck as `Equal`. If you want alias of 'introduce', you can
+Suck as `Equal`. If you want alias of `introduce` argument, you can
 
 ``` ruby
 class Product < ActiveRecord::Base
@@ -122,26 +120,84 @@ end
 If you want to use a column query the SQL look like `SELECT "products".* FROM "products" WHERE (production_date >= '2016-07-05 13:09:00')`, you can pass it as an option:
 
 ``` ruby
-# params = {started_at: '2016-07-05 13:09:00'}
-# Product.cast_about_for(params, jsonapi: false)
+# params = {production_started_at: '2016-07-05 13:09:00', by_time: 'production_date'}
+# Product.cast_about_for(params)
+
+class Product < ActiveRecord::Base
+  cast_about_for_params after: { field: 'by_time', time: "production_started_at" }
+
+  # ...
+end
+```
+In addition, if your `params` not include `by_time` option. Like `params = {production_started_at: '2016-07-05 13:09:00'}`, the query column will be set the default column `created_at`.
+
+If you want to use multiple column query the SQL look like `SELECT "products".* FROM "products" WHERE (production_date >= '2016-07-05 13:09:00') AND (created_at >= '2016-07-04')`, you can do it like this:
+
+``` ruby
+# params = {production_started_at: '2016-07-05 13:09:00', by_time: 'production_date', create_field: 'created_at', production_created_at: '2016-07-04'}
+# Product.cast_about_for(params)
 
 class Product < ActiveRecord::Base
-  cast_about_for_params after: { production_date: "started_at" }
+  cast_about_for_params after: [{field: 'by_time', time: "production_started_at"}, { field: 'create_field', time: "production_created_at"}]
 
   # ...
 end
 ```
+If you want more columns to query, you can code it like this pattern: `cast_about_for_params after: [{field: 'by_time', time: "production_started_at"}, { field: 'create_field', time: "production_created_at"}, {field: '..', time: '..'}, {...}, ...]`
+
+If you want to set the field exact column you can do it like this:
+
+``` ruby
+# params = {production_started_at: '2016-07-05 13:09:00'}
+# Product.cast_about_for(params) # The SQL: `SELECT "products".* FROM "products" WHERE (production_date >= '2016-07-05 13:09:00')`
+
+class Product < ActiveRecord::Base
+  cast_about_for_params after: [{field: {exact: "production_date"}, time: "production_started_at"}]
+
+  # ...
+end
+```
+
 
 ### Before
 
+Just like the above `After`.
 If you want to use a column query the SQL look like `SELECT "products".* FROM "products" WHERE (production_date <= '2016-07-05 13:09:00')`, you can pass it as an option:
 
 ``` ruby
-# params = {before_at: '2016-07-05 13:09:00'}
-# Product.cast_about_for(params, jsonapi: false)
+# params = {production_ended_at: '2016-07-05 13:09:00', by_time: 'production_date'}
+# Product.cast_about_for(params)
+
+class Product < ActiveRecord::Base
+  cast_about_for_params before: {field: 'by_time', time: 'production_ended_at'}
+
+  # ...
+end
+```
+In addition, if your `params` not include `by_time` option. Like `params = {production_ended_at: '2016-07-05 13:09:00'}`, the query column will be set the default column `created_at`.
+
+If you want to use multiple column query the SQL look like `SELECT "products".* FROM "products" WHERE (production_date <= '2016-07-05 13:09:00') AND (created_at <= '2016-07-04')`, you can do it like this:
+
+``` ruby
+# params = {production_ended_at: '2016-07-05 13:09:00', by_time: 'production_date', create_field: 'created_at', production_created_at: '2016-07-04'}
+# Product.cast_about_for(params)
 
 class Product < ActiveRecord::Base
-  cast_about_for_params before: { production_date: "before_at" }
+  cast_about_for_params after: [{field: 'by_time', time: "production_ended_at"}, { field: 'create_field', time: "production_created_at"}]
+
+  # ...
+end
+```
+If you want more columns to query, you can code it like this pattern: `cast_about_for_params after: [{field: 'by_time', time: "production_ended_at"}, { field: 'create_field', time: "production_created_at"}, {field: '..', time: '..'}, {...}, ...]`
+
+If you want to set the field exact column you can do it like this:
+
+``` ruby
+# params = {production_ended_at: '2016-07-05 13:09:00'}
+# Product.cast_about_for(params) # The SQL: `SELECT "products".* FROM "products" WHERE (production_date <= '2016-07-05 13:09:00')`
+
+class Product < ActiveRecord::Base
+  cast_about_for_params after: [{field: {exact: "production_date"}, time: "production_ended_at"}]
 
   # ...
 end
@@ -153,7 +209,7 @@ If you have a column use enum, you can pass it as an option:
 
 ``` ruby
 # params = {category: "food"}
-# Product.cast_about_for(params, jsonapi: false)
+# Product.cast_about_for(params)
 
 class Product < ActiveRecord::Base
   enum category: {food: 0}
@@ -163,6 +219,18 @@ class Product < ActiveRecord::Base
 end
 ```
 
+Suck as `Equal`. If you want alias of `category` argument, you can
+
+``` ruby
+# params = {other_name: "food"}
+# Product.cast_about_for(params)
+
+class Product < ActiveRecord::Base
+  cast_about_for_params enum: [{category: 'other_name'}]
+
+  # ...
+end
+```
 ## Advanced Usage
 
 ### JSON API
@@ -171,7 +239,6 @@ If you are using `JSON API`, you can set in the `#cast_about_for`:
 
 ```ruby
   Product.cast_about_for(params, jsonapi: true) # JSON API
-  Product.cast_about_for(params, jsonapi: false) # or not
 ```
 
 ### Custom Query by Block

data/lib/cast_about_for/base.rb

@@ -14,10 +14,9 @@ module CastAboutFor
           raise ArgumentError, "Unknown cast_about_for key: '#{key}" unless CAST_ABOUT_FOR_KEY.include?(key)
         end
 
-        validate_keys = options.slice(*CAST_ABOUT_FOR_KEY)
+        validate_keys = options.slice(*CAST_ABOUT_FOR_KEY.first(3))
 
         validate_keys.each do |key, value|
-          next unless value.is_a?(Array)
           value.each do |attribute|
             attribute = attribute.is_a?(Hash) ? attribute.first.first : attribute
             raise ArgumentError, "Unknown column: #{attribute}" unless self.respond_to?(attribute) || self.column_names.include?(attribute.to_s)

data/lib/cast_about_for/search.rb

@@ -23,7 +23,7 @@ module CastAboutFor
     def cast_about_for_by_equal search_values, params, seach_model
       search_values.each do |search_value|
         search_column, search_name = obtain_value(search_value)
-        seach_model = seach_model.where("#{search_column} = ?", params[search_name.to_sym]) if params[search_name.to_sym].present?
+        seach_model = seach_model.where("#{self.to_s.tableize}.#{search_column} = ?", params[search_name.to_sym]) if params.present? && params[search_name.to_sym].present?
       end
       seach_model
     end
@@ -31,28 +31,39 @@ module CastAboutFor
     def cast_about_for_by_like search_values, params, seach_model
       search_values.each do |search_value|
         search_column, search_name = obtain_value(search_value)
-        seach_model = seach_model.where("#{search_column} LIKE ?", "%#{params[search_name.to_sym]}%") if params[search_name.to_sym].present?
+        seach_model = seach_model.where("#{self.to_s.tableize}.#{search_column} LIKE ?", "%#{params[search_name.to_sym]}%") if params.present? && params[search_name.to_sym].present?
       end
       seach_model
     end
 
     def cast_about_for_by_after search_values, params, seach_model
-      search_column, search_name = obtain_by_star_value(search_values, params[search_values[:field].to_sym])
-      seach_model = seach_model.after(params[search_name.to_sym].to_datetime, field: "#{self.to_s.tableize}.#{search_column.to_s}") if params[search_name.to_sym].present?
+      step = "after"
+      if search_values.is_a?(Array)
+        search_values.each do |search_value|
+          seach_model = find_records_from_by_star(search_value, params, seach_model, step)
+        end
+      else
+        seach_model = find_records_from_by_star(search_values, params, seach_model, step)
+      end
       seach_model
     end
 
     def cast_about_for_by_before search_values, params, seach_model
-      search_column, search_name = obtain_by_star_value(search_values, params[search_values[:field].to_sym])
-
-      seach_model = seach_model.before(params[search_name.to_sym].to_datetime, field: "#{self.to_s.tableize}.#{search_column.to_s}") if params[search_name.to_sym].present?
+      step = "before"
+      if search_values.is_a?(Array)
+        search_values.each do |search_value|          
+          seach_model = find_records_from_by_star(search_value, params, seach_model, step)
+        end
+      else
+        seach_model = find_records_from_by_star(search_values, params, seach_model, step)
+      end
       seach_model
     end
 
     def cast_about_for_by_enum search_values, params, seach_model
       search_values.each do |search_value|
         search_column, search_name = obtain_value(search_value)
-        seach_model = seach_model.where("#{search_column} = ?", self.send(search_column.to_s.pluralize.to_sym)[params[search_name.to_sym]]) if params[search_name.to_sym].present?
+        seach_model = seach_model.where("#{self.to_s.tableize}.#{search_column} = ?", self.send(search_column.to_s.pluralize.to_sym)[params[search_name.to_sym]]) if params.present? && params[search_name.to_sym].present?
       end
       seach_model
     end
@@ -64,7 +75,14 @@ module CastAboutFor
       end          
     end
 
-    def obtain_by_star_value(value, field)
+    def find_records_from_by_star(search_value, params, seach_model, step)
+      search_column, search_name = obtain_by_star_value(search_value, params)
+      seach_model = seach_model.send("#{step}", params[search_name.to_sym].to_datetime, field: "#{self.to_s.tableize}.#{search_column.to_s}") if params.present? && params[search_name.to_sym].present?
+      seach_model
+    end
+
+    def obtain_by_star_value(value, params)
+      field = value[:field].present? ? (value[:field].is_a?(Hash) ? value[:field][:exact] : params[value[:field].to_sym]) : nil
       column = field.present? ? field : :created_at
       raise ArgumentError, "Unknown column: #{column}" unless self.respond_to?(column) || self.column_names.include?(column.to_s)
       [column.to_sym, value[:time]]

data/lib/cast_about_for/version.rb

@@ -1,3 +1,3 @@
 module CastAboutFor
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cast_about_for
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - JeskTop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: query ActiveRecord? Easy.