activerecord-where-any-of 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef5ed54bad29379534fe78509785670884e727a
-  data.tar.gz: 20680a21436a675196da93736f5a3ee737547d84
+  metadata.gz: 07f33898c696d787dbb54fe69e22445332f59d74
+  data.tar.gz: ab421f360ba43c7bf6ef5dcb36dd37cc3130884a
 SHA512:
-  metadata.gz: cbe1832d8d6b711ce196c91808edc0c34fe6384d959b4d39f6d1943e99dfa69b6d2878f63cfe2e82b76881f968e3fd2f3c17b1ea3def9731f7c1786ca0ce3551
-  data.tar.gz: 0637588ca5ed891adb966c8dafc45c4ad9adf650569463e73f776fbe33a79f0cf4d35fc8603bd47a63b04bc5ee656358bd1d3e934aefe774d8d1f742be5d9660
+  metadata.gz: ea1dae0d404b1cf67210eee30a18df9e498cd99685c48b582536cb15b4c750f8e22c79776aa1c1ab07b94b9c724fb8587112e10adbf18517ca516306401c35c3
+  data.tar.gz: 55e261b044362ddbf309c9c1e2a9cc5fff22da86f3b78654c2a1ade5c3ff0e18ebe41fe5906f130055aa471e02acc18f2171dee7837ba62bdef639e5a29197cb

data/Rakefile

@@ -1 +1,23 @@
 require "bundler/gem_tasks"
+
+namespace :rspec do
+
+  desc "Run specs against ActiveRecord 3"
+  task :active_record_3 do
+    sh 'ACTIVE_RECORD_VERSION=3 rspec -O spec/spec.opts'
+  end
+
+  desc "Run specs against ActiveRecord 4"
+  task :active_record_4 do
+    sh 'ACTIVE_RECORD_VERSION=4 rspec -O spec/spec.opts'
+  end
+
+  desc "Run specs against ActiveRecord 5"
+  task :active_record_5 do
+    sh 'ACTIVE_RECORD_VERSION=5 rspec -O spec/spec.opts'
+  end
+
+  desc "Run specs against all three versions of ActiveRecord"
+  task all: [:active_record_3, :active_record_4, :active_record_5]
+
+end

data/activerecord-where-any-of.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = 'activerecord-where-any-of'
-  s.version = '1.0.6'
+  s.version = '1.1.0'
   s.license = 'MIT'
-  s.date = '2015-12-28'
+  s.date = '2016-12-25'
   s.summary = 'A simple mixin to ActiveRecord::Base that allows use of OR arel relations.'
-  s.description = '...'
+  s.description = 'Should work in Rails 3, 4, & 5.  However, in Rails 5 use of #or is prefered.'
   s.description = File.read(File.expand_path('../README.md', __FILE__))[/Description:\n-+\s*(.*?)\n\n/m, 1]
   s.authors = ['David McCullars']
   s.email = ['david.mccullars@gmail.com']
@@ -15,4 +15,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activerecord', '>= 3.0'
   s.add_development_dependency 'bundler', '>= 1.3'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 end

data/lib/active_record/where-any-of-mixin-rails-5.rb

@@ -0,0 +1,19 @@
+# Rails 5+ mixin
+module ActiveRecord
+  module WhereAnyOfMixin
+
+    def where_any_of(*conditions)
+      # Rails 5 comes with an #or method for relations, so we can just use that
+      # It is advised that once on Rails 5, this gem should be removed.
+      conditions = conditions.map do |c|
+        if c.is_a? Symbol or c.is_a? String
+          self.unscoped.send(c)
+        else
+          c
+        end
+      end
+      all.merge conditions.reduce(:or)
+    end
+
+  end
+end

data/lib/active_record/where-any-of-mixin.rb

@@ -1,16 +1,21 @@
+# Rails 4+ mixin
 module ActiveRecord
   module WhereAnyOfMixin
 
     def where_any_of(*conditions)
       # Takes any number of scopes and OR them together
       # into a new scope which can be combined with other scopes
+      bind_values = []
       conditions = conditions.map do |c|
         if c.is_a? Symbol or c.is_a? String
           c = self.unscoped.send(c)
         end
+        bind_values.concat(c.bind_values)
         __convert_string_wheres(c.where_values).reduce(:and)
       end
-      where(conditions.reduce(:or))
+      s = where(conditions.reduce(:or))
+      s.bind_values += bind_values if bind_values.present?
+      s
     end
 
     def __convert_string_wheres(wheres)

data/lib/activerecord-where-any-of.rb

@@ -1,3 +1,7 @@
 require 'active_record'
-require 'active_record/where-any-of-mixin'
+if ActiveRecord::VERSION::MAJOR >= 5
+  require 'active_record/where-any-of-mixin-rails-5'
+else
+  require 'active_record/where-any-of-mixin'
+end
 ActiveRecord::Base.send(:extend, ActiveRecord::WhereAnyOfMixin)

data/spec/lib/activerecord_where_any_of_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+require 'activerecord-where-any-of'
+
+describe 'where_any_of' do
+
+  subject { ExampleModel }
+
+  let(:lparen) do
+    '(' if ActiveRecord::VERSION::MAJOR <= 3
+  end
+
+  let(:rparen) do
+    ')' if ActiveRecord::VERSION::MAJOR <= 3
+  end
+
+  describe '(*relations)' do
+
+    let(:relation) do
+      subject.where_any_of(
+        subject.active.on_shelf('h'),
+        subject.inactive.recent,
+        subject.with_name('apple'),
+      )
+    end
+
+    specify :count do
+      expect(relation.count).to eq(6)
+    end
+
+    specify :first do
+      m = relation.first
+      expect(m.id).to eq(1)
+      expect(m.name).to eq('apple')
+    end
+
+    specify :to_sql do
+      expect(relation.to_sql).to match_ignoring_whitespace(<<-END)
+        SELECT "example_models".*
+        FROM "example_models"
+        WHERE #{lparen}((
+             "example_models"."active" = 't' AND (name LIKE 'h%')
+          OR "example_models"."active" = 'f' AND (created_at > '2016-11-01'))
+          OR "example_models"."name" = 'apple'
+        )#{rparen}
+      END
+    end
+
+    specify :group_count do
+      expect(relation.group(:active).count).to match(true => 2, false => 4)
+    end
+
+    specify :order_limit do
+      expect(relation.order('updated_at DESC').limit(2).pluck(:name)).to eq [
+        "historiette boxthorn quinaldine",
+        "slipcase diorthotic holocentrid plessimetry prestudiously",
+      ]
+    end
+
+  end
+
+  describe "(:symbol, 'string', relation)" do
+
+    let(:relation) do
+      subject.where('name <> ?', 'bad').where_any_of(
+        :recent,
+        'active',
+        subject.on_shelf('z'),
+      )
+    end
+
+    specify :count do
+      expect(relation.count).to eq(38)
+    end
+
+    specify :merge_and_count do
+      expect(relation.merge(subject.inactive).count).to eq(4)
+    end
+
+    specify :to_sql do
+      expect(relation.to_sql).to match_ignoring_whitespace(<<-END)
+        SELECT "example_models".*
+        FROM "example_models"
+        WHERE (name <> 'bad') AND #{lparen}((
+             (created_at > '2016-11-01')
+          OR "example_models"."active" = 't')
+          OR (name LIKE 'z%')
+        )#{rparen}
+      END
+    end
+
+  end
+
+end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--colour
+--format progress

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+if ENV['COVERAGE'] =~ /^t/i
+  require 'simplecov'
+
+  SimpleCov.start 'root_filter' do
+    add_filter '/spec/'
+  end
+end
+
+require 'rspec'
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }

data/spec/support/active_record.rb

@@ -0,0 +1,10 @@
+version = ENV.fetch('ACTIVE_RECORD_VERSION', '3.0').to_f
+raise "Unsupported ActiveRecord version #{version.inspect}" unless version >= 3.0 && version < 6.0
+gem 'activerecord', "~> #{version}"
+
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(
+  adapter:  'sqlite3',
+  database: File.expand_path('../../database.sqlite3', __FILE__),
+)

data/spec/support/example_model.rb

@@ -0,0 +1,23 @@
+class ExampleModel < ActiveRecord::Base
+
+  def self.with_name(name)
+    where(name: name)
+  end
+
+  def self.on_shelf(letter)
+    letter =~ /\A[a-z]\z/i ? where("name LIKE '#{letter}%'") : where('1=0')
+  end
+
+  def self.active
+    where(active: true)
+  end
+
+  def self.inactive
+    where(active: false)
+  end
+
+  def self.recent
+    where('created_at > ?', Date.parse('2016-11-01'))
+  end
+
+end

data/spec/support/match_ignoring_whitespace.rb

@@ -0,0 +1,18 @@
+RSpec::Matchers.define :match_ignoring_whitespace do |expected|
+  match do |actual|
+    expected.to_s.gsub(/\s/, '') == actual.to_s.gsub(/\s/, '')
+  end
+
+  failure_message do |actual|
+    sep = '=' * 80
+    <<-END
+#{sep}
+Expected:
+#{expected.to_s.strip}
+#{sep}
+Actual:
+#{actual.to_s.strip}
+#{sep}
+    END
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-where-any-of
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - David McCullars
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: '0'
 description: |-
   Provides a mechanism for OR'ing together one or more AREL relations.  Normally when
   one performs `SomeModel.where(condition_1).where(condition_2)`, the result is to AND
@@ -69,8 +83,16 @@ files:
 - README.md
 - Rakefile
 - activerecord-where-any-of.gemspec
+- lib/active_record/where-any-of-mixin-rails-5.rb
 - lib/active_record/where-any-of-mixin.rb
 - lib/activerecord-where-any-of.rb
+- spec/database.sqlite3
+- spec/lib/activerecord_where_any_of_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/support/active_record.rb
+- spec/support/example_model.rb
+- spec/support/match_ignoring_whitespace.rb
 homepage: 
 licenses:
 - MIT
@@ -91,8 +113,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: A simple mixin to ActiveRecord::Base that allows use of OR arel relations.
 test_files: []
+has_rdoc: