restly 0.0.1.alpha.1 → 0.0.1.alpha.2

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

@@ -12,26 +12,34 @@ module Restly::Base::Instance::Attributes
   end
 
   def attributes
-    nil_values = fields.inject({}) do |hash, key|
-      hash[key] = nil
+    fields.reduce(HashWithIndifferentAccess.new) do |hash, key|
+      hash[key] = read_attribute key, autoload: false
       hash
     end
-    @attributes.reverse_merge!(nil_values)
   end
 
   def write_attribute(attr, val)
     if fields.include?(attr)
       send("#{attr}_will_change!".to_sym) unless val == @attributes[attr.to_sym] || !@loaded
       @attributes[attr.to_sym] = val
+
+    elsif (association = klass.reflect_on_resource_association attr).present?
+      set_association attr, association.stub(self, val) unless (@association_attributes ||= {}.with_indifferent_access)[attr].present?
+
     else
       puts "WARNING: Attribute `#{attr}` not written. ".colorize(:yellow) +
                "To fix this add the following the the model. -- field :#{attr}"
     end
   end
 
-  def read_attribute(attr)
-    raise NoMethodError, "undefined method #{attr} for #{klass}" unless fields.include?(attr)
-    attributes[attr.to_sym]
+  def read_attribute(attr, options={})
+    options.reverse_merge!({autoload: true})
+    if @attributes[attr.to_sym].nil? && !!options[:autoload] && !loaded?
+      load!
+      read_attribute(attr)
+    else
+      @attributes[attr.to_sym]
+    end
   end
 
   alias :attribute :read_attribute
@@ -51,10 +59,18 @@ module Restly::Base::Instance::Attributes
     attribute(attr)
   end
 
+  def respond_to_attribute?(m)
+    !!(/(?<attr>\w+)(?<setter>=)?$/ =~ m.to_s) && associations.include?(attr)
+  end
+
+  def respond_to?(m, include_private = false)
+    respond_to_attribute?(m) || super
+  end
+
   private
 
   def attribute_for_inspect(attr_name)
-    value = attribute(attr_name)
+    value = attribute(attr_name, autoload: false)
     if value.is_a?(String) && value.length > 50
       "#{value[0..50]}...".inspect
     else
@@ -63,26 +79,20 @@ module Restly::Base::Instance::Attributes
   end
 
   def set_attributes_from_response(response=self.response)
-    parsed = response.parsed || {}
-    parsed = parsed[resource_name] if parsed.is_a?(Hash) && parsed[resource_name]
-    self.attributes = parsed
+    self.attributes = parsed_response(response)
   end
 
   def method_missing(m, *args, &block)
     if !!(/(?<attr>\w+)(?<setter>=)?$/ =~ m.to_s) && fields.include?(m)
       case !!setter
         when true
-          write_attribute(m, *args)
+          write_attribute(attr, *args)
         when false
-          read_attribute(m)
+          read_attribute(attr)
       end
     else
       super(m, *args, &block)
     end
   end
 
-  def respond_to_missing?(method_name, include_private = false)
-    !!(/(?<attr>\w+)=?$/ =~ method_name.to_s) && fields.include?(method_name)
-  end
-
 end

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

@@ -14,7 +14,12 @@ module Restly::Base::Instance::Persistence
   end
 
   def reload!
-    self.class.send :instance_from_response, connection.get(path, force: true)
+    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)
+    @loaded = true
+    self
   end
 
+  alias :load! :reload!
+
 end

data/lib/restly/base/{write_callbacks.rb → instance/write_callbacks.rb}

@@ -1,4 +1,4 @@
-module Restly::Base::WriteCallbacks
+module Restly::Base::Instance::WriteCallbacks
   extend ActiveSupport::Concern
 
   included do

data/lib/restly/base/instance.rb

@@ -4,11 +4,13 @@ module Restly::Base::Instance
   autoload :Actions
   autoload :Attributes
   autoload :Persistence
+  autoload :WriteCallbacks
 
   include Restly::Base::GenericMethods
   include Actions
   include Attributes
   include Persistence
+  include WriteCallbacks
 
   included do
     attr_reader :init_options, :response
@@ -43,8 +45,8 @@ module Restly::Base::Instance
 
   end
 
-  def pry_in
-    binding.pry
+  def loaded?
+    @loaded
   end
 
   def set_response(response)
@@ -52,7 +54,16 @@ module Restly::Base::Instance
     @response = response
     if response.try(:body)
       set_attributes_from_response
-      stub_associations_from_response
+    end
+  end
+
+  def parsed_response(response=self.response)
+    return {} unless response
+    parsed = response.parsed || {}
+    if parsed.is_a?(Hash) && parsed[resource_name]
+      parsed[resource_name]
+    else
+      parsed
     end
   end
 
@@ -61,12 +72,7 @@ module Restly::Base::Instance
   end
 
   def connection=(val)
-    @connection
-  end
-
-  # Todo: Needed?
-  def instance
-    self
+    @connection = val
   end
 
   def klass

data/lib/restly/base.rb

@@ -2,13 +2,10 @@ module Restly
   class Base
     # Autoload
     extend ActiveSupport::Autoload
-    #autoload :Pagination # Todo!
     autoload :Resource
     autoload :Instance
-    autoload :Collection
     autoload :GenericMethods
     autoload :Includes
-    autoload :WriteCallbacks
     autoload :MassAssignmentSecurity
     autoload :Fields
 
@@ -32,13 +29,15 @@ module Restly
     # Set Up Callbacks
     define_model_callbacks :create, :save, :delete, :update, :initialize
 
+    # Concerned Inheritance
+    include Restly::ConcernedInheritance
+
     # Actions & Callbacks
     extend  Resource
     include Includes
     include Instance
     include Fields
     include MassAssignmentSecurity
-    include WriteCallbacks
 
     # Relationships
     include Restly::Associations

data/lib/restly/client.rb

@@ -5,8 +5,8 @@ class Restly::Client < OAuth2::Client
 
   def initialize(*args, &block)
     opts = args.extract_options!
-    self.id =     args[0] || Restly::Configuration.client_id
-    self.secret = args[1] || Restly::Configuration.client_secret
+    self.id =     args[0] || Restly::Configuration.oauth_options[:client_id]
+    self.secret = args[1] || Restly::Configuration.oauth_options[:client_secret]
     self.site = opts.delete(:site) || Restly::Configuration.site
     self.options = Restly::Configuration.client_options.merge(opts)
     self.ssl = opts.delete(:ssl) || Restly::Configuration.ssl

data/lib/restly/collection/pagination.rb

@@ -1,4 +1,4 @@
-module Restly::Base::Collection::Pagination
+module Restly::Collection::Pagination
 
   def page(num)
     with_params(page: num, per_page: per_page).all.paginate(page: num, per_page: per_page)

data/lib/restly/concerned_inheritance.rb

@@ -0,0 +1,30 @@
+module Restly::ConcernedInheritance
+  extend ActiveSupport::Concern
+
+  included do
+    extend ClassMethods
+
+    class_attribute :inherited_callbacks
+    self.inherited_callbacks = []
+
+    inherited do
+      self.inherited_callbacks = inherited_callbacks
+    end
+
+  end
+
+  module ClassMethods
+
+    private
+
+    def inherited(subclass = nil, &block)
+      self.inherited_callbacks << block and return if block_given?
+
+      inherited_callbacks.each do |call_block|
+        subclass.class_eval(&call_block)
+      end
+    end
+
+  end
+
+end

data/lib/restly/configuration.rb

@@ -4,30 +4,31 @@ module Restly::Configuration
     defaults = {
       session_key: :access_token,
       load_middleware: true,
-      :authorize_url    => '/oauth/authorize',
-      :token_url        => '/oauth/token',
-      :token_method     => :post,
-      :connection_opts  => {},
-      :max_redirects    => 5,
-      :raise_errors     => true
+      use_oauth: false,
+      cache: false,
+      default_format: :json,
+      oauth_options: {
+        :authorize_url    => '/oauth/authorize',
+        :token_url        => '/oauth/token',
+        :token_method     => :post,
+      },
+      client_options: {
+        :connection_opts  => {},
+        :max_redirects    => 5,
+        :raise_errors     => true
+      }
     }
-    defaults.merge(@config || {})
+    config = defaults.deep_merge(@config || {})
+    config.assert_valid_keys(:session_key, :load_middleware, :oauth_options, :use_oauth, :cache, :cache_options, :client_options, :site, :default_format)
+    config
   end
 
   def self.client_options
-    config.select do |k,v|
-      [ :authorize_url,
-        :token_url,
-        :token_method,
-        :connection_opts,
-        :max_redirects,
-        :raise_errors
-      ].include?(k.to_sym)
-    end
+    config[:client_options].merge(config[:oauth_options])
   end
 
   def self.load_config(hash)
-    @config = hash
+    @config = hash.symbolize_keys
   end
 
   def self.method_missing(m, *args, &block)
@@ -38,6 +39,7 @@ module Restly::Configuration
     true
   end
 
-  load_config YAML.load_file(File.join(Rails.root, 'config', 'restly.yml'))[Rails.env] if defined? Rails
+  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)
 
 end

data/lib/restly/error.rb

@@ -1,30 +1,28 @@
 module Restly::Error
 
-  class NotAnRestly < StandardError
-  end
-
-  class RecordNotFound < StandardError
-  end
+  class StandardError < ::StandardError
 
-  class WrongResourceType < StandardError
-  end
-
-  class InvalidParentAssociation < StandardError
-  end
+    def message
+      super.red
+    end
 
-  class InvalidJoinerAssociation < StandardError
   end
 
-  class InvalidObject < StandardError
-  end
-
-  class InvalidToken < StandardError
-  end
-
-  class InvalidConnection < StandardError
-  end
+  errors = %w{
+    RecordNotFound
+    WrongResourceType
+    InvalidParentAssociation
+    InvalidJoinerAssociation
+    InvalidObject
+    InvalidToken
+    InvalidConnection
+    MissingId
+    InvalidSpec
+    AssociationError
+  }
 
-  class InvalidSpec < StandardError
+  errors.each do |error|
+    const_set(error.to_sym, Class.new(StandardError))
   end
 
 end

data/lib/restly/nested_attributes.rb

@@ -15,8 +15,9 @@ module Restly::NestedAttributes
   # 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]
-    association_attributes = attributes.delete("#{association_name}_attributes") || {}
-    associated_instance = send(association_name) || self.class.reflect_on_resource_association(association_name).build
+    association_attributes[association_name] = attributes.delete("#{association_name}_attributes") || {}
+    associated_instance = send(association_name) ||
+      self.class.reflect_on_resource_association(association_name).build(self)
     associated_instance.attributes = association_attributes
   end
 
@@ -42,7 +43,7 @@ module Restly::NestedAttributes
     attributes_collection.each do |attributes|
       attributes = attributes.with_indifferent_access
       if attributes[:id].blank?
-        send(association_name) << association.build(attributes.except(:id))
+        send(association_name) << association.build(self, attributes.except(:id))
       elsif existing_record = existing_records.find{ |record| record.id.to_s == attributes['id'].to_s }
         existing_record.attributes = attributes
       end

data/lib/restly/proxies/{auth.rb → authorization.rb}

@@ -1,4 +1,4 @@
-class Restly::Proxies::Auth < Restly::Proxies::Base
+class Restly::Proxies::Authorization < Restly::Proxies::Base
 
   def initialize(receiver, token)
     super(receiver)

data/lib/restly/proxies/base.rb

@@ -36,4 +36,8 @@ class Restly::Proxies::Base < SimpleDelegator
     @receiver.class
   end
 
+  def proxied?
+    true
+  end
+
 end

data/lib/restly/proxies/{params.rb → with_params.rb}

@@ -1,4 +1,4 @@
-class Restly::Proxies::Params < Restly::Proxies::Base
+class Restly::Proxies::WithParams < Restly::Proxies::Base
 
   def initialize(receiver, params)
     super(receiver)

data/lib/restly/proxies/with_path.rb

@@ -0,0 +1,24 @@
+class Restly::Proxies::WithPath < Restly::Proxies::Base
+
+  def initialize(receiver, *args)
+    super(receiver)
+    @options = args.extract_options!
+    @options.assert_valid_keys(:prepend, :append)
+    self.path = args.first
+    adjust_path_from_options! if @options.present?
+  end
+
+  def adjust_path_from_options!
+    prepend = if @options[:prepend]
+                @options[:prepend].gsub(/^([^\/])/, "/\\1").gsub(/\/$/, "")
+              end
+
+    append = if @options[:append]
+                @options[:append].gsub(/^\//, "").gsub(/\/$/, "")
+              end
+
+    self.path = [prepend, path, append].compact.join('/')
+
+  end
+
+end

data/lib/restly/proxies.rb

@@ -1,10 +1,9 @@
 module Restly::Proxies
   extend ActiveSupport::Autoload
 
-  autoload :Auth
-  autoload :AssociatedInstance
-  autoload :AssociatedCollection
-  autoload :Params
+  autoload :Authorization
+  autoload :WithParams
+  autoload :WithPath
   autoload :Base
 
   module Associations

data/lib/restly/railtie.rb

@@ -1,6 +1,11 @@
 module Restly
   class Railtie < ::Rails::Railtie
 
+    generators do
+      require "generators/restly_model_generator"
+      require "generators/restly_config_generator"
+    end
+
     initializer "my_engine.add_middleware" do |app|
       app.middleware.use "Restly::Middleware" if Restly::Configuration.load_middleware
     end

data/lib/restly/version.rb

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

data/lib/restly.rb

@@ -1,4 +1,5 @@
 require "colorize"
+require "active_support"
 require "restly/version"
 require "oauth2"
 
@@ -18,6 +19,7 @@ module Restly
   autoload :Middleware
   autoload :ThreadLocal
   autoload :Client
+  autoload :ConcernedInheritance
 
 end
 

data/restly.gemspec

@@ -23,6 +23,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry"
-  gem.add_development_dependency "fakeweb"
 
 end

data/spec/restly/associations/base_spec.rb

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

data/spec/restly/associations/belongs_to_spec.rb

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

data/spec/restly/associations/embeddable_resources/embeds_many_spec.rb

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

data/spec/restly/associations/embeddable_resources/embeds_one_spec.rb

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

data/spec/restly/associations/embeddable_resources_spec.rb

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

data/spec/restly/associations/has_many_spec.rb

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

data/spec/restly/associations/has_one_spec.rb

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

data/spec/restly/associations_spec.rb

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

data/spec/restly/base/fields_spec.rb

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

data/spec/restly/base/generic_methods_spec.rb

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

data/spec/restly/base/includes_spec.rb

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

data/spec/restly/base/instance/actions_spec.rb

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

data/spec/restly/base/instance/attributes_spec.rb

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

data/spec/restly/base/instance/persistence_spec.rb

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

data/spec/restly/base/instance/write_callbacks_spec.rb

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

data/spec/restly/base/instance_spec.rb

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

data/spec/restly/base/mass_assignment_security_spec.rb

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

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

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