restly 0.0.1.alpha.6 → 0.0.1.alpha.7

data/README.md

@@ -100,28 +100,34 @@ In restly interacting with objects is familiar.
 
 __Getting the Collection:__
 
-```MyModel.all```
+```ruby
+MyModel.all
+```
 
 __Finding an Instance:__
 
-```my_instance = MyModel.find(1)```
+```ruby
+my_instance = MyModel.find(1)
+```
 
 __Updating an Instance:__
 
-```my_instance.update_attributes({my_attr: 'val'})```
+```ruby
+my_instance.update_attributes({my_attr: 'val'})
+```
 
 or
 
 ```ruby
 my_instance.my_attr = 'val'
-my_instnace.save
+my_instance.save
 ```
 
 __Creating an Instance__
 
 ```
 my_instance
-
+```
 
 ## Contributing
 

data/lib/restly/associations.rb

@@ -29,8 +29,6 @@ module Restly::Associations
 
     class_attribute :resource_associations, instance_reader: false, instance_writer: false
 
-    attr_reader :association_attributes
-
     self.resource_associations = AssociationsHash.new
 
     inherited do
@@ -57,16 +55,20 @@ module Restly::Associations
 
   private
 
+  def association_attributes
+    @association_attributes ||= {}
+  end
+
   def set_association(attr, val)
     association = self.class.reflect_on_resource_association(attr)
     association.valid?(val)
-    @association_attributes[attr] = val
+    association_attributes[attr] = val
   end
 
   def get_association(attr, options={})
     association = self.class.reflect_on_resource_association(attr)
 
-    if (stubbed = association.stub self, @association_attributes[attr]).present?
+    if (stubbed = association.stub self, association_attributes[attr]).present?
       stubbed
     elsif (loaded = association.load self, options).present?
       loaded

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

@@ -12,8 +12,6 @@ module Restly::Associations::Base::Loaders
     collection? ? association.load_collection(parent) : association.load_instance(parent)
   end
 
-  private
-
   def load_collection(parent, association_class = self.association_class)
     raise Restly::Error::AssociationError, "Not a collection" unless collection?
     collection = if embedded?

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

@@ -13,10 +13,11 @@ module Restly::Associations::Base::Modifiers
 
   def with_path(parent, path = nil, association_class=self.association_class)
     duplicate = self.dup
+    parent_path = parent.respond_to?(:path) ? parent.path : nil
     duplicate.instance_variable_set :@association_class, if path
                                                            association_class.with_path(path)
                                                          else
-                                                           association_class.with_path(association_resource_name, prepend: parent.path)
+                                                           association_class.with_path(association_resource_name, prepend: parent_path)
                                                          end
     duplicate
   end

data/lib/restly/associations/belongs_to.rb

@@ -4,7 +4,12 @@ class Restly::Associations::BelongsTo < Restly::Associations::Base
     if polymorphic
       set_polymorphic_class(parent).load(parent, options)
     else
-      super(parent, options)
+      # Merge Options
+      options.reverse_merge!(self.options)
+
+      # Authorize and Set Path
+      association = authorize(options[:authorize])
+      association.load_instance(parent)
     end
   end
 

data/lib/restly/base.rb

@@ -64,9 +64,9 @@ module Restly
     # Set Defaults on Inheritance
     inherited do
       field :id
-      self.resource_name          = name.gsub(/.*::/,'').underscore
-      self.path                   = resource_name.pluralize
-      self.params                 = params.dup
+      self.resource_name      = name.gsub(/.*::/,'').underscore if name.present?
+      self.path               = resource_name.pluralize
+      self.params             = params.dup
     end
 
     # Run Active Support Load Hooks

data/lib/restly/base/includes.rb

@@ -10,6 +10,11 @@ module Restly::Base::Includes
       @client ||= Restly::Client.new
     end
 
+    def client=(client)
+      raise Restly::Error::InvalidClient, "Client is invalid!"
+      @client = client
+    end
+
     def connection
       connection = @connection || Restly::Connection.tokenize(client, current_token)
       connection.cache ||= cache

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

@@ -1,3 +1,5 @@
+require "colorize"
+
 module Restly::Base::Instance::Attributes
 
   def update_attributes(attributes)

data/lib/restly/client.rb

@@ -11,7 +11,7 @@ class Restly::Client < OAuth2::Client
     self.options = Restly::Configuration.client_options.merge(opts)
     self.ssl = opts.delete(:ssl) || Restly::Configuration.ssl
     self.format = @format = opts.delete(:format) || Restly::Configuration.default_format
-    self.options[:connection_build] = block
+    self.options[:connection_build] ||= block
   end
 
   def ssl=(val)

data/lib/restly/collection.rb

@@ -1,13 +1,13 @@
 class Restly::Collection < Array
-  # extend ActiveSupport::Autoload
+  extend ActiveSupport::Autoload
+  autoload :Pagination
+
   include Restly::Base::Resource::Finders
   include Restly::Base::Resource::BatchActions
   include Restly::Base::GenericMethods
 
   delegate :resource_name, :new, :client, to: :resource
 
-  # autoload :Pagination
-
   attr_reader :resource
 
   def initialize(resource, array=[], opts={})

data/lib/restly/configuration.rb

@@ -41,7 +41,9 @@ module Restly::Configuration
     true
   end
 
-  config_file = File.join(Rails.root, 'config', 'restly.yml')
-  load_config YAML.load_file(config_file)[Rails.env] if defined?(Rails) && File.exists?(config_file)
+  if defined?(Rails)
+    config_file = File.join(Rails.root, 'config', 'restly.yml')
+    load_config YAML.load_file(config_file)[Rails.env] if File.exists?(config_file)
+  end
 
 end

data/lib/restly/embedded_associations/embedded_in.rb

@@ -1,4 +1,4 @@
-class Restly::EmbeddableResources::EmbeddedIn < Restly::EmbeddedAssociations::Base
+class Restly::EmbeddedAssociations::EmbeddedIn < Restly::EmbeddedAssociations::Base
 
   def nested?
     true

data/lib/restly/embedded_associations/embeds_many.rb

@@ -1,4 +1,4 @@
-class Restly::EmbeddableResources::EmbedsMany < Restly::EmbeddedAssociations::Base
+class Restly::EmbeddedAssociations::EmbedsMany < Restly::EmbeddedAssociations::Base
 
   def collection?
     true

data/lib/restly/embedded_associations/embeds_one.rb

@@ -1,3 +1,3 @@
-class Restly::EmbeddableResources::EmbedsOne < Restly::EmbeddedAssociations::Base
+class Restly::EmbeddedAssociations::EmbedsOne < Restly::EmbeddedAssociations::Base
 
 end

data/lib/restly/error.rb

@@ -10,11 +10,8 @@ module Restly::Error
 
   errors = %w{
     RecordNotFound
-    WrongResourceType
-    InvalidParentAssociation
-    InvalidJoinerAssociation
+    InvalidClient
     InvalidObject
-    InvalidToken
     InvalidConnection
     MissingId
     InvalidSpec

data/lib/restly/proxies/base.rb

@@ -1,3 +1,5 @@
+require "delegate"
+
 class Restly::Proxies::Base < SimpleDelegator
 
   delegate :is_a?, :kind_of?, to: :__getobj__

data/lib/restly/version.rb

@@ -1,3 +1,3 @@
 module Restly
-  VERSION = "0.0.1.alpha.6"
+  VERSION = "0.0.1.alpha.7"
 end

data/restly.gemspec

@@ -23,5 +23,8 @@ Gem::Specification.new do |gem|
 
   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"
 
 end

data/spec/restly/base/resource/batch_actions_spec.rb

@@ -0,0 +1,8 @@
+require "rspec"
+require "spec_helper"
+
+describe Restly::Base::Resource::BatchActions do
+
+  it "should have specs"
+
+end

data/spec/restly/base_spec.rb

@@ -3,10 +3,7 @@ require "pry"
 
 describe Restly::Base do
 
-  subject do
-    Restly::Base.stub(:name) { 'RestlyTestObject' }
-    Class.new(Restly::Base)
-  end
+  include_context "sample_class"
 
   it "should have specs"
 

data/spec/restly/embeddable_resources_spec.rb

@@ -1,7 +1,7 @@
 require "rspec"
 require "spec_helper"
 
-describe Restly::Associations::EmbeddableResources do
+describe Restly::EmbeddedAssociations do
 
   it "should have specs"
   

data/spec/restly/embedded_associations/embedded_in_spec.rb

@@ -0,0 +1,8 @@
+require "rspec"
+require "spec_helper"
+
+describe Restly::EmbeddedAssociations::EmbeddedIn do
+
+  it "should have specs"
+
+end

data/spec/restly/{embeddable_resources/embeds_one_spec.rb → embedded_associations/embeds_many_spec.rb}

@@ -1,7 +1,7 @@
 require "rspec"
 require "spec_helper"
 
-describe Restly::Associations::EmbeddableResources::EmbedsOne do
+describe Restly::EmbeddedAssociations::EmbedsMany do
 
   it "should have specs"
   

data/spec/restly/embedded_associations/embeds_one_spec.rb

@@ -0,0 +1,8 @@
+require "rspec"
+require "spec_helper"
+
+describe Restly::EmbeddedAssociations::EmbedsOne do
+
+  it "should have specs"
+
+end

data/spec/spec_helper.rb

@@ -6,23 +6,18 @@ require 'active_model'
 require 'rspec'
 require 'rspec/autorun'
 require 'restly'
+require 'support/models'
+require 'support/routes'
 
+class Post < Restly::Base
+  field :body
+  field :created_at
+  field :updated_at
+end
 
-Restly::Configuration.load_config(
-  {
-    site: 'http://fakesi.te',
-    client_id: 'default_id',
-    client_secret: 'default_secret',
-    default_format: 'json',
-    cache: false,
-    cache_opts: {
-      expires_in: 3600
-    }
-  }
-)
-
-Faraday.default_adapter = :test
+Object.send :define_method, :logger do
+  @logger ||= Logger.new(STDOUT)
+end
 
 RSpec.configure do |conf|
-  include OAuth2
 end

data/spec/support/memory_model.rb

@@ -0,0 +1,105 @@
+class MemoryModel < Hash
+
+  cattr_accessor :models
+
+  self.models = []
+
+  class RecordNotFound < StandardError
+  end
+
+  class_attribute :collection, :fields, instance_writer: false, instance_reader: false
+
+  class << self
+
+    delegate *(Array.instance_methods - Object.instance_methods), to: :collection
+
+    def inherited(subclass)
+      subclass.fields = {}
+      subclass.collection = []
+      subclass.send :field, :id
+      self.models << subclass
+    end
+
+    def all
+      collection
+    end
+
+    def truncate_all_models
+      models.each { |model| model.truncate }
+    end
+
+    def truncate
+      self.collection.clear
+    end
+
+    alias_method :delete_all, :truncate
+
+    def find(id)
+      instance = all[id - 1]
+      raise RecordNotFound, "Record was not found" unless instance
+      instance
+    end
+
+    def accepts_params
+      self.new.except(:id, :created_at, :updated_at).keys
+    end
+
+    def spec
+      { attributes: new.keys,
+        actions: [
+          {
+            method: 'POST',
+            parameters: accepts_params
+          },
+        ]
+      }
+    end
+
+    def field(attr, options={})
+      options.assert_valid_keys(:default)
+      self.fields[attr] = options[:default]
+    end
+
+  end
+
+  def initialize(hash={})
+    super
+    self.class.collection << @instance = merge!(fields.merge hash)
+    @instance[:id] = self.class.collection.index(@instance) + 1
+  end
+
+  def update(hash={})
+    self[:updated_at] = Time.now if fields.keys.include?(:updated_at)
+    merge!(hash).slice *fields.keys
+  end
+
+  def delete
+    self.class.collection.delete(self)
+    freeze
+    true
+  end
+
+  def merge(hash)
+    hash.assert_valid_keys(*self.class.fields.keys)
+    super
+  end
+
+  def merge!(hash)
+    hash.assert_valid_keys(*self.class.fields.keys)
+    super
+  end
+
+  def []=(key, value)
+    valid = {}
+    valid[key] = value
+    valid.assert_valid_keys(*self.class.fields.keys)
+    super(key, value)
+  end
+
+  private
+
+  def fields
+    self.class.fields.reduce({}) { |fields, (field, value)| fields[field] = value.is_a?(Proc) ? value.call : value ; fields }
+  end
+
+end

data/spec/support/models.rb

@@ -0,0 +1,23 @@
+require "support/memory_model"
+
+module SampleObjects
+
+  class User < MemoryModel
+
+    field :first_name
+    field :last_name
+    field :age
+    field :created_at, default: ->{ Time.now }
+    field :updated_at, default: ->{ Time.now }
+
+  end
+
+  class Post < MemoryModel
+
+    field :body
+    field :created_at, default: ->{ Time.now }
+    field :updated_at, default: ->{ Time.now }
+
+  end
+
+end

data/spec/support/requester.rb

@@ -0,0 +1,88 @@
+class Requester
+
+  def initialize(env, &block)
+    @env = env
+    logger.debug "#{@env[:method].upcase} #{@env[:url].path}"
+    @action = instance_eval(&block)
+  end
+
+  def response
+    return @response if @response
+    @response ||= case format
+                 when "json"
+                   @action.to_json
+                 when "xml"
+                   @action.to_xml
+                 else
+                   @action.to_param
+               end
+    logger.debug "  response body: #{@response}" if @response.present?
+    @response
+  end
+
+  def response_headers
+    return @response_headers if @response_headers
+    @response_headers ||= {
+      "Content-Type" => content_type
+    }
+    logger.debug "  response headers: #{@response_headers}"
+    @response_headers
+  end
+
+  private
+
+  def format
+    return @format if @format
+    @format ||= params[:format]
+    logger.debug "  format: #{@format}"
+    @format
+  end
+
+  def model
+    ["SampleObjects", params[:model].try(:classify)].join("::").try(:constantize)
+  end
+
+  def params
+    return @params if @params
+    @params ||= @env[:params].try(:with_indifferent_access) || {}
+    logger.debug "  request params: #{@params}" if @params.present?
+    @params
+  end
+
+  def data
+    model_body   = parsed[model.name.underscore] || {}
+    model_params = params[model.name.underscore] || {}
+    model_params.merge(model_body)
+  end
+
+  def parsed
+    return {} unless body.present?
+    case format
+      when "json"
+        JSON.parse(body)
+      when "xml"
+        Hash.from_xml(body)
+      else
+        {}
+    end
+  end
+
+  def content_type
+    case format
+      when "json"
+        "application/json"
+      when "xml"
+        "application/xml"
+      else
+        "text/plain"
+    end
+  end
+
+  def body
+    return @body if @body
+    @body ||= @env[:body]
+    puts "  request body: #{@body}" if @body.present?
+    @body
+  end
+
+end

data/spec/support/routes.rb

@@ -0,0 +1,95 @@
+require "faraday_simulation"
+require "faraday_middleware"
+require "support/requester"
+
+# Test Connection Object
+connection = ->(builder){
+  builder.use Faraday::Request::UrlEncoded
+
+  builder.response :xml,  :content_type => /\bxml$/
+  builder.response :json, :content_type => /\bjson$/
+
+  builder.use FaradaySimulation::Adapter do |stub|
+
+    # Associated
+    stub.get '/:model.:format' do |env|
+      req = Requester.new(env) { model.all }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.post '/:model.:format' do |env|
+      req = Requester.new(env) { model.new(data) }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.get '/:model/:id.:format' do |env|
+      req = Requester.new(env) { model.find(params[:id]) }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.put '/:model/:id.:format' do |env|
+      req = Requester.new(env) { model.find(params[:id]).update(data) }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.delete '/:model/:id.:format' do |env|
+      req = Requester.new(env) { model.find(params[:id]).delete }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.options '/:model/:id' do |env|
+      env[:params]["format"] = "json"
+      req = Requester.new(env) { model.spec }
+      [200, req.response_headers, req.response ]
+    end
+
+    # Associated
+    stub.get '/:parent_model/:parent_id/:model.:format' do |env|
+      req = Requester.new(env) { model.all }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.post '/:parent_model/:parent_id/:model.:format' do |env|
+      req = Requester.new(env) { model.new(data) }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.get '/:parent_model:model/:parent_id/:id.:format' do |env|
+      req = Requester.new(env) { model.find(params[:id]) }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.put '/:parent_model/:parent_id:model/:id.:format' do |env|
+      req = Requester.new(env) { model.find(params[:id]).update(data) }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.delete '/:parent_model/:parent_id/:model/:id.:format' do |env|
+      req = Requester.new(env) { model.find(params[:id]).delete }
+      [200, req.response_headers, req.response ]
+    end
+
+    stub.options '/:parent_model/:parent_id/:model/:id' do |env|
+      env[:params]["format"] = "json"
+      req = Requester.new(env) { model.spec }
+      [200, req.response_headers, req.response ]
+    end
+
+  end
+}
+
+Restly::Configuration.load_config(
+  {
+    site: 'http://fakesi.te',
+    cache: false,
+    use_oauth: true,
+    client_options: {
+      connection_build: connection
+    },
+    oauth_options: {
+      client_id: 'default_id',
+      client_secret: 'default_secret',
+      default_format: 'json'
+    },
+  }
+)

data/spec/support/shared.rb

@@ -0,0 +1,48 @@
+class Contact < Restly::Base
+
+  field :first_name
+  field :last_name
+  field :created_at
+  field :updated_at
+
+  has_many_resources :comments
+  has_many_resources :posts
+
+end
+
+class Post < Restly::Base
+
+  field :title
+  field :body
+  field :created_at
+  field :updated_at
+
+  belongs_to_resource :contact
+  has_many_resources  :comments
+  has_one_resource    :rating
+
+end
+
+class Comment < Restly::Base
+
+  # root_accessible false # Todo
+
+  field :content
+  field :created_at
+  field :updated_at
+
+  belongs_to_resource :contact
+  embedded_in :post
+
+end
+
+class Rating < Restly::Base
+
+  # root_accessible false # Todo
+
+  field :stars
+  field :count
+
+  belongs_to :post
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restly
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.6
+  version: 0.0.1.alpha.7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -107,6 +107,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_simulation
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  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'
 email:
 - jason@waldrip.net
@@ -254,6 +302,7 @@ files:
 - spec/restly/base/instance/write_callbacks_spec.rb
 - spec/restly/base/instance_spec.rb
 - spec/restly/base/mass_assignment_security_spec.rb
+- spec/restly/base/resource/batch_actions_spec.rb
 - spec/restly/base/resource/finders_spec.rb
 - spec/restly/base/resource_spec.rb
 - spec/restly/base_spec.rb
@@ -264,9 +313,10 @@ files:
 - spec/restly/configuration_spec.rb
 - spec/restly/connection_spec.rb
 - spec/restly/controller_methods_spec.rb
-- spec/restly/embeddable_resources/embeds_many_spec.rb
-- spec/restly/embeddable_resources/embeds_one_spec.rb
 - spec/restly/embeddable_resources_spec.rb
+- spec/restly/embedded_associations/embedded_in_spec.rb
+- spec/restly/embedded_associations/embeds_many_spec.rb
+- spec/restly/embedded_associations/embeds_one_spec.rb
 - spec/restly/middleware_spec.rb
 - spec/restly/nested_attributes_spec.rb
 - spec/restly/proxies/associations/collection_spec.rb
@@ -276,6 +326,11 @@ files:
 - spec/restly/proxies/with_params_spec.rb
 - spec/restly/thread_local_spec.rb
 - spec/spec_helper.rb
+- spec/support/memory_model.rb
+- spec/support/models.rb
+- spec/support/requester.rb
+- spec/support/routes.rb
+- spec/support/shared.rb
 homepage: http://github.com/jwaldrip/restly
 licenses: []
 post_install_message: 
@@ -379,6 +434,7 @@ test_files:
 - spec/restly/base/instance/write_callbacks_spec.rb
 - spec/restly/base/instance_spec.rb
 - spec/restly/base/mass_assignment_security_spec.rb
+- spec/restly/base/resource/batch_actions_spec.rb
 - spec/restly/base/resource/finders_spec.rb
 - spec/restly/base/resource_spec.rb
 - spec/restly/base_spec.rb
@@ -389,9 +445,10 @@ test_files:
 - spec/restly/configuration_spec.rb
 - spec/restly/connection_spec.rb
 - spec/restly/controller_methods_spec.rb
-- spec/restly/embeddable_resources/embeds_many_spec.rb
-- spec/restly/embeddable_resources/embeds_one_spec.rb
 - spec/restly/embeddable_resources_spec.rb
+- spec/restly/embedded_associations/embedded_in_spec.rb
+- spec/restly/embedded_associations/embeds_many_spec.rb
+- spec/restly/embedded_associations/embeds_one_spec.rb
 - spec/restly/middleware_spec.rb
 - spec/restly/nested_attributes_spec.rb
 - spec/restly/proxies/associations/collection_spec.rb
@@ -401,4 +458,8 @@ test_files:
 - spec/restly/proxies/with_params_spec.rb
 - spec/restly/thread_local_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/support/memory_model.rb
+- spec/support/models.rb
+- spec/support/requester.rb
+- spec/support/routes.rb
+- spec/support/shared.rb

data/spec/restly/embeddable_resources/embeds_many_spec.rb

@@ -1,8 +0,0 @@
-require "rspec"
-require "spec_helper"
-
-describe Restly::Associations::EmbeddableResources::EmbedsMany do
-
-  it "should have specs"
-  
-end