restly 0.0.1.alpha.12 → 0.0.1.alpha.16

data/lib/restly/base/includes.rb

@@ -1,6 +1,10 @@
 module Restly::Base::Includes
   extend ActiveSupport::Concern
 
+  included do
+    class_attribute :current_specification, instance_writer: false
+  end
+
   module ClassMethods
 
     # Delegate stuff to client
@@ -16,13 +20,17 @@ module Restly::Base::Includes
     end
 
     def has_specification
-      self.fields = Restly::Base::Resource::Specification.new(self).fields
+      self.current_specification = Restly::Base::Resource::Specification.new(self)
+
+      self.fields = current_specification.fields
 
       self._accessible_attributes = accessible_attributes_configs.dup
+      self._protected_attributes =  protected_attributes_configs.dup
 
-      (self._accessible_attributes ||= {})[:default] = Restly::Base::Resource::Specification.new(self).accessible_attributes
+      (self._accessible_attributes ||= {})[:default] = current_specification.accessible_attributes
+      (self._protected_attributes ||= {})[:default] = current_specification.protected_attributes
 
-      self._active_authorizer = self._accessible_attributes
+      self._active_authorizer = current_specification.active_authorizer
     end
 
     def connection

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

@@ -26,7 +26,7 @@ module Restly::Base::Instance::Persistence
 
   def reload!
     raise Restly::Error::MissingId, "Cannot reload #{resource_name}, either it hasn't been created or it is missing an ID." unless id
-    set_attributes_from_response connection.get(path, force: true)
+    set_attributes_from_response connection.get(path_with_format, force: true)
     @loaded = true
     self
   end

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

@@ -1,103 +1,60 @@
-class Restly::Base::Resource::Specification < HashWithIndifferentAccess
+class Restly::Base::Resource::Specification
+  extend ActiveSupport::Autoload
 
-  attr_reader :model, :fields, :accessible_attributes
+  autoload :Fields
+  autoload :MassAssignmentSecurity
+
+  attr_reader :model
+
+  delegate :authorize, :client_token, :path, to: :model
 
   def initialize(model)
     @model = model
-    @fields = Fields.new(self)
-    @accessible_attributes = AccessibleAttributes.new(self)
+    @specification = HashWithIndifferentAccess.new
+    @retry_count = 0
   end
 
-  def [](key)
-    reload! if super.nil?
-    super
+  def accessible_attributes
+    @accessible_attributes ||= MassAssignmentSecurity::AccessibleAttributes.new(self)
   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
+  def protected_attributes
+    @protected_attributes ||= MassAssignmentSecurity::ProtectedAttributes.new(self)
   end
 
-  def method_missing(method, *args, &block)
-    return model.send(method, *args, &block) if model.respond_to?(method)
-    super
+  def active_authorizer
+    @active_authorizer ||= MassAssignmentSecurity::DynamicAuthorizer.new(self)
   end
 
-  def respond_to_missing?(method, include_private=false)
-    model.respond_to?(method)
+  def fields
+    @fields ||= Fields.new(self)
   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
-
+  def [](key)
+    reload_specification! unless @specification[key].present?
+    @specification[key]
   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
+  private
 
+  def reload_specification!
+    parsed_response = authorize(client_token).connection.request(:options, path).parsed
+    @specification = parsed_response.with_indifferent_access if parsed_response.present?
+  rescue OAuth2::Error
+    false
   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?
+  def method_missing(method, *args, &block)
+    if self[method]
+      self[method]
+    else
+      @retry_count = 0
+      super(method, *args, &block)
     end
+  end
 
+  def respond_to_missing?(method, include_private=false)
+    model.respond_to?(method)
   end
 
 end

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

@@ -0,0 +1,40 @@
+class Restly::Base::Resource::Specification::Fields < Restly::Proxies::Base
+
+  attr_reader :spec
+
+  def initialize(spec)
+    @spec = spec
+    @removed = Set.new
+    @added = Set.new
+    super Restly::Base::Fields::FieldSet.new
+  end
+
+  def -(field)
+    @removed << field
+    super
+  end
+
+  def +(field)
+    @added << field
+    super
+  end
+
+  private
+
+  def method_missing(m, *args, &block)
+    reload_specification! unless super.present?
+    if (value = super).is_a? self.class
+      __setobj__ value
+      self
+    else
+      value
+    end
+  end
+
+  def reload_specification!
+    from_spec = spec[:attributes] || []
+    fields = (from_spec - @removed.to_a) + @added.to_a
+    __setobj__ Restly::Base::Fields::FieldSet.new(fields)
+  end
+
+end

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

@@ -0,0 +1,76 @@
+module Restly::Base::Resource::Specification::MassAssignmentSecurity
+
+  class DynamicAuthorizer < Restly::Proxies::Base
+
+    attr_reader :spec
+
+    def initialize(spec)
+      @spec = spec
+      super({ default: ActiveModel::MassAssignmentSecurity::BlackList.new })
+    end
+
+    private
+
+    def method_missing(m, *args, &block)
+
+      # Try to set the proper authorizer!
+      if spec.accessible_attributes.present?
+        __setobj__ ({ default: spec.accessible_attributes })
+
+      elsif spec.protected_attributes.present?
+        __setobj__ ({ default: spec.protected_attributes })
+
+      end
+
+      super
+    end
+
+  end
+
+  class AccessibleAttributes < Restly::Proxies::Base
+
+    attr_reader :spec
+
+    def initialize(spec)
+      @spec = spec
+      super ActiveModel::MassAssignmentSecurity::WhiteList.new
+    end
+
+    private
+
+    def method_missing(m, *args, &block)
+      reload_specification! unless super.present?
+      super
+    end
+
+    def reload_specification!
+      accepts = spec.actions.map { |action| action['accepts_parameters'] }.flatten if spec.actions.present?
+      __setobj__ ActiveModel::MassAssignmentSecurity::BlackList.new accepts
+    end
+
+  end
+
+  class ProtectedAttributes < Restly::Proxies::Base
+
+    attr_reader :spec
+
+    def initialize(spec)
+      @spec = spec
+      super ActiveModel::MassAssignmentSecurity::BlackList.new
+    end
+
+    private
+
+    def method_missing(m, *args, &block)
+      reload_specification! unless super.present?
+      super
+    end
+
+    def reload_specification!
+      rejects = spec.actions.map { |action| action['rejects_parameters'] }.flatten if spec.actions.present?
+      __setobj__ ActiveModel::MassAssignmentSecurity::BlackList.new rejects
+    end
+
+  end
+
+end

data/lib/restly/version.rb

@@ -1,3 +1,3 @@
 module Restly
-  VERSION = "0.0.1.alpha.12"
+  VERSION = "0.0.1.alpha.16"
 end

data/restly.gemspec

@@ -8,23 +8,23 @@ Gem::Specification.new do |gem|
   gem.version       = Restly::VERSION
   gem.authors       = ["Jason Waldrip"]
   gem.email         = ["jason@waldrip.net"]
-  gem.description   = %q{ Allows your app to authenticate a resource with oauth}
-  gem.summary       = %q{ Allows your app to authenticate a resource with oauth}
+  gem.description   = %q{ An ODM for a RESTful service }
+  gem.summary       = %q{ Restly incorporates a ActiveModel based ODM for your REST based service. Think of Restly as a Re-imagination of Rails' ActiveResource }
   gem.homepage      = "http://github.com/jwaldrip/restly"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency "oauth2"
-  gem.add_dependency "activesupport"
-  gem.add_dependency "activemodel"
-  gem.add_dependency "colorize"
+  gem.add_dependency "oauth2", "~> 0.8.0"
+  gem.add_dependency "activesupport", "~> 3.2"
+  gem.add_dependency "activemodel", "~> 3.2"
+  gem.add_dependency "colorize", "~> 0.5.8"
 
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "pry"
-  gem.add_development_dependency "faraday_simulation"
-  gem.add_development_dependency "faraday_middleware"
-  gem.add_development_dependency "multi_xml"
+  gem.add_development_dependency "rspec", "~> 2.12"
+  gem.add_development_dependency "pry", "~> 9.10"
+  gem.add_development_dependency "faraday_simulation", "~> 0.0.2"
+  gem.add_development_dependency "faraday_middleware", "~> 0.9"
+  gem.add_development_dependency "multi_xml", "~> 0.5"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restly
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.12
+  version: 0.0.1.alpha.16
   prerelease: 6
 platform: ruby
 authors:
@@ -9,153 +9,153 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.10'
 - !ruby/object:Gem::Dependency
   name: faraday_simulation
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: ! ' Allows your app to authenticate a resource with oauth'
+        version: '0.5'
+description: ! ' An ODM for a RESTful service '
 email:
 - jason@waldrip.net
 executables: []
@@ -197,6 +197,8 @@ files:
 - lib/restly/base/resource/batch_actions.rb
 - lib/restly/base/resource/finders.rb
 - lib/restly/base/resource/specification.rb
+- lib/restly/base/resource/specification/fields.rb
+- lib/restly/base/resource/specification/mass_assignment_security.rb
 - lib/restly/client.rb
 - lib/restly/collection.rb
 - lib/restly/collection/pagination.rb
@@ -354,7 +356,8 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Allows your app to authenticate a resource with oauth
+summary: Restly incorporates a ActiveModel based ODM for your REST based service.
+  Think of Restly as a Re-imagination of Rails' ActiveResource
 test_files:
 - spec/dummy/.gitignore
 - spec/dummy/README.rdoc