query_methods_extend 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d367aa7df76a32f4ec16a1ce7c2f3c687215bd35
-  data.tar.gz: 44b34c1a6410a6022bff5e67e41737e075075894
+  metadata.gz: 458610213fb0ca54d4fc08f62d83d1aaafd07753
+  data.tar.gz: 73f79ee1edd5f50f9702126b70edd987c2aada66
 SHA512:
-  metadata.gz: e9b5d15eeb893fbe8fd438d944f859c27061ca55d5a6942f328fd952d5ee8172bbe147d10711fd3cb1bf51c3132d6851e113bac7e4845e1891f1ea3b1d6703aa
-  data.tar.gz: 20e0c7b62fc6ef090238a6f59320e986f58558f16c773c2b62238ed42f646aace78f624ecfe400ca78d800da344000a16826dfc65020bf62f58c8b92e7c3f226
+  metadata.gz: 7b53316ac1c3840e54730ece5d26223b41d3f3ac0e2d85040d1bfeb289f2e946f69fa7db8f197fcee8d703d569b0dba6c0b7f9c1cf8ed118916f2f71912c0184
+  data.tar.gz: 7d6d43fd4bd310842e3f5a5b9da7557fd2e2e7f85442288cccc2506c7631b8afd4d3efb5225b58b466f2ede4b3614462f38edd62077dd8a10e7e51be956a6951

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/lib/query_methods_extend.rb

@@ -1,14 +1,13 @@
 require "query_methods_extend/version"
-require "query_methods_extend/basic"
 require "query_methods_extend/association"
 require "query_methods_extend/or"
 require "query_methods_extend/like"
 require "query_methods_extend/operators"
 require "query_methods_extend/union"
+require "query_methods_extend/activerecord"
 
 module QueryMethodsExtend extend ActiveSupport::Concern
   included do
-    include Basic
     include Association
     include OrQuery
     include Like
@@ -16,3 +15,5 @@ module QueryMethodsExtend extend ActiveSupport::Concern
     include Union
   end
 end
+
+

data/lib/query_methods_extend/activerecord.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module QueryMethods
+    include QueryMethodsExtend::Association
+
+    def method_missing(method_name, *args, &block)
+      if respond_to? method_name
+        super
+      else
+        check_association_exist(method_name) || super
+      end
+    end
+  end
+end

data/lib/query_methods_extend/association.rb

@@ -1,33 +1,27 @@
 module QueryMethodsExtend
-  module Association
-    @check_association_exist_flag = false
+  module Association extend ActiveSupport::Concern
+    included do
+      @check_association_exist_flag = false
 
-    def method_missing(method_name, *args, &block)
-      if respond_to? method_name
-        super
-      else
-        check_association_exist(method_name) || super
-      end
-    end
+      def self.check_association_exist method_name
+        if @check_association_exist_flag
+          return false
+        end
 
-    def check_association_exist method_name
-      if @check_association_exist_flag
-        return false
-      end
+        @check_association_exist_flag = true
 
-      @check_association_exist_flag = true
+        association = self.try(:reflect_on_association, method_name)
+        result = false
+        if association && association.macro == :has_many
+          model_reflect = association.inverse_of
+          model = model_reflect.active_record
+          query = self.select(association.primary_key_column.name)
+          result = model.where("#{model.table_name}.#{model_reflect.foreign_key.to_sym} IN (#{query.to_sql})")
+        end
 
-      association = self.try(:reflect_on_association, method_name)
-      result = false
-      if association && association.macro == :has_many
-        model_reflect = association.inverse_of
-        model = model_reflect.active_record
-        query = self.select(association.primary_key_column.name)
-        result = model.where("#{model.table_name}.#{model_reflect.foreign_key.to_sym} IN (#{query.to_sql})")
+        @check_association_exist_flag = false
+        return result
       end
-
-      @check_association_exist_flag = false
-      return result
     end
   end
 end

data/lib/query_methods_extend/like.rb

@@ -32,7 +32,7 @@ module QueryMethodsExtend
           end
           return items
         else
-          raise 'Agruments should be a HASH'
+          raise "Like method with agruments should be a HASH"
         end
       }
     end

data/lib/query_methods_extend/operators.rb

@@ -30,7 +30,7 @@ module QueryMethodsExtend
           end
           return items
         else
-          raise 'Agruments should be a HASH'
+          raise "Operators '#{@extend_operator_string}' with agruments should be a HASH"
         end
       }
     end

data/lib/query_methods_extend/or.rb

@@ -39,7 +39,7 @@ module QueryMethodsExtend
             raise 'Agruments should be a HASH'
           end
         else
-          all.set_is_query_or(true)
+          all.extending(OrExtend).set_is_query_or(true)
         end
       }
     end

data/lib/query_methods_extend/spec/association.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+module QueryMethodsExtend
+  describe Association do
+    before :all do
+      run_migrate
+    end
+
+    describe "Or methods" do
+      before :all do
+        @store1 = Store.create(address: 'Vietnam')
+        @store2 = Store.create(address: 'USA')
+        @store3 = Store.create(address: 'Japan')
+
+        @cate1 = @store1.categories.create(name: 'Php')
+        @cate2 = @store1.categories.create(name: 'Rails')
+        @cate3 = @store1.categories.create(name: 'C#')
+        @cate4 = @store2.categories.create(name: 'Java')
+        @cate5 = @store3.categories.create(name: 'Unknow')
+
+        @book1 = @cate1.books.create(name: 'Ruby on rails advance', price: 10)
+        @book2 = @cate1.books.create(name: 'PHP advance', price: 15)
+        @book3 = @cate2.books.create(name: 'Java every day', price: 20)
+        @book4 = @cate2.books.create(name: 'C# 24 days', price: 25)
+        @book5 = @cate4.books.create(name: 'Unknown', price: 30)
+      end
+
+      it "return 3 categories" do
+        result = Store.where('stores.address = ? OR stores.address = ?', 'Vietnam', 'USA').categories
+        expect(result).to match_array([@cate1, @cate2, @cate3, @cate4])
+      end
+
+      it "return 4 books" do
+        result = Store.where(address: 'Vietnam').categories.books
+        expect(result).to match_array([@book1, @book2, @book3, @book4])
+      end
+
+      it "return 2 books" do
+        result = Store.where(address: 'Vietnam').categories.books.where('books.price <= 15')
+        expect(result).to match_array([@book1, @book2])
+      end
+    end
+  end
+end

data/lib/query_methods_extend/spec/like_spec.rb

@@ -0,0 +1,61 @@
+require "spec_helper"
+
+module QueryMethodsExtend
+  describe Like do
+    before :all do
+      run_migrate
+    end
+
+    describe "Like methods" do
+      before :all do
+        @first = Book.create(name: 'Ruby on rails advance', price: 10)
+        @seconds = Book.create(name: 'PHP advance', price: 20)
+      end
+
+      context 'like method' do
+        it "return first book" do
+          expect(Book.like(name: 'rails')).to match_array(@first)
+        end
+        it "return seconds book" do
+          expect(Book.like(name: 'PHP')).to match_array(@seconds)
+        end
+        it "return first and seconds book" do
+          expect(Book.like(name: 'advance')).to match_array([@first, @seconds])
+        end
+      end
+
+      context 'left like method' do
+        it "return first book" do
+          expect(Book.l_like(name: 'rails advance')).to match_array(@first)
+        end
+        it "return seconds book" do
+          expect(Book.l_like(name: 'PHP advance')).to match_array(@seconds)
+        end
+        it "return first and seconds book" do
+          expect(Book.l_like(name: 'advance')).to match_array([@first, @seconds])
+        end
+      end
+
+      context 'right like method' do
+        it "return first book" do
+          expect(Book.r_like(name: 'Ruby')).to match_array(@first)
+        end
+        it "return seconds book" do
+          expect(Book.r_like(name: 'PHP')).to match_array(@seconds)
+        end
+      end
+
+      context 'regex like method' do
+        it "return first book" do
+          expect(Book.regex_like(name: '%rails%')).to match_array(@first)
+        end
+        it "return seconds book" do
+          expect(Book.regex_like(name: '%PHP%')).to match_array(@seconds)
+        end
+        it "return first and seconds book" do
+          expect(Book.regex_like(name: '%advance')).to match_array([@first, @seconds])
+        end
+      end
+    end
+  end
+end

data/lib/query_methods_extend/spec/operators.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+module QueryMethodsExtend
+  describe Operators do
+    before :all do
+      run_migrate
+    end
+
+    describe "Operators methods" do
+      before :all do
+        @first = Book.create(name: 'Ruby on rails advance', price: 10)
+        @seconds = Book.create(name: 'PHP advance', price: 20)
+      end
+
+      context 'like method' do
+        it "return match array is true" do
+          expect(Book.lt(price: 15)).to match_array(@first)
+          expect(Book.gt(price: 15)).to match_array(@seconds)
+          expect(Book.lteq(price: 10)).to match_array(@first)
+          expect(Book.gteq(price: 10)).to match_array([@first, @seconds])
+        end
+      end
+    end
+  end
+end

data/lib/query_methods_extend/spec/or.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+module QueryMethodsExtend
+  describe OrExtend do
+    before :all do
+      run_migrate
+    end
+
+    describe "Or methods" do
+      before :all do
+        @first = Book.create(name: 'Ruby on rails advance', price: 10)
+        @seconds = Book.create(name: 'PHP advance', price: 10)
+        @three = Book.create(name: 'C# Programmer', price: 5)
+      end
+
+      context 'or with agruments' do
+        it "return seconds and three books" do
+          expect(Book.or(name: 'PHP advance', price: 5)).to match_array([@seconds, @three])
+        end
+      end
+
+      context 'or no agurments' do
+        it "return first and seconds book" do
+          expect(Book.where(name: 'PHP advance').or.where(price: 5)).to match_array([@seconds, @three])
+        end
+      end
+    end
+  end
+end

data/lib/query_methods_extend/spec/union.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+module QueryMethodsExtend
+  describe Union do
+    before :all do
+      run_migrate
+    end
+
+    describe "Union methods" do
+      before :all do
+        @first = Book.create(name: 'Ruby on rails advance', price: 10)
+        @seconds = Book.create(name: 'PHP advance', price: 10)
+        @three = Book.create(name: 'C# Programmer', price: 5)
+      end
+
+      it "return seconds and three books" do
+        result = Book.where(name: 'PHP advance').union(Book.where(price: 5))
+        expect(result).to match_array([@seconds, @three])
+      end
+    end
+  end
+end

data/lib/query_methods_extend/version.rb

@@ -1,3 +1,3 @@
 module QueryMethodsExtend
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/query_methods_extend.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = QueryMethodsExtend::VERSION
   spec.authors       = 'Alicuche'
   spec.email         = 'alicuche@gmail.com'
-  spec.summary       = 'Query methods extend in rails 4: Asscociation has_many, union, or, like, operators'
+  spec.summary       = 'Query methods extend in rails 4: Asscociation has_many, union, or, like, operators...'
   spec.description   = ''
   spec.homepage      = ""
   spec.license       = "MIT"
@@ -18,7 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activerecord", ">= 3.0"
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  # spec.add_development_dependency "activerecord", "~> 4.0"
+  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency 'sqlite3'
 end

data/spec/models/book.rb

@@ -0,0 +1,4 @@
+class Book < ActiveRecord::Base
+  include QueryMethodsExtend
+  belongs_to :category
+end

data/spec/models/category.rb

@@ -0,0 +1,5 @@
+class Category < ActiveRecord::Base
+  include QueryMethodsExtend
+  belongs_to :store
+  has_many :books
+end

data/spec/models/store.rb

@@ -0,0 +1,4 @@
+class Store < ActiveRecord::Base
+  include QueryMethodsExtend
+  has_many :categories
+end

data/spec/spec_helper.rb

@@ -0,0 +1,91 @@
+require "active_record"
+require "supports/migrate"
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  # config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  # config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    # config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  # config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  # Kernel.srand config.seed
+
+end

data/spec/supports/migrate.rb

@@ -0,0 +1,40 @@
+require "query_methods_extend"
+require "query_methods_extend/basic"
+require "query_methods_extend/association"
+require "query_methods_extend/like"
+require "query_methods_extend/operators"
+require "query_methods_extend/or"
+require "query_methods_extend/union"
+require 'models/book.rb'
+require 'models/category.rb'
+require 'models/store.rb'
+
+def run_migrate
+  ActiveRecord::Base.establish_connection(
+    adapter: 'sqlite3',
+    database: ':memory:'
+  )
+
+  ActiveRecord::Schema.define do
+    create_table :books do |t|
+      t.string :name
+      t.integer :price
+      t.references :category
+
+      t.timestamps
+    end
+
+    create_table :categories do |t|
+      t.string :name
+      t.references :store
+
+      t.timestamps
+    end
+
+    create_table :stores do |t|
+      t.string :address
+
+      t.timestamps
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: query_methods_extend
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alicuche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: ''
 email: alicuche@gmail.com
 executables: []
@@ -45,20 +87,31 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/query_methods_extend.rb
+- lib/query_methods_extend/activerecord.rb
 - lib/query_methods_extend/association.rb
-- lib/query_methods_extend/basic.rb
 - lib/query_methods_extend/like.rb
 - lib/query_methods_extend/operators.rb
 - lib/query_methods_extend/or.rb
+- lib/query_methods_extend/spec/association.rb
+- lib/query_methods_extend/spec/like_spec.rb
+- lib/query_methods_extend/spec/operators.rb
+- lib/query_methods_extend/spec/or.rb
+- lib/query_methods_extend/spec/union.rb
 - lib/query_methods_extend/union.rb
 - lib/query_methods_extend/version.rb
 - query_methods_extend.gemspec
+- spec/models/book.rb
+- spec/models/category.rb
+- spec/models/store.rb
+- spec/spec_helper.rb
+- spec/supports/migrate.rb
 homepage: ''
 licenses:
 - MIT
@@ -83,5 +136,10 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'Query methods extend in rails 4: Asscociation has_many, union, or, like,
-  operators'
-test_files: []
+  operators...'
+test_files:
+- spec/models/book.rb
+- spec/models/category.rb
+- spec/models/store.rb
+- spec/spec_helper.rb
+- spec/supports/migrate.rb

data/lib/query_methods_extend/basic.rb

@@ -1,9 +0,0 @@
-module QueryMethodsExtend
-  module Basic extend ActiveSupport::Concern
-    included do
-      def self.where(opts, *rest)
-        super(opts, *rest).all.extending(Association, OrExtend)
-      end
-    end
-  end
-end