restly 0.0.1.alpha.4 → 0.0.1.alpha.6

data/lib/restly/base/instance.rb

@@ -14,7 +14,7 @@ module Restly::Base::Instance
 
   included do
     attr_reader :init_options, :response
-    delegate :spec, to: :klass
+    delegate :spec, to: :resource
   end
 
   def initialize(attributes = nil, options = {})
@@ -22,25 +22,19 @@ module Restly::Base::Instance
     @init_options = options
     @attributes = HashWithIndifferentAccess.new
     @association_cache = {}
+    @association_attributes = {}
     @aggregation_cache = {}
     @attributes_cache = {}
     @previously_changed = {}
     @changed_attributes = {}
 
     run_callbacks :initialize do
-
       @readonly = options[:readonly] || false
       set_response options[:response] if options[:response]
       @loaded = options.has_key?(:loaded) ? options[:loaded] : true
       self.attributes = attributes if attributes
       self.connection = options[:connection] if options[:connection].is_a?(OAuth2::AccessToken)
-      self.path = if response && response.response.env[:url]
-                    response.response.env[:url].path.gsub(/\.\w+$/,'')
-                  elsif respond_to?(:id) && id
-                    [path, id].join('/')
-                  else
-                    klass.path
-                  end
+
     end
 
   end
@@ -49,6 +43,31 @@ module Restly::Base::Instance
     @loaded
   end
 
+  def connection
+    @connection || resource.connection
+  end
+
+  def connection=(val)
+    @connection = val
+  end
+
+  def path=(val)
+    @path = val
+  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('/')
+    else
+      self.class.path
+    end
+  end
+
+  private
+
   def set_response(response)
     raise Restly::Error::InvalidResponse unless response.is_a? OAuth2::Response
     @response = response
@@ -67,16 +86,4 @@ module Restly::Base::Instance
     end
   end
 
-  def connection
-    @connection || self.class.connection
-  end
-
-  def connection=(val)
-    @connection = val
-  end
-
-  def klass
-    self.class
-  end
-
 end

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

@@ -0,0 +1,15 @@
+module Restly::Base::Resource::BatchActions
+
+  def destroy_all
+    !all.map(&:destroy).include?(false)
+  end
+
+  def delete_all
+    !all.map(&:delete).include?(false)
+  end
+
+  def update_all(attributes={})
+    all.map{ |item| item.update_attributes(attributes) }
+  end
+
+end

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

@@ -18,7 +18,7 @@ module Restly::Base::Resource::Finders
 
   def collection_from_response(response)
     raise Restly::Error::InvalidResponse unless response.is_a? OAuth2::Response
-    Restly::Collection.new self, nil, response: response
+    Restly::Collection.new resource, nil, response: response
   end
 
   def instance_from_response(response)

data/lib/restly/base/resource.rb

@@ -1,9 +1,14 @@
 module Restly::Base::Resource
   extend ActiveSupport::Autoload
+
   autoload :Finders
+  autoload :BatchActions
 
   include Restly::Base::GenericMethods
   include Finders
+  include BatchActions
+
+  delegate :first, :last, to: :all
 
   # OPTIONS FOR /:path
   # Fetches the spec of a remote resource
@@ -16,4 +21,8 @@ module Restly::Base::Resource
     end
   end
 
+  def resource
+    self
+  end
+
 end

data/lib/restly/base.rb

@@ -8,6 +8,7 @@ module Restly
     autoload :Includes
     autoload :MassAssignmentSecurity
     autoload :Fields
+    autoload :EmbeddedAssociations
 
     # Thread Local Accessor
     extend Restly::ThreadLocal
@@ -27,7 +28,7 @@ module Restly
     include ActiveModel::Serializers::Xml
 
     # Set Up Callbacks
-    define_model_callbacks :create, :save, :delete, :update, :initialize
+    define_model_callbacks :create, :save, :destroy, :update, :initialize
 
     # Concerned Inheritance
     include Restly::ConcernedInheritance
@@ -41,11 +42,12 @@ module Restly
 
     # Relationships
     include Restly::Associations
+    include Restly::EmbeddedAssociations
 
     # Set up the Attributes
     thread_local_accessor :current_token
+    class_attribute :path, instance_writer: false, instance_reader: false
     class_attribute :resource_name,
-                    :path,
                     :include_root_in_json,
                     :params,
                     :cache,
@@ -70,10 +72,12 @@ module Restly
     # Run Active Support Load Hooks
     ActiveSupport.run_load_hooks(:restly, self)
 
-    delegate :client, to: :klass
-
     # Alias the class for delegation
-    def klass
+    def client
+      self.class.client
+    end
+
+    def resource
       self.class
     end
 

data/lib/restly/collection.rb

@@ -1,40 +1,69 @@
 class Restly::Collection < Array
-  extend ActiveSupport::Autoload
+  # extend ActiveSupport::Autoload
+  include Restly::Base::Resource::Finders
+  include Restly::Base::Resource::BatchActions
+  include Restly::Base::GenericMethods
 
-  delegate :resource_name, :connection, to: :resource
+  delegate :resource_name, :new, :client, to: :resource
 
-  autoload :Pagination
+  # autoload :Pagination
 
   attr_reader :resource
 
-  def initialize(resource, array, opts={})
+  def initialize(resource, array=[], opts={})
     @resource = resource
     @response = opts[:response]
+    @connection
     array = items_from_response if @response.is_a?(OAuth2::Response)
     super(array)
   end
 
-  def paginate(opts={})
-    @pagination_opts = opts
-    collection = self.dup
-    collection.extend(Restly::Collection::Pagination)
-    return page(opts[:page]) unless opts[:page] == current_page && opts[:per_page] == response_per_page
-    collection
+  [:path, :connection, :params].each do |attr|
+    define_method attr do
+      instance_variable_get(:"@#{attr}") || resource.send(attr)
+    end
+
+    define_method "#{attr}=" do |val|
+      instance_variable_set(:"@#{attr}", val)
+    end
+  end
+
+  def create(*args)
+    self << instance = super
+    instance
   end
 
+  def map(*args)
+    initialize resource, super
+  end
+
+  alias :collect :map
+
+  #def paginate(opts={})
+  #  @pagination_opts = opts
+  #  collection = self.dup
+  #  collection.extend(Restly::Collection::Pagination)
+  #  return page(opts[:page]) unless opts[:page] == current_page && opts[:per_page] == response_per_page
+  #  collection
+  #end
+
   def <<(instance)
-    raise Restly::Error::InvalidObject, "Object is not an instance of #{resource}" unless instance.is_a?(resource)
+    raise Restly::Error::InvalidObject, "Object is not an instance of #{resource}" unless accepts?(instance)
     super(instance)
   end
 
+  def reload!
+    replace collection_from_response(connection.get path)
+  end
+
+  private
+
   def serializable_hash(options = nil)
     self.collect do |i|
       i.serializable_hash(options)
     end
   end
 
-  private
-
   def items_from_response
     parsed = @response.parsed || {}
     parsed = parsed[resource_name.pluralize] if parsed.is_a?(Hash) && parsed[resource_name.pluralize]
@@ -44,4 +73,8 @@ class Restly::Collection < Array
     end
   end
 
+  def accepts?(instance)
+    instance.class.name == resource.name
+  end
+
 end

data/lib/restly/configuration.rb

@@ -1,5 +1,11 @@
 module Restly::Configuration
 
+  def self.load_config(hash)
+    @config = hash.symbolize_keys
+  end
+
+  private
+
   def self.config
     defaults = {
       session_key: :access_token,
@@ -27,10 +33,6 @@ module Restly::Configuration
     config[:client_options].merge(config[:oauth_options])
   end
 
-  def self.load_config(hash)
-    @config = hash.symbolize_keys
-  end
-
   def self.method_missing(m, *args, &block)
     config.with_indifferent_access[m]
   end

data/lib/restly/controller_methods.rb

@@ -1,16 +1,11 @@
 module Restly::ControllerMethods
-  extend ActiveSupport::Concern
 
-  included do
-
-    def auth_token
-      @oauth_token ||= session[Restly::Configuration.session_key].try(:dup) || {}
-    end
-
-    def auth_token=(token_object)
-      session[Restly::Configuration.session_key] = Restly::Connection.tokenize(Restly::Base.client, token_object).to_hash
-    end
+  def auth_token
+    @oauth_token ||= session[Restly::Configuration.session_key].try(:dup) || {}
+  end
 
+  def auth_token=(token_object)
+    session[Restly::Configuration.session_key] = Restly::Connection.tokenize(Restly::Base.client, token_object).to_hash
   end
 
 end

data/lib/restly/embedded_associations/base.rb

@@ -0,0 +1,7 @@
+class Restly::EmbeddedAssociations::Base < Restly::Associations::Base
+
+  def embedded?
+    true
+  end
+
+end

data/lib/restly/{associations/embeddable_resources.rb → embedded_associations/class_methods.rb}

@@ -1,9 +1,6 @@
-module Restly::Associations::EmbeddableResources
-  extend ActiveSupport::Autoload
+module Restly::EmbeddedAssociations::ClassMethods
 
-  autoload :EmbeddedIn
-  autoload :EmbedsMany
-  autoload :EmbedsOne
+  private
 
   # Embeds One
   def embeds_resource(name, options = {})
@@ -36,4 +33,16 @@ module Restly::Associations::EmbeddableResources
 
   end
 
+  def embedded_in(name, options={})
+    self.resource_associations[name] = association = EmbeddedIn.new(self, name, options)
+
+    define_method name do |options={}|
+      get_association(name, options)
+    end
+
+    define_method "#{name}=" do |value|
+      set_association name, value
+    end
+  end
+
 end

data/lib/restly/embedded_associations/embedded_in.rb

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

data/lib/restly/embedded_associations/embeds_many.rb

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

data/lib/restly/embedded_associations/embeds_one.rb

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

data/lib/restly/embedded_associations.rb

@@ -0,0 +1,12 @@
+module Restly::EmbeddedAssociations
+  extend ActiveSupport::Autoload
+
+  autoload :EmbeddedIn
+  autoload :EmbedsMany
+  autoload :EmbedsOne
+  autoload :ClassMethods
+  autoload :Base
+
+  extend ActiveSupport::Concern
+
+end

data/lib/restly/error.rb

@@ -3,7 +3,7 @@ module Restly::Error
   class StandardError < ::StandardError
 
     def message
-      super.red
+      defined?(IRB) ? super.red : super
     end
 
   end

data/lib/restly/nested_attributes.rb

@@ -12,6 +12,8 @@ module Restly::NestedAttributes
 
   end
 
+  private
+
   # One To One Association
   def assign_nested_attributes_for_one_to_one_resource_association(association_name, attributes, assignment_opts = {})
     options = self.nested_attributes_options[association_name]

data/lib/restly/proxies/associations/collection.rb

@@ -2,15 +2,16 @@ class Restly::Proxies::Associations::Collection < Restly::Proxies::Base
 
   attr_reader :parent, :joiner
 
-  def initialize(receiver, parent, joiner=nil)
-    super(receiver)
+  def initialize(collection, parent, joiner=nil)
+    collection.map!{ |instance| Restly::Proxies::Associations::Instance.new(instance, parent, joiner) }
+    super(collection)
     @parent = parent
     @joiner = joiner
   end
 
   def <<(instance)
-    collection = receiver << instance
-    instance.save unless instance.persisted
+    collection = super
+    instance = create(instance.attributes) unless instance.persisted?
     if joiner
       joiner.create("#{parent.resource_name}_id" => parent.id, "#{instance.resource_name}_id" => instance.id)
     elsif parent

data/lib/restly/proxies/associations/instance.rb

@@ -2,8 +2,8 @@ class Restly::Proxies::Associations::Instance < Restly::Proxies::Base
 
   attr_reader :parent, :joiner
 
-  def initialize(receiver, parent, joiner=nil)
-    super(receiver)
+  def initialize(instance, parent, joiner=nil)
+    super(instance)
     @parent = parent
     @joiner = joiner
   end

data/lib/restly/proxies/base.rb

@@ -1,10 +1,13 @@
 class Restly::Proxies::Base < SimpleDelegator
 
+  delegate :is_a?, :kind_of?, to: :__getobj__
+
   # Initialize the Proxy
   def initialize(receiver)
 
     # Dupe the Requester
     if receiver.class == Class
+
       @receiver = receiver.dup
 
       # Some Key Methods Added to the Duplicated Requester
@@ -31,6 +34,8 @@ class Restly::Proxies::Base < SimpleDelegator
     super(@receiver)
   end
 
+  alias_method :proxy_class, :class
+
   # Tell the Proxy its Class!
   def class
     @receiver.class

data/lib/restly/proxies/with_path.rb

@@ -8,6 +8,8 @@ class Restly::Proxies::WithPath < Restly::Proxies::Base
     adjust_path_from_options! if @options.present?
   end
 
+  private
+
   def adjust_path_from_options!
     prepend = if @options[:prepend]
                 @options[:prepend].gsub(/^([^\/])/, "/\\1").gsub(/\/$/, "")

data/lib/restly/version.rb

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

data/lib/restly.rb

@@ -1,4 +1,4 @@
-require "colorize"
+require "colorize" if defined?(IRB)
 require "active_support"
 require "restly/version"
 require "oauth2"
@@ -13,6 +13,7 @@ module Restly
   autoload :Collection
   autoload :ControllerMethods
   autoload :Associations
+  autoload :EmbeddedAssociations
   autoload :NestedAttributes
   autoload :Error
   autoload :Connection

data/spec/dummy/app/controllers/api/other_objects_controller.rb

@@ -0,0 +1,45 @@
+class Api::OtherObjectsController < ApplicationController
+
+  # Api::OtherObject
+
+  before_filter do
+    nested_in_resources = params.select{ |param| /_id$/ =~ param }
+    params[:other_object].merge!(nested_in_resources)
+    @resource = Api::OtherObject.where(nested_in_resources) if nested_in_resources.present?
+  end
+
+  def index
+    render json: @other_objects = @resource.all
+  end
+
+  def create
+    render json: if (@other_object = Api::OtherObject.create(params[:other_object]))
+      @other_object
+    else
+      flash.now "Something bad Happened"
+    end
+  end
+
+  def show
+    render json: @other_object = Api::OtherObject.find(params[:id])
+  end
+
+  def update
+    @other_object = Api::OtherObject.find(params[:id])
+    render json: if @other_object.update_attributes(params[:other_object])
+      @other_object
+    else
+      "Something bad Happened"
+    end
+  end
+
+  def destroy
+    @other_object = Api::OtherObject.find(params[:id])
+    render json: if @other_object.delete
+      { success: true }
+    else
+      "Something bad Happened"
+    end
+  end
+
+end

data/spec/dummy/app/controllers/api/sample_objects_controller.rb

@@ -5,8 +5,8 @@ class Api::SampleObjectsController < ApplicationController
   end
 
   def create
-    if (@sample_object = Api::SampleObject.create(params[:sample_object]))
-      redirect_to @sample_object
+    render json: if (@sample_object = Api::SampleObject.create(params[:sample_object]))
+      @sample_object
     else
       flash.now "Something bad Happened"
     end
@@ -19,7 +19,7 @@ class Api::SampleObjectsController < ApplicationController
   def update
     @sample_object = Api::SampleObject.find(params[:id])
     render json: if @sample_object.update_attributes(params[:sample_object])
-      redirect_to @sample_object
+      @sample_object
     else
       "Something bad Happened"
     end
@@ -28,7 +28,7 @@ class Api::SampleObjectsController < ApplicationController
   def destroy
     @sample_object = Api::SampleObject.find(params[:id])
     render json: if @sample_object.delete
-      redirect_to sample_objects_path
+      { success: true }
     else
       "Something bad Happened"
     end

data/spec/dummy/app/models/other_object.rb

@@ -6,7 +6,10 @@ class OtherObject < Restly::Base
 
   field :foo_var
   field :bar_lee
+  field :sample_object_id
   field :created_at
   field :updated_at
 
+  attr_protected :created_at, :updated_at, :id
+
 end

data/spec/dummy/app/models/sample_object.rb

@@ -12,4 +12,6 @@ class SampleObject < Restly::Base
   field :created_at
   field :updated_at
 
+  attr_protected :created_at, :updated_at, :id
+
 end

data/spec/dummy/config/routes.rb

@@ -1,7 +1,10 @@
 Dummy::Application.routes.draw do
   root to: "sample_objects#index"
   resources :sample_objects
+
   namespace :api, format: :json do
-    resources :sample_objects
+    resources :sample_objects do
+      resources :other_objects
+    end
   end
 end