ar_outer_joins 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b08109bce18501fcb96033fa12ba0233f2fa185c
+  data.tar.gz: ab591b631e058e82c867d026712e7fbf389cb39b
+SHA512:
+  metadata.gz: 703f36b3498b00aa953c2133e915923267911fa5aaacef7de096842b1a58f1fb89b2b09f2d8b880b4fcf3a6b4abb1297ef0135b5f242d36e3f4ee877f5935460
+  data.tar.gz: 5417ff4dd08024915f596eb70c9646158d125119553951d7397b91ff7ea3d2419d90fdb5ad1f884cd29da3f4033acf4172a9c5fafc1dddc51c5bd02f18b42425

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "ar3.2" do
+  gem "activerecord", "~>3.2.0"
+end
+
+appraise "ar4" do
+  gem "activerecord", "4.0.0.beta1"
+end

data/Gemfile

@@ -1,4 +1,6 @@
 source 'http://rubygems.org'
 
+gem "appraisal"
+
 # Specify your gem's dependencies in ar_outer_joins.gemspec
 gemspec

data/README.md

@@ -20,7 +20,7 @@ require "ar_outer_joins"
 class Product
   belongs_to :category
 
-  def published
+  def self.published
     outer_joins(:category).where("categories.published = ? OR products.published = ?", true, true)
   end
 end

data/Rakefile

@@ -1,2 +1,16 @@
 #!/usr/bin/env rake
+
+require "rubygems"
+require "bundler/setup"
+require "appraisal"
+require "rspec/core/rake_task"
+
 require "bundler/gem_tasks"
+
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  #t.rspec_path = 'bin/rspec'
+  t.rspec_opts = %w[--color]
+end
+
+task :default => :spec

data/{ar_outer_joins.gemspec → ar_outer_join.gemspec}

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ArOuterJoins::VERSION
 
-  gem.add_dependency "activerecord", "~>3.2"
+  gem.add_dependency "activerecord", ">=3.2"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "pry"

data/gemfiles/ar3.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~>3.2.0"
+
+gemspec :path=>"../"

data/gemfiles/ar3.2.gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: /Users/dev/Projects/ar_outer_joins
+  specs:
+    ar_outer_joins (0.0.1)
+      activerecord (>= 3.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    coderay (1.0.9)
+    diff-lcs (1.2.1)
+    i18n (0.6.4)
+    method_source (0.8.1)
+    multi_json (1.6.1)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.0.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    slop (3.4.3)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.36)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.0)
+  appraisal
+  ar_outer_joins!
+  pry
+  rspec
+  sqlite3

data/gemfiles/ar4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "4.0.0.beta1"
+
+gemspec :path=>"../"

data/gemfiles/ar4.gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: /Users/dev/Projects/ar_outer_joins
+  specs:
+    ar_outer_joins (0.0.1)
+      activerecord (>= 3.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.beta1)
+      activemodel (= 4.0.0.beta1)
+      activerecord-deprecated_finders (~> 0.0.3)
+      activesupport (= 4.0.0.beta1)
+      arel (~> 4.0.0.beta1)
+    activerecord-deprecated_finders (0.0.3)
+    activesupport (4.0.0.beta1)
+      i18n (~> 0.6.2)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.33)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (4.0.0.beta1)
+    atomic (1.0.1)
+    builder (3.1.4)
+    coderay (1.0.9)
+    diff-lcs (1.2.1)
+    i18n (0.6.4)
+    method_source (0.8.1)
+    minitest (4.6.2)
+    multi_json (1.6.1)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.0.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    slop (3.4.3)
+    sqlite3 (1.3.7)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.36)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 4.0.0.beta1)
+  appraisal
+  ar_outer_joins!
+  pry
+  rspec
+  sqlite3

data/lib/ar_outer_joins.rb

@@ -8,7 +8,9 @@ module ArOuterJoins
     association_joins, regular_joins = joins.partition do |join|
       join.is_a?(Hash) or join.is_a?(Array) or join.is_a?(Symbol)
     end
-    Join.new(self).apply(*association_joins).joins(*regular_joins)
+    join_set = Join.new(self).apply(*association_joins)
+    join_set = join_set.joins(*regular_joins) unless regular_joins.empty?
+    join_set
   end
 end
 

data/lib/ar_outer_joins/join.rb

@@ -20,7 +20,15 @@ module ArOuterJoins
     end
 
     def apply(*args)
-      klass.joins(generate(*args))
+      scope = if klass.all.is_a?(ActiveRecord::Relation) then klass.all else klass.scoped end
+      joins = scope.joins_values.select.map { |j| j.to_sql if j.respond_to?(:to_sql) }
+      generate(*args).flatten.inject(scope) do |scope, join|
+        if joins.include?(join.to_sql)
+          scope
+        else
+          scope.joins(join)
+        end
+      end
     end
   end
 end

data/lib/ar_outer_joins/join_builder.rb

@@ -24,7 +24,11 @@ module ArOuterJoins
           on = Arel::Nodes::On.new(table[association.foreign_key].eq(joined_table[primary_key]))
           [Arel::Nodes::OuterJoin.new(joined_table, on)]
         when :has_and_belongs_to_many
-          join_model_table = Arel::Table.new(association.options[:join_table])
+          join_model_table = if association.respond_to?(:join_table)
+              Arel::Table.new(association.join_table)
+            else
+              Arel::Table.new(association.options[:join_table])
+            end
           joined_primary_key = association.klass.primary_key
 
           on1 = Arel::Nodes::On.new(join_model_table[association.foreign_key].eq(table[primary_key]))

data/lib/ar_outer_joins/version.rb

@@ -1,3 +1,3 @@
 module ArOuterJoins
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/outer_join_spec.rb

@@ -39,7 +39,7 @@ describe ActiveRecord::Base do
         product2 = Product.create! :category => category2
         product3 = Product.create! :published => true
         query = Product.outer_joins(:category).where("categories.name = ? OR products.published = ?", "Shirts", true)
-        query.all.should =~ [product2, product3]
+        query.to_a.should =~ [product2, product3]
       end
 
       it "joins several associations" do
@@ -51,7 +51,7 @@ describe ActiveRecord::Base do
         product3 = Product.create! :published => true
         product4 = Product.create! :site => site1
         query = Product.outer_joins(:category, :site).where("sites.name = ? OR categories.name = ? OR products.published = ?", "Elabs", "Shirts", true)
-        query.all.should =~ [product2, product3, product4]
+        query.to_a.should =~ [product2, product3, product4]
       end
     end
 
@@ -66,7 +66,7 @@ describe ActiveRecord::Base do
         Image.create! :product => product2
 
         query = Product.outer_joins(:image).where("images.highres = ? OR products.published = ?", true, true)
-        query.all.should =~ [product1, product3]
+        query.to_a.should =~ [product1, product3]
       end
     end
 
@@ -81,7 +81,7 @@ describe ActiveRecord::Base do
         LineItem.create! :product => product2
 
         query = Product.outer_joins(:line_items).where("line_items.price = ? OR products.published = ?", 4, true)
-        query.all.should =~ [product1, product3]
+        query.to_a.should =~ [product1, product3]
       end
     end
 
@@ -97,7 +97,7 @@ describe ActiveRecord::Base do
 
 
         query = Product.outer_joins(:tags).where("tags.name = ? OR products.published = ?", "Red", true)
-        query.all.should =~ [product2, product3, product4]
+        query.to_a.should =~ [product2, product3, product4]
       end
     end
 
@@ -116,7 +116,7 @@ describe ActiveRecord::Base do
         LineItem.create! :product => product3
 
         query = Product.outer_joins(:baskets).where("baskets.purchased = ? OR products.published = ?", true, true)
-        query.all.should =~ [product1, product3]
+        query.to_a.should =~ [product1, product3]
       end
     end
 
@@ -135,7 +135,7 @@ describe ActiveRecord::Base do
         LineItem.create! :product => product3
 
         query = Product.outer_joins(:line_items => :basket).where("baskets.purchased = ? OR products.published = ?", true, true)
-        query.all.should =~ [product1, product3]
+        query.to_a.should =~ [product1, product3]
       end
 
       it "allows hashes with arrays" do
@@ -154,7 +154,15 @@ describe ActiveRecord::Base do
         Discount.create! :line_item => line_item3, :percentage => 80
 
         query = Product.outer_joins(:line_items => [:basket, :discounts]).where("baskets.purchased = ? OR products.published = ? OR discounts.percentage > ?", true, true, 50)
-        query.all.should =~ [product1, product3, product4]
+        query.to_a.should =~ [product1, product3, product4]
+      end
+
+      it "does not perform join more than once" do
+        query = Product.outer_joins(:line_items => [:basket, :discounts]).outer_joins("INNER JOIN images ON products.id = images.product_id")
+        query = query.outer_joins(:line_items => [:discounts])
+        query = query.outer_joins(:line_items)
+        query = query.outer_joins(:line_items => :basket)
+        query.to_a.should be_empty
       end
     end
 
@@ -167,7 +175,7 @@ describe ActiveRecord::Base do
         product3 = Product.create! :published => true
         query = Product.outer_joins("LEFT OUTER JOIN categories ON products.category_id = categories.id")
         query = query.where("categories.name = ? OR products.published = ?", "Shirts", true)
-        query.all.should =~ [product2, product3]
+        query.to_a.should =~ [product2, product3]
       end
 
       it "allows multiple joins" do
@@ -178,7 +186,7 @@ describe ActiveRecord::Base do
         product3 = Product.create! :published => true
         query = Product.outer_joins(:line_items, "LEFT OUTER JOIN categories ON products.category_id = categories.id")
         query = query.where("categories.name = ? OR products.published = ?", "Shirts", true)
-        query.all.should =~ [product2, product3]
+        query.to_a.should =~ [product2, product3]
       end
 
       it "allows arel joins" do
@@ -193,7 +201,7 @@ describe ActiveRecord::Base do
 
         query = Product.outer_joins(join)
         query = query.where("categories.name = ? OR products.published = ?", "Shirts", true)
-        query.all.should =~ [product2, product3]
+        query.to_a.should =~ [product2, product3]
       end
     end
   end

data/spec/spec_helper.rb

@@ -48,6 +48,10 @@ ActiveRecord::Base.connection.create_table :images do |t|
 end
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
   config.around do |example|
     ActiveRecord::Base.transaction do
       example.run

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_outer_joins
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -10,52 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2159798540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2159798540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159798120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159798120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2159797660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159797660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2159797200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159797200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds the missing outer_joins method to ActiveRecord
 email:
 - jonas.nicklas@gmail.com
@@ -64,11 +75,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- Appraisals
 - Gemfile
 - README.md
 - Rakefile
-- ar_outer_joins.gemspec
+- ar_outer_join.gemspec
+- gemfiles/ar3.2.gemfile
+- gemfiles/ar3.2.gemfile.lock
+- gemfiles/ar4.gemfile
+- gemfiles/ar4.gemfile.lock
 - lib/ar_outer_joins.rb
 - lib/ar_outer_joins/join.rb
 - lib/ar_outer_joins/join_builder.rb
@@ -77,27 +93,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/elabs/ar_outer_joins
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: outer_joins for ActiveRecord
 test_files:
 - spec/outer_join_spec.rb