query_methods_extend 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 458610213fb0ca54d4fc08f62d83d1aaafd07753
-  data.tar.gz: 73f79ee1edd5f50f9702126b70edd987c2aada66
+  metadata.gz: 9c4039add270257fd9f5c8c1799aec94af2603eb
+  data.tar.gz: 7a45d215f5a8f2307e60ccbc8d7feb594f0e3ff5
 SHA512:
-  metadata.gz: 7b53316ac1c3840e54730ece5d26223b41d3f3ac0e2d85040d1bfeb289f2e946f69fa7db8f197fcee8d703d569b0dba6c0b7f9c1cf8ed118916f2f71912c0184
-  data.tar.gz: 7d6d43fd4bd310842e3f5a5b9da7557fd2e2e7f85442288cccc2506c7631b8afd4d3efb5225b58b466f2ede4b3614462f38edd62077dd8a10e7e51be956a6951
+  metadata.gz: 329c27fa87fc6f178f55ddb12d07fe2a5e69c11f74cd391d397ee1a0b5ce649a3041a99f55937290d4b79635bd08b3981d2e140881028a2a3eb6f9519114b660
+  data.tar.gz: bb9845d99f036e524aaf7037df007351ee02e63e8200927a7d2c6a3c6879ee641a7202c697e90f81f1ffefacaaa73d2c56c7b5076af73f7f883a2131958d623e

data/README.md

@@ -11,30 +11,22 @@ Add this line to your application's Gemfile:
 gem 'query_methods_extend'
 ```
 
-And model file:
-```ruby
-include QueryMethodsExtend
-```
-
 ## Usage
 
 The structure book models:
 ```ruby
 class Store < ActiveRecord::Base
-  include QueryMethodsExtend
   has_many :categories
 end
 // Store(id: integer, address: string)
 
 class Category < ActiveRecord::Base
-  include QueryMethodsExtend
   belongs_to :store
   has_many :books
 end
 // Category(id: integer, name: string, store_id: integer)
 
 class Book < ActiveRecord::Base
-  include QueryMethodsExtend
   belongs_to :category
 end
 // Book(id: integer, name: string, price: integer, category_id: integer)
@@ -57,7 +49,7 @@ SELECT "categories".* FROM "categories"
 )
 ```
 
-And take **all books in the stores** in Vietnam (without use **:through**):
+And take **all books in the stores** in Vietnam:
 ```ruby
 Store.where(address: 'Vietnam').categories.books
 

data/lib/query_methods_extend.rb

@@ -1,4 +1,5 @@
 require "query_methods_extend/version"
+require "query_methods_extend/railtie"
 require "query_methods_extend/association"
 require "query_methods_extend/or"
 require "query_methods_extend/like"

data/lib/query_methods_extend/activerecord.rb

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

data/lib/query_methods_extend/association.rb

@@ -12,7 +12,7 @@ module QueryMethodsExtend
 
         association = self.try(:reflect_on_association, method_name)
         result = false
-        if association && association.macro == :has_many
+        if association && association.try(:macro) == :has_many
           model_reflect = association.inverse_of
           model = model_reflect.active_record
           query = self.select(association.primary_key_column.name)

data/lib/query_methods_extend/like.rb

@@ -3,38 +3,40 @@ module QueryMethodsExtend
     included do
       attr_accessor :extend_like_string
 
-      scope :like, ->(agrs){
+      def self.like agrs
         @extend_like_string = '%{?}%'
         like_basic agrs
-      }
+      end
 
-      scope :l_like, ->(agrs){
+      def self.l_like agrs
         @extend_like_string = '%{?}'
         like_basic agrs
-      }
+      end
 
-      scope :r_like, ->(agrs){
+      def self.r_like agrs
         @extend_like_string = '{?}%'
         like_basic agrs
-      }
+      end
 
-      scope :regex_like, ->(agrs){
+      def self.regex_like agrs
         @extend_like_string = '{?}'
         like_basic agrs
-      }
+      end
 
-      scope :like_basic, ->(agrs){
-        if agrs.class == Hash
-          items = self
-          agrs.each do |agr|
-            field, value = agr
-            items = items.where("#{self.table_name}.#{field} LIKE ?", @extend_like_string.gsub('{?}', value.to_s))
+      private
+        def self.like_basic agrs
+          if agrs.class == Hash
+            items = self
+            agrs.each do |agr|
+              field, value = agr
+              items = items.where("#{self.table_name}.#{field} LIKE ?", @extend_like_string.gsub('{?}', value.to_s))
+            end
+            return items
+          else
+            raise "Like method with agruments should be a HASH"
           end
-          return items
-        else
-          raise "Like method with agruments should be a HASH"
         end
-      }
+
     end
   end
 end

data/lib/query_methods_extend/operators.rb

@@ -1,38 +1,40 @@
 module QueryMethodsExtend
   module Operators extend ActiveSupport::Concern
     included do
-      scope :gt, ->(agrs){
+      def self.gt agrs
         @extend_operator_string = '>'
         operator_basic agrs
-      }
+      end
 
-      scope :gteq, ->(agrs){
+      def self.gteq agrs
         @extend_operator_string = '>='
         operator_basic agrs
-      }
+      end
 
-      scope :lt, ->(agrs){
+      def self.lt agrs
         @extend_operator_string = '<'
         operator_basic agrs
-      }
+      end
 
-      scope :lteq, ->(agrs){
+      def self.lteq agrs
         @extend_operator_string = '<='
         operator_basic agrs
-      }
+      end
 
-      scope :operator_basic, ->(agrs){
-        if agrs.class == Hash
-          items = self
-          agrs.each do |agr|
-            field, value = agr
-            items = items.where("#{self.table_name}.#{field} #{@extend_operator_string} ?", value)
+      private
+        def self.operator_basic agrs
+          if agrs.class == Hash
+            items = self
+            agrs.each do |agr|
+              field, value = agr
+              items = items.where("#{self.table_name}.#{field} #{@extend_operator_string} ?", value)
+            end
+            return items
+          else
+            raise "Operators '#{@extend_operator_string}' with agruments should be a HASH"
           end
-          return items
-        else
-          raise "Operators '#{@extend_operator_string}' with agruments should be a HASH"
         end
-      }
+
     end
   end
 end

data/lib/query_methods_extend/or.rb

@@ -30,7 +30,7 @@ module QueryMethodsExtend
 
   module OrQuery extend ActiveSupport::Concern
     included do
-      scope :or, ->(agrs = nil){
+      def self.or agrs = nil
         if agrs
           if agrs.class == Hash
             act = self.unscoped.where(agrs).where_values.map{ |data| data.to_sql }.join(' OR ')
@@ -41,7 +41,8 @@ module QueryMethodsExtend
         else
           all.extending(OrExtend).set_is_query_or(true)
         end
-      }
+      end
     end
   end
+
 end

data/lib/query_methods_extend/railtie.rb

@@ -0,0 +1,9 @@
+module QueryMethodsExtend
+  class Railtie < Rails::Railtie
+    initializer "query_methods_extend.initializer" do
+      ActiveSupport.on_load(:active_record) do
+        include QueryMethodsExtend
+      end
+    end
+  end
+end

data/lib/query_methods_extend/spec/{association.rb → association_spec.rb}

@@ -40,5 +40,6 @@ module QueryMethodsExtend
         expect(result).to match_array([@book1, @book2])
       end
     end
+
   end
 end

data/lib/query_methods_extend/union.rb

@@ -1,10 +1,10 @@
 module QueryMethodsExtend
   module Union extend ActiveSupport::Concern
     included do
-      scope :union, ->(query){
+      def self.union query
         query_self = self.all.to_sql
         self.unscoped.from("(#{query_self} UNION #{query.to_sql}) AS #{self.table_name}")
-      }
+      end
     end
   end
 end

data/lib/query_methods_extend/version.rb

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

data/query_methods_extend.gemspec

@@ -18,7 +18,8 @@ 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 "activerecord", ">= 3.0"
+  spec.add_development_dependency 'rails', '~> 4.0'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require "active_record"
+require "rails"
 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`.

data/spec/supports/migrate.rb

@@ -1,13 +1,15 @@
 require "query_methods_extend"
-require "query_methods_extend/basic"
+# require "query_methods_extend/railtie"
 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'
+require "query_methods_extend/activerecord"
+
+require 'models/book'
+require 'models/category'
+require 'models/store'
 
 def run_migrate
   ActiveRecord::Base.establish_connection(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_methods_extend
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Alicuche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,13 +17,27 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -99,11 +113,12 @@ files:
 - 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/railtie.rb
+- lib/query_methods_extend/spec/association_spec.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/spec/operators_spec.rb
+- lib/query_methods_extend/spec/or_spec.rb
+- lib/query_methods_extend/spec/union_spec.rb
 - lib/query_methods_extend/union.rb
 - lib/query_methods_extend/version.rb
 - query_methods_extend.gemspec