active_record_extended 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea05f761dcce2d09ac0b86e315396e9f6bbc822d53df4bf085bc1b161a28904e
-  data.tar.gz: 42283db511f3ca78b5d6963c2d1cf642b1bbbf0f8c77416f37d56843e0c8a957
+  metadata.gz: 3676a5b5f744f28f9e545a951e006f03457660046d5908d5f5fdc4200591c6c6
+  data.tar.gz: '0434468d2a6f1988df93a4150b7276e1d0d0538252519cf715e76cd12ba5e8de'
 SHA512:
-  metadata.gz: 050ad5a8796e2886691b63723470d506002c62a53ed0c54b658678c257d9d60e6a50aab580bd189f207c30c28c6c53177a75411b73b03d3255b9f9b7cc4a2fb1
-  data.tar.gz: bddfdc0cc704d95e98785697a9b1b80e43b193ec97acc40ba12fa0663010b80e9b65437227c16b00f01a52ea3d63ef4d9b04686c4ad66b596d5c05eb8822e0a4
+  metadata.gz: 0bafb6e58693b523541fe90556bf863a271d93310e76de4929214f4b6e06117da92aa625dad7c932f1a5f58b8647b8b3f521de48b8428d011402b1c329af0fb4
+  data.tar.gz: 234e63478d2f25f2eccdc5fe5c6a96a7a500ae0f5207a8232fdef30638cfb7e773cec4a413cc8073419525c26729796a7766288c955500f402a88e4720728523

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.0 - May 9th 2018
+
+- Use Arel's `or` for grouping queries when using `#any_of` or `#none_of`
+- Added Plural aliases for `.either_join` : `.either_joins` and `.either_order` : `.either_orders`
+
 # 0.3.0 - May 9th 2018
 
 - Fixed ActiveRecord QueryMethod constant load error.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_record_extended (0.3.0)
+    active_record_extended (0.4.0)
       activerecord (>= 5.1, < 6.0)
       ar_outer_joins (~> 0.2)
       pg (~> 0.18)

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/GeorgeKaraszi/active_record_extended.svg?branch=master)](https://travis-ci.org/GeorgeKaraszi/active_record_extended) [![Maintainability](https://api.codeclimate.com/v1/badges/98ecffc0239417098cbc/maintainability)](https://codeclimate.com/github/GeorgeKaraszi/active_record_extended/maintainability)
+[![Build Status](https://travis-ci.com/GeorgeKaraszi/ActiveRecordExtended.svg?branch=master)](https://travis-ci.com/GeorgeKaraszi/ActiveRecordExtended) [![Maintainability](https://api.codeclimate.com/v1/badges/98ecffc0239417098cbc/maintainability)](https://codeclimate.com/github/GeorgeKaraszi/active_record_extended/maintainability)
 
 # Active Record Extended
 
@@ -32,14 +32,7 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/postgres_extended. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the ActiveRecordExtended project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/postgres_extended/blob/master/CODE_OF_CONDUCT.md).

data/lib/active_record_extended/query_methods/any_of.rb

@@ -52,7 +52,7 @@ module ActiveRecordExtended
             query_map[:references] << translate_reference(query.references_values) if query.references_values.any?
             query_map[:binds] += bind_attributes(query)
             query.arel.constraints.reduce(:and)
-          end.reduce(:group_or)
+          end.reduce(:or)
         end
       end
 

data/lib/active_record_extended/query_methods/either.rb

@@ -14,12 +14,14 @@ module ActiveRecordExtended
         condition__query    = xor_field_sql(association_options) + "= #{table_name}.#{primary_key}"
         outer_joins(associations).where(Arel.sql(condition__query))
       end
+      alias either_joins either_join
 
       def either_order(direction, **associations_and_columns)
         reflected_columns = map_columns_to_tables(associations_and_columns)
         conditional_query = xor_field_sql(reflected_columns) + sort_order_sql(direction)
         outer_joins(associations_and_columns.keys).order(Arel.sql(conditional_query))
       end
+      alias either_orders either_order
 
       private
 

data/lib/active_record_extended/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordExtended
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/query_methods/either_spec.rb

@@ -15,6 +15,14 @@ RSpec.describe "Active Record Either Methods" do
       expect(query).to include(one, two)
       expect(query).to_not include(three)
     end
+
+    context "Alias .either_joins/2" do
+      it "Should only only return records that belong to profile L or profile R" do
+        query = Person.either_joins(:profile_l, :profile_r)
+        expect(query).to include(one, two)
+        expect(query).to_not include(three)
+      end
+    end
   end
 
   describe ".either_order/2" do
@@ -32,5 +40,12 @@ RSpec.describe "Active Record Either Methods" do
       query = Person.either_order(:desc, profile_l: :likes, profile_r: :dislikes).where(id: [one.id, two.id])
       expect(query).to match_array([one, two])
     end
+
+    context "Alias .either_order/2" do
+      it "Should order people based on their likes and dislikes in ascended order" do
+        query = Person.either_orders(:asc, profile_l: :likes, profile_r: :dislikes).where(id: [one.id, two.id])
+        expect(query).to match_array([two, one])
+      end
+    end
   end
 end

data/spec/sql_inspections/any_of_sql_spec.rb

@@ -3,15 +3,15 @@
 require "spec_helper"
 
 RSpec.describe "Any / None of SQL Queries" do
-  let(:equal_query) { "people\".\"personal_id\" = 1" }
-  let(:or_query)    { "OR (\"people\".\"personal_id\" = 2)" }
+  let(:equal_query) { '"people"."personal_id" = 1' }
+  let(:or_query)    { 'OR "people"."personal_id" = 2' }
   let(:equal_or)    { equal_query + " " + or_query }
   let(:join_query)  { /INNER JOIN \"tags\" ON \"tags\".\"person_id\" = \"people\".\"id/ }
 
   describe "where.any_of/1" do
     it "should group different column arguments into nested or conditions" do
       query = Person.where.any_of({ personal_id: 1 }, { id: 2 }, { personal_id: 2 }).to_sql
-      expect(query).to match_regex(/WHERE .+ = 1 OR \(.+\) OR \(.+\)/)
+      expect(query).to match_regex(/WHERE \(\(.+ = 1 OR .+ = 2\) OR .+ = 2\)/)
     end
 
     it "Should assign where clause predicates for standard queries" do
@@ -35,7 +35,7 @@ RSpec.describe "Any / None of SQL Queries" do
   describe "where.none_of/1" do
     it "Should surround the query in a WHERE NOT clause" do
       query = Person.where.none_of({ personal_id: 1 }, { id: 2 }, { personal_id: 2 }).to_sql
-      expect(query).to match_regex(/WHERE.+NOT \(.+ = 1 OR \(.+\) OR \(.+\)\)/)
+      expect(query).to match_regex(/WHERE.+NOT \(\(.+ = 1 OR .+ = 2\) OR .+ = 2\)/)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - George Protacio-Karaszi