other_joins 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fc5fca16149be9cfc985e91180e80e8e7f892db
-  data.tar.gz: 92bae71a9765043014239839bc621f0f082fdb65
+  metadata.gz: a73d9a260ced47f210e7474ab90894a7e1c8f2db
+  data.tar.gz: 235e1bf010a329e310c4ea916060e7d9985dd5df
 SHA512:
-  metadata.gz: 35b737680fc429cc1e541a7af53dd867ab366eb76a51004996dae8ef234afb7c1df0405205fb23239c0f2ae66215ea9d9cb7159d32cf60bd5fcf1b70a1e9eaa8
-  data.tar.gz: 4a98a5e7a3575308749de1ae276e9642ac83c70c8bbaf3a551fe21029faae35d351128fdc89a10b3b3990b9de0726927a6f57b608107bd02f9fccab4c8420528
+  metadata.gz: 363489393067329e34763120aa32510869cd1320fc5cadeb0a9f44faf770b17d84a2b1bcaf8e72d9a4ec19483a4754ae84859db057c334573196737b72be4c91
+  data.tar.gz: 7a2c00c9c9c787d0d7ef9e1b8b081d4d3a46d162d710d2998ed45d7840ff3711b3c1339cb35746d665d550cd0c692cb6af12e94bd6553d6d390d07ee18a75d02

data/.gitignore

@@ -10,3 +10,4 @@
 *~
 .*.swp
 *.gem
+*.lock

data/.travis.yml

@@ -1,4 +1,14 @@
 language: ruby
 rvm:
   - 2.2.3
+gemfile:
+  - gemfiles/activerecord_3.0.gemfile
+  - gemfiles/activerecord_3.2_.gemfile
+  - gemfiles/activerecord_4.0.gemfile
+  - gemfiles/activerecord_4.2_.gemfile
+  - gemfiles/activerecord_3.1.gemfile
+  - gemfiles/activerecord_3.2.gemfile 
+  - gemfiles/activerecord_4.1.gemfile
+  - gemfiles/activerecord_4.2.gemfile
 before_install: gem install bundler -v 1.10.6
+script: bundle exec rake test

data/Appraisals

@@ -0,0 +1,35 @@
+appraise "activerecord-3.0" do
+  gem "activerecord", "~> 3.0.0"
+  gem "minitest"
+end
+
+appraise "activerecord-3.1" do
+  gem "activerecord", "~> 3.1.0"
+  gem "minitest"
+end
+
+appraise "activerecord-3.2" do
+  gem "activerecord", "~> 3.2.0"
+  gem "minitest"
+end
+
+appraise "activerecord-3.2+" do
+  gem "activerecord", "~> 3.2"
+  gem "minitest"
+end
+
+appraise "activerecord-4.0" do
+  gem "activerecord", "~> 4.0.0"
+end
+
+appraise "activerecord-4.1" do
+  gem "activerecord", "~> 4.1.0"
+end
+
+appraise "activerecord-4.2" do
+  gem "activerecord", "~> 4.2.0"
+end
+
+appraise "activerecord-4.2+" do
+  gem "activerecord", "~> 4.2"
+end

data/README.md

@@ -1,6 +1,8 @@
 # OtherJoins
 
-Add obvious `left_joins`, `outer_joins`, `full_joins` methods to ActiveRecord as plain way to join tables.
+Add obvious `left_joins`, `outer_joins` methods to ActiveRecord as plain way to join tables.
+
+This version works with ActiveRecord (3.0.x - 4.2.x).
 
 ## Introdution
 Usually to join tables in Rails app you use something like this:
@@ -33,11 +35,9 @@ Not difficult, but it is bored and ungracefully. Instinctively we want to use `l
 ## Installation
 
 Add this line to your application's Gemfile:
-
 ```ruby
 gem 'other_joins'
 ```
-
 And then execute:
 
     $ bundle

data/Rakefile

@@ -1,3 +1,5 @@
+require "rubygems"
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
 

data/gemfiles/activerecord_3.0.gemfile

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

data/gemfiles/activerecord_3.1.gemfile

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

data/gemfiles/activerecord_3.2.gemfile

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

data/gemfiles/activerecord_3.2_.gemfile

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

data/gemfiles/activerecord_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.0.0"
+
+gemspec :path => "../"

data/gemfiles/activerecord_4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.1.0"
+
+gemspec :path => "../"

data/gemfiles/activerecord_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2.0"
+
+gemspec :path => "../"

data/gemfiles/activerecord_4.2_.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2"
+
+gemspec :path => "../"

data/lib/other_joins.rb

@@ -1,5 +1,7 @@
 require 'active_record'
 require 'other_joins/version'
-require 'other_joins/other_joins_methods'
-require 'other_joins/active_record'
-require 'other_joins/left_join_dependency'
+require 'other_joins/other_joins_way'
+require "other_joins/activerecord-#{ActiveRecord::OTHER_JOINS_WAY}/other_joins_methods"
+require "other_joins/activerecord-#{ActiveRecord::OTHER_JOINS_WAY}/other_joins_methods"
+require "other_joins/activerecord-#{ActiveRecord::OTHER_JOINS_WAY}/active_record"
+require "other_joins/activerecord-#{ActiveRecord::OTHER_JOINS_WAY}/left_join_dependency"

data/lib/other_joins/activerecord-3/active_record.rb

@@ -0,0 +1,13 @@
+require 'active_support/core_ext/module'
+module ActiveRecord
+
+  class Relation
+    include OtherJoinsMethods
+  end
+
+  class Base
+    class << self # Class methods
+      delegate :left_joins, :outer_joins, to: :scoped
+    end
+  end
+end

data/lib/other_joins/activerecord-3/left_join_dependency.rb

@@ -0,0 +1,14 @@
+module ActiveRecord
+  module Associations
+    module ClassMethods
+      class LeftJoinDependency < JoinDependency
+
+        protected
+        def build(associations, parent = nil, join_type = Arel::OuterJoin)
+          super
+        end
+
+      end
+    end
+  end
+end

data/lib/other_joins/activerecord-3/other_joins_methods.rb

@@ -0,0 +1,15 @@
+module OtherJoinsMethods
+  extend ActiveSupport::Concern
+
+  def left_joins(*args)
+    join_dependency = ActiveRecord::Associations::ClassMethods::LeftJoinDependency.new(
+      @klass,
+      args,
+      []
+    )
+    joins(join_dependency.join_associations)
+  end
+
+  alias outer_joins left_joins
+
+end

data/lib/other_joins/activerecord-4.0/left_join_dependency.rb

@@ -0,0 +1,12 @@
+module ActiveRecord
+  module Associations
+    class LeftJoinDependency < JoinDependency
+
+      protected
+      def build(associations, parent = nil, join_type = Arel::OuterJoin)
+        super
+      end
+
+    end
+  end
+end

data/lib/other_joins/activerecord-4.0/other_joins_methods.rb

@@ -0,0 +1,16 @@
+module OtherJoinsMethods
+  extend ActiveSupport::Concern
+
+  def left_joins(*args)
+    join_dependency = ActiveRecord::Associations::LeftJoinDependency.new(
+      @klass,
+      args,
+      []
+    )
+    joins(join_dependency.join_associations)
+  end
+
+
+  alias outer_joins left_joins
+
+end

data/lib/other_joins/activerecord-4.1/active_record.rb

@@ -0,0 +1,11 @@
+module ActiveRecord
+
+  class Relation
+    include OtherJoinsMethods
+  end
+
+  module Querying
+    delegate :left_joins, :outer_joins, to: :all
+  end
+
+end

data/lib/other_joins/other_joins_way.rb

@@ -0,0 +1,17 @@
+module ActiveRecord
+
+  class InvalidActiveRecordVersion < StandardError
+  end
+
+  OTHER_JOINS_WAY = 
+    case
+    when ActiveRecord::VERSION::STRING =~ /^3/
+      3
+    when ActiveRecord::VERSION::STRING =~ /^4.0/
+      4.0
+    when ActiveRecord::VERSION::STRING =~ /^4.[1,2]/
+      4.1
+    else
+      raise InvalidActiveRecordVersion, "Gem 'other_joins #{OtherJoins::VERSION}' cannot work with 'activerecord #{ActiveRecord.version}'"
+    end
+end

data/lib/other_joins/version.rb

@@ -1,3 +1,3 @@
 module OtherJoins
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/other_joins.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '~> 4.1'
+  spec.add_dependency 'activerecord', '>= 3.0', '< 5'
 
+  spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 11.1'
   spec.add_development_dependency 'sqlite3', '~> 1.3'

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: other_joins
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Levanevski-Perevozchikov Ilya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-03 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'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: '4.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +98,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -85,10 +106,25 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/activerecord_3.0.gemfile
+- gemfiles/activerecord_3.1.gemfile
+- gemfiles/activerecord_3.2.gemfile
+- gemfiles/activerecord_3.2_.gemfile
+- gemfiles/activerecord_4.0.gemfile
+- gemfiles/activerecord_4.1.gemfile
+- gemfiles/activerecord_4.2.gemfile
+- gemfiles/activerecord_4.2_.gemfile
 - lib/other_joins.rb
-- lib/other_joins/active_record.rb
-- lib/other_joins/left_join_dependency.rb
-- lib/other_joins/other_joins_methods.rb
+- lib/other_joins/activerecord-3/active_record.rb
+- lib/other_joins/activerecord-3/left_join_dependency.rb
+- lib/other_joins/activerecord-3/other_joins_methods.rb
+- lib/other_joins/activerecord-4.0/active_record.rb
+- lib/other_joins/activerecord-4.0/left_join_dependency.rb
+- lib/other_joins/activerecord-4.0/other_joins_methods.rb
+- lib/other_joins/activerecord-4.1/active_record.rb
+- lib/other_joins/activerecord-4.1/left_join_dependency.rb
+- lib/other_joins/activerecord-4.1/other_joins_methods.rb
+- lib/other_joins/other_joins_way.rb
 - lib/other_joins/version.rb
 - other_joins.gemspec
 homepage: https://github.com/ilp416/other_joins
@@ -111,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Some joins methods for ActiveRecord