default_where 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 415c588b05d60281fb9ce000d231a468ff9bf924f08a91a0d5ab062f4b8c03db
-  data.tar.gz: 2663281cf4596d7a59eda6dd0866d589580d38f2a2c3bd547a815800041b8560
+  metadata.gz: 4925afe89ab55b52bb5945813486b4aeefaa3f29e9a2ed93ca0ca3982076df39
+  data.tar.gz: 9b564d353c2b3e7f578e3773aac664294ccd4d08d092d6b71ecc2aa92d247d31
 SHA512:
-  metadata.gz: 8a7456d42265499ebef6ab5df439539e0d6f4c2baae493fdfda5232112a09a1ba67a56c60a0103b44f1643741f576b11510f94e07c34c8f62a83b1c57657b86f
-  data.tar.gz: 00f9cee62150cefeedc252988d49cd81cd5aea77507e531e6c7c88930d1a95d27d0ce6283ec46c84884c4d4afaa3f10fdf96677c645ec684670456fec0198775
+  metadata.gz: ae9e5b07c2b5b8fb269370c98d2a8c3d772d263f646a7fa2b229e1b338436c7a55a1ba6448ff44d39381171d42d0e615b1dd204eabbaa0cd634c350615f293e2
+  data.tar.gz: eaa3827a022d87f95a5ecbea489bb87e07b5e6a051981ee21cc94dd130fc115574a8f3e212bb0352619a038bdf8ab4997e0d177ce4ad511115ea22dfee483980

data/README.md

@@ -66,6 +66,14 @@ User.default_where(params)
 User.default_where(params, { allow: [nil] })
 ```
 
+### OR
+```ruby
+params = {
+  'users.email-not-or-name': 'dhh'
+}
+
+```
+
 ### Auto call strip for string 
 * params
 ```ruby

data/Rakefile

@@ -8,25 +8,29 @@ require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'QueryScope'
+  rdoc.title = 'DefaultWhere'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
+Rake::TestTask.new(test: :environment) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
 
+task :environment do
+  ActiveRecord::Tasks::DatabaseTasks.database_configuration = YAML.load_file('test/config/database.yml')
+  ActiveRecord::Tasks::DatabaseTasks.env = 'test'
+  ActiveRecord::Tasks::DatabaseTasks.root = __dir__
+  ActiveRecord::Tasks::DatabaseTasks.migrations_paths = ['test/migrations']
+  ActiveRecord::Base.configurations = ActiveRecord::Tasks::DatabaseTasks.database_configuration
+  ActiveRecord::Base.establish_connection :test
+end
 
-task default: :test
+load 'active_record/railties/databases.rake'

data/lib/default_or.rb

@@ -0,0 +1,20 @@
+module DefaultWhere::DefaultOr
+
+  def default_or(hash)
+    return all if hash.blank?
+
+    keys = hash.keys
+    query = where(keys[0] => hash[keys[0]])
+
+    keys[1..-1].each do |key|
+      query = query.or(where(key => hash[key]))
+    end
+
+    query
+  end
+
+end
+
+ActiveSupport.on_load :active_record do
+  extend DefaultWhere::DefaultOr
+end

data/lib/default_where.rb

@@ -2,12 +2,14 @@ require 'default_where/not'
 require 'default_where/range'
 require 'default_where/like'
 require 'default_where/order'
+require 'default_where/or'
 
 module DefaultWhere
   include DefaultWhere::Not
   include DefaultWhere::Range
   include DefaultWhere::Order
   include DefaultWhere::Like
+  #include DefaultWhere::Or
 
   REJECT = ['', nil]
   STRIP = true
@@ -15,8 +17,10 @@ module DefaultWhere
   def default_where(params = {}, options = {})
     return all if params.blank?
 
+    params = params.to_h
     params, refs, tables = params_with_table(params, options)
 
+    #or_params = filter_or(params)
     range_params = filter_range(params)
     order_params = filter_order(params)
     not_params = filter_not(params)
@@ -33,9 +37,9 @@ module DefaultWhere
 
   def params_with_table(params = {}, options = {})
     if options.has_key?(:reject)
-      default_reject = [options[:reject]].flatten
+      default_reject = Array(options[:reject])
     elsif options.has_key?(:allow)
-      default_reject = REJECT - [options[:allow]].flatten
+      default_reject = REJECT - Array(options[:allow])
     else
       default_reject = REJECT
     end
@@ -44,39 +48,38 @@ module DefaultWhere
       options[:strip] = STRIP
     end
 
-    params = params.to_h
-    params.stringify_keys!
-    params.reject! { |_, value| default_reject.include?(value) }
-
     refs = []
     tables = []
     final_params = {}
 
     params.each do |key, value|
       value = value.strip if value.is_a?(String) && options[:strip]
+      next if default_reject.include?(value)
+      key = key.to_s
 
       if key =~ /\./
-        table, col = key.split('.')
-        as_model = reflections[table]
-        f_col, _ = col.split('-')
-
-        if as_model && as_model.klass.column_names.include?(f_col)
-          final_params["#{as_model.table_name}.#{col}"] = value
-          tables << as_model.table_name
-          refs << table.to_sym
-        elsif connection.data_sources.include? table
-          final_params["#{table}.#{col}"] = value
-          tables << table
-          keys = reflections.select { |_, v| !v.polymorphic? && v.table_name == table }.keys
-          if keys && keys.size == 1
-            refs << keys.first.to_sym
+        _table, _column = key.split('.')
+        _real_column = _column.split('-').first
+        _ref = reflections[_table]
+        if _ref && _ref.klass.column_names.include?(_real_column)
+          _table = _ref.table_name
+        elsif connection.data_sources.include?(_table) && connection.column_exists?(_table, _real_column)
+          _refs = reflections.select { |_, v| v.table_name == _table && !v.polymorphic? }
+          if _refs.size == 1
+            _ref = _refs.first
+          else
+            raise "#{key} makes confused, please use reflection name!"
           end
+        else
+          next
         end
+        refs << _ref.name unless refs.include?(_ref.name)
+        tables << _table unless tables.include?(_table)
+        final_params["#{_table}.#{_column}"] = value
       else
-        f_key, _ = key.split('-')
-        if column_names.include?(f_key)
-          final_params["#{key}"] = value
-        end
+        _real_column = key.split('-').first
+        next unless column_names.include?(_real_column)
+        final_params[key] = value
       end
     end
 
@@ -85,4 +88,6 @@ module DefaultWhere
 
 end
 
-ActiveRecord::Base.extend DefaultWhere
+ActiveSupport.on_load :active_record do
+  extend DefaultWhere
+end

data/lib/default_where/like.rb

@@ -1,11 +1,12 @@
 module DefaultWhere
   module Like
+    PATTERN = ['-like', '-rl', '-ll']
 
     def like_scope(params)
       where_string = []
       where_hash = {}
 
-      params.select{ |k, _| k.end_with?('-like') }.each do |key, value|
+      params.select{ |k, _| k.end_with?(*PATTERN) }.each do |key, value|
         real_key = key.sub(/-like$/, '')
         agent_key = key.gsub(/[-.]/, '_')
 
@@ -14,7 +15,16 @@ module DefaultWhere
         end
 
         where_string << "#{real_key} like :#{agent_key}"
-        where_hash.merge! agent_key.to_sym => '%' + value.to_s + '%'
+
+        if key.end_with?('-ll')
+          like_value = value.to_s + '%'
+        elsif key.end_with?('-rl')
+          like_value = '%' + value.to_s
+        else
+          like_value = '%' + value.to_s + '%'
+        end
+
+        where_hash.merge! agent_key.to_sym => like_value
       end
 
       where_string = where_string.join ' AND '
@@ -29,7 +39,7 @@ module DefaultWhere
 
     def filter_like(params)
       params.select do |k, _|
-        k.end_with?('-like')
+        k.end_with?(*PATTERN)
       end
     end
 

data/lib/default_where/or.rb

@@ -0,0 +1,32 @@
+module DefaultWhere
+  module Or
+
+    def or_scope(params)
+      where_hash = {}
+
+      params.each do |key, value|
+        real_key = key.split('-or-')
+
+        if column_names.include?(real_key)
+          real_key = "#{table_name}.#{real_key}"
+        end
+
+        where_hash.merge! real_key => value
+      end
+
+      if where_hash.present?
+        where.not(where_hash)
+      else
+        all
+      end
+    end
+
+    def filter_or(params)
+      params.select do |k, _|
+        k.include?('-or-')
+      end
+    end
+
+  end
+end
+

data/lib/default_where/version.rb

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

data/test/config/database.yml

@@ -0,0 +1,32 @@
+default: &default
+  adapter: mysql2
+  encoding: utf8
+  pool: 5
+  username: root
+  password: root123_ROOT
+  socket: /tmp/mysql.sock
+
+development:
+  <<: *default
+  database: default_where_development
+
+test:
+  <<: *default
+  database: default_where_test
+
+sqlite:
+  adapter: sqlite3
+  database: "file:memdb1?mode=memory&cache=shared"
+
+mysql:
+  adapter: mysql2
+  username: root
+  password: root
+  database: default_where
+
+postgresql:
+  adapter: postgresql
+  username: postgres
+  password:
+  database: default_where
+  min_messages: ERROR

data/test/config/database.yml.example

@@ -0,0 +1,32 @@
+default: &default
+  adapter: mysql2
+  encoding: utf8
+  pool: 5
+  username: root
+  password: root123_ROOT
+  socket: /tmp/mysql.sock
+
+development:
+  <<: *default
+  database: default_where_development
+
+test:
+  <<: *default
+  database: default_where_test
+
+sqlite:
+  adapter: sqlite3
+  database: "file:memdb1?mode=memory&cache=shared"
+
+mysql:
+  adapter: mysql2
+  username: root
+  password: root
+  database: default_where
+
+postgresql:
+  adapter: postgresql
+  username: postgres
+  password:
+  database: default_where
+  min_messages: ERROR

data/test/default_where_test.rb

@@ -1,16 +1,19 @@
 require 'helper'
+require 'models/user'
 
 class DefaultWhereTest < ActiveSupport::TestCase
 
-  test "truth" do
+  test 'truth' do
     assert_kind_of Module, DefaultWhere
   end
 
-  test "" do
+  test 'basic' do
+    create :user
     params = { id: 1, uid: 2, name: 3 }
     options = { signs: 'name' }
 
-
+    count = User.default_where(name: 'qinmingyuan').count
+    assert_equal 1, count
   end
 
 end

data/test/factories/users.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+
+  factory :user do
+    name 'qinmingyuan'
+  end
+
+end

data/test/helper.rb

@@ -1,24 +1,36 @@
 # $DEBUG = true
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:default, :test, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require "active_record"
-require "minitest/autorun"
+require 'active_record'
+require 'minitest/autorun'
+require 'factory_bot'
 
-db_config = YAML.load_file(File.expand_path("../database.yml", __FILE__)).fetch(ENV["DB"] || "sqlite")
-ActiveRecord::Base.establish_connection(db_config)
 ActiveRecord::Schema.verbose = false
+ActiveRecord::Tasks::DatabaseTasks.database_configuration = YAML.load_file('test/config/database.yml')
+ActiveRecord::Base.configurations = ActiveRecord::Tasks::DatabaseTasks.database_configuration
+ActiveRecord::Base.establish_connection :test
+
+if defined?(FactoryBot)
+  FactoryBot.definition_file_paths << File.expand_path('test/factories', __dir__)
+  FactoryBot.find_definitions
+end
+
+class ActiveSupport::TestCase
+  include FactoryBot::Syntax::Methods
+end
 
 def teardown_db
   tables = ActiveRecord::Base.connection.data_sources
   tables.each do |table|
-    ActiveRecord::Base.connection.drop_table(table)
+    ActiveRecord::Base.connection.truncate(table)
   end
-end
+end
+teardown_db

data/test/migrations/20180508082145_test_init.rb

@@ -0,0 +1,12 @@
+class TestInit < ActiveRecord::Migration[5.2]
+  def change
+    create_table :users do |t|
+      t.string :name
+    end
+
+    create_table :posts do |t|
+      t.string :title
+      t.references :user
+    end
+  end
+end

data/test/models/user.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+require 'default_where'
+class User < ActiveRecord::Base
+  extend DefaultWhere
+
+end
+

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: default_where
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - qinmingyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description of QueryScope.
 email:
 - mingyuan0715@foxmail.com
@@ -65,21 +79,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
 - README.md
 - Rakefile
+- lib/default_or.rb
 - lib/default_where.rb
 - lib/default_where/like.rb
 - lib/default_where/not.rb
+- lib/default_where/or.rb
 - lib/default_where/order.rb
 - lib/default_where/range.rb
 - lib/default_where/version.rb
-- test/database.yml
+- test/config/database.yml
+- test/config/database.yml.example
 - test/default_where_test.rb
+- test/factories/users.rb
 - test/helper.rb
+- test/migrations/20180508082145_test_init.rb
+- test/models/user.rb
 homepage: https://github.com/qinmingyuan/default_where
 licenses:
-- MIT
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -97,11 +116,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: default process params for where
 test_files:
 - test/default_where_test.rb
+- test/migrations/20180508082145_test_init.rb
+- test/config/database.yml.example
+- test/config/database.yml
 - test/helper.rb
-- test/database.yml
+- test/models/user.rb
+- test/factories/users.rb

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2015 qinmingyuan<mingyuan0715@foxmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/database.yml

@@ -1,16 +0,0 @@
-sqlite:
-  adapter: sqlite3
-  database: "file:memdb1?mode=memory&cache=shared"
-
-mysql:
-  adapter: mysql2
-  username: root
-  password:
-  database: default_where
-
-postgresql:
-  adapter: postgresql
-  username: postgres
-  password:
-  database: default_where
-  min_messages: ERROR