left_joins 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e53341751b336f45518a17f999a01edce0a82e2
-  data.tar.gz: d846380c736ba9b8c6e08a3f354b8b2cb23b0dcc
+  metadata.gz: 33da27b6e6da1cea9aed88c993c7ab327f831331
+  data.tar.gz: dc0cf372cf8c4fb4d551e8710ad99ade145faae1
 SHA512:
-  metadata.gz: e84494efa9cb604ca6f03499e009b186a3e3d936e7824f403026dcf9faecb25a6a7b64ec6277a19b06328cc9751e4649e0f80f90d20899174e15dc409493695a
-  data.tar.gz: 819bfefd4723df868dcfc2f038ed12b1772453f3c9ecded4991fb702f29c4a148e27c78415eefde05c64068729fabfa35319dc6783bf0c4ebc2ce3aa57e98cc4
+  metadata.gz: 5814d112df40ef96bface633fa7493cc69144eb6830a4c1d26be820a318abed1bbadfe216d2b2fbd3328cf42eac9a15e3e3e8013c7ebbb42577b36206a3f84b9
+  data.tar.gz: 809e8b6174b80093671bd7cdee59e996423a229777968da0711cddfd7d5b1f55008dd5b1fe4d8bfdbd1cb4c93bdc850d7295779ca527154bc41dbec8a8919a9e

data/.travis.yml

@@ -10,11 +10,14 @@ before_install:
   - gem --version
 gemfile:
   - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
+  - gemfiles/5.2.gemfile
 addons:
     code_climate:
-        repo_token: 4be4fd5792acf886a179e8ebff97d155dc19858816d7179f2bf5002bae874818
+        repo_token: 9f3ed69eaf4cd5087f34c19d2e74f2457cdd1ae031cc43d0c1be308675e95823
 after_success:
   - bundle exec codeclimate-test-reporter
 

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+## Change Log
+
+### v1.0.2 2018/01/12
+- [#3](https://github.com/khiav223577/left_joins/pull/3) fix missing left joins when using in association condition (@khiav223577)
+
+### v1.0.1 2017/12/25
+- [#2](https://github.com/khiav223577/left_joins/pull/2)  Fix count which would sometimes force a DISTINCT (@khiav223577)
+
+### v1.0.0 2017/12/25
+- [#1](https://github.com/khiav223577/left_joins/pull/1) implement left joins (@khiav223577)

data/gemfiles/3.2.gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rails_or.gemspec
-
-gem "activerecord", "~> 3.2"
+gem "activerecord", "~> 3.2.0"
 
 group :test do
   gem "simplecov"

data/gemfiles/4.0.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem "activerecord", "~> 4.0.0"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+gemspec :path => "../"
+

data/gemfiles/4.2.gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rails_or.gemspec
-
-gem "activerecord", "~> 4.2"
+gem "activerecord", "~> 4.2.0"
 
 group :test do
   gem "simplecov"

data/gemfiles/5.0.gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rails_or.gemspec
-
-gem "activerecord", "~> 5.0"
+gem "activerecord", "~> 5.0.0"
 
 group :test do
   gem "simplecov"

data/gemfiles/5.1.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem "activerecord", "~> 5.1.0"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+gemspec :path => "../"
+

data/gemfiles/5.2.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem "activerecord", "~> 5.2.0"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+gemspec :path => "../"
+

data/left_joins.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "sqlite3", "~> 1.3"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "pluck_all", ">= 1.2.3"
+  spec.add_development_dependency "minitest", ">= 4.2"
+  spec.add_development_dependency "pluck_all", ">= 2.0.2"
 
   spec.add_dependency "activerecord", ">= 3"
 

data/lib/left_joins.rb

@@ -4,20 +4,10 @@ require 'active_record/relation'
 
 module LeftJoins
   IS_RAILS3_FLAG = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
+  require 'left_joins_for_rails_3' if IS_RAILS3_FLAG
 end
 
 module ActiveRecord::QueryMethods
-
-  # ----------------------------------------------------------------
-  # ● Implement check_if_method_has_arguments! method for Rails 3
-  # ----------------------------------------------------------------
-  if LeftJoins::IS_RAILS3_FLAG
-    def check_if_method_has_arguments!(method_name, args)
-      if args.blank?
-        raise ArgumentError, "The method .#{method_name}() must contain arguments."
-      end
-    end
-  end
   if not method_defined?(:left_outer_joins!)
     # ----------------------------------------------------------------
     # ● Storing left joins values into @left_outer_joins_values
@@ -69,18 +59,18 @@ module ActiveRecord::QueryMethods
     end
 
     class ::ActiveRecord::Associations::JoinDependency
-      if LeftJoins::IS_RAILS3_FLAG
-        alias_method :build_without_hooking_join_type, :build
-        def build(associations, parent = nil, join_type = Arel::Nodes::InnerJoin)
-          join_type = Thread.current.thread_variable_get :left_joins_join_type || join_type
-          return build_without_hooking_join_type(associations, parent, join_type)
-        end
-      else
+      if private_method_defined?(:make_constraints)
         alias_method :make_constraints_without_hooking_join_type, :make_constraints
         def make_constraints(*args, join_type)
           join_type = Thread.current.thread_variable_get :left_joins_join_type || join_type
           return make_constraints_without_hooking_join_type(*args, join_type)
         end
+      else
+        alias_method :build_without_hooking_join_type, :build
+        def build(associations, parent = nil, join_type = Arel::Nodes::InnerJoin)
+          join_type = Thread.current.thread_variable_get :left_joins_join_type || join_type
+          return build_without_hooking_join_type(associations, parent, join_type)
+        end
       end
     end
 
@@ -90,7 +80,7 @@ module ActiveRecord::QueryMethods
 
         # If #count is used with #distinct (i.e. `relation.distinct.count`) it is
         # considered distinct.
-        distinct = LeftJoins::IS_RAILS3_FLAG ? options[:distinct] || self.uniq_value : self.distinct_value
+        distinct = options[:distinct] || self.distinct_value
 
         if operation == "count"
           column_name ||= select_for_count

data/lib/left_joins/version.rb

@@ -1,3 +1,3 @@
 module LeftJoins
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/left_joins_for_rails_3.rb

@@ -0,0 +1,16 @@
+# ----------------------------------------------------------------
+# ● Implement check_if_method_has_arguments! method for Rails 3
+# ----------------------------------------------------------------
+module ActiveRecord::QueryMethods
+  def check_if_method_has_arguments!(method_name, args)
+    if args.blank?
+      raise ArgumentError, "The method .#{method_name}() must contain arguments."
+    end
+  end
+end
+
+module ActiveRecord::Calculations
+  def distinct_value
+    uniq_value
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: left_joins
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,30 +56,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: pluck_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -111,11 +112,15 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
 - left_joins.gemspec
 - lib/left_joins.rb
 - lib/left_joins/version.rb
+- lib/left_joins_for_rails_3.rb
 homepage: https://github.com/khiav223577/left_joins
 licenses:
 - MIT