remotable 0.2.4 → 0.2.5.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e84548b3d422a45df52d3a730cbe4d41d78c954e
-  data.tar.gz: 4734d71d361ec0ca5f9634a660f53a1375ad5670
+  metadata.gz: dced86b6d1612537910a489e785e2dbb9b280018
+  data.tar.gz: db13ecad5bf99f21719f5e03ed4057fce8ed14f1
 SHA512:
-  metadata.gz: 1d89d1ffb5585fc6f9219460f901c61e9c3512260272daa87fa15d3c68a0c3bf914bbf921a23d6f62def17d04ff0186583bebff9a6d20cda3cc3bc0cc5a1d451
-  data.tar.gz: c4da1216f5058cc9d7b4a1b265601edc41f44769efdf05950fa2c8cc0f40020d2c1895aa7b306e6176095fa7679bff799c3e8b35060033cde1a3460f013d8ae5
+  metadata.gz: 9fcb24667b7b4914f7d64efd18a7e27f8906e22adbc17c14ca2191d05a53f31d3e25a9d9fb58dbd244d47fad34bd63a9b7908d1526d871271dd980664a7bddbb
+  data.tar.gz: 189ac92190ec9add70eb40d364d434b7706dba41b49459e276500db31db14f99b15f63cd1270d5ca33aebf9e2bf8399bdf32731c445620634c33c45f6b17d1df

data/Gemfile.lock

@@ -9,104 +9,105 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
+      mail (~> 2.5.4)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    active_resource_simulator (0.0.1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    active_resource_simulator (0.0.2)
       activeresource
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activeresource (4.0.0)
+      activemodel (~> 4.0)
+      activesupport (~> 4.0)
+      rails-observers (~> 0.1.1)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     ansi (1.4.3)
-    arel (3.0.2)
-    builder (3.0.4)
-    coderay (1.0.8)
-    database_cleaner (0.6.7)
+    arel (4.0.1)
+    atomic (1.1.14)
+    builder (3.1.4)
+    coderay (1.1.0)
+    database_cleaner (1.2.0)
+    docile (1.1.2)
     erubis (2.7.0)
-    factory_girl (2.0.4)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    factory_girl (2.0.5)
+    hike (1.2.3)
+    i18n (0.6.9)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.1)
-    mime-types (1.21)
-    minitest (2.10.0)
-    multi_json (1.0.3)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    multi_json (1.8.4)
     polyglot (0.3.3)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+      slop (~> 3.4)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.2)
+      sprockets-rails (~> 2.0.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rr (1.0.4)
-    simplecov (0.5.3)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    slop (3.3.3)
-    sprockets (2.2.2)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.1)
+    rr (1.1.2)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.4.7)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    thor (0.17.0)
-    tilt (1.3.6)
-    treetop (1.4.12)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     turn (0.9.6)
       ansi
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
@@ -114,10 +115,9 @@ PLATFORMS
 DEPENDENCIES
   active_resource_simulator
   database_cleaner
-  factory_girl
-  minitest
+  factory_girl (~> 2.0.4)
   pry
-  rails
+  rails (>= 3.1.0, < 5.0.0)
   remotable!
   rr
   simplecov

data/lib/remotable/active_record_extender.rb

@@ -1,6 +1,7 @@
 require "remotable/core_ext"
 require "active_support/concern"
 require "active_support/core_ext/array/wrap"
+require "benchmark"
 
 
 module Remotable
@@ -9,7 +10,8 @@ module Remotable
     include Nosync
     
     def nosync?
-      self.class.nosync? || super
+      return super if nosync_value?
+      self.class.nosync?
     end
     
     
@@ -26,6 +28,7 @@ module Remotable
       @remote_attribute_map ||= default_remote_attributes.map_to_self
       @local_attribute_routes ||= {}
       @expires_after ||= 1.day
+      @remote_timeout = { :index => 4, :show => 1, :update => 2, :create => 2, :destroy => 2 }
     end
     
     
@@ -34,7 +37,9 @@ module Remotable
       include Nosync
       
       def nosync?
-        Remotable.nosync? || remote_model.nil? || super
+        return true if remote_model.nil?
+        return super if nosync_value?
+        Remotable.nosync?
       end
       
       # Sets the key with which a resource is identified remotely.
@@ -84,6 +89,14 @@ module Remotable
         @local_attribute_routes = {} # reset routes
       end
       
+      def remote_timeout(*args)
+        if args.any?
+          @remote_timeout = n = args.first
+          @remote_timeout = {:index => n, :show => n, :create => n, :update => n, :destroy => n} if n.is_a?(Numeric)
+        end
+        @remote_timeout
+      end
+      
       def fetch_with(local_key, options={})
         @local_attribute_routes.merge!(local_key => options[:path])
       end
@@ -140,12 +153,27 @@ module Remotable
       def instantiate(*args)
         record = super
         if record.expired? && !record.nosync?
-          record.pull_remote_data!
-          record = nil if record.destroyed?
+          begin
+            Remotable.logger.debug "[remotable:#{name.underscore}:instantiate](#{record.fetch_value.inspect}) expired #{record.expires_at}"
+            record.pull_remote_data!
+            record = nil if record.destroyed?
+          rescue Remotable::TimeoutError
+            report_ignored_timeout_error($!)
+          rescue Remotable::ServiceUnavailableError
+            report_ignored_503_error($!)
+          end
         end
         record
       end
       
+      def report_ignored_timeout_error(error)
+        Remotable.logger.error "[remotable:#{name.underscore}:instantiate] #{error.message}"
+      end
+      
+      def report_ignored_503_error(error)
+        Remotable.logger.error "[remotable:#{name.underscore}:instantiate] #{error.message}"
+      end
+      
       
       
       def respond_to?(method_sym, include_private=false)
@@ -163,7 +191,7 @@ module Remotable
             raise ArgumentError, "#{method_sym} was called with #{values.length} but #{local_attributes.length} was expected"
           end
           
-          local_resource = ((0...local_attributes.length).inject(scoped) do |scope, i|
+          local_resource = ((0...local_attributes.length).inject(self) do |scope, i|
             scope.where(local_attributes[i] => values[i])
           end).first || fetch_by(method_details[:remote_key], *values)
           
@@ -215,9 +243,21 @@ module Remotable
         remote_resource && new_from_remote(remote_resource)
       end
       
-      # Looks the resource up remotely;
-      # Returns the remote resource.
       def find_remote_resource_by(remote_attr, *values)
+        invoke_remote_model_find_by(remote_attr, *values)
+      end
+      
+      def find_remote_resource_for_local_by(local_resource, remote_attr, *values)
+        if remote_model.respond_to?(:find_by_for_local)
+          invoke_remote_model_find_by_for_local(local_resource, remote_attr, *values)
+        else
+          invoke_remote_model_find_by(remote_attr, *values)
+        end
+      end
+      
+      def invoke_remote_model_find_by(remote_attr, *values)
+        remote_set_timeout :show
+        
         find_by = remote_model.method(:find_by)
         case find_by.arity
         when 1; find_by.call(remote_path_for(remote_attr, *values))
@@ -227,6 +267,20 @@ module Remotable
         end
       end
       
+      def invoke_remote_model_find_by_for_local(local_resource, remote_attr, *values)
+        remote_set_timeout :show
+        
+        find_by_for_local = remote_model.method(:find_by_for_local)
+        case find_by_for_local.arity
+        when 2; find_by_for_local.call(local_resource, remote_path_for(remote_attr, *values))
+        when 3; find_by_for_local.call(local_resource, remote_attr, *values)
+        else
+          raise InvalidRemoteModel, "#{remote_model}.find_by_for_local should take either 2 or 3 parameters"
+        end
+      end
+      
+      
+      
       def remote_path_for(remote_key, *values)
         route = route_for(remote_key)
         local_key = self.local_key(remote_key)
@@ -260,12 +314,13 @@ module Remotable
       end
       
       def find_by_remote_query(remote_method_name, *args)
-        remote_resources = remote_model.send(remote_method_name, *args)
+        remote_set_timeout :index
+        remote_resources = Array.wrap(remote_model.send(remote_method_name, *args))
         map_remote_resources_to_local(remote_resources)
       end
       
       def map_remote_resources_to_local(remote_resources)
-        return [] if remote_resources.empty?
+        return [] if remote_resources.nil? || remote_resources.empty?
         
         local_resources = nosync { fetch_corresponding_local_resources(remote_resources).to_a }
         
@@ -279,7 +334,7 @@ module Remotable
           local_resource = local_resources.detect { |local_resource|
             Array.wrap(remote_key).all? { |remote_attr|
               local_attr = local_attribute_name(remote_attr)
-              local_resource.send(local_attr) == remote_resource.send(remote_attr)
+              local_resource.send(local_attr) == remote_resource[remote_attr]
             }
           }
           
@@ -298,7 +353,7 @@ module Remotable
       def fetch_corresponding_local_resources(remote_resources)
         conditions = Array.wrap(remote_key).each_with_object({}) do |remote_attr, query|
           local_attr = local_attribute_name(remote_attr)
-          query[local_attr] = remote_resources.map(&remote_attr)
+          query[local_attr] = remote_resources.map { |resource| resource[remote_attr] }
         end
         
         where(conditions)
@@ -306,6 +361,12 @@ module Remotable
       
       
       
+      def remote_set_timeout(mode)
+        remote_model.timeout = remote_timeout[mode] if remote_model.respond_to?(:timeout=)
+      end
+      
+      
+      
     private
       
       def default_remote_attributes
@@ -339,6 +400,7 @@ module Remotable
              :local_attribute_names,
              :local_attribute_name,
              :expires_after,
+             :remote_set_timeout,
              :to => "self.class"
     
     def expired?
@@ -371,8 +433,6 @@ module Remotable
     
     
     
-  private
-    
     def fetch_value
       if local_key.is_a?(Array)
         local_key.map(&method(:send))
@@ -381,16 +441,21 @@ module Remotable
       end
     end
     
+    
+    
+  private
+    
     def fetch_remote_resource
       fetch_value && find_remote_resource_by(remote_key, fetch_value)
     end
     
     def find_remote_resource_by(remote_key, fetch_value)
-      if remote_model.respond_to?(:find_by_for_local)
-        remote_model.find_by_for_local(self, remote_key, fetch_value)
-      else
-        self.class.find_remote_resource_by(remote_key, fetch_value)
+      result = nil
+      ms = Benchmark.ms do
+        result = self.class.find_remote_resource_for_local_by(self, remote_key, fetch_value)
       end
+      Remotable.logger.info "[remotable:#{self.class.name.underscore}:find_remote_resource_by](#{fetch_value.inspect}) %.1fms" % [ ms ]
+      result
     end
     
     def merge_remote_data!(remote_resource)
@@ -401,6 +466,7 @@ module Remotable
     end
     
     def remote_model_has_been_destroyed!
+      Remotable.logger.info "[remotable:#{self.class.name.underscore}:remote_model_has_been_destroyed!](#{fetch_value.inspect})"
       nosync { destroy }
     end
     
@@ -409,6 +475,8 @@ module Remotable
     def update_remote_resource
       if any_remote_changes? && remote_resource
         merge_local_data(remote_resource, true)
+        
+        remote_set_timeout :update
         if remote_resource.save
           merge_remote_data!(remote_resource)
         else
@@ -422,6 +490,7 @@ module Remotable
       @remote_resource = remote_model.new_resource
       merge_local_data(@remote_resource)
       
+      remote_set_timeout :create
       if @remote_resource.save
         
         # This line is especially crucial if the primary key
@@ -436,6 +505,8 @@ module Remotable
     
     def destroy_remote_resource
       return nil unless remote_resource
+      
+      remote_set_timeout :destroy
       if remote_resource.destroy
         true
       else
@@ -467,6 +538,7 @@ module Remotable
     
     
     def merge_remote_errors(errors)
+      Remotable.logger.debug "[remotable:#{self.class.name.underscore}:merge_remote_errors](#{fetch_value.inspect}) #{errors.inspect}"
       errors.each do |attribute, messages|
         Array.wrap(messages).each do |message|
           self.errors.add(local_attribute_name(attribute), message)
@@ -477,8 +549,10 @@ module Remotable
     
     def merge_remote_data(remote_resource)
       remote_attribute_map.each do |remote_attr, local_attr|
-        if remote_resource.respond_to?(remote_attr)
-          send("#{local_attr}=", remote_resource.send(remote_attr))
+        if remote_resource.key?(remote_attr)
+          remote_value = remote_resource[remote_attr]
+          Remotable.logger.debug "[remotable:#{self.class.name.underscore}:merge_remote_data](#{fetch_value.inspect}) local.#{local_attr} = #{remote_value.inspect}"
+          send("#{local_attr}=", remote_value)
         end
       end
       self
@@ -487,7 +561,9 @@ module Remotable
     def merge_local_data(remote_resource, changes_only=false)
       remote_attribute_map.each do |remote_attr, local_attr|
         if !changes_only || local_attribute_changed?(local_attr)
-          remote_resource.send("#{remote_attr}=", send(local_attr))
+          local_value = send(local_attr)
+          Remotable.logger.debug "[remotable:#{self.class.name.underscore}:merge_local_data](#{fetch_value.inspect}) remote.#{remote_attr} = #{local_value.inspect}"
+          remote_resource[remote_attr] = local_value
         end
       end
       self

data/lib/remotable/active_resource_fixes.rb

@@ -99,6 +99,20 @@ end
 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
+
+
+
 # ActiveResource expects that errors will be an array of string
 # However, this is not what Rails Responders are inclined to return.
 

data/lib/remotable/adapters/active_resource.rb

@@ -8,16 +8,50 @@ module Remotable
     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
+      
+      
+      
       module ClassMethods
         
+        IF_MODIFIED_SINCE = "If-Modified-Since".freeze
+        
+        
         
         def new_resource
           new
         end
         
         
-        def find_by!(path)
-          find(:one, :from => expanded_path_for(path))
+        
+        # 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
+        # alter the behavior of a normal model at all.
+        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.respond_to?(:updated_at)
+          find_by(path)
+        ensure
+          if had_previous_value
+            headers[IF_MODIFIED_SINCE] = previous_value
+          else
+            headers.delete(IF_MODIFIED_SINCE)
+          end
         end
         
         def find_by(path)
@@ -26,6 +60,19 @@ module Remotable
           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)
+        rescue ::ActiveResource::TimeoutError
+          $!.extend Remotable::TimeoutError
+          raise
+        rescue ::ActiveResource::ServerError
+          $!.extend Remotable::ServiceUnavailableError if $!.response.code == 503
+          raise
+        end
+        
+        
         
         def expanded_path_for(path)
           if relative_path?(path)
@@ -36,14 +83,13 @@ module Remotable
         end
         
         
-      private
         
+      private
         
         def relative_path?(path)
           !(path.start_with?("/") || path["://"])
         end
         
-        
       end
     end
   end

data/lib/remotable/errors.rb

@@ -0,0 +1,5 @@
+module Remotable
+  module Error; end
+  module TimeoutError; include Error; end
+  module ServiceUnavailableError; include Error; end
+end

data/lib/remotable/logger_wrapper.rb

@@ -0,0 +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

@@ -6,16 +6,20 @@ module Remotable
       self.nosync = true
     end
     
-    def nosync
-      value = @nosync
-      nosync!
+    def nosync(new_value=true)
+      old_value = @nosync
+      self.nosync = new_value
       yield
     ensure
-      self.nosync = value
+      @nosync = old_value
     end
     
     def nosync=(val)
-      @nosync = (val == true)
+      @nosync = val
+    end
+    
+    def nosync_value?
+      !@nosync.nil?
     end
     
     def nosync?

data/lib/remotable/null_remote.rb

@@ -27,13 +27,16 @@ module Remotable
     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 method_missing(method_name, *args)
-      super unless method_name.to_s =~ /=$/
+    def []=(attribute, value)
     end
     
+    def key?(attribute)
+      false
+    end
     
     def save
       true

data/lib/remotable/version.rb

@@ -1,3 +1,3 @@
 module Remotable
-  VERSION = "0.2.4"
+  VERSION = "0.2.5.beta1"
 end

data/lib/remotable.rb

@@ -3,6 +3,8 @@ require "remotable/nosync"
 require "remotable/null_remote"
 require "remotable/validate_models"
 require "remotable/with_remote_model_proxy"
+require "remotable/errors"
+require "remotable/logger_wrapper"
 
 
 # Remotable keeps a locally-stored ActiveRecord
@@ -42,6 +44,16 @@ module Remotable
   # but turn it off in production.
   self.validate_models = true
   
+  # Logger
+  def self.logger; @logger ||= LoggerWrapper.new(FakeLogger.new); end
+  def self.logger=(logger); @logger = LoggerWrapper.new(logger); end
+  
+  class << self
+    attr_accessor :log_level
+    Remotable.log_level = :debug
+  end
+  
+  
   
   # == remote_model( model [optional] )
   # 
@@ -112,6 +124,24 @@ module Remotable
   
   class InvalidRemoteModel < ArgumentError; end
   
+  class FakeLogger
+    
+    def write(s)
+      puts s
+    end
+    
+    alias :debug :write
+    alias :info :write
+    alias :warn :write
+    alias :error :write
+    
+  end
+  
+  
+  def self.http_format_time(time)
+    time.utc.strftime("%a, %e %b %Y %H:%M:%S %Z")
+  end
+  
   
   
 private

data/remotable.gemspec

@@ -17,11 +17,10 @@ Gem::Specification.new do |s|
   s.add_dependency "activerecord"
   s.add_dependency "activesupport"
   
-  s.add_development_dependency "rails"
-  s.add_development_dependency "minitest"
+  s.add_development_dependency "rails", ">= 3.1.0", "< 5.0.0"
   s.add_development_dependency "turn"
   s.add_development_dependency "pry"
-  s.add_development_dependency "factory_girl"
+  s.add_development_dependency "factory_girl", "~> 2.0.4"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "active_resource_simulator"
   s.add_development_dependency "simplecov"

data/test/active_resource_test.rb

@@ -14,6 +14,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   
   
   
+  
   # ========================================================================= #
   #  Finding                                                                  #
   # ========================================================================= #
@@ -117,6 +118,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   
   
   
+  
   # ========================================================================= #
   # Expiration                                                                #
   # ========================================================================= #
@@ -146,13 +148,40 @@ class ActiveResourceTest < ActiveSupport::TestCase
         :id => tenant.remote_id,
         :slug => tenant.slug,
         :church_name => unexpected_name
-      })
+      }, :headers => if_modified_since(tenant))
       
       tenant = Tenant.find_by_remote_id(tenant.remote_id)
       assert_equal unexpected_name, tenant.name
     end
   end
   
+  test "should treat a 304 response as no changes" do
+    tenant = Factory(:tenant, :expires_at => 1.year.ago)
+    
+    RemoteTenant.run_simulation do |s|
+      s.show(tenant.remote_id, nil, :status => 304, :headers => if_modified_since(tenant))
+      
+      tenant = Tenant.find_by_remote_id(tenant.remote_id)
+      assert tenant.expires_at > Time.now, "Tenant should be considered fresh"
+      assert_not_nil tenant.remote_id, "The Remote Tenant's id should not be considered nil just because there was no body in the remote response"
+    end
+  end
+  
+  test "should ignore a 503 response" do
+    expired_at = 1.year.ago
+    tenant = Factory(:tenant, :expires_at => expired_at)
+    
+    RemoteTenant.run_simulation do |s|
+      s.show(tenant.remote_id, nil, :status => 503, :headers => if_modified_since(tenant))
+      
+      assert_nothing_raised do
+        tenant = Tenant.find_by_remote_id(tenant.remote_id)
+      end
+      assert_equal expired_at, tenant.expires_at, "Tenant's expiration date should not have changed"
+    end
+  end
+  
+  
   
   
   # ========================================================================= #
@@ -168,7 +197,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
         :id => tenant.remote_id,
         :slug => "totally-wonky",
         :church_name => tenant.name
-      })
+      }, :headers => if_modified_since(tenant))
       
       tenant.nosync = false
       tenant.name = "Totally Wonky"
@@ -191,7 +220,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
         :id => tenant.remote_id,
         :slug => tenant.slug,
         :church_name => tenant.name
-      })
+      }, :headers => if_modified_since(tenant))
       s.update(tenant.remote_id, :status => 422, :body => {
         :errors => {:church_name => ["is already taken"]}
       })
@@ -275,6 +304,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   
   
   
+  
   # ========================================================================= #
   # Destroying                                                                #
   # ========================================================================= #
@@ -287,7 +317,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
         :id => tenant.remote_id,
         :slug => tenant.slug,
         :church_name => tenant.name
-      })
+      }, :headers => if_modified_since(tenant))
       
       # Throws an error if save is not called on the remote resource
       mock(tenant.remote_resource).destroy { true }
@@ -305,7 +335,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
         :id => tenant.remote_id,
         :slug => tenant.slug,
         :church_name => tenant.name
-      })
+      }, :headers => if_modified_since(tenant))
       
       s.destroy(tenant.remote_id, 
         :body => { :errors => { :base => ["nope"] } },
@@ -323,9 +353,9 @@ class ActiveResourceTest < ActiveSupport::TestCase
     
     assert_difference "Tenant.count", -1 do
       RemoteTenant.run_simulation do |s|
-        s.show(tenant.remote_id, nil, :status => 404)
+        s.show(tenant.remote_id, nil, :status => 404, :headers => if_modified_since(tenant))
         
-        tenant = Tenant.find_by_remote_id(tenant.remote_id)
+        tenant = Tenant.where(:remote_id => tenant.remote_id).first
         assert_equal nil, tenant
       end
     end
@@ -333,6 +363,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   
   
   
+  
   # ========================================================================= #
   #  Listing                                                                  #
   # ========================================================================= #
@@ -365,4 +396,44 @@ class ActiveResourceTest < ActiveSupport::TestCase
   
   
   
+  # ========================================================================= #
+  #  Timeouts                                                                 #
+  # ========================================================================= #
+  
+  test "should raise a Remotable::TimeoutError when a timeout occurs" do
+    assert_raise Remotable::TimeoutError do
+      stub(Tenant.remote_model).find do |*args|
+        raise ActiveResource::TimeoutError, "it timed out"
+      end
+      
+      Tenant.find_by_remote_id(15)
+    end
+  end
+  
+  test "should ignore a Remotable::TimeoutError when instantiating a record" do
+    tenant = Factory(:tenant, :expires_at => 1.year.ago)
+    
+    assert_nothing_raised do
+      stub(Tenant.remote_model).find do |*args|
+        raise ActiveResource::TimeoutError, "it timed out"
+      end
+      
+      tenant = Tenant.find_by_remote_id(tenant.remote_id)
+      assert_not_nil tenant
+    end
+  end
+  
+  
+  
+  
+private
+  
+  
+  
+  def if_modified_since(record)
+    {"If-Modified-Since" => Remotable.http_format_time(record.updated_at)}
+  end
+  
+  
+  
 end

data/test/nosync_test.rb

@@ -25,6 +25,30 @@ class NoSyncTest < ActiveSupport::TestCase
     end
   end
   
+  test "nosync? should be false if syncing is resumed temporarily on a model that prevents it by default" do
+    Tenant.nosync!
+    assert_equal true, Tenant.new.nosync?
+    Tenant.nosync(false) do
+      assert_equal false, Tenant.new.nosync?
+    end
+    assert_equal true, Tenant.new.nosync?
+  end
+  
+  test "nosync? should take the value further up the chain if a model's value is temporarily cleared" do
+    assert_not_nil Tenant.remote_model
+    
+    Remotable.nosync!
+    Tenant.nosync(false) do
+      Tenant.nosync(nil) do
+        assert_equal false, Tenant.nosync_value?
+        assert_equal true, Tenant.nosync?
+      end
+      assert_equal true, Tenant.nosync_value?
+      assert_equal false, Tenant.nosync?
+    end
+    assert_equal true, Tenant.nosync?
+  end
+  
   
   
   # ========================================================================= #

data/test/support/bespoke.rb

@@ -28,11 +28,10 @@ end
 class BespokeResource
   
   def initialize(attributes={})
-    self.slug = attributes[:slug]
-    self.name = attributes[:name]
+    @attributes = attributes
   end
   
-  attr_accessor :slug, :name
+  delegate :key?, :[], :[]=, :to => :@attributes
   
   def save
     true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remotable
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5.beta1
 platform: ruby
 authors:
 - Robert Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -58,28 +58,20 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+        version: 3.1.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +104,16 @@ dependencies:
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +207,8 @@ files:
 - lib/remotable/core_ext/enumerable.rb
 - lib/remotable/core_ext/object.rb
 - lib/remotable/core_ext/uri.rb
+- lib/remotable/errors.rb
+- lib/remotable/logger_wrapper.rb
 - lib/remotable/nosync.rb
 - lib/remotable/null_remote.rb
 - lib/remotable/validate_models.rb
@@ -247,12 +241,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: remotable
-rubygems_version: 2.0.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Binds an ActiveRecord model to a remote resource and keeps the two synchronized