left_joins 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe2a83d6cffc287bbf6724737c4e8dbfbe3ea6f
-  data.tar.gz: 2838cceb023ba1586a31efddc33aaac6349ad4f6
+  metadata.gz: 7e53341751b336f45518a17f999a01edce0a82e2
+  data.tar.gz: d846380c736ba9b8c6e08a3f354b8b2cb23b0dcc
 SHA512:
-  metadata.gz: 655ca8dad040ed55ee43eab786bc935e27afd74c3dfc43a3462ba3ab98232bb5c0e85121ee66c739e51a92522672562de94bd4e60d5ec5867b03530edc7296ba
-  data.tar.gz: 0f55aa90871bd786842f941c3446dae67c221554d31c7f56ca850a2cf59f4024d7ce8e5f50b33ae1e98d8810a8819a67bdacf29c9c03b53700b4f9223c95852f
+  metadata.gz: e84494efa9cb604ca6f03499e009b186a3e3d936e7824f403026dcf9faecb25a6a7b64ec6277a19b06328cc9751e4649e0f80f90d20899174e15dc409493695a
+  data.tar.gz: 819bfefd4723df868dcfc2f038ed12b1772453f3c9ecded4991fb702f29c4a148e27c78415eefde05c64068729fabfa35319dc6783bf0c4ebc2ce3aa57e98cc4

data/left_joins.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   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_dependency "activerecord", ">= 3"
 

data/lib/left_joins.rb

@@ -2,9 +2,16 @@ require "left_joins/version"
 require 'active_record'
 require 'active_record/relation'
 
-module ActiveRecord::QueryMethods
+module LeftJoins
   IS_RAILS3_FLAG = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
-  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."
@@ -12,13 +19,17 @@ module ActiveRecord::QueryMethods
     end
   end
   if not method_defined?(:left_outer_joins!)
+    # ----------------------------------------------------------------
+    # ● Storing left joins values into @left_outer_joins_values
+    # ----------------------------------------------------------------
+    attr_accessor :left_outer_joins_values
     def left_outer_joins(*args)
       check_if_method_has_arguments!(:left_outer_joins, args)
 
       args.compact!
       args.flatten!
 
-      return (IS_RAILS3_FLAG ? clone : spawn).left_outer_joins!(*args)
+      return (LeftJoins::IS_RAILS3_FLAG ? clone : spawn).left_outer_joins!(*args)
     end
 
     def left_outer_joins!(*args)
@@ -26,6 +37,9 @@ module ActiveRecord::QueryMethods
       self
     end
 
+    # ----------------------------------------------------------------
+    # ● Implement left joins when building arel
+    # ----------------------------------------------------------------
     alias_method :left_joins, :left_outer_joins
     alias_method :build_arel_without_outer_joins, :build_arel
     def build_arel(*args)
@@ -55,7 +69,7 @@ module ActiveRecord::QueryMethods
     end
 
     class ::ActiveRecord::Associations::JoinDependency
-      if IS_RAILS3_FLAG
+      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
@@ -76,7 +90,7 @@ module ActiveRecord::QueryMethods
 
         # If #count is used with #distinct (i.e. `relation.distinct.count`) it is
         # considered distinct.
-        distinct = IS_RAILS3_FLAG ? options[:distinct] || self.uniq_value : self.distinct_value
+        distinct = LeftJoins::IS_RAILS3_FLAG ? options[:distinct] || self.uniq_value : self.distinct_value
 
         if operation == "count"
           column_name ||= select_for_count
@@ -94,3 +108,33 @@ module ActiveRecord::QueryMethods
   end
 end
 
+# ----------------------------------------------------------------
+# ● Implement left joins when merging relations
+# ----------------------------------------------------------------
+if not LeftJoins::IS_RAILS3_FLAG
+  require 'active_record/relation/merger'
+  class ActiveRecord::Relation
+    class Merger
+      alias_method :merge_without_left_joins, :merge
+      def merge
+        values = other.left_outer_joins_values
+        relation.left_outer_joins!(*values) if values.present?
+        return merge_without_left_joins
+      end
+    end
+  end
+
+  module ActiveRecord
+    module SpawnMethods
+
+      private
+
+      alias_method :relation_with_without_left_joins, :relation_with
+      def relation_with(values) # :nodoc:
+        result = relation_with_without_left_joins(values)
+        result.left_outer_joins_values = self.left_outer_joins_values
+        return result
+      end
+    end
+  end
+end

data/lib/left_joins/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: left_joins
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pluck_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement