remotable 0.4.0.beta2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50bbb2463866bea7de985bdc5375aaac0b7c715b
-  data.tar.gz: ee16e4675c4c3c8a7cd4420e9180a0d532575a80
+  metadata.gz: ddc9f37b1e04cbd48e85ae0b05e75e6b72f6e145
+  data.tar.gz: e019957e6c601abba1a6fc6c88ed1f2d357691cb
 SHA512:
-  metadata.gz: 32767f6332fe922693bf2265c7dff1b73b916c491800e792b44e4d4104050335fcf562a5c729bf1ba9f1306d3bf14d2a0590e4211c98de7bf22a0f4a7865d26f
-  data.tar.gz: 46c8039a5195b3a629761798b359c228ce8448caa72b59686402182f17ea70773fe8191ee5c80fcd13a3cd8af9ebbf73947ae4c53317ceef78fa4fa9ae730d46
+  metadata.gz: c50f5da9c4150f66a92d1ceb12e97f473e19d7c15f2743777885112b8e0b04b1b83aa2ee78113e225557a17a280a34d1bebaf8b25f060a0c564279eb9aa16f0a
+  data.tar.gz: 88b1a55add081c7312221d1855f03305d039e72603f093b1656f043bbba71d89dccd2f644d78ae0fd373cd2e266307663d15ef9fec529e6187d4259eca76f375

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - 2.3.1
+  - 2.5.1
+
+matrix:
+  allow_failures:
+    - rvm: 2.5.1
+
+script: bundle exec rake test
+
+# To stop Travis from running tests for a new commit,
+# add the following to your commit message: [ci skip]
+# You should add this when you edit documentation or comments, etc.

data/Gemfile.lock

@@ -1,113 +1,67 @@
 PATH
   remote: .
   specs:
-    remotable (0.4.0.beta2)
+    remotable (0.4.0)
       activerecord
-      activeresource
+      activeresource (>= 3.2)
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    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)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
     active_resource_simulator (0.0.2)
       activeresource
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
+      activesupport (= 4.0.13)
       arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activeresource (4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activeresource (4.1.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
-      rails-observers (~> 0.1.1)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
+      rails-observers (~> 0.1.2)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    ansi (1.4.3)
-    arel (4.0.1)
-    atomic (1.1.14)
+    ansi (1.5.0)
+    arel (4.0.2)
     builder (3.1.4)
-    coderay (1.1.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
     database_cleaner (1.2.0)
-    docile (1.1.2)
-    erubis (2.7.0)
+    docile (1.3.1)
     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.2)
-    mime-types (1.25.1)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
+    method_source (0.9.0)
     minitest (4.7.5)
-    multi_json (1.8.4)
-    polyglot (0.3.3)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    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)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    multi_json (1.13.1)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rails-observers (0.1.5)
+      activemodel (>= 4.0)
+    rake (12.3.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)
-    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)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    turn (0.9.7)
       ansi
-    tzinfo (0.3.38)
+      minitest (~> 4)
+    tzinfo (0.3.54)
 
 PLATFORMS
   ruby
@@ -117,12 +71,12 @@ DEPENDENCIES
   database_cleaner
   factory_girl (~> 2.0.4)
   pry
-  rails (>= 3.1.0, < 5.0.0)
+  rake
   remotable!
   rr
   simplecov
-  sqlite3
+  sqlite3 (~> 1.3.13)
   turn
 
 BUNDLED WITH
-   1.10.6
+   1.16.1

data/README.mdown

@@ -1,5 +1,7 @@
 # Remotable
 
+[![Build Status](https://travis-ci.org/cph/remotable.svg)](https://travis-ci.org/cph/remotable)
+
 Remotable associates an ActiveRecord model with a remote resource (like an ActiveResource model) and keeps the two synchronized.
 
 - When a local record is loaded, Remotable ensures that it is up-to-date.

data/lib/remotable/active_record_extender.rb

@@ -108,6 +108,16 @@ module Remotable
         @local_attribute_routes.merge!(local_key => options[:path])
       end
 
+      attr_accessor :remotable_skip_validation_on_sync
+
+      def remotable_skip_validation!
+        self.remotable_skip_validation_on_sync = true
+      end
+
+      def remotable_skip_validation_on_sync?
+        self.remotable_skip_validation_on_sync
+      end
+
 
 
       attr_reader :remote_attribute_map,
@@ -168,6 +178,8 @@ module Remotable
             report_ignored_network_error($!)
           rescue Remotable::ServiceUnavailableError
             report_ignored_503_error($!)
+          rescue Remotable::SSLError
+            report_ignored_ssl_error($!)
           end
         end
         record
@@ -185,6 +197,10 @@ module Remotable
         Remotable.logger.error "[remotable:#{name.underscore}:instantiate] #{error.message}"
       end
 
+      def report_ignored_ssl_error(error)
+        Remotable.logger.error "[remotable:#{name.underscore}:instantiate] #{error.message}"
+      end
+
 
 
       # !todo: create these methods on an anonymous module and mix it in
@@ -330,7 +346,6 @@ module Remotable
       end
 
 
-
       def all_by_remote
         find_by_remote_query(:all)
       end
@@ -338,6 +353,7 @@ module Remotable
       def find_by_remote_query(remote_method_name, *args)
         remote_set_timeout :list
         remote_resources = Array.wrap(remote_model.send(remote_method_name, *args))
+
         map_remote_resources_to_local(remote_resources)
       end
 
@@ -421,6 +437,7 @@ module Remotable
              :local_attribute_names,
              :local_attribute_name,
              :expires_after,
+             :remotable_skip_validation_on_sync?,
              :to => "self.class"
 
     def expired?
@@ -487,7 +504,7 @@ module Remotable
     def merge_remote_data!(remote_resource)
       merge_remote_data(remote_resource)
       reset_expiration_date
-      nosync { save! }
+      nosync { save!(validate: !remotable_skip_validation_on_sync?) }
       self
     end
 
@@ -547,6 +564,7 @@ module Remotable
 
     def initialize_expiration_date
       reset_expiration_date unless self.expires_at
+      true
     end
 
     def reset_expiration_date

data/lib/remotable/active_resource_fixes.rb

@@ -34,68 +34,6 @@ module ActiveResourceFixes
 
 end
 
-
-module ActiveResourceFixes30
-
-  # 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.
-  def respond_to?(method_symbol, include_private=false)
-    method_name = method_symbol.to_s
-    if method_name =~ /\w+=/
-      true
-    elsif attributes.include?(method_name)
-      true
-    else
-      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.
-  def respond_to?(method_symbol, include_private=false)
-    method_name = method_symbol.to_s
-    if method_name =~ /\w+=/
-      true
-    elsif attributes.include?(method_name)
-      true
-    else
-      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), true)
-      @persisted = true
-    end
-  end
-
-end
-
-if Rails.version >= '3.2'
-  #
-elsif Rails.version < '3.1'
-  ActiveResource::Base.send(:include, ActiveResourceFixes30)
-else
-  ActiveResource::Base.send(:include, ActiveResourceFixes31)
-end
-
-
 ActiveResource::Base.send(:include, ActiveResourceFixes)
 
 

data/lib/remotable/adapters/active_resource.rb

@@ -98,8 +98,11 @@ module Remotable
           $!.extend Remotable::TimeoutError
           raise
         rescue ::ActiveResource::ServerError
-          $!.extend Remotable::ServiceUnavailableError if $!.response.code == 503
-          $!.extend Remotable::TimeoutError if $!.response.code == 504
+          $!.extend Remotable::ServiceUnavailableError if $!.response.code.to_i == 503
+          $!.extend Remotable::TimeoutError if $!.response.code.to_i == 504
+          raise
+        rescue ::ActiveResource::SSLError
+          $!.extend Remotable::SSLError
           raise
         end
 

data/lib/remotable/errors.rb

@@ -4,4 +4,5 @@ module Remotable
   module ServiceUnavailableError; include Error; end
   module NetworkError; include Error; end
   module NotFound; include Error; end
+  module SSLError; include Error; end
 end

data/lib/remotable/nosync.rb

@@ -7,7 +7,7 @@ module Remotable
     end
 
     def nosync(new_value=true)
-      old_value = @nosync
+      old_value = _nosync
       self.nosync = new_value
       yield
     ensure
@@ -19,13 +19,19 @@ module Remotable
     end
 
     def nosync_value?
-      !@nosync.nil?
+      !_nosync.nil?
     end
 
     def nosync?
       @nosync == true
     end
 
+  private
+
+    def _nosync
+      @nosync if instance_variable_defined?(:@nosync)
+    end
+
 
   end
 end

data/lib/remotable/version.rb

@@ -1,3 +1,3 @@
 module Remotable
-  VERSION = "0.4.0.beta2"
+  VERSION = "0.4.0"
 end

data/remotable.gemspec

@@ -10,23 +10,23 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = %q{Binds an ActiveRecord model to a remote resource and keeps the two synchronized}
   s.description = %q{Remotable keeps a locally-stored ActiveRecord synchronized with a remote resource.}
-  
+
   s.rubyforge_project = "remotable"
-  
-  s.add_dependency "activeresource"
+
+  s.add_dependency "activeresource", ">= 3.2"
   s.add_dependency "activerecord"
   s.add_dependency "activesupport"
-  
-  s.add_development_dependency "rails", ">= 3.1.0", "< 5.0.0"
+
+  s.add_development_dependency "rake"
   s.add_development_dependency "turn"
   s.add_development_dependency "pry"
   s.add_development_dependency "factory_girl", "~> 2.0.4"
-  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "sqlite3", "~> 1.3.13"
   s.add_development_dependency "active_resource_simulator"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rr"
   s.add_development_dependency "database_cleaner"
-  
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/test/active_resource_test.rb

@@ -207,7 +207,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
       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"
+      assert_in_delta expired_at, tenant.expires_at, 0.1, "Tenant's expiration date should not have changed"
     end
   end
 

data/test/test_helper.rb

@@ -1,15 +1,13 @@
-require 'rubygems'
-require 'simplecov'
-require 'rails'
-require 'rails/test_help'
-require 'active_support/core_ext'
-require 'factory_girl'
-require 'turn'
-require 'pry'
-require 'database_cleaner'
-
-
-require 'active_record'
+require "rubygems"
+require "simplecov"
+require "active_support/core_ext"
+require "factory_girl"
+require "turn"
+require "pry"
+require "database_cleaner"
+require "active_record"
+require "factories/tenants"
+require "minitest/autorun"
 
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
@@ -18,10 +16,6 @@ ActiveRecord::Base.establish_connection(
 
 load File.join(File.dirname(__FILE__), "support", "schema.rb")
 
-
-require 'factories/tenants'
-
-
 DatabaseCleaner.strategy = :transaction
 
 class ActiveSupport::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remotable
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta2
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -53,25 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
@@ -118,16 +112,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: active_resource_simulator
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +188,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".simplecov"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -243,12 +238,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: remotable
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Binds an ActiveRecord model to a remote resource and keeps the two synchronized