type_scopes 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 26fb4bb8237b5e8afa0912bb38895c1afc4475d7
-  data.tar.gz: d331c4b23670597d42be35954bd0b2ca6a24b3b3
+SHA256:
+  metadata.gz: 9e8bdc381d58fe45f3469a665b2f5be91c2dd26a3865152eaf121b01d557faa5
+  data.tar.gz: 6d1cba071587a8ede1cdf4689bd5cc5306c63316ebc9dce7b4f5fa29bedfdd6f
 SHA512:
-  metadata.gz: 23b399603b333ceb04df3ffefcb6ee65309e3b9e027dc39f24dca9908870d75924a36100e99b33a10e24e1fecd800594a5b999ba75ad2da3a28e9cf34071cc6a
-  data.tar.gz: 5bb76bf2695722732e17f973fce71cd44d747b599b955669781afbebc142548c0dc1cc74a95d126c12070c52300914a7c1f154e15f69ca932db401ce1d1f1409
+  metadata.gz: 779176bcded65c9163253892abc66d5df1d7443bc6f1a2c6d15843cf72af3e968d0a6e922507dfb883484c1faa7dc83c2b18b361c98d21e05e3831b3a5d5f23e
+  data.tar.gz: 3772b0545a904a4b6cbe7bd0677bab5f5f341af5b9f5a15ff6857f1ee4a19f6bf88abfa26df041ffa1e74335c6e1c091807febf99f0976b9efbbb19b8deec9cd

data/README.md

@@ -3,7 +3,7 @@
 Type scopes creates useful scopes based on the type of the columns of your models.
 It handles dates, times, strings and numerics.
 
-Here is an example of all the available scopes:
+Here are examples for all the available scopes:
 
 ```ruby
 # paid_at: datetime
@@ -14,11 +14,14 @@ class Transaction < ActiveRecord::Base
 end
 
 # Time scopes
-Transaction.paid_to("2017-09-06") # => where("paid_to <= '2017-09-06'")
-Transaction.paid_from("2017-09-06") # => where("paid_to >= '2017-09-06'")
-Transaction.paid_after("2017-09-06") # => where("paid_to > '2017-09-06'")
-Transaction.paid_before("2017-09-06") #= where("paid_to < '2017-09-06'")
-Transaction.paid_between("2017-09-06", "2017-09-07")  # => where("paid_to BETWEEN '2017-09-06' AND '2017-09-07'")
+Transaction.paid_to("2017-09-06") # => where("paid_at <= '2017-09-06'")
+Transaction.paid_from("2017-09-06") # => where("paid_at >= '2017-09-06'")
+Transaction.paid_after("2017-09-06") # => where("paid_at > '2017-09-06'")
+Transaction.paid_before("2017-09-06") #= where("paid_at < '2017-09-06'")
+Transaction.paid_between("2017-09-06", "2017-09-07")  # => where("paid_at BETWEEN '2017-09-06' AND '2017-09-07'")
+Transaction.paid_not_between("2017-09-06", "2017-09-07")  # => where("paid_at NOT BETWEEN '2017-09-06' AND '2017-09-07'")
+Transaction.paid_within("2017-09-06", "2017-09-07")  # => where("paid_at > '2017-09-06' AND paid_at < '2017-09-07'")
+Transaction.paid_not_within("2017-09-06", "2017-09-07")  # => where("paid_at <= '2017-09-06' OR paid_at >= '2017-09-07'")
 
 # Numeric scopes
 Transaction.amount_to(100) # => where("amount <= 100")
@@ -26,6 +29,9 @@ Transaction.amount_from(100) # => where("amount >= 100")
 Transaction.amount_above(100) # => where("amount > 100")
 Transaction.amount_below(100) # => where("amount < 100")
 Transaction.amount_between(100, 200) # => where("amount BETWEEN 100 AND 200")
+Transaction.amount_not_between(100, 200) # => where("amount NOT BETWEEN 100 AND 200")
+Transaction.amount_within(100, 200) # => where("amount > 100 AND amount < 200")
+Transaction.amount_not_within(100, 200) # => where("amount <= 100 OR amount >= 200")
 
 # String scopes
 Transaction.description_contains("foo") # => where("description LIKE '%foo%'")

data/lib/numeric_scopes.rb

@@ -1,5 +1,5 @@
 module NumericScopes
-  TYPES = ["integer", "double precision", "numeric"].freeze
+  TYPES = ["integer", "double precision", "numeric", "bigint"].freeze
 
   def self.included(model)
     model.extend(ClassMethods)
@@ -9,18 +9,22 @@ module NumericScopes
   module ClassMethods
     def create_numeric_scopes
       for column in columns
-        if TYPES.include?(column.sql_type)
+        if TYPES.any? { |type| column.sql_type.include?(type) }
           create_numeric_scopes_for_column(column.name)
         end
       end
     end
 
     def create_numeric_scopes_for_column(name)
-      scope :"#{name}_to", lambda { |value| where("#{quoted_table_name}.#{name} <= ?", value) }
-      scope :"#{name}_from", lambda { |value| where("#{quoted_table_name}.#{name} >= ?", value) }
-      scope :"#{name}_above", lambda { |value| where("#{quoted_table_name}.#{name} > ?", value) }
-      scope :"#{name}_below", lambda { |value| where("#{quoted_table_name}.#{name} < ?", value) }
-      scope :"#{name}_between", lambda { |from, to| where("#{quoted_table_name}.#{name} BETWEEN ? AND ?", from, to) }
+      full_name = "#{quoted_table_name}.#{name}"
+      scope :"#{name}_to", lambda { |value| where("#{full_name} <= ?", value) }
+      scope :"#{name}_from", lambda { |value| where("#{full_name} >= ?", value) }
+      scope :"#{name}_above", lambda { |value| where("#{full_name} > ?", value) }
+      scope :"#{name}_below", lambda { |value| where("#{full_name} < ?", value) }
+      scope :"#{name}_between", lambda { |from, to| where("#{full_name} BETWEEN ? AND ?", from, to) }
+      scope :"#{name}_not_between", lambda { |from, to| where("#{full_name} BETWEEN ? AND ?", from, to) }
+      scope :"#{name}_within", lambda { |from, to| where("#{full_name} > ? AND #{full_name} < ?", from, to) }
+      scope :"#{name}_not_within", lambda { |from, to| where("#{full_name} <= ? OR #{full_name} >= ?", from, to) }
     end
   end
 end

data/lib/string_scopes.rb

@@ -1,4 +1,6 @@
 module StringScopes
+  TYPES = ["character", "text"].freeze
+
   def self.included(model)
     model.extend(ClassMethods)
     model.create_string_scopes
@@ -13,16 +15,17 @@ module StringScopes
   module ClassMethods
     def create_string_scopes
       for column in columns
-        if column.sql_type.index("character") == 0 || column.sql_type.index("text") == 0
+        if TYPES.any? { |type| column.sql_type.include?(type) }
           create_string_scopes_for_column(column.name)
         end
       end
     end
 
     def create_string_scopes_for_column(name)
-      scope :"#{name}_contains", lambda { |str| where("#{quoted_table_name}.#{name} LIKE ?", "%#{StringScopes.escape(str)}%") }
-      scope :"#{name}_starts_with", lambda { |str| where("#{quoted_table_name}.#{name} LIKE ?", "#{StringScopes.escape(str)}%") }
-      scope :"#{name}_ends_with", lambda { |str| where("#{quoted_table_name}.#{name} LIKE ?", "%#{StringScopes.escape(str)}") }
+      full_name = "#{quoted_table_name}.#{name}"
+      scope :"#{name}_contains", lambda { |str| where("#{full_name} LIKE ?", "%#{StringScopes.escape(str)}%") }
+      scope :"#{name}_starts_with", lambda { |str| where("#{full_name} LIKE ?", "#{StringScopes.escape(str)}%") }
+      scope :"#{name}_ends_with", lambda { |str| where("#{full_name} LIKE ?", "%#{StringScopes.escape(str)}") }
     end
   end
 end

data/lib/timestamp_scopes.rb

@@ -1,4 +1,6 @@
 module TimestampScopes
+  TYPES = ["timestamp", "datetime", "date"].freeze
+
   def self.included(model)
     model.extend(ClassMethods)
     model.create_timestamp_scopes
@@ -7,19 +9,23 @@ module TimestampScopes
   module ClassMethods
     def create_timestamp_scopes
       for column in columns
-        if column.sql_type.index("timestamp") == 0
+        if TYPES.any? { |type| column.sql_type.include?(type) }
           create_timestamp_scopes_for_column(column.name)
         end
       end
     end
 
     def create_timestamp_scopes_for_column(name)
+      full_name = "#{quoted_table_name}.#{name}"
       short_name = shorten_column_name(name)
-      scope :"#{short_name}_to", lambda { |date| where("#{quoted_table_name}.#{name} <= ?", date) }
-      scope :"#{short_name}_from", lambda { |date| where("#{quoted_table_name}.#{name} >= ?", date) }
-      scope :"#{short_name}_after", lambda { |date| where("#{quoted_table_name}.#{name} > ?", date) }
-      scope :"#{short_name}_before", lambda { |date| where("#{quoted_table_name}.#{name} < ?", date) }
-      scope :"#{short_name}_between", lambda { |from, to| where("#{quoted_table_name}.#{name} BETWEEN ? AND ?", from, to) }
+      scope :"#{short_name}_to", lambda { |date| where("#{full_name} <= ?", date) }
+      scope :"#{short_name}_from", lambda { |date| where("#{full_name} >= ?", date) }
+      scope :"#{short_name}_after", lambda { |date| where("#{full_name} > ?", date) }
+      scope :"#{short_name}_before", lambda { |date| where("#{full_name} < ?", date) }
+      scope :"#{short_name}_between", lambda { |from, to| where("#{full_name} BETWEEN ? AND ?", from, to) }
+      scope :"#{short_name}_not_between", lambda { |from, to| where("#{full_name} NOT BETWEEN ? AND ?", from, to) }
+      scope :"#{short_name}_within", lambda { |from, to| where("#{full_name} > ? AND #{full_name} < ?", from, to) }
+      scope :"#{short_name}_not_within", lambda { |from, to| where("#{full_name} <= ? OR #{full_name} >= ?", from, to) }
     end
 
     def shorten_column_name(name)

data/lib/type_scopes/version.rb

@@ -1,3 +1,3 @@
 module TypeScopes
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: type_scopes
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies: []
 description: Useful scopes based on columns' types (dates, times, strings and numerics).
 email:
@@ -44,10 +44,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Automatic scopes for ActiveRecord models.
 test_files: []
-has_rdoc: