clientele 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6582c99553295f93676db28a306f47c12a618c24
-  data.tar.gz: 981a484ad7dda1988ec60df5a2cd1c6a1f82d992
+  metadata.gz: 8207fdcdcd84032d25d8326f164adfe78c1127d3
+  data.tar.gz: 49fef12babfe85a269d5bfda4189c9b6e9c51374
 SHA512:
-  metadata.gz: f63be792b186af675a00945ff1e999813dfabfd4e8c6bbcf09a98f901b2ae8081971061a4da5adb29f74fd6764c0d58c445048ae062c7c9db78b534d4eba1f94
-  data.tar.gz: 7524c40b6373d57b3745e423f5fd9afead437495fab9d5356b580b33c54a80a6a445358caca7df0b2dafac32303f683b80c12a676847a6125db131f9c0983767
+  metadata.gz: ec6d1576db4412c82976bd30215b56b51a490dee08721f09beb7c153999fb10445c3351f7d27033a9f35548ff9f276b145eb648c0b0cc582a4be94f69416a715
+  data.tar.gz: 0a2d471117284e00096927c40532810cd1de570a28f390fd5db659756386ebca15299b045fe768533dc6c100c34e00542673fd3c5ffb38e525c3c85e15d9aa20

data/lib/clientele/resource.rb

@@ -51,39 +51,31 @@ module Clientele
       end
 
       def result_key
-        @result_key || method_name.singularize
+        @result_key || method_name.to_s.singularize
       end
 
-      def plural_key
-        @plural_key || method_name
+      def result(data)
+        data[result_key]
       end
 
-      def nested_result_key
-        @nested_result_key || result_key
-      end
-
-      def nested_plural_key
-        @nested_plural_key || plural_key
-      end
-
-      def nested_plural_key
-        @nested_plural_key || plural_key
+      def results(data)
+        result(data) if result(data) and result(data).kind_of?(Array)
       end
 
       def build(data, client: nil, response: nil)
         new(
           catch(:build) do
             if data.kind_of? Hash
-              if data.keys.map(&:to_s).include? plural_key.to_s
-                build data.fetch(plural_key), client: client, response: response
-              elsif data.keys.map(&:to_s).include? result_key.to_s
-                throw :build, data.fetch(result_key)
+              if many = results(data)
+                build many, client: client#, response: response
+              elsif one = result(data)
+                throw :build, one
               else
                 throw :build, data
               end
             elsif data.respond_to? :map
               data.map do |dataset|
-                build dataset, client: client, response: response
+                build dataset, client: client#, response: response
               end
             end
           end

data/lib/clientele/version.rb

@@ -1,3 +1,3 @@
 module Clientele
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clientele
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Chris Keele