activerecord-setops 0.1.4 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 589b444f538dbed67ef27ef4ca4a3054874f9f4ac7af7b70d512706813cff3c9
-  data.tar.gz: ee289c292f6c6d42fd99bd52e41570c5f7f62202aeeb874485da3815f3765f4c
+  metadata.gz: 74a900ef6d935b4b3cfb29f33cc5d4eeac0de51ea13f552d23401e8de845d73c
+  data.tar.gz: e4325d04937f9555d669d55fc90f487bbd85d0cf32a0cd1fc3585ffa2f91ab0d
 SHA512:
-  metadata.gz: 412f025be786a827bb919f0be0374f642628d459a7bccdcca15c849e3a0fad84b58386cd4a1d62a31d4c263acff1ef3ae27e841a2015c92fe2b1cd27556bc3ee
-  data.tar.gz: c2a1b6b8e4c5a6ea785002cc80f64974a795096f068093868493d354510aed5bea8694003f68a2e2cb73387010e4f66e19bbf8d9767000fbb05294423ba88e80
+  metadata.gz: f3d7d3ae1244d66744308e410dc4fe4f477da96c1eb191c7477305a4543c9f0e6354360db433efe023badd260ba8269941070b82108ff1279d4ee4a7f0e79312
+  data.tar.gz: d9796791c1efb1aa3edd8fcbc6b8a32ab1dadaf168d125aec9708c67ffea6c2e484d6a7222ba053f100965ac363ebdb6fec4b8746c2dc2299c14d5ef13b03efd

data/.github/workflows/ruby.yml

@@ -1,21 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
 name: Ruby
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
-  build:
+  test:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
       with:
-        ruby-version: 2.6.x
-    - name: Build and test with Rake
-      run: |
-        sudo apt-get install libsqlite3-dev
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Changelog
+
+## 0.1.7
+
+- alias `union_all` as `+`
+
+## 0.1.6
+
+- Removed `except` can still be called as `difference` or `-`.
+
+
+## 0.1.5
+
+- Added `lib/activerecord-setops.rb`

data/Gemfile

@@ -4,3 +4,10 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in activerecord-setoperations.gemspec
 gemspec
+
+gem 'gen-test', github: 'delonnewman/gen-test'
+gem 'contracts-gen', github: 'delonnewman/contracts-gen'
+
+gem 'activerecord', '~> 6.1.2'
+gem 'activesupport', '~> 6.1.2'
+gem 'sqlite3', '~> 1.4.2'

data/Gemfile.lock

@@ -1,71 +1,80 @@
+GIT
+  remote: https://github.com/delonnewman/contracts-gen
+  revision: 48f5d08cf2df0f2f21df887b77022b5793c7017e
+  specs:
+    contracts-gen (0.2.0)
+      contracts (~> 0.16.0)
+      faker (~> 1.9.6)
+      gen-test (~> 0.2)
+
+GIT
+  remote: https://github.com/delonnewman/gen-test
+  revision: 3279faed9301ac6f7accf137d58ff6dae124b834
+  specs:
+    gen-test (0.2.0)
+      faker (~> 1.9.6)
+      regexp-examples (~> 1.5.0)
+
 PATH
   remote: .
   specs:
-    activerecord-setops (0.1.4)
+    activerecord-setops (1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
-      arel (>= 9.0)
-    activesupport (5.2.4.3)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    concurrent-ruby (1.1.6)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.8)
     contracts (0.16.0)
-    contracts-gen (0.1.1)
-      contracts (~> 0.16.0)
-      faker (~> 1.9.6)
-      gen-test (~> 0.1.0)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     faker (1.9.6)
       i18n (>= 0.7)
-    gen-test (0.1.1)
-      faker (~> 1.9.6)
-      regexp-examples (~> 1.5.0)
-    i18n (1.8.2)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
-    rake (13.0.1)
+    minitest (5.14.4)
+    rake (13.0.3)
     regexp-examples (1.5.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 5.2.4.3, < 6)
+  activerecord (~> 6.1.2)
   activerecord-setops!
-  activesupport (>= 5.2.4.3, < 6)
-  bundler (~> 1.17)
-  contracts-gen (~> 0.1.1)
-  gen-test (~> 0.1.1)
+  activesupport (~> 6.1.2)
+  bundler (~> 2.1)
+  contracts-gen!
+  gen-test!
   rake (~> 13.0)
   rspec (~> 3.0)
   sqlite3 (~> 1.4.2)
 
 BUNDLED WITH
-   1.17.3
+   2.2.3

data/README.md

@@ -38,7 +38,44 @@ Or install it yourself as:
 
     $ gem install activerecord-setops
 
+# Non-Installation
+
+If you'd like the functionality, but would prefer to avoid yet another dependency, please fill free to paste the following code into your nearest lib directory, I'm certain it's not perfect but it has been [tested](spec/active_record/setops_spec.rb) with Rails 5, and is being used in production.
+
+```ruby
+module ActiveRecord
+  class Relation
+    def union(other)
+      binary_operation(Arel::Nodes::Union, other)
+    end
+    alias | union
+
+    def union_all(other)
+      binary_operation(Arel::Nodes::UnionAll, other)
+    end
+    alias + union_all
+
+    def intersect(other)
+      binary_operation(Arel::Nodes::Intersect, other)
+    end
+    alias & intersect
+
+    def difference(other)
+      binary_operation(Arel::Nodes::Except, other)
+    end
+    alias - difference
+
+    private
+
+    def binary_operation(op_class, other)
+      @klass.unscoped.from(Arel::Nodes::TableAlias.new(op_class.new(self.arel.ast, other.arel.ast), @klass.arel_table.name))
+    end
+  end
+end
+```
+
 # See Also
 
 - [Sequel](http://sequel.jeremyevans.net)
 - [SQL Set Operations](https://en.wikipedia.org/wiki/Set_operations_(SQL))
+- [active_record_union](https://github.com/brianhempel/active_record_union)

data/activerecord-setops.gemspec

@@ -36,12 +36,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "gen-test", "~> 0.1.1"
-  spec.add_development_dependency "contracts-gen", "~> 0.1.1"
-  spec.add_development_dependency "activerecord", [">= 5.2.4.3", "< 6"]
-  spec.add_development_dependency "activesupport", [">= 5.2.4.3", "< 6"]
-  spec.add_development_dependency "sqlite3", "~> 1.4.2"
 end

data/lib/active_record/setops.rb

@@ -8,22 +8,21 @@ module ActiveRecord
       binary_operation(Arel::Nodes::Union, other)
     end
     alias | union
-    alias + union
 
     def union_all(other)
       binary_operation(Arel::Nodes::UnionAll, other)
     end
+    alias + union_all
 
     def intersect(other)
       binary_operation(Arel::Nodes::Intersect, other)
     end
     alias & intersect
 
-    def except(other)
+    def difference(other)
       binary_operation(Arel::Nodes::Except, other)
     end
-    alias difference except
-    alias - except
+    alias - difference
 
     private
 

data/lib/active_record/setops/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Setops
-    VERSION = "0.1.4"
+    VERSION = "1.0.1"
   end
 end

data/lib/activerecord-setops.rb

@@ -0,0 +1 @@
+require_relative 'active_record/setops'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-setops
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.1
 platform: ruby
 authors:
 - Delon Newman
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,88 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: gen-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: contracts-gen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.2
 description: Union, Intersection, and Difference operations for ActiveRecord
 email:
 - contact@delonnewman.name
@@ -144,6 +62,7 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -152,6 +71,7 @@ files:
 - activerecord-setops.gemspec
 - lib/active_record/setops.rb
 - lib/active_record/setops/version.rb
+- lib/activerecord-setops.rb
 homepage: https://github.com/delonnewman/activerecord-setops#readme
 licenses:
 - MIT
@@ -161,7 +81,7 @@ metadata:
   source_code_uri: https://github.com/delonnewman/activerecord-setops
   changelog_uri: https://github.com/delonnewman/activerecord-setops#changelog
   documentation_uri: https://www.rubydoc.info/gems/activerecord-setops
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,8 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Set operations for ActiveRecord
 test_files: []