restly 0.0.1.alpha.9 → 0.0.1.alpha.10

data/lib/restly/associations/base.rb

@@ -13,7 +13,7 @@ class Restly::Associations::Base
   include Modifiers
   include Conditionals
 
-  attr_reader :name, :association_class, :namespace, :polymorphic, :options
+  attr_reader :name, :namespace, :polymorphic, :options
 
   def initialize(owner, name, options={})
     @name = name
@@ -21,10 +21,13 @@ class Restly::Associations::Base
     @polymorphic = options.delete(:polymorphic)
     options[:class_name] ||= name.to_s.classify
     @owner = owner
-    @association_class = [@namespace, options.delete(:class_name)].select(&:present?).join('::').constantize
     @options = options
   end
 
+  def association_class
+    [@namespace, options(:class_name)].select(&:present?).join('::').constantize
+  end
+
   private
 
   def association_resource_name

data/lib/restly/base.rb

@@ -6,7 +6,6 @@ module Restly
     autoload :Instance
     autoload :GenericMethods
     autoload :Includes
-    autoload :MassAssignmentSecurity
     autoload :Fields
     autoload :EmbeddedAssociations
 
@@ -38,7 +37,6 @@ module Restly
     include Includes
     include Instance
     include Fields
-    include MassAssignmentSecurity
 
     # Relationships
     include Restly::Associations

data/lib/restly/base/fields.rb

@@ -2,8 +2,6 @@ module Restly::Base::Fields
   extend ActiveSupport::Concern
 
   included do
-    extend  SharedMethods
-    include SharedMethods
     extend  ClassMethods
 
     class_attribute :fields
@@ -16,31 +14,16 @@ module Restly::Base::Fields
 
   end
 
-  module SharedMethods
-
-    private
-
-    def set_field(attr)
-      base = self.is_a?(Class) ? self : singleton_class
-      unless base.send :instance_method_already_implemented?, attr
-        base.send :define_attribute_method, attr
-        self.fields += [attr]
-      end
-    end
-
-  end
-
   module ClassMethods
 
     private
 
     def field(attr)
-      if attr.is_a?(Hash) && attr[:from_spec]
-        before_initialize do
-          spec[:attributes].each{ |attr| set_field(attr) }
+      if attr.is_a?(Symbol) || attr.is_a?(String)
+        unless instance_method_already_implemented? attr
+          define_attribute_method attr
+          self.fields += [attr]
         end
-      elsif attr.is_a?(Symbol) || attr.is_a?(String)
-        set_field(attr)
       else
         raise Restly::Error::InvalidField, "field must be a symbol or string."
       end
@@ -63,7 +46,7 @@ module Restly::Base::Fields
   class FieldSet < Set
 
     def include?(value)
-      super(value.to_sym)
+      super(value.to_sym) || super(value.to_s)
     end
 
     def <<(value)

data/lib/restly/base/includes.rb

@@ -15,6 +15,11 @@ module Restly::Base::Includes
       @client = client
     end
 
+    def has_specification
+      self.fields = Restly::Base::Resource::Specification.new(self).fields
+      (self._accessible_attributes ||= {})[:default] = Restly::Base::Resource::Specification.new(self).accessible_attributes
+    end
+
     def connection
       connection = @connection || Restly::Connection.tokenize(client, current_token)
       connection.cache ||= cache

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

@@ -60,7 +60,7 @@ module Restly::Base::Instance::Attributes
 
   def inspect
     inspection = if @attributes
-                   fields.collect { |name|
+                   fields.map { |name|
                      "#{name}: #{attribute_for_inspect(name)}"
                    }.compact.join(", ")
                  else

data/lib/restly/base/resource.rb

@@ -3,6 +3,7 @@ module Restly::Base::Resource
 
   autoload :Finders
   autoload :BatchActions
+  autoload :Specification
 
   include Restly::Base::GenericMethods
   include Finders
@@ -10,17 +11,6 @@ module Restly::Base::Resource
 
   delegate :first, :last, to: :all
 
-  # OPTIONS FOR /:path
-  # Fetches the spec of a remote resource
-  def spec(path=self.path)
-    begin
-      parsed_response = authorize(client_token).connection.request(:options, path, params: params).parsed
-      (parsed_response || {}).with_indifferent_access
-    rescue OAuth2::Error
-      raise Restly::Error::InvalidSpec, "Unable to load the specification for #{self.class}"
-    end
-  end
-
   def resource
     self
   end

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

@@ -0,0 +1,103 @@
+class Restly::Base::Resource::Specification < HashWithIndifferentAccess
+
+  attr_reader :model, :fields, :accessible_attributes
+
+  def initialize(model)
+    @model = model
+    @fields = Fields.new(self)
+    @accessible_attributes = AccessibleAttributes.new(self)
+  end
+
+  def [](key)
+    reload! if super.nil?
+    super
+  end
+
+  def reload!
+    parsed_response = authorize(client_token).connection.request(:options, path).parsed
+    self.replace parsed_response if parsed_response.present?
+  rescue OAuth2::Error
+    false
+  end
+
+  def method_missing(method, *args, &block)
+    return model.send(method, *args, &block) if model.respond_to?(method)
+    super
+  end
+
+  def respond_to_missing?(method, include_private=false)
+    model.respond_to?(method)
+  end
+
+  module ReloadableSet
+
+    def include?(field)
+      reload! unless super
+      super
+    end
+
+    def inspect
+      reload! if empty?
+      super
+    end
+
+    def each(*args, &block)
+      reload! if empty?
+      super
+    end
+
+    def map(*args, &block)
+      reload! if empty?
+      super
+    end
+
+    def map!(*args, &block)
+      reload! if empty?
+      super
+    end
+
+    def reduce(*args, &block)
+      reload! if empty?
+      super
+    end
+
+    def reload!
+      replace []
+      self
+    end
+
+  end
+
+  class Fields < Restly::Base::Fields::FieldSet
+    include ReloadableSet
+
+    attr_reader :spec
+
+    def initialize(spec)
+      @spec = spec
+      super([])
+    end
+
+    def reload!
+      replace spec[:attributes]
+    end
+
+  end
+
+  class AccessibleAttributes < ActiveModel::MassAssignmentSecurity::WhiteList
+    include ReloadableSet
+
+    attr_reader :spec
+
+    def initialize(spec)
+      @spec = spec
+      super([])
+    end
+
+    def reload!
+      replace spec[:actions].map { |action| action['parameters'] }.flatten if spec[:actions].present?
+    end
+
+  end
+
+end

data/lib/restly/error.rb

@@ -15,6 +15,7 @@ module Restly::Error
     InvalidConnection
     MissingId
     InvalidSpec
+    InvalidField
     AssociationError
   }
 

data/lib/restly/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restly
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.9
+  version: 0.0.1.alpha.10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -193,10 +193,10 @@ files:
 - lib/restly/base/instance/attributes.rb
 - lib/restly/base/instance/persistence.rb
 - lib/restly/base/instance/write_callbacks.rb
-- lib/restly/base/mass_assignment_security.rb
 - lib/restly/base/resource.rb
 - lib/restly/base/resource/batch_actions.rb
 - lib/restly/base/resource/finders.rb
+- lib/restly/base/resource/specification.rb
 - lib/restly/client.rb
 - lib/restly/collection.rb
 - lib/restly/collection/pagination.rb

data/lib/restly/base/mass_assignment_security.rb

@@ -1,19 +0,0 @@
-module Restly::Base::MassAssignmentSecurity
-  extend ActiveSupport::Concern
-
-  module ClassMethods
-
-    def attr_accessible(*args)
-      options = args.dup.extract_options!
-      if options[:from_spec]
-        before_initialize do
-          self._accessible_attributes = spec[:actions].map { |action| action['parameters'] }.flatten
-        end
-      else
-        super(*args)
-      end
-    end
-
-  end
-
-end