remotable 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ddc9f37b1e04cbd48e85ae0b05e75e6b72f6e145
-  data.tar.gz: e019957e6c601abba1a6fc6c88ed1f2d357691cb
+SHA256:
+  metadata.gz: eb1390c1e1b04414cc0c44807a064f1d5d879c891a01988abcd7b919d9d53f37
+  data.tar.gz: 5f5b316b09904143182ba07de7225f1151328bc1dd12b52a3e5797b0b1f8dc03
 SHA512:
-  metadata.gz: c50f5da9c4150f66a92d1ceb12e97f473e19d7c15f2743777885112b8e0b04b1b83aa2ee78113e225557a17a280a34d1bebaf8b25f060a0c564279eb9aa16f0a
-  data.tar.gz: 88b1a55add081c7312221d1855f03305d039e72603f093b1656f043bbba71d89dccd2f644d78ae0fd373cd2e266307663d15ef9fec529e6187d4259eca76f375
+  metadata.gz: ef0d217377d44f7ea675da8ff0faf6718654502abec68cc2f388bc1d1ab95ecf7325aa20733608575d51842390510e9799326149b7ab31b075bcc8fe9902e188
+  data.tar.gz: 134e43c05eb6da221d66d1ae14bdb93f42d89c22a7b32336d505a81c3ad11e18f63ca5e52ca7838cebb52035221abbd9638473aa32c2bdef310c84bbd39e687c

data/.gitignore

@@ -1,3 +1,5 @@
+Gemfile.lock
+gemfiles/*.gemfile.lock
 *.gem
 .bundle
 pkg/*

data/.travis.yml

@@ -1,11 +1,28 @@
 language: ruby
 rvm:
-  - 2.3.1
-  - 2.5.1
+  - 2.3
+  - 2.5
+  - 2.6
 
-matrix:
+gemfile:
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
+  - gemfiles/rails_edge.gemfile
+
+jobs:
+  exclude:
+  - rvm: 2.3
+    gemfile: gemfiles/rails_6.0.gemfile
+  - rvm: 2.3
+    gemfile: gemfiles/rails_edge.gemfile
+  - rvm: 2.4
+    gemfile: gemfiles/rails_6.0.gemfile
+  - rvm: 2.4
+    gemfile: gemfiles/rails_edge.gemfile
   allow_failures:
-    - rvm: 2.5.1
+  - gemfile: gemfiles/rails_edge.gemfile
 
 script: bundle exec rake test
 

data/Appraisals

@@ -0,0 +1,24 @@
+appraise "rails-5.0" do
+  gem "activerecord", "~> 5.0.0"
+  gem "sqlite3", "~> 1.3.6"
+end
+
+appraise "rails-5.1" do
+  gem "activerecord", "~> 5.1.0"
+  gem "sqlite3", "~> 1.3.6"
+end
+
+appraise "rails-5.2" do
+  gem "activerecord", "~> 5.2.0"
+  gem "sqlite3", "~> 1.3.6"
+end
+
+appraise "rails-6.0" do
+  gem "activerecord", "~> 6.0.0"
+  gem "sqlite3", "~> 1.4.0"
+end
+
+appraise "rails-edge" do
+  gem "rails", git: "https://github.com/rails/rails.git", branch: "master", require: "activerecord"
+  gem "sqlite3", "~> 1.4.0"
+end

data/README.mdown

@@ -20,29 +20,34 @@ Just add the following to your Gemfile:
 
 **1.** Remotable requires that your local model have an `expires_at` column.
 
-    class AddExpiresAtToTenants < ActiveRecord::Migration
-      def self.up
-        add_column :tenants, :expires_at, :timestamp, :null => false
-      end
-    end
+```ruby
+class AddExpiresAtToTenants < ActiveRecord::Migration
+  def self.up
+    add_column :tenants, :expires_at, :timestamp, :null => false
+  end
+end
+```
 
 **2.** Your local model has to be associated with a remote model: (Let's say `RemoteTenant` is the name of an ActiveResource model.)
 
-    class Tenant < ActiveRecord::Base
-      remote_model RemoteTenant
-    end
-
+```ruby
+class Tenant < ActiveRecord::Base
+  remote_model RemoteTenant
+end
+```
 
 ### Configuration
 
 Specify the attributes of the local model that you want to keep in sync with the remote model. You can also specify mappings by using the hash rocket. The line `:customer_name => :name` tells Remotable to keep `RemoteTenant#customer_name` in sync with `Tenant#name`.
 
-    class Tenant < ActiveRecord::Base
-      remote_model RemoteTenant
-      attr_remote :slug,
-                  :customer_name => :name,
-                  :id => :remote_id
-    end
+```ruby
+class Tenant < ActiveRecord::Base
+  remote_model RemoteTenant
+  attr_remote :slug,
+              :customer_name => :name,
+              :id => :remote_id
+end
+```
 
 ### Remote Keys
 
@@ -50,24 +55,28 @@ By default Remotable assumes that the local model and remote model are joined wi
 
 If you specify `attr_remote :id => :remote_id`, then the join will be on `local_model.remote_id=remote_model.id`, but you can also use a different attribute as the join key:
 
-    class Tenant < ActiveRecord::Base
-      remote_model RemoteTenant
-      attr_remote :slug,
-                  :customer_name => :name,
-                  :id => :remote_id
-      remote_key  :slug
-    end
+```ruby
+class Tenant < ActiveRecord::Base
+  remote_model RemoteTenant
+  attr_remote :slug,
+              :customer_name => :name,
+              :id => :remote_id
+  remote_key  :slug
+end
+```
 
 Now, the join could be expressed this way: `local_model.slug=remote_model.slug`.
 
 If you must look up a remote model with more than one attribute, you can express a composite key this way:
 
-    class Event < ActiveRecord::Base
-      remote_model RemoteEvent
-      attr_remote :calendar_id,
-                  :id => :remote_id
-      remote_key  [:calendar_id, :remote_id]
-    end
+```ruby
+class Event < ActiveRecord::Base
+  remote_model RemoteEvent
+  attr_remote :calendar_id,
+              :id => :remote_id
+  remote_key  [:calendar_id, :remote_id]
+end
+```
 
 ### Finders
 
@@ -75,33 +84,38 @@ For `:id` or whatever you chose to be the remote key, Remotable will create a fi
 
 You can create additional finder with the `fetch_with` method:
 
-    class Tenant < ActiveRecord::Base
-      remote_model RemoteTenant
-      attr_remote :slug,
-                  :customer_name => :name,
-                  :id => :remote_id
-      fetch_with :slug
-      fetch_with :name
-    end
+```ruby
+class Tenant < ActiveRecord::Base
+  remote_model RemoteTenant
+  attr_remote :slug,
+              :customer_name => :name,
+              :id => :remote_id
+  fetch_with :slug
+  fetch_with :name
+end
+```
 
 Remotable will create the following methods and assume the URI for the custom finders from the attribute. The example above will create the following methods:
 
+```ruby
     find_by_remote_id(...)    # Looks in api_path/tenants/:id
     find_by_slug(...)         # Looks in api_path/tenants/by_slug/:slug
     find_by_name(...)         # Looks in api_path/tenants/by_name/:name
+```
 
 Note that the finder methods are named with the _local_ attributes.
 
 You can specify a custom path with the `fetch_with` method:
 
-    class Tenant < ActiveRecord::Base
-      remote_model RemoteTenant
-      attr_remote :slug,
-                  :customer_name => :name,
-                  :id => :remote_id
-      fetch_with :name, :path => "by_nombre/:name"
-    end
-
+```ruby
+class Tenant < ActiveRecord::Base
+  remote_model RemoteTenant
+  attr_remote :slug,
+              :customer_name => :name,
+              :id => :remote_id
+  fetch_with :name, :path => "by_nombre/:name"
+end
+```
 
 When you use `fetch_with`, give the name of the _local_ attribute not the remote one (if they differ). Also, the name of the symbolic part of the path should match the local attribute name as well.
 
@@ -109,10 +123,12 @@ When you use `fetch_with`, give the name of the _local_ attribute not the remote
 
 Whenever a remoted record is instantiated, Remotable checks the value of its `expires_at` attribute. If the date is in the past, Remotable pulls changes from the remote resource. Whenever a record is saved, `expires_at` is set to a time in the future&mdash;by default, 1 day. You can change how frequently a record expires by setting `expires_after` to a duration:
 
-    class Tenant < ActiveRecord::Base
-      remote_model RemoteTenant
-      expires_after 1.hour
-    end
+```ruby
+class Tenant < ActiveRecord::Base
+  remote_model RemoteTenant
+  expires_after 1.hour
+end
+```
 
 ### Adapters
 

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.6"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.6"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.6"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "sqlite3", "~> 1.4.0"
+
+gemspec path: "../"

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", git: "https://github.com/rails/rails.git", branch: "master", require: "activerecord"
+gem "sqlite3", "~> 1.4.0"
+
+gemspec path: "../"

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 "active_resource/threadsafe_attributes"
 require "benchmark"
 
 
@@ -25,10 +26,10 @@ module Remotable
 
       validates_presence_of :expires_at
 
-      @remote_attribute_map ||= default_remote_attributes.map_to_self
-      @local_attribute_routes ||= {}
-      @expires_after ||= 1.day
-      @remote_timeout = {
+      self._remote_attribute_map ||= default_remote_attributes.map_to_self
+      self._local_attribute_routes ||= {}
+      self._expires_after ||= 1.day
+      self._remote_timeout = {
         :list    => 4, # when we're getting many remote resources
         :fetch   => 4, # when we're getting a remote resource that doesn't exist locally
         :pull    => 1, # when we're getting a remote resource to refresh a local one
@@ -42,6 +43,10 @@ module Remotable
 
     module ClassMethods
       include Nosync
+      include ThreadsafeAttributes
+
+      threadsafe_attribute :_remote_key, :_expires_after, :_remote_attribute_map,
+        :_local_attribute_routes, :_remote_timeout, :remotable_skip_validation_on_sync
 
       def nosync?
         return true if remote_model.nil?
@@ -78,37 +83,43 @@ module Remotable
           # Set up a finder method for the remote_key
           fetch_with(local_key(remote_key), options)
 
-          @remote_key = remote_key
+          self._remote_key = remote_key
         else
-          @remote_key || generate_default_remote_key
+          _remote_key || generate_default_remote_key
         end
       end
 
       def expires_after(*args)
-        @expires_after = args.first if args.any?
-        @expires_after
+        self._expires_after = args.first if args.any?
+        _expires_after
       end
 
       def attr_remote(*attrs)
         map = attrs.extract_options!
         map = attrs.map_to_self.merge(map)
-        @remote_attribute_map = map
-        @local_attribute_routes = {} # reset routes
+        self._remote_attribute_map = map
+        self._local_attribute_routes = {} # reset routes
       end
 
       def remote_timeout(*args)
         if args.any?
-          @remote_timeout = n = args.first
-          @remote_timeout = {:list => n, :fetch => n, :pull => n, :create => n, :update => n, :destroy => n} if n.is_a?(Numeric)
+          self._remote_timeout = n = args.first
+          self._remote_timeout = {:list => n, :fetch => n, :pull => n, :create => n, :update => n, :destroy => n} if n.is_a?(Numeric)
         end
-        @remote_timeout
+        _remote_timeout
       end
 
-      def fetch_with(local_key, options={})
-        @local_attribute_routes.merge!(local_key => options[:path])
+      def remote_attribute_map
+        self._remote_attribute_map
       end
 
-      attr_accessor :remotable_skip_validation_on_sync
+      def local_attribute_routes
+        self._local_attribute_routes
+      end
+
+      def fetch_with(local_key, options={})
+        self._local_attribute_routes.merge!(local_key => options[:path])
+      end
 
       def remotable_skip_validation!
         self.remotable_skip_validation_on_sync = true
@@ -119,10 +130,6 @@ module Remotable
       end
 
 
-
-      attr_reader :remote_attribute_map,
-                  :local_attribute_routes
-
       def local_key(remote_key=nil)
         remote_key ||= self.remote_key
         if remote_key.is_a?(Array)
@@ -133,24 +140,24 @@ module Remotable
       end
 
       def remote_attribute_names
-        remote_attribute_map.keys
+        _remote_attribute_map.keys
       end
 
       def local_attribute_names
-        remote_attribute_map.values
+        _remote_attribute_map.values
       end
 
       def remote_attribute_name(local_attr)
-        remote_attribute_map.key(local_attr) || local_attr
+        _remote_attribute_map.key(local_attr) || local_attr
       end
 
       def local_attribute_name(remote_attr)
-        remote_attribute_map[remote_attr] || remote_attr
+        _remote_attribute_map[remote_attr] || remote_attr
       end
 
       def route_for(remote_key)
         local_key = self.local_key(remote_key)
-        local_attribute_routes[local_key] || default_route_for(local_key, remote_key)
+        _local_attribute_routes[local_key] || default_route_for(local_key, remote_key)
       end
 
       def default_route_for(local_key, remote_key=nil)
@@ -167,10 +174,23 @@ module Remotable
       # !nb: this method is called when associations are loaded
       # so you can use the remoted record in associations.
       def instantiate(*args)
-        record = super
+        super.tap do |record|
+          sync_on_instantiate(record) unless ActiveRecord.version.segments.first > 5
+        end
+      end
+
+      # !nb: In Rails 6+, this has been extracted from instantiate and can be called
+      # to instantiate homogenous sets of records without calling instantiate
+      def instantiate_instance_of(*args)
+        super.tap do |record|
+          sync_on_instantiate(record)
+        end
+      end
+
+      def sync_on_instantiate(record)
         if record.expired? && !record.nosync?
           begin
-            Remotable.logger.debug "[remotable:#{name.underscore}:instantiate](#{record.fetch_value.inspect}) expired #{record.expires_at}"
+            Remotable.logger.debug "[remotable:#{name.underscore}:sync_on_instantiate](#{record.fetch_value.inspect}) expired #{record.expires_at}"
             record.pull_remote_data!
           rescue Remotable::TimeoutError
             report_ignored_timeout_error($!)
@@ -182,7 +202,6 @@ module Remotable
             report_ignored_ssl_error($!)
           end
         end
-        record
       end
 
       def report_ignored_timeout_error(error)
@@ -254,7 +273,7 @@ module Remotable
         generate_default_remote_key # <- Make sure we've figured out the remote
                                     #    primary key if we're evaluating a finder
 
-        return false unless local_attribute_routes.key?(local_key)
+        return false unless _local_attribute_routes.key?(local_key)
 
         { :local_attributes => local_attributes,
           :remote_key => remote_key }
@@ -412,7 +431,7 @@ module Remotable
 
 
       def generate_default_remote_key
-        return @remote_key if @remote_key
+        return _remote_key if _remote_key
         raise("No remote key supplied and :id is not a remote attribute") unless remote_attribute_names.member?(:id)
         remote_key(:id)
       end
@@ -554,7 +573,7 @@ module Remotable
         true
       else
         merge_remote_errors(remote_resource.errors)
-        false
+        ActiveRecord.version.segments.first > 4 ? throw(:abort) : false
       end
     rescue Remotable::NotFound
       report_ignored_404_on_destroy $!

data/lib/remotable/active_resource_fixes.rb

@@ -1,10 +1,6 @@
 require "active_resource"
-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.
@@ -12,17 +8,11 @@ module ActiveResourceFixes
     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`.
-  def destroy_with_validation
-    destroy_without_validation
+  def destroy
+    super
   rescue ActiveResource::ResourceInvalid => error
     # cache the remote errors because every call to <tt>valid?</tt> clears
     # all errors. We must keep a copy to add these back after local
@@ -34,7 +24,7 @@ module ActiveResourceFixes
 
 end
 
-ActiveResource::Base.send(:include, ActiveResourceFixes)
+ActiveResource::Base.send(:prepend, ActiveResourceFixes)
 
 
 

data/lib/remotable/nosync.rb

@@ -1,37 +1,69 @@
+require "active_resource/threadsafe_attributes"
+
 module Remotable
   module Nosync
 
-
-    def nosync!
-      self.nosync = true
+    def self.included(base)
+      base.include InstanceMethods
     end
 
-    def nosync(new_value=true)
-      old_value = _nosync
-      self.nosync = new_value
-      yield
-    ensure
-      @nosync = old_value
+    def self.extended(base)
+      base.extend ClassMethods
     end
 
-    def nosync=(val)
-      @nosync = val
-    end
+    module InstanceMethods
 
-    def nosync_value?
-      !_nosync.nil?
-    end
+      def nosync!
+        self.nosync = true
+      end
 
-    def nosync?
-      @nosync == true
-    end
+      def reset_nosync!
+        remove_instance_variable(:@nosync) if instance_variable_defined?(:@nosync)
+      end
+
+      def nosync(new_value=true)
+        old_value = _nosync
+        self.nosync = new_value
+        yield
+      ensure
+        self.nosync = old_value
+      end
+
+      def nosync=(val)
+        @nosync = val
+      end
 
-  private
+      def nosync_value?
+        !_nosync.nil?
+      end
+
+      def nosync?
+        !!_nosync
+      end
+
+    private
+
+      def _nosync
+        @nosync if instance_variable_defined?(:@nosync)
+      end
 
-    def _nosync
-      @nosync if instance_variable_defined?(:@nosync)
     end
 
+    module ClassMethods
+      include ThreadsafeAttributes
+      include InstanceMethods
+
+      def reset_nosync!
+        self.nosync = nil
+      end
+
+      def nosync=(val)
+        self._nosync = val
+      end
+
+    private
+      threadsafe_attribute :_nosync
+    end
 
   end
 end

data/lib/remotable/validate_models.rb

@@ -1,13 +1,19 @@
+require "active_resource/threadsafe_attributes"
+
 module Remotable
   module ValidateModels
+    include ThreadsafeAttributes
 
+    def self.extended(*args)
+      threadsafe_attribute :_validate_models
+    end
 
     def validate_models=(val)
-      @validate_models = (val == true)
+      self._validate_models = (val == true)
     end
 
     def validate_models?
-      @validate_models == true
+      _validate_models == true
     end
 
     def without_validation

data/lib/remotable/version.rb

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

data/remotable.gemspec

@@ -11,17 +11,18 @@ Gem::Specification.new do |s|
   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", ">= 3.2"
   s.add_dependency "activerecord"
   s.add_dependency "activesupport"
 
+  s.add_development_dependency "appraisal"
   s.add_development_dependency "rake"
-  s.add_development_dependency "turn"
+  s.add_development_dependency "minitest", "~> 5.10.3"
+  s.add_development_dependency "minitest-reporters"
+  s.add_development_dependency "minitest-reporters-turn_reporter"
   s.add_development_dependency "pry"
-  s.add_development_dependency "factory_girl", "~> 2.0.4"
-  s.add_development_dependency "sqlite3", "~> 1.3.13"
+  s.add_development_dependency "factory_bot"
+  s.add_development_dependency "sqlite3"
   s.add_development_dependency "active_resource_simulator"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rr"

data/test/active_resource_test.rb

@@ -7,7 +7,6 @@ require "rr"
 
 
 class ActiveResourceTest < ActiveSupport::TestCase
-  include RR::Adapters::TestUnit
 
   test "should make an absolute path and add the format" do
     assert_equal "/api/accounts/by_slug/value.json",   RemoteTenant.expanded_path_for("by_slug/value")
@@ -154,7 +153,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   # ========================================================================= #
 
   test "should not fetch a remote record when a local record is not expired" do
-    tenant = Factory(:tenant, :expires_at => 100.years.from_now)
+    tenant = create(:tenant, :expires_at => 100.years.from_now)
     unexpected_name = "Totally Wonky"
 
     RemoteTenant.run_simulation do |s|
@@ -170,7 +169,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   end
 
   test "should fetch a remote record when a local record is expired" do
-    tenant = Factory(:tenant, :expires_at => 1.year.ago)
+    tenant = create(:tenant, :expires_at => 1.year.ago)
     unexpected_name = "Totally Wonky"
 
     RemoteTenant.run_simulation do |s|
@@ -186,7 +185,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   end
 
   test "should treat a 304 response as no changes" do
-    tenant = Factory(:tenant, :expires_at => 1.year.ago)
+    tenant = create(:tenant, :expires_at => 1.year.ago)
 
     RemoteTenant.run_simulation do |s|
       s.show(tenant.remote_id, nil, :status => 304, :headers => if_modified_since(tenant))
@@ -199,7 +198,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
 
   test "should ignore a 503 response" do
     expired_at = 1.year.ago
-    tenant = Factory(:tenant, :expires_at => expired_at)
+    tenant = create(:tenant, :expires_at => expired_at)
 
     RemoteTenant.run_simulation do |s|
       s.show(tenant.remote_id, nil, :status => 503, :headers => if_modified_since(tenant))
@@ -219,7 +218,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   # ========================================================================= #
 
   test "should update a record remotely when updating one locally" do
-    tenant = Factory(:tenant)
+    tenant = create(:tenant)
     new_name = "Totally Wonky"
 
     RemoteTenant.run_simulation do |s|
@@ -242,7 +241,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   end
 
   test "should be able to update resources by different attributes" do
-    tenant = RemoteWithKey.where(id: Factory(:tenant).id).first
+    tenant = RemoteWithKey.where(id: create(:tenant).id).first
     new_name = "Totally Wonky"
 
     RemoteTenant.run_simulation do |s|
@@ -265,7 +264,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   end
 
   test "should fail to update a record locally when failing to update one remotely" do
-    tenant = Factory(:tenant)
+    tenant = create(:tenant)
     new_name = "Totally Wonky"
 
     RemoteTenant.run_simulation do |s|
@@ -363,7 +362,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   # ========================================================================= #
 
   test "should destroy a record remotely when destroying one locally" do
-    tenant = Factory(:tenant)
+    tenant = create(:tenant)
 
     RemoteTenant.run_simulation do |s|
       s.show(tenant.remote_id, {
@@ -381,7 +380,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   end
 
   test "should destroy resources by different attributes" do
-    tenant = RemoteWithKey.where(id: Factory(:tenant).id).first
+    tenant = RemoteWithKey.where(id: create(:tenant).id).first
     new_name = "Totally Wonky"
 
     RemoteTenant.run_simulation do |s|
@@ -399,7 +398,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   end
 
   test "should fail to destroy a record locally when failing to destroy one remotely" do
-    tenant = Factory(:tenant)
+    tenant = create(:tenant)
 
     RemoteTenant.run_simulation do |s|
       s.show(tenant.remote_id, {
@@ -420,7 +419,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   end
 
   test "should succeed in destroying a record locally when the remote source is not found" do
-    tenant = Factory(:tenant)
+    tenant = create(:tenant)
 
     RemoteTenant.run_simulation do |s|
       s.show(tenant.remote_id, {
@@ -439,7 +438,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   end
 
   test "should delete a local record when a remote record has been deleted" do
-    tenant = Factory(:tenant, :expires_at => 1.year.ago)
+    tenant = create(:tenant, :expires_at => 1.year.ago)
 
     assert_difference "Tenant.count", -1 do
       RemoteTenant.run_simulation do |s|
@@ -459,7 +458,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   # ========================================================================= #
 
   test "should be able to find all remote resources and sync them with local resources" do
-    tenant = Factory(:tenant, :expires_at => 1.year.ago)
+    tenant = create(:tenant, :expires_at => 1.year.ago)
 
     assert_equal 1, Tenant.count, "There's supposed to be 1 tenant"
 
@@ -467,10 +466,10 @@ class ActiveResourceTest < ActiveSupport::TestCase
     assert_difference "Tenant.count", +1 do
       RemoteTenant.run_simulation do |s|
         s.show(nil, [
-          { :id => tenant.id,
+          { :id => tenant.remote_id,
             :slug => "a-different-slug",
             :church_name => "A Different Name" },
-          { :id => tenant.id + 1,
+          { :id => tenant.remote_id + 1,
             :slug => "generic-slug",
             :church_name => "Generic Name" }],
           :path => "/api/accounts.json")
@@ -501,7 +500,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   end
 
   test "should ignore a Remotable::TimeoutError when instantiating a record" do
-    tenant = Factory(:tenant, :expires_at => 1.year.ago)
+    tenant = create(:tenant, :expires_at => 1.year.ago)
 
     assert_nothing_raised do
       stub(Tenant.remote_model).find do |*args|

data/test/bespoke_test.rb

@@ -5,8 +5,6 @@ require "rr"
 
 
 class BespokeTest < ActiveSupport::TestCase
-  include RR::Adapters::TestUnit
-
 
   teardown do
     def model.new_resource
@@ -68,7 +66,7 @@ class BespokeTest < ActiveSupport::TestCase
   # ========================================================================= #
 
   test "should update a record remotely when updating one locally" do
-    @tenant = Factory(:bespoke_tenant)
+    @tenant = create(:bespoke_tenant)
     new_name = "Totally Wonky"
 
     # RemoteTenant.run_simulation do |s|
@@ -90,7 +88,7 @@ class BespokeTest < ActiveSupport::TestCase
   end
 
   test "should fail to update a record locally when failing to update one remotely" do
-    @tenant = Factory(:bespoke_tenant, :nosync => false)
+    @tenant = create(:bespoke_tenant, :nosync => false)
 
     def model.find_by(attribute, value)
       BespokeResource.new(attribute => value)
@@ -156,13 +154,13 @@ class BespokeTest < ActiveSupport::TestCase
   # ========================================================================= #
 
   test "should destroy a record remotely when destroying one locally" do
-    @tenant = Factory(:bespoke_tenant, :nosync => false)
+    @tenant = create(:bespoke_tenant, :nosync => false)
     mock(resource).destroy { true }
     @tenant.destroy
   end
 
   test "should fail to destroy a record locally when failing to destroy one remotely" do
-    @tenant = Factory(:bespoke_tenant, :nosync => false)
+    @tenant = create(:bespoke_tenant, :nosync => false)
     mock(resource).destroy { raise StandardError }
     assert_raises(StandardError) do
       @tenant.destroy
@@ -170,7 +168,7 @@ class BespokeTest < ActiveSupport::TestCase
   end
 
   test "should delete a local record when a remote record has been deleted" do
-    @tenant = Factory(:bespoke_tenant, :expires_at => 1.year.ago)
+    @tenant = create(:bespoke_tenant, :expires_at => 1.year.ago)
 
     def model.find_by(remote_attr, value)
       nil

data/test/factories/tenants.rb

@@ -1,23 +1,28 @@
-Factory.define :tenant do |f|
-  f.sequence(:slug) { |n| "test#{n}" }
-  f.name "Test"
-  f.sequence(:remote_id)
-  f.expires_at 100.years.from_now
-  f.nosync true
-end
+FactoryBot.define do
 
-Factory.define :bespoke_tenant do |f|
-  f.sequence(:slug) { |n| "test#{n}" }
-  f.name "Test"
-  f.sequence(:remote_id)
-  f.expires_at 100.years.from_now
-  f.nosync true
-end
+  factory :tenant do
+    sequence(:slug) { |n| "test#{n}" }
+    name { "Test" }
+    sequence :remote_id
+    expires_at { 100.years.from_now }
+    nosync { true }
+  end
+
+  factory :bespoke_tenant do
+    sequence(:slug) { |n| "test#{n}" }
+    name { "Test" }
+    sequence :remote_id
+    expires_at { 100.years.from_now }
+    nosync { true }
+  end
+
+  factory :null_test_tenant do
+    sequence(:slug) { |n| "test#{n}" }
+    name { "Test" }
+    sequence :remote_id
+    expires_at { 100.years.from_now }
+    nosync { true }
+  end
 
-Factory.define :null_test_tenant do |f|
-  f.sequence(:slug) { |n| "test#{n}" }
-  f.name "Test"
-  f.sequence(:remote_id)
-  f.expires_at 100.years.from_now
-  f.nosync true
 end
+

data/test/nosync_test.rb

@@ -6,7 +6,6 @@ require "support/active_resource"
 class NoSyncTest < ActiveSupport::TestCase
 
 
-
   test "nosync? should be false by default" do
     assert_equal false, Tenant.new.nosync?
   end
@@ -56,7 +55,7 @@ class NoSyncTest < ActiveSupport::TestCase
   # ========================================================================= #
 
   test "should do nothing if a tenant is expired" do
-    tenant = Factory(:tenant, :expires_at => 1.year.ago)
+    tenant = create(:tenant, :expires_at => 1.year.ago)
 
     Remotable.nosync do
       result = Tenant.find_by_remote_id(tenant.remote_id)

data/test/null_remote_test.rb

@@ -4,16 +4,13 @@ require "support/null"
 
 
 class NullRemoteTest < ActiveSupport::TestCase
-  include RR::Adapters::TestUnit
-
-
 
   # ========================================================================= #
   # Finding                                                                   #
   # ========================================================================= #
 
   test "should do nothing if a tenant is expired" do
-    tenant = Factory(:null_test_tenant, expires_at: 2.days.ago)
+    tenant = create(:null_test_tenant, expires_at: 2.days.ago)
     result = NullTestTenant.find_by_slug(tenant.slug)
     assert_equal tenant, result
   end
@@ -35,7 +32,7 @@ class NullRemoteTest < ActiveSupport::TestCase
   # ========================================================================= #
 
   test "should update a record locally without any interference" do
-    tenant = Factory(:null_test_tenant)
+    tenant = create(:null_test_tenant)
     new_name = "Totally Wonky"
 
     tenant.name = new_name
@@ -63,7 +60,7 @@ class NullRemoteTest < ActiveSupport::TestCase
   # ========================================================================= #
 
   test "should destroy a record locally without any interference" do
-    tenant = Factory(:null_test_tenant)
+    tenant = create(:null_test_tenant)
     tenant.nosync = false
     tenant.destroy
   end

data/test/test_helper.rb

@@ -1,13 +1,16 @@
 require "rubygems"
-require "simplecov"
+require "active_support"
 require "active_support/core_ext"
-require "factory_girl"
-require "turn"
+require "simplecov"
+require "factory_bot"
 require "pry"
 require "database_cleaner"
 require "active_record"
 require "factories/tenants"
 require "minitest/autorun"
+require "minitest/reporters/turn_reporter"
+
+Minitest::Reporters.use! Minitest::Reporters::TurnReporter.new
 
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
@@ -19,10 +22,19 @@ load File.join(File.dirname(__FILE__), "support", "schema.rb")
 DatabaseCleaner.strategy = :transaction
 
 class ActiveSupport::TestCase
+  include FactoryBot::Syntax::Methods
+
   setup do
     DatabaseCleaner.start
   end
   teardown do
     DatabaseCleaner.clean
+
+    Remotable.reset_nosync!
+    Tenant.reset_nosync!
+    BespokeTenant.reset_nosync!
+    RemoteWithoutKey.reset_nosync!
+    RemoteWithKey.reset_nosync!
+    RemoteWithCompositeKey.reset_nosync!
   end
 end

data/test/understanding_test.rb

@@ -4,8 +4,6 @@ require "rr"
 
 
 class UnderstandingTest < ActiveSupport::TestCase
-  include RR::Adapters::TestUnit
-
   # This test fails with an Error if `hello` is never called on `o`
   test "I know how rr works :)" do
     o = Object.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remotable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Robert Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +81,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.10.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.10.3
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters-turn_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,33 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_resource_simulator
   requirement: !ruby/object:Gem::Requirement
@@ -189,11 +231,16 @@ files:
 - ".gitignore"
 - ".simplecov"
 - ".travis.yml"
+- Appraisals
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.mdown
 - Rakefile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/remotable.rb
 - lib/remotable/active_record_extender.rb
 - lib/remotable/active_resource_fixes.rb
@@ -242,8 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: remotable
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Binds an ActiveRecord model to a remote resource and keeps the two synchronized

data/Gemfile.lock

@@ -1,82 +0,0 @@
-PATH
-  remote: .
-  specs:
-    remotable (0.4.0)
-      activerecord
-      activeresource (>= 3.2)
-      activesupport
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    active_resource_simulator (0.0.2)
-      activeresource
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activeresource (4.1.0)
-      activemodel (~> 4.0)
-      activesupport (~> 4.0)
-      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.5.0)
-    arel (4.0.2)
-    builder (3.1.4)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.2.0)
-    docile (1.3.1)
-    factory_girl (2.0.5)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    method_source (0.9.0)
-    minitest (4.7.5)
-    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.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
-      minitest (~> 4)
-    tzinfo (0.3.54)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_resource_simulator
-  database_cleaner
-  factory_girl (~> 2.0.4)
-  pry
-  rake
-  remotable!
-  rr
-  simplecov
-  sqlite3 (~> 1.3.13)
-  turn
-
-BUNDLED WITH
-   1.16.1