restly 0.0.1.alpha.8 → 0.0.1.alpha.9

data/lib/restly.rb

@@ -22,6 +22,12 @@ module Restly
   autoload :Client
   autoload :ConcernedInheritance
 
+  if defined?(Rails::Console)
+    def self.login(username, password)
+      Base.current_token = { access_token: Client.new.password.get_token(username, password).token }
+    end
+  end
+
 end
 
 require 'restly/railtie' if Object.const_defined?('Rails')

data/lib/restly/associations.rb

@@ -56,18 +56,18 @@ module Restly::Associations
   private
 
   def association_attributes
-    @association_attributes ||= {}
+    @association_attributes ||= {}.with_indifferent_access
   end
 
   def set_association(attr, val)
     association = self.class.reflect_on_resource_association(attr)
     association.valid?(val)
     association_attributes[attr] = val
+    puts association_attributes
   end
 
   def get_association(attr, options={})
     association = self.class.reflect_on_resource_association(attr)
-
     if (stubbed = association.stub self, association_attributes[attr]).present?
       stubbed
     elsif (loaded = association.load self, options).present?

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

@@ -12,8 +12,6 @@ module Restly::Associations::Base::Builders
     collection? ? association.build_collection(parent) : association.build_instance(parent, attributes)
   end
 
-  private
-
   def build_instance(parent, attributes)
     instance = association_class.new(attributes, options)
     instance.write_attribute("#{@owner.resource_name}_id", parent.id) if association_class.method_defined?("#{@owner.resource_name}_id")

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

@@ -1,7 +1,5 @@
 module Restly::Associations::Base::Conditionals
 
-  private
-
   # Conditionals
   def valid?(val)
     valid_instances = Array.wrap(val).reject{ |item| item.resource_name == @association_class.resource_name }.empty?

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

@@ -6,10 +6,14 @@ module Restly::Associations::Base::Stubs
     collection? ? stub_collection(parent, attributes) : stub_instance(parent, attributes)
   end
 
-  private
-
   def stub_collection(parent, attributes)
-    collection = attributes.map{ |item_attrs| association_class.new(item_attrs, loaded: embedded?) }
+    collection = attributes.map do |item|
+      if item.respond_to? :attributes
+        item
+      else
+        association_class.new(item, loaded: embedded?)
+      end
+    end
     Restly::Proxies::Associations::Collection.new(collection, parent)
   end
 

data/lib/restly/base/instance.rb

@@ -22,7 +22,7 @@ module Restly::Base::Instance
     @init_options = options
     @attributes = HashWithIndifferentAccess.new
     @association_cache = {}
-    @association_attributes = {}
+    @association_attributes = {}.with_indifferent_access
     @aggregation_cache = {}
     @attributes_cache = {}
     @previously_changed = {}

data/lib/restly/embedded_associations/class_methods.rb

@@ -5,7 +5,7 @@ module Restly::EmbeddedAssociations::ClassMethods
   # Embeds One
   def embeds_resource(name, options = {})
     exclude_field(name) if ancestors.include?(Restly::Base)
-    self.resource_associations[name] = association = EmbedsOne.new(self, name, options)
+    self.resource_associations[name] = association = Restly::EmbeddedAssociations::EmbedsOne.new(self, name, options)
 
     define_method name do |options={}|
       return get_association(name) if get_association(name).present?
@@ -21,7 +21,7 @@ module Restly::EmbeddedAssociations::ClassMethods
   # Embeds Many
   def embeds_resources(name, options = {})
     exclude_field(name) if ancestors.include?(Restly::Base)
-    self.resource_associations[name] = association = EmbedsMany.new(self, name, options)
+    self.resource_associations[name] = association = Restly::EmbeddedAssociations::EmbedsMany.new(self, name, options)
 
     define_method name do |options={}|
       get_association(name, options)
@@ -34,7 +34,7 @@ module Restly::EmbeddedAssociations::ClassMethods
   end
 
   def embedded_in(name, options={})
-    self.resource_associations[name] = association = EmbeddedIn.new(self, name, options)
+    self.resource_associations[name] = association = Restly::EmbeddedAssociations::EmbeddedIn.new(self, name, options)
 
     define_method name do |options={}|
       get_association(name, options)

data/lib/restly/version.rb

@@ -1,3 +1,3 @@
 module Restly
-  VERSION = "0.0.1.alpha.8"
+  VERSION = "0.0.1.alpha.9"
 end

metadata

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