restly 0.0.1.beta.5 → 0.0.1.beta.6

data/lib/restly/associations/base/loaders.rb

@@ -26,14 +26,16 @@ module Restly::Associations::Base::Loaders
   def load_instance(parent, association_class = self.association_class)
     raise Restly::Error::AssociationError, "Not an instance" if collection?
     return nil if embedded?
-    instance = if parent.attributes.has_key? "#{name}_id"
-                 foreign_key = parent.attributes["#{name}_id"]
-                 return nil unless foreign_key
-                 association_class.find(foreign_key)
+    foreign_key = options[:foreign_key] || "#{name}_id"
+    instance = if parent.attributes.has_key? foreign_key
+                 id = parent.attributes[foreign_key]
+                 return nil unless id
+                 association_class.find(id)
                else
-                 association_class.instance_from_response association_class.connection.get(association_class.path)
+                 association_class.instance_from_response association_class.connection.get(association_class.path_with_format)
                end
     Restly::Proxies::Associations::Instance.new(instance, parent)
   end
 
-end
+
+end

data/lib/restly/base.rb

@@ -66,6 +66,7 @@ module Restly
     # Set Defaults on Inheritance
     inherited do
       field :id
+      find_by :id
       self.resource_name      = name.gsub(/.*::/,'').underscore if name.present?
       self.path               = resource_name.pluralize
       self.params             = params.dup

data/lib/restly/base/fields.rb

@@ -46,7 +46,7 @@ module Restly::Base::Fields
     end
 
     def include?(value)
-      super(value.to_sym) || super(value.to_s)
+      super(value.try :to_sym) || super(value.try :to_s)
     end
 
     def <<(value)

data/lib/restly/base/includes.rb

@@ -2,7 +2,7 @@ module Restly::Base::Includes
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :current_specification, instance_writer: false
+    class_attribute :finder, :current_specification, instance_writer: false
   end
 
   module ClassMethods
@@ -24,6 +24,11 @@ module Restly::Base::Includes
       @client
     end
 
+    def find_by(field)
+      raise Restly::Error::InvalidField, "#{field} was not a valid field." unless field.in? fields
+      self.finder = field
+    end
+
     def has_specification
       self.current_specification = Restly::Base::Resource::Specification.new(self)
 

data/lib/restly/base/instance.rb

@@ -71,11 +71,12 @@ module Restly::Base::Instance
   end
 
   def path
-    return @path if @path
-    if response && response.response.env[:url]
-      response.response.env[:url].path.gsub(/\.\w+$/,'')
-    elsif respond_to?(:id) && id
-      [self.class.path, id].join('/')
+    if @path
+      @path
+    elsif path_from_response
+      path_from_response
+    elsif send self.finder
+      [self.class.path, send self.finder].join('/')
     else
       self.class.path
     end
@@ -99,6 +100,11 @@ module Restly::Base::Instance
     end
   end
 
+  def path_from_response
+    return nil unless response
+    response.response.env[:url].try(:path).try(:gsub, /\.\w+$/,'')
+  end
+
   def parsed_response(response=self.response)
     return {} unless response
     parsed = response.parsed || {}

data/lib/restly/base/instance/persistence.rb

@@ -1,7 +1,7 @@
 module Restly::Base::Instance::Persistence
 
   def exists?
-    return false unless id
+    return false unless id || path_from_response
 
     begin
       @response = connection.get(path, force: true) unless @response.status.to_i < 400

data/lib/restly/base/resource/finders.rb

@@ -2,11 +2,10 @@ module Restly::Base::Resource::Finders
 
   Collection = Restly::Collection
 
-  def find(id, *args)
+  def find(finder, *args)
+    finder = nil unless self.finder.in? fields
     options = args.extract_options!
-
-    #params[pagination_options[:params][:page]] = options[:page] if pagination
-    instance_from_response connection.get(path_with_format(id), params: params)
+    instance_from_response connection.get(path_with_format(finder), params: params)
   end
 
   def all

data/lib/restly/nested_attributes.rb

@@ -45,7 +45,7 @@ module Restly::NestedAttributes
 
     if attributes_collection.is_a? Hash
       keys = attributes_collection.keys
-      attributes_collection = if keys.include?('id') || keys.include?(:id)
+      attributes_collection = if keys.include?(self.finder.try(:to_s)) || keys.include?(self.finder.try(:to_sym))
                                 Array.wrap(attributes_collection)
                               else
                                 attributes_collection.values
@@ -57,9 +57,9 @@ module Restly::NestedAttributes
 
     attributes_collection.each do |attributes|
       attributes = attributes.with_indifferent_access
-      if attributes[:id].blank?
-        send(association_name) << association.build(self, attributes.except(:id))
-      elsif (existing_record = existing_records.find{ |record| record.id.to_s == attributes['id'].to_s })
+      if attributes[self.finder].blank?
+        send(association_name) << association.build(self, attributes.except(self.finder))
+      elsif (existing_record = existing_records.find{ |record| record.id.to_s == attributes[self.finder].to_s })
         existing_record.attributes = attributes
       end
     end

data/lib/restly/version.rb

@@ -1,3 +1,3 @@
 module Restly
-  VERSION = "0.0.1.beta.5"
+  VERSION = "0.0.1.beta.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restly
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.5
+  version: 0.0.1.beta.6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2