smart_params 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b4b84cd337c3737f9f83d70a8e64d3a95e0e08a4106eca29bd0c00cceedcf9
-  data.tar.gz: 6e303c416ae81b6e933a4d7a3fb4e497746c1968f4730e317c8cab253c62805e
+  metadata.gz: 54e6652607fb402ff6368c2b0dc8d16c8b4fce3e45b0ad0aeb4d74ecc1798ab8
+  data.tar.gz: 4c829acd140f7758ee9a8828a4627a554020b5f05773fea748440578d4506120
 SHA512:
-  metadata.gz: bb603816b69b989284b538ab7fe95e82418652f3560b0100071329a3f0e1fe6013a7e3318d2c9432847905c5600dae5aaed52a9dfef55d7dbf27e98b4746e122
-  data.tar.gz: 2cdfa446d1c492e786087390d1220cac38b5f6f2fee75e234427e9b6c8e58d25f2a590b12c3af4d3b7fd027cd4610bde849f3da0da6f2e29bc034da956f25cfc
+  metadata.gz: 51f677d9c2c58724cb79a796665f987b2a5a9e7390f17b625b7dfac49907dd611bbbb7541d1b65d0fe1d98f13d4e68eeb03d1eb97cdeb3cfb90dd7c950777759
+  data.tar.gz: 4bb161323aafc93aab63636dd32713dc42b37dd8a2a14e9bd6a5821cf52106d61b79437eb1412b2501d3a67de4790d17b7ecc2c280654d128c6cdd0edb19a022

data/lib/smart_params/field.rb

@@ -7,8 +7,7 @@ module SmartParams
     attr_reader :subfields
     attr_reader :type
 
-    def initialize(keychain:, type:, root: false, &nesting)
-      @root = root
+    def initialize(keychain:, type:, &nesting)
       @keychain = Array(keychain)
       @subfields = Set.new
       @type = type
@@ -18,18 +17,14 @@ module SmartParams
       end
     end
 
-    def field(key, type:, &subfield)
-      @subfields << self.class.new(keychain: [*keychain, key], type: type, &subfield)
-    end
-
     def deep?
       subfields.present?
     end
 
     def claim(raw)
-      unless root?
-        @value = type[if keychain.empty? then raw else raw.dig(*keychain) end]
-      end
+      return type[dug(raw)] if deep?
+
+      @value = type[dug(raw)]
     rescue Dry::Types::ConstraintError => bad_type_exception
       raise SmartParams::Error::InvalidPropertyType, keychain: keychain, wanted: type, raw: if keychain.empty? then raw else raw.dig(*keychain) end
     end
@@ -49,12 +44,20 @@ module SmartParams
       value.nil?
     end
 
-    def root?
-      @root
+    def weight
+      keychain
     end
 
-    def weight
-      keychain.length
+    private def field(key, type:, &subfield)
+      @subfields << self.class.new(keychain: [*keychain, key], type: type, &subfield)
+    end
+
+    private def dug(raw)
+      if keychain.empty?
+        raw
+      else
+        raw.dig(*keychain)
+      end
     end
   end
 end

data/lib/smart_params/version.rb

@@ -1,3 +1,3 @@
 module SmartParams
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/lib/smart_params.rb

@@ -86,7 +86,7 @@ module SmartParams
 
   class_methods do
     def schema(type:, &subfield)
-      @schema = Field.new(keychain: [], type: type, root: true, &subfield)
+      @schema = Field.new(keychain: [], type: type, &subfield)
     end
   end
 end

data/lib/smart_params_spec.rb

@@ -87,10 +87,11 @@ RSpec.describe SmartParams do
           data: {
             type: "accounts",
             attributes: {
-              email: "kurtis@example.com"
+              email: "kurtis@example.com",
+              y: "y"
             }
           },
-          x: "y"
+          x: "x"
         }
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_params
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Kurtis Rainbolt-Greene
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-22 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler