magic_scopes 1.1.0 → 1.1.1

data/lib/magic_scopes.rb

@@ -6,11 +6,12 @@ require 'magic_scopes/scopes_generators/mixins/equality_scopes'
 require 'magic_scopes/scopes_generators/mixins/presence_scopes'
 require 'magic_scopes/scopes_generators/base'
 require 'magic_scopes/scopes_generators/boolean'
-require 'magic_scopes/scopes_generators/integer'
+require 'magic_scopes/scopes_generators/numeric'
 require 'magic_scopes/scopes_generators/string'
 require 'magic_scopes/scopes_generators/float'
 require 'magic_scopes/scopes_generators/association'
 require 'magic_scopes/scopes_generators/state'
+require 'magic_scopes/scopes_generators/compat'
 require 'magic_scopes/version'
 require 'magic_scopes/railtie' if defined?(Rails)
 

data/lib/magic_scopes/scopes_builder.rb

@@ -33,14 +33,19 @@ module MagicScopes
     end
 
     def generate_scopes
-      @attributes.inject({}) { |hsh, attr| hsh[attr] = generate_scopes_for_attr(attr, @needed_scopes); hsh }.merge(
-        @attributes_with_scopes.inject({}) { |hsh, (attr, attr_scopes)| hsh[attr] = generate_scopes_for_attr(attr, attr_scopes); hsh }
-      )
+      generate_explicitly_passed_scopes.merge(generate_implicitly_specified_scopes)
     end
 
-
     private
 
+    def generate_implicitly_specified_scopes
+      @attributes.inject({}) { |hsh, attr| hsh[attr] = generate_scopes_for_attr(attr, @needed_scopes); hsh }
+    end
+
+    def generate_explicitly_passed_scopes
+      @attributes_with_scopes.inject({}) { |hsh, (attr, attr_scopes)| hsh[attr] = generate_scopes_for_attr(attr, attr_scopes); hsh }
+    end
+
     def generate_scopes_for_attr(attr, scopes)
       scopes.inject([]) do |ar, scope_info|
         scope_info = Array.wrap(scope_info)

data/lib/magic_scopes/scopes_generators/association.rb

@@ -51,7 +51,7 @@ module MagicScopes
         val
       elsif val.is_a?(ActiveRecord::Base)
         val.id
-      elsif val.is_a?(Array) && val.all? { |v| v.is_a?(Fixnum) || (v.is_a?(String) && v.to_i != 0) || v.is_a?(ActiveRecord::Base) }
+      elsif val.is_a?(Array) && val.all? { |v| v.is_a?(Integer) || (v.is_a?(String) && v.to_i != 0) || v.is_a?(ActiveRecord::Base) }
         val.is_a?(ActiveRecord::Base) ? val.map(&:id) : val
       else
         raise ArgumentError, "Wrong argument type #{attr.class.name} for argument #{attr}"

data/lib/magic_scopes/scopes_generators/base.rb

@@ -13,12 +13,8 @@ module MagicScopes
       end
 
       def self.instance(model, attr)
-        if @@instances[model.name].try(:has_key?, attr)
-          @@instances[model.name][attr]
-        else
-          @@instances[model.name] ||= {}
-          @@instances[model.name][attr] = new(model, attr)
-        end
+        @@instances[model.name] ||= {}
+        @@instances[model.name][attr] ||= new(model, attr)
       end
 
       delegate :scope, :where, :order, to: :@model

data/lib/magic_scopes/scopes_generators/compat.rb

@@ -0,0 +1,9 @@
+module MagicScopes
+  TextScopesGenerator     = StringScopesGenerator
+
+  IntegerScopesGenerator  = NumericScopesGenerator
+  DecimalScopesGenerator  = NumericScopesGenerator
+  TimeScopesGenerator     = NumericScopesGenerator
+  DatetimeScopesGenerator = NumericScopesGenerator
+  DateScopesGenerator     = NumericScopesGenerator
+end

data/lib/magic_scopes/scopes_generators/numeric.rb

@@ -0,0 +1,17 @@
+module MagicScopes
+  class NumericScopesGenerator < ScopesGenerator::Base
+
+    include EqualityScopes
+    include OrderScopes
+    include ComparisonScopes
+
+    def gte(name)
+      scope name || "#{@attr}_gte", ->(val) { where("#{@key} >= ?", val) }
+    end
+
+    def lte(name)
+      scope name || "#{@attr}_lte", ->(val) { where("#{@key} <= ?", val) }
+    end
+
+  end
+end

data/lib/magic_scopes/scopes_generators/state.rb

@@ -16,12 +16,12 @@ if defined?(StateMachine)
       end
 
       def with(name)
-        @model.instance_eval("undef :with_#{attr}")
+        @model.instance_eval("undef :with_#{attr}") unless name
         scope name || "with_#{@attr}", ->(*vals) { where(vals.empty? ? "#{@key} IS NOT NULL" : ["#{@key} IN (?)", vals]) }
       end
 
       def without(name)
-        @model.instance_eval("undef :without_#{attr}")
+        @model.instance_eval("undef :without_#{attr}") unless name
         scope name || "without_#{@attr}", ->(*vals) { where(vals.empty? ? "#{@key} IS NULL" : ["#{@key} NOT IN (?)", vals]) }
       end
 

data/lib/magic_scopes/scopes_generators/string.rb

@@ -35,6 +35,4 @@ module MagicScopes
       @model.connection.adapter_name == 'PostgreSQL'
     end
   end
-
-  TextScopesGenerator = StringScopesGenerator
 end

data/lib/magic_scopes/version.rb

@@ -1,3 +1,3 @@
 module MagicScopes
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_scopes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -135,12 +135,13 @@ files:
 - lib/magic_scopes/scopes_generators/association.rb
 - lib/magic_scopes/scopes_generators/base.rb
 - lib/magic_scopes/scopes_generators/boolean.rb
+- lib/magic_scopes/scopes_generators/compat.rb
 - lib/magic_scopes/scopes_generators/float.rb
-- lib/magic_scopes/scopes_generators/integer.rb
 - lib/magic_scopes/scopes_generators/mixins/comparison_scopes.rb
 - lib/magic_scopes/scopes_generators/mixins/equality_scopes.rb
 - lib/magic_scopes/scopes_generators/mixins/order_scopes.rb
 - lib/magic_scopes/scopes_generators/mixins/presence_scopes.rb
+- lib/magic_scopes/scopes_generators/numeric.rb
 - lib/magic_scopes/scopes_generators/state.rb
 - lib/magic_scopes/scopes_generators/string.rb
 - lib/magic_scopes/standard_scopes.rb

data/lib/magic_scopes/scopes_generators/integer.rb

@@ -1,27 +0,0 @@
-module MagicScopes
-  class IntegerScopesGenerator < ScopesGenerator::Base
-
-    include EqualityScopes
-    include OrderScopes
-    include ComparisonScopes
-
-    def gte(name)
-      scope name || "#{@attr}_gte", ->(val) { where("#{@key} >= ?", val) }
-    end
-
-    def lte(name)
-      scope name || "#{@attr}_lte", ->(val) { where("#{@key} <= ?", val) }
-    end
-
-  end
-
-  # TODO
-  # make something like:
-  # %w(integer decimal time datetime date).each do |type|
-  #   send("#{type.classify}=", NumScopesGenerator)
-  # end
-  DecimalScopesGenerator  = IntegerScopesGenerator
-  TimeScopesGenerator     = IntegerScopesGenerator
-  DatetimeScopesGenerator = IntegerScopesGenerator
-  DateScopesGenerator     = IntegerScopesGenerator
-end