base.rb in balanced-0.2.2

- old
+ new

@@ -17,10 +17,46 @@
 
       def member_name
         Utils.underscore resource_name
       end
 
+      def construct_from_response payload
+        payload = Balanced::Utils.hash_with_indifferent_read_access payload
+        klass = Balanced.from_uri(payload[:uri])
+        instance = klass.new payload
+        payload.each do |name, value|
+          klass.class_eval {
+            attr_accessor name.to_s
+          }
+          # here is where our interpretations will begin.
+          # if the value is a sub-resource, lets instantiate the class
+          # and set it correctly
+          if value.instance_of? Hash and value.has_key? 'uri'
+            value = construct_from_response value
+          elsif name =~ /_uri$/
+            modified_name = name.sub(/_uri$/, '')
+            klass.instance_eval {
+              define_method(modified_name) {
+                values_class = Balanced.from_uri(value)
+                # if uri is a collection -> this would definitely be if it ends in a symbol
+                # then we should allow a lazy executor of the query pager
+                if Balanced.is_collection(value)
+                  # TODO: return the pager
+                  p "TODO: return the pager for this class: #{values_class}"
+                  values_class.new
+                else
+                  values_class.find(value)
+                end
+              }
+            }
+          end
+
+          instance.instance_variable_set "@#{name}", value
+        end
+        instance
+      end
+
     end
 
     attr_reader :attributes
 
     def initialize attributes = {}
@@ -44,69 +80,34 @@
     end
     alias []= write_attribute
 
     # delegate the query to the pager module
 
-    def find (uri, options={})
+    def find uri, options={}
       payload = Balanced.get :uri => uri
       construct_from_response payload
     end
 
     def save
       uri = self.attributes.delete('uri') { |key| nil }
       method = :post
       if uri.nil?
         uri = self.class.collection_path
-      else
+      elsif !Balanced.is_collection(uri)
         method = :put
       end
       response = Balanced.send(method, uri, self.attributes)
       reload response
     end
 
     def destroy
       Balanced.delete :uri => self.attributes['uri']
     end
 
-    def construct_from_response payload
-      klass = Balanced.from_uri(payload['uri'])
-      instance = klass.new payload
-      payload.each do |name, value|
-        klass.class_eval {
-          attr_accessor name.to_s
-        }
-        # here is where our interpretations will begin.
-        # if the value is a sub-resource, lets instantiate the class
-        # and set it correctly
-        if value.instance_of? Hash and value.has_key? 'uri'
-          value = construct_from_response value
-        elsif name =~ /_uri$/
-          modified_name = name.sub(/_uri$/, '')
-          klass.instance_eval {
-            define_method(modified_name) {
-              values_class = Balanced.from_uri(value)
-              # if uri is a collection -> this would definitely be if it ends in a symbol
-              # then we should allow a lazy executor of the query pager
-              if Balanced.is_collection(value)
-                # TODO: return the pager
-                p "TODO: return the pager for this class: #{values_class}"
-                values_class.new
-              else
-                values_class.find(value)
-              end
-            }
-          }
-        end
-
-        instance.instance_variable_set "@#{name}", value
-      end
-      instance
-    end
-
     def reload response = nil
       if response
         return if response.body.to_s.length.zero?
-        fresh = self.construct_from_response response.body
+        fresh = self.class.construct_from_response response.body
       else
         fresh = self.find(@attributes['uri'])
       end
       fresh and copy_from fresh
       self
\ No newline at end of file