patchboard 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b8396b43a867c8dd3f0d7ad9554cc452af65098
-  data.tar.gz: fdb8ed9700cc348cdc4f551c9ca32563a44bffea
+  metadata.gz: 46fe7f3a6e42bd2248df577e00d2bf4ebff0de19
+  data.tar.gz: e5cbc55c390be6754d739326283058c2d120f71c
 SHA512:
-  metadata.gz: 91da69da6c145512a3a3b9af1687f54ce49b3f86d0e0bfb28be52b68599487a365b0cee23a44cb66be0f5d30b223a59d0940a3660c924e9e699cac30701a9b35
-  data.tar.gz: d1bb9654e039f2636737cd33c7ae25fd657ec1c0cb5229c2d7ed3653cf97abfbe256e7e07692df06072f5d252d51e854e45d856b8eae06a01f02f9a1d0b416af
+  metadata.gz: 8d5bd558a0d07e437dab031f50f291eb82ae334492f8c4bf2284b859b66077f7938224bfa661ea82c926b94880fc3ca060c9fad9ee5bf1e58f2131dd72c821af
+  data.tar.gz: 5096c602c6aee31da7d65dffb3efe1fec7d1539efdd47854dd16c833118c3e23ff3f57b1dc442bb4d46f1df7cf8071cbc3b81ce01ef2236f4b92cc986e7666b7

data/lib/patchboard/action.rb

@@ -43,8 +43,7 @@ class Patchboard
       raw = self.http.request @method, url, options.merge(:response => :object)
       response = Response.new(raw)
       if response.status != @status
-        # TODO: custom exception classes, express response body in such.
-        raise "Unexpected response status: #{response.status}"
+        raise ResponseError.new(response.status, response.body), "Unexpected response status: #{response.status} - #{response.body}"
       end
       out = @api.decorate(resource.context, @response_schema, response.data)
       out.response = response
@@ -100,7 +99,15 @@ class Patchboard
     end
 
 
+    class ResponseError < StandardError
+      attr_reader :status
+      attr_reader :body
 
+      def initialize(status, body)
+        @status = status
+        @body = body
+      end
+    end
 
   end
 

data/lib/patchboard/api.rb

@@ -47,38 +47,37 @@ class Patchboard
       else
         # Otherwise traverse the schema in search of subschemas that have
         # resource classes available.
-        case schema[:type]
-        when "array"
+
+        if schema[:items]
           # TODO: handle the case where schema.items is an array, which
           # signifies a tuple.  schema.additionalItems then becomes important.
           array = data.map! do |item|
             self.decorate(context, schema[:items], item)
           end
           data = ArrayResource.new(array)
-        when "object"
-          if schema[:properties]
-            schema[:properties].each do |key, prop_schema|
-              if value = data[key]
-                data[key] = self.decorate(context, prop_schema, value)
-              end
+        end
+
+        if schema[:properties]
+          schema[:properties].each do |key, prop_schema|
+            if value = data[key]
+              data[key] = self.decorate(context, prop_schema, value)
             end
           end
-          # TODO: handle schema.patternProperties
-          # TODO: consider alternative to iterating over all keys.
-          if schema[:additionalProperties]
-            data.each do |key, value|
-              next if schema[:properties] && schema[:properties][key]
-              data[key] = self.decorate(context, schema[:additionalProperties], value)
-            end
+        end
+
+        if schema[:additionalProperties]
+          data.each do |key, value|
+            next if schema[:properties] && schema[:properties][key]
+            data[key] = self.decorate(context, schema[:additionalProperties], value)
           end
+        end
+
+        if data.is_a? Hash
           data = Hashie::Mash.new data
-        else
-          if data.is_a? Hash
-            data = Hashie::Mash.new data
-          end
         end
+        data
       end
-      data
+
     end
 
   end

data/lib/patchboard/resource.rb

@@ -17,20 +17,45 @@ class Patchboard
         schema
       end
 
+      # FIXME: break this out into multiple methods.
       if schema && schema[:properties]
         schema[:properties].each do |name, definition|
-          define_method name do
-            @attributes[name]
+
+          if property_mapping = self.api.find_mapping(definition)
+            if property_mapping.query
+              define_method name do |params={}|
+                params[:url] = @attributes[name][:url]
+                url = property_mapping.generate_url(params)
+                property_mapping.klass.new self.context, :url => url
+              end
+            else
+              define_method name do
+                property_mapping.klass.new self.context, @attributes[name]
+              end
+            end
+          else
+            define_method name do
+              @attributes[name]
+            end
           end
+
         end
       end
 
+
+      # When an additionalProperties schema is defined, the resource can
+      # contain top-level attributes that should obey that schema.
       if schema && schema[:additionalProperties] != false
-        define_method :method_missing do |name, *args, &block|
-          if args.size == 0
+
+        if (add_mapping = self.api.find_mapping(schema)) && (add_mapping.query)
+          define_method :method_missing do |name, params|
+            params[:url] = @attributes[name][:url]
+            url = add_mapping.generate_url(params)
+            add_mapping.klass.new self.context, :url => url
+          end
+        else
+          define_method :method_missing do |name|
             @attributes[name.to_sym]
-          else
-            super(name, *args, &block)
           end
         end
       end
@@ -53,26 +78,10 @@ class Patchboard
       # TODO: add some sort of validation for the input attributes.
       # Hey, we have a JSON Schema, why not use it?
       if self.schema && (properties = self.schema[:properties])
-        context = instance.context
         properties.each do |key, sub_schema|
-          next unless (value = attributes[key])
-
-          if mapping = self.api.find_mapping(sub_schema)
-            if mapping.query
-              # TODO: find a way to define this at runtime, not once
-              # for every instance.
-              instance.define_singleton_method key do |params={}|
-                params[:url] = value[:url]
-                url = mapping.generate_url(params)
-                mapping.klass.new context, :url => url
-              end
-            else
-              attributes[key] = mapping.klass.new context, value
-            end
-          else
-            attributes[key] = self.api.decorate(context, sub_schema, value)
+          if (value = attributes[key]) && !self.api.find_mapping(sub_schema)
+            attributes[key] = self.api.decorate(instance.context, sub_schema, value)
           end
-
         end
       end
       attributes
@@ -91,7 +100,7 @@ class Patchboard
       id = "%x" % (self.object_id << 1)
       %Q{
         #<#{self.class}:0x#{id}
-        @url="#{@url}" @context=#{@context}>
+        @url="#{@url}">
       }.strip
     end
 

data/lib/patchboard/schema_manager.rb

@@ -1,4 +1,3 @@
-require "pp"
 class Patchboard
 
   class SchemaManager

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchboard
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Matthew King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json