remotable 0.3.0 → 0.4.0.beta2

data/lib/remotable/active_resource_fixes.rb

@@ -4,20 +4,20 @@ require "active_support/concern"
 
 module ActiveResourceFixes
   extend ActiveSupport::Concern
-  
-  
+
+
   # ! ActiveModel::AttributeMethods assumes that :attribute is the target
   # for attribute lookup. ActiveResource doesn't define that method.
   def attribute(method)
     attributes[method]
   end
-  
-  
+
+
   included do
     alias_method_chain :destroy, :validation
   end
-  
-  
+
+
   # ActiveResource::Validations overrides ActiveResource::Base#save
   # to rescue from ActiveResource::ResourceInvalid and record the
   # resource's errors. Do the same for `destroy`.
@@ -31,7 +31,7 @@ module ActiveResourceFixes
     load_remote_errors(@remote_errors, true)
     false
   end
-  
+
 end
 
 
@@ -50,19 +50,19 @@ module ActiveResourceFixes30
       super(method_symbol, include_private)
     end
   end
-  
+
   # ! in this method, don't check the Content-Type header: rack doesn't always return it
   def load_attributes_from_response(response)
     if !response.body.nil? && response.body.strip.size > 0
       load(self.class.format.decode(response.body))
     end
   end
-  
+
 end
 
 
 module ActiveResourceFixes31
-  
+
   # ActiveResource hacks method_missing without hacking respond_to?
   # In fact, it responds to any method that ends in an equals sign.
   # It also responds to any method that matches an attribute name.
@@ -76,7 +76,7 @@ module ActiveResourceFixes31
       super(method_symbol, include_private)
     end
   end
-  
+
   # ! in this method, don't check the Content-Type header: rack doesn't always return it
   def load_attributes_from_response(response)
     if !response.body.nil? && response.body.strip.size > 0
@@ -84,7 +84,7 @@ module ActiveResourceFixes31
       @persisted = true
     end
   end
-  
+
 end
 
 if Rails.version >= '3.2'
@@ -101,12 +101,12 @@ ActiveResource::Base.send(:include, ActiveResourceFixes)
 
 
 module ActiveResourceJsonFormatFixes
-  
+
   def decode(json)
     return {} if json.blank? # <-- insert this line. json will be nil if response is 304
     super
   end
-  
+
 end
 
 ActiveResource::Formats::JsonFormat.extend ActiveResourceJsonFormatFixes
@@ -117,7 +117,7 @@ ActiveResource::Formats::JsonFormat.extend ActiveResourceJsonFormatFixes
 # However, this is not what Rails Responders are inclined to return.
 
 class ActiveResource::Errors
-  
+
   # Grabs errors from an array of messages (like ActiveRecord::Validations).
   # The second parameter directs the errors cache to be cleared (default)
   # or not (by passing true).
@@ -130,5 +130,5 @@ class ActiveResource::Errors
       end
     end
   end
-  
+
 end

data/lib/remotable/adapters/active_resource.rb

@@ -7,51 +7,60 @@ module Remotable
   module Adapters
     module ActiveResource
       extend ActiveSupport::Concern
-      
-      
-      
+
+
+
       def key?(attribute)
         attributes.key?(attribute.to_s)
       end
-      
+
       def [](attribute)
         attributes[attribute.to_s]
       end
-      
+
       def []=(attribute, value)
         attributes[attribute.to_s] = value
       end
-      
-      
-      
+
+
+
       # If we use `remote_key` to explicitly set the path where
       # this resource ought to be found, then we should use the
       # same path when updating or destroying this resource.
-      # 
+      #
       # To accomplish this, we need to override ActiveResource's
       # element_path to return the canonical path for this resource.
-      
+
       attr_accessor :remote_key_path
-      
+
       def element_path(*args)
         return remote_key_path if remote_key_path
         super
       end
-      
-      
-      
+
+
+
+      def destroy
+        super
+      rescue ::ActiveResource::ResourceNotFound
+        $!.extend Remotable::NotFound
+        raise
+      end
+
+
+
       module ClassMethods
-        
+
         IF_MODIFIED_SINCE = "If-Modified-Since".freeze
-        
-        
-        
+
+
+
         def new_resource
           new
         end
-        
-        
-        
+
+
+
         # This is always invoked by instance#fetch_remote_resource.
         # It expects to find a remote counterpart for a local resource.
         # It should always return a NullRemote object that doesn't
@@ -59,8 +68,8 @@ module Remotable
         def find_by_for_local(local_record, path)
           had_previous_value = headers.key?(IF_MODIFIED_SINCE)
           previous_value = headers[IF_MODIFIED_SINCE]
-          
-          headers[IF_MODIFIED_SINCE] = Remotable.http_format_time(local_record.updated_at) if local_record.accepts_not_modified?
+
+          headers[IF_MODIFIED_SINCE] = Remotable.http_format_time(local_record.remote_updated_at) if local_record.accepts_not_modified?
           find_by(path)
         ensure
           if had_previous_value
@@ -69,19 +78,22 @@ module Remotable
             headers.delete(IF_MODIFIED_SINCE)
           end
         end
-        
+
         def find_by(path)
           find_by!(path)
         rescue ::ActiveResource::ResourceNotFound
           nil
         end
-        
+
         def find_by!(path)
           expanded_path = expanded_path_for(path)
           Remotable.logger.info "[remotable:#{name.underscore}] GET #{expanded_path} (timeout: #{timeout})"
           find(:one, :from => expanded_path).tap do |resource|
             resource.remote_key_path = expanded_path if resource
           end
+        rescue SocketError, EOFError
+          $!.extend Remotable::NetworkError
+          raise
         rescue ::ActiveResource::TimeoutError
           $!.extend Remotable::TimeoutError
           raise
@@ -90,9 +102,9 @@ module Remotable
           $!.extend Remotable::TimeoutError if $!.response.code == 504
           raise
         end
-        
-        
-        
+
+
+
         def expanded_path_for(path)
           if relative_path?(path)
             URI.join_url_segments(prefix, collection_name, "#{path}.#{format.extension}")
@@ -100,15 +112,15 @@ module Remotable
             path
           end
         end
-        
-        
-        
+
+
+
       private
-        
+
         def relative_path?(path)
           !(path.start_with?("/") || path["://"])
         end
-        
+
       end
     end
   end

data/lib/remotable/core_ext/enumerable.rb

@@ -1,7 +1,7 @@
 module Enumerable
-  
+
   def map_to_self(result={})
     inject(result) {|hash, value| hash.merge(value => value)}
   end
-  
+
 end

data/lib/remotable/core_ext/object.rb

@@ -1,23 +1,23 @@
 module Remotable
   module CoreExt
     module Object
-      
-      
+
+
       def respond_to_all?(*methods)
         respond_to = method(:respond_to?)
         methods.flatten.all?(&respond_to)
       end
-      
+
       def responds_to(*methods)
         respond_to = method(:respond_to?)
         methods.flatten.select(&respond_to)
       end
-      
+
       def does_not_respond_to(*methods)
         methods.flatten - self.responds_to(methods)
       end
-      
-      
+
+
     end
   end
 end

data/lib/remotable/core_ext/uri.rb

@@ -4,16 +4,16 @@ require "uri"
 module Remotable
   module CoreExt
     module URI
-      
-      
+
+
       def join_url_segments(*segments)
         segments = segments.dup.flatten.map(&:to_s)
         first_segment = segments.shift.gsub(/\/$/, "")
         segments.map! { |seg| seg.gsub(/(^\/)|(\/$)/, "") }
         [first_segment, *segments].join("/")
       end
-      
-      
+
+
     end
   end
 end

data/lib/remotable/errors.rb

@@ -2,4 +2,6 @@ module Remotable
   module Error; end
   module TimeoutError; include Error; end
   module ServiceUnavailableError; include Error; end
+  module NetworkError; include Error; end
+  module NotFound; include Error; end
 end

data/lib/remotable/logger_wrapper.rb

@@ -1,37 +1,37 @@
 module Remotable
   class LoggerWrapper
-    
+
     def initialize(logger)
       @logger = logger
     end
-    
+
     attr_reader :logger
-    
+
     def debug(*args)
       logger.debug(*args) if log? :debug
     end
-    
+
     def info(*args)
       logger.info(*args) if log? :info
     end
-    
+
     def warn(*args)
       logger.warn(*args) if log? :warn
     end
-    
+
     def error(*args)
       logger.error(*args) if log? :error
     end
-    
+
   private
-    
+
     LEVELS = [:debug, :info, :warn, :error].freeze
-    
+
     def log?(value)
       level = LEVELS.index(Remotable.log_level)
       value = LEVELS.index(value)
       value >= level
     end
-    
+
   end
 end

data/lib/remotable/nosync.rb

@@ -1,11 +1,11 @@
 module Remotable
   module Nosync
-    
-    
+
+
     def nosync!
       self.nosync = true
     end
-    
+
     def nosync(new_value=true)
       old_value = @nosync
       self.nosync = new_value
@@ -13,19 +13,19 @@ module Remotable
     ensure
       @nosync = old_value
     end
-    
+
     def nosync=(val)
       @nosync = val
     end
-    
+
     def nosync_value?
       !@nosync.nil?
     end
-    
+
     def nosync?
       @nosync == true
     end
-    
-    
+
+
   end
 end

data/lib/remotable/null_remote.rb

@@ -1,8 +1,8 @@
 module Remotable
   class NullRemote
-    
+
     class << self
-      
+
       # This is always invoked by instance#fetch_remote_resource.
       # It expects to find a remote counterpart for a local resource.
       # It should always return a NullRemote object that doesn't
@@ -10,7 +10,7 @@ module Remotable
       def find_by_for_local(local_record, remote_key, fetch_value)
         new
       end
-      
+
       # This is always invoked via class#find_remote_resource_by
       # by class#fetch_by. It gives the remote model an opportunity
       # to discover a remote object that doesn't have a local
@@ -19,36 +19,36 @@ module Remotable
       def find_by(remote_attr, value)
         nil
       end
-      
+
       def new_resource
         new
       end
-      
+
     end
-    
-    
-    
+
+
+
     # NullRemote needs to receive setter messages and
     # swallow them. It doesn't need to respond to getter
     # messages since it has nothing to say.
     def []=(attribute, value)
     end
-    
+
     def key?(attribute)
       false
     end
-    
+
     def save
       true
     end
-    
+
     def errors
       {}
     end
-    
+
     def destroy
       true
     end
-    
+
   end
 end