restly 0.0.1.beta.1 → 0.0.1.beta.2

data/lib/restly/associations.rb

@@ -1,4 +1,7 @@
 module Restly::Associations
+
+  ATTR_MATCHER = /(?<attr>\w+)(?<setter>=)?$/
+
   extend ActiveSupport::Concern
   extend ActiveSupport::Autoload
 
@@ -46,7 +49,7 @@ module Restly::Associations
   end
 
   def respond_to_association?(m)
-    !!(/(?<attr>\w+)(?<setter>=)?$/ =~ m.to_s) && associations.include?(attr.to_sym)
+    (matched = ATTR_MATCHER.match m) && associations.include?(matched[:attr].to_sym)
   end
 
   def respond_to?(m, include_private = false)
@@ -85,9 +88,8 @@ module Restly::Associations
   end
 
   def association_missing(m, *args)
-    if !!(/(?<attr>\w+)(?<setter>=)?$/ =~ m.to_s) && respond_to_association?(m)
-      attr = attr.to_sym
-      case !!setter
+    if (matched = ATTR_MATCHER.match m) && associations.include?(attr = matched[:attr].to_sym)
+      case !!matched[:setter]
         when true
           set_association(attr, *args)
         when false

data/lib/restly/base.rb

@@ -32,16 +32,16 @@ module Restly
     # Concerned Inheritance
     include Restly::ConcernedInheritance
 
+    # Relationships
+    include Restly::Associations
+    include Restly::EmbeddedAssociations
+
     # Actions & Callbacks
     extend  Resource
     include Includes
     include Instance
     include Fields
 
-    # 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

data/lib/restly/base/instance.rb

@@ -39,12 +39,14 @@ module Restly::Base::Instance
 
         @readonly = options[:readonly] || false
         set_response options[:response] if options[:response]
-        @loaded = options.has_key?(:loaded) ? options[:loaded] : true
         self.attributes = attributes if attributes
+        @loaded = options.has_key?(:loaded) ? options[:loaded] : true
         self.connection = options[:connection] if options[:connection].is_a?(OAuth2::AccessToken)
 
       end
 
+      @initialized = true
+
     end
   end
 
@@ -52,6 +54,10 @@ module Restly::Base::Instance
     !!@loaded
   end
 
+  def initialized?
+    !!@initialized
+  end
+
   def connection
     @connection || resource.connection
   end

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

@@ -1,5 +1,7 @@
 module Restly::Base::Instance::Attributes
 
+  ATTR_MATCHER = /(?<attr>\w+)(?<setter>=)?$/
+
   def update_attributes(attributes)
     self.attributes = attributes
     save
@@ -19,7 +21,7 @@ module Restly::Base::Instance::Attributes
   end
 
   def attribute(key, options={})
-    read_attribute(key)
+    read_attribute(key, options)
   end
 
   def []=(key, value)
@@ -35,7 +37,7 @@ module Restly::Base::Instance::Attributes
   end
 
   def respond_to_attribute?(m)
-    !!(/(?<attr>\w+)(?<setter>=)?$/ =~ m.to_s) && fields.include?(attr)
+    (matched = ATTR_MATCHER.match m) && fields.include?(matched[:attr])
   end
 
   def respond_to?(m, include_private = false)
@@ -56,8 +58,8 @@ module Restly::Base::Instance::Attributes
   private
 
   def attribute_missing(m, *args)
-    if !!(/(?<attr>\w+)(?<setter>=)?$/ =~ m.to_s) && fields.include?(attr)
-      case !!setter
+    if (matched = ATTR_MATCHER.match m) && fields.include?(attr = matched[:attr].to_sym)
+      case !!matched[:setter]
         when true
           write_attribute(attr, *args)
         when false
@@ -76,8 +78,8 @@ module Restly::Base::Instance::Attributes
 
   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] = Attribute.new(val)
+      send("#{attr}_will_change!") if val != read_attribute(attr) && loaded?
+      @attributes[attr.to_sym] = val
 
     else
       ActiveSupport::Notifications.instrument("missing_attribute.restly", attr: attr)
@@ -86,7 +88,12 @@ module Restly::Base::Instance::Attributes
 
   def read_attribute(attr, options={})
     options.reverse_merge!({ autoload: true })
-    load! if (key = attr.to_sym) != :id && @attributes[key].nil? && !!options[:autoload] && !loaded? && !exists?
+
+    # Try and get the attribute if the item is not loaded
+    if initialized? && attr.to_sym != :id && @attributes[attr].nil? && !!options[:autoload] && !loaded? && exists?
+      load!
+    end
+
     @attributes[attr.to_sym]
   end
 
@@ -103,37 +110,4 @@ module Restly::Base::Instance::Attributes
     self.attributes = parsed_response(response)
   end
 
-  class Attribute < Restly::Proxies::Base
-
-    def initialize(attr)
-      @attr = attr
-      case @attr
-        when String
-          type_convert_string
-        end
-      super(@attr)
-    end
-
-    private
-
-    def type_convert_string
-      time =    (@attr.to_time rescue nil)
-      date =    (@attr.to_date rescue nil)
-      # int  =    (@attr.to_i    rescue nil)
-      # flt  =    (@attr.to_f    rescue nil)
-      @attr = if time.try(:iso8601) == @attr
-                time
-              elsif date.try(:to_s) == @attr
-                date
-              #elsif int.try (:to_s) == @attr
-              #  int
-              #elsif flt.try (:to_s) == @attr
-              #  flt
-              else
-                @attr
-      end
-    end
-
-  end
-
 end

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

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

data/lib/restly/connection.rb

@@ -64,7 +64,7 @@ class Restly::Connection < OAuth2::AccessToken
   alias_method :forced_request, :request
 
   def request(verb, path, opts={}, &block)
-    path = [base_path, path.gsub(/^\/?/, '')].join('/')
+    path = [base_path.gsub(/\/?$/, ''), path.gsub(/^\/?/, '')].join('/')
 
     if cache && !opts[:force]
       request_log("Restly::CacheRequest", path, verb) do

data/lib/restly/nested_attributes.rb

@@ -1,5 +1,7 @@
 module Restly::NestedAttributes
 
+  ATTR_MATCHER = /(?<attr>\w+)_attributes=$/
+
   extend ActiveSupport::Concern
 
   included do
@@ -65,7 +67,7 @@ module Restly::NestedAttributes
   end
 
   def nested_attribute_missing(m, *args)
-    if !!(/(?<attr>\w+)_attributes=$/ =~ m.to_s) && (options = resource_nested_attributes_options[attr])
+    if !!(matched = ATTR_MATCHER.match m) && (options = resource_nested_attributes_options[(attr = matched[:attr])])
       send( "assign_nested_attributes_for_#{options[:association_type]}_resource_association", attr, *args )
     else
       raise Restly::Error::InvalidNestedAttribute, "Nested Attribute does not exist!"

data/lib/restly/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restly
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.1
+  version: 0.0.1.beta.2
   prerelease: 6
 platform: ruby
 authors: