restly 0.0.1.alpha.19 → 0.0.1.alpha.22

data/lib/restly/base/fields.rb

@@ -2,6 +2,7 @@ module Restly::Base::Fields
   extend ActiveSupport::Concern
 
   included do
+
     extend  ClassMethods
 
     class_attribute :fields

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

@@ -9,23 +9,24 @@ class Restly::Base::Resource::Specification::Fields < Restly::Proxies::Base
     super Restly::Base::Fields::FieldSet.new(spec.model)
   end
 
-  def -(field)
+  def - field
     @removed << field
-    super
+    method_missing __method__, field
   end
 
-  def +(field)
+  def + field
     @added << field
-    super
+    method_missing __method__, field
   end
 
   private
 
   def method_missing(m, *args, &block)
-    reload_specification! unless super.present?
+    reload_specification! if !super.present? || m == :inspect
     if (value = super).is_a? self.class
-      __setobj__ value
-      self
+      duplicate = self.dup
+      duplicate.__setobj__ super
+      duplicate
     else
       value
     end

data/lib/restly/client.rb

@@ -1,16 +1,20 @@
 class Restly::Client < OAuth2::Client
 
-  attr_accessor :id, :secret, :site
-  attr_reader :format, :resource
+  attr_accessor :id, :secret, :site, :base_path
+  attr_reader :format, :resource, :site
 
   def initialize(*args, &block)
     opts = args.extract_options!
     opts.merge!(raise_errors: false)
 
+    # Set Resource
     self.resource  = opts.delete(:resource) if opts[:resource]
     self.id        = args[0] || Restly::Configuration.oauth_options[:client_id]
     self.secret    = args[1] || Restly::Configuration.oauth_options[:client_secret]
+
+    # Set URL
     self.site      = opts.delete(:site) || Restly::Configuration.site
+
     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
@@ -31,6 +35,15 @@ class Restly::Client < OAuth2::Client
     self.options[:connection_opts][:ssl] = val if val
   end
 
+  def site=(val)
+    url     =        URI.parse(val)
+    scheme  =       "#{url.scheme}://"
+    host    =       url.host
+    port    =       url.port == 80 || url.port == 443 ? nil : ":#{url.port}"
+    @site           = [scheme, host, port].compact.join
+    @base_path      = url.path
+  end
+
   def format=(val)
     self.options[:connection_opts][:headers] = {
         "Accept" => "application/#{format}",

data/lib/restly/connection.rb

@@ -2,7 +2,7 @@ class Restly::Connection < OAuth2::AccessToken
 
   attr_accessor :cache, :cache_options
 
-  delegate :resource, :resource_name, to: :client
+  delegate :resource, :resource_name, :base_path, to: :client
 
   # TODO: Refactor with subclasses that have their own tokenize methods.
   def self.tokenize(client, object)
@@ -64,6 +64,9 @@ class Restly::Connection < OAuth2::AccessToken
   alias_method :forced_request, :request
 
   def request(verb, path, opts={}, &block)
+    path = [base_path, path.gsub(/^\/?/, '')].join('/')
+    puts path.blue
+
     if cache && !opts[:force]
       request_log("Restly::CacheRequest", path, verb) do
         cached_request(verb, path, opts, &block)

data/lib/restly/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restly
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.19
+  version: 0.0.1.alpha.22
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2