scopie 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d9229c6a75c80011a20a5cf7b7d32013f9d1941
-  data.tar.gz: 82a4971ec39be00ee49352305c031c4d135da7d7
+  metadata.gz: fe59078e2e2798ce9fb21bfbaf5d84073832fec1
+  data.tar.gz: 04be530e19f3441fb2b4255558c5c5d5ce98628b
 SHA512:
-  metadata.gz: 69a30eb8da71ad17d0bfb11a8c8e57af1c3878bfd9d8a8290f5a289a3057b32ff31da4aa00f259c295d2c321e0265c9d4327f7b0c4bd992af257eef7b518bf23
-  data.tar.gz: 5c9982a5584dee2f5abd03a52d7b6659763144f00ac52ee8ec9825b24fc013ae2fd6484b1f2544f180bc066e8f9b992d801fad72773027755beb88c2e7eccf4a
+  metadata.gz: d33e2a61b45ff6a8d14384a70d3e0a4cbf48b4236ed172c21b0bcf4d3ec261f628984d49fafe5802931bddb3242939057126e6b8c6f0a1299bdc94b5d5da0a76
+  data.tar.gz: b0ebe558815608b0b9f581f61a3b00ea0be147e16bf8848c30b85503573c16596534c4aeec10c4745f5aaa6b61ecd2d55e43ae91af131a47e7317022f0782893

data/README.md

@@ -15,7 +15,7 @@ Motivation:
 * Dedicated class for scopes mapping, so that the logic is isolated and your controller is skinny.
 * Dependencies free. Please have a look at [scopie_rails](http://github.com/beorc/scopie_rails) if you are using Ruby on Rails framework.
 * Ability to override default mapping behavior by definition of a method with the same name as scope in the scopie class.
-* Ability to DRY your custom scopes mapping logic using private methods defined in scopie class and use the same scopie class in multiple controllers.
+* Ability to use the object oriented approach to DRY your custom scopes mapping logic and reuse the scopie class.
 
 Imagine the following model called graduations:
 

data/lib/scopie/base.rb

@@ -2,8 +2,6 @@
 
 class Scopie::Base
 
-  TRUE_VALUES = ['true', true, '1', 1].freeze
-
   def self.scopes_configuration
     instance_variable_get(:@scopes_configuration) || {}
   end
@@ -33,7 +31,7 @@ class Scopie::Base
       value = scope_value(scope_name, options, hash)
       next unless scope_applicable?(value, options, method)
 
-      [scope_name, coerce_value_type(value, options[:type])]
+      [scope_name, value.coerced]
     end
 
     scopes.compact!
@@ -62,42 +60,14 @@ class Scopie::Base
     key_name = key_name(scope_name, options)
     reduced_hash = reduced_hash(hash, options)
 
-    return reduced_hash[key_name] if reduced_hash.key?(key_name)
-    options[:default]
-  end
-
-  def coerce_value_type(value, type)
-    return value unless type
-
-    coercion_method_name = "coerce_to_#{type}"
-
-    respond_to?(coercion_method_name, true) || fail(Scopie::InvalidOptionError.new("Unknown value for option 'type' provided: :#{type}"))
-
-    send(coercion_method_name, value)
-  end
-
-  def coerce_to_boolean(value)
-    TRUE_VALUES.include? value
-  end
-
-  def coerce_to_integer(value)
-    Integer(value)
-  end
-
-  def coerce_to_date(value)
-    Date.parse(value)
-  end
-
-  def coerce_to_float(value)
-    Float(value)
+    Scopie::Value.new(reduced_hash, key_name, options)
   end
 
   def scope_applicable?(value, options, method)
     return false unless method_applicable?(method, options)
+    return false unless value.given?
 
-    is_value_present = value.respond_to?(:empty?) ? !value.empty? : !!value
-
-    is_value_present || !!options[:allow_blank]
+    value.present? || !!options[:allow_blank]
   end
 
   def reduced_hash(hash, options)

data/lib/scopie/value.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class Scopie::Value < Struct.new(:hash, :key_name, :options)
+
+  TRUE_VALUES = ['true', true, '1', 1].freeze
+
+  def raw
+    return hash[key_name] if hash.key?(key_name)
+    fetch_default
+  end
+
+  def coerced
+    coerce_to_type(raw, fetch_type)
+  end
+
+  def fetch_type
+    options[:type]
+  end
+
+  def fetch_default
+    options[:default]
+  end
+
+  def has_default?
+    options.key?(:default)
+  end
+
+  def given?
+    key_passed? || has_default?
+  end
+
+  def key_passed?
+    hash.key?(key_name)
+  end
+
+  def present?
+    value = raw
+    value.respond_to?(:empty?) ? !value.empty? : !!value
+  end
+
+  private
+
+  def coerce_to_type(value, type)
+    return value unless type
+
+    coercion_method_name = "coerce_to_#{type}"
+
+    respond_to?(coercion_method_name, true) || fail(Scopie::InvalidOptionError.new("Unknown value for option 'type' provided: :#{type}"))
+
+    send(coercion_method_name, value)
+  end
+
+  def coerce_to_boolean(value)
+    TRUE_VALUES.include? value
+  end
+
+  def coerce_to_integer(value)
+    Integer(value)
+  end
+
+  def coerce_to_date(value)
+    Date.parse(value)
+  end
+
+  def coerce_to_float(value)
+    Float(value)
+  end
+
+end

data/lib/scopie/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Scopie
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/scopie.rb

@@ -4,6 +4,7 @@ module Scopie
 
   class InvalidOptionError < StandardError; end
 
+  require 'scopie/value'
   require 'scopie/base'
 
   def self.apply_scopes(target, hash, method: nil, scopie: Scopie::Base.new)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopie
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yury Kotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-25 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies: []
 description: Minimal mapping of incoming parameters to named scopes in your resources
   through OO design and pure Ruby classes
@@ -22,6 +22,7 @@ files:
 - README.md
 - lib/scopie.rb
 - lib/scopie/base.rb
+- lib/scopie/value.rb
 - lib/scopie/version.rb
 homepage: https://github.com/beorc/scopie
 licenses: