scopy 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 004c459a5bf82bd646e7e334421d4d35d389b98c
-  data.tar.gz: 7cca38da896c3ae80b46d10066649bb96f0c2257
+SHA256:
+  metadata.gz: e356c71afb90675d134342fe20b4faa3fce31b9d282b04e4655a4c710e55b3b4
+  data.tar.gz: da964167cf6e60ed41b5c7216ad7ecc37c4f618fc68c0b9160b9b5633a4aff01
 SHA512:
-  metadata.gz: f9a4f605f1b0dec01c6d7f1040c7a871a9c0b62dd8093719967ccd9271eb8654afb1b9a620999da5d9253c5f6197d10dd4bc8584cb7ffca92fd0c5f69e427fb1
-  data.tar.gz: 77cbae0ad992d0a96fd3924c0115ad9a4480a54865564da80831e80816e9ab44da211d117bf34f1d2ca7696541ccb0c143c9024f29fc52efb6a0beed9e02d24b
+  metadata.gz: 60dfcf677ddfe01907b89e074bbf203076552397109b4713b8ff351f4b2d3eddd89f652e02911e9216559b0beb8017c6743c57da584dc83e9fb6f6edb7e7a5d9
+  data.tar.gz: e98b79d8525befee48d99b1795fc033cb81bb7d72bc8cfae6395748162c063eb0fa0a13da99ec5e68698ce565cec9a14c937f5f8284bcc696c3ee0c6a3ea7a05

data/README.md

@@ -25,7 +25,7 @@ Version 0.4 works with Rails 3.2 and later.
 
 ## Usage
 
-Include the concern modules you would like to use in your models:
+Include the modules you would like to use in your models:
 
 ```ruby
 class Dog < ActiveRecord::Base
@@ -70,16 +70,22 @@ Dog.created_in_year(Time.new(2013))
 ##### Scopy::IdScopes
 
 ```ruby
-Dog.excluding_id(123)
+Dog.excluding(123)
 # => dogs excluding id 123
 
-Dog.excluding_ids( [1, 2, 3] )
+Dog.excluding([1, 2, 3])
 # => dogs excluding ids 1, 2, and 3
 
 Dog.excluding(dog)
 # => dogs excluding dog
+
+Dog.excluding(Dog.where(id: [1, 2]))
+# => dogs excluding other dogs
 ```
 
+Note: `.excluding_ids` and `.excluding_id` scopes were removed in
+version 2.0. Replace those calls with `.excluding`.
+
 ##### Scopy::NameScopes
 
 ```ruby

data/lib/scopy/created_at_scopes.rb

@@ -22,11 +22,8 @@ module Scopy
         created_between(date.beginning_of_day, date.end_of_day) if date
       end
 
-      scope :created_in_week, ->(date, day_of_week = :sunday) do
-        created_between(
-          date.beginning_of_week(day_of_week),
-          date.end_of_week(day_of_week)
-        ) if date
+      scope :created_in_week, ->(date, day = :sunday) do
+        created_between(date.beginning_of_week(day), date.end_of_week(day)) if date
       end
 
       scope :created_in_month, ->(date) do

data/lib/scopy/id_scopes.rb

@@ -3,9 +3,12 @@ module Scopy
     extend ActiveSupport::Concern
 
     included do
-      scope :excluding_id,  ->(id) { where("#{table_name}.id <> ?", id) if id }
-      scope :excluding_ids, ->(ids) { where("#{table_name}.id NOT IN (?)", ids) if ids.any? }
-      scope :excluding,     ->(object) { excluding_id(object.id) if object }
+      # objects may be:
+      #   one id
+      #   an array of ids
+      #   one model
+      #   a relation or array of models
+      scope :excluding, -> (objects) { where.not(id: Array.wrap(objects)) }
     end
   end
 end

data/lib/scopy/version.rb

@@ -1,3 +1,3 @@
 module Scopy
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Rails ActiveRecord scopes for id, created_at, and name