remotable 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137c22fc6804e7a6d4261c63b139287c06aa44020f315318982d9c301cac6676
-  data.tar.gz: caaef13d6e976628e0d94d6dc0a5c615c1a50b14e48b1b66f4d2393e179b2548
+  metadata.gz: c5772a5edc3139fabf4602d96c59fc69fe3ac83ae016d286a2257deac26ae8e0
+  data.tar.gz: e0e6a52da707287733bcc0bb22a4d34e515bec9e2e869f0a2ac4f49696e07b19
 SHA512:
-  metadata.gz: af3a795753d0f1dd53964c02355cc37845228316f3c2361fc9cca3270baede2355f63d88b997e43a93df320930072d1a3bac8a4038795aa4b9322aaaef9ad921
-  data.tar.gz: 42bb95792ed9035a6b4766b4370852ef27b17ceebce9a24d98bc43aac766057ddd67d493a420e2526f0a12e8022f6efe260a21b64e491a6e0a1ef033ec2b538b
+  metadata.gz: ec594e5275ecb8a7dbd7df17f5c1addfc16f3b982391d8bb88079dc3922f3d62549ef4422bad8d9c9113d7528077490947d3999ca02d32cc2d12a262acad8980
+  data.tar.gz: 5d4c975e43ab1e62af43e257eacd0d5f28a32729ed31de556ef8bf950890db1bf7117d06c0d669cb9ceb8a189f24e77fafda0dd177ff643a41fef4b2615d6117

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 0.6.0
+* **Bugfix** Completely removed dependence on `activeresource`'s `ThreadsafeAttributes`. This makes multithreaded behavior more deterministic and involves fewer edgecases, since things meant to be global state are reverted back to being so, while things meant to have a per-thread scope are constrained as they should be.
+
 ### 0.5.1
 * **Bugfix** Addressed an issue where `Remotable.with_remote_model` could leave a model with the wrong `remote_model` when used in a multithreaded environment.
 

data/lib/remotable.rb

@@ -5,7 +5,6 @@ require "remotable/validate_models"
 require "remotable/with_remote_model_proxy"
 require "remotable/errors"
 require "remotable/logger_wrapper"
-require "active_resource/threadsafe_attributes"
 
 
 # Remotable keeps a locally-stored ActiveRecord
@@ -55,7 +54,6 @@ module Remotable
     Remotable.log_level = :debug
   end
 
-  threadsafe_attribute :_remote_model, :__remotable_included
 
 
 
@@ -92,17 +90,13 @@ module Remotable
   #
   def remote_model(*args)
     if args.length >= 1
-      self._remote_model = args.first
+      @remote_model = args.first
 
-      self.__remotable_included ||= begin
-        require "remotable/active_record_extender"
-        include Remotable::ActiveRecordExtender
-        true
-      end
+      ensure_remotable_included!
 
-      extend_remote_model(_remote_model) if _remote_model
+      extend_remote_model(@remote_model) if @remote_model
     end
-    _remote_model
+    override_remote_model? ? _remote_model_override : @remote_model
   end
 
 
@@ -110,11 +104,13 @@ module Remotable
   def with_remote_model(model)
     if block_given?
       begin
-        original = self.remote_model
-        self.remote_model(model)
+        extend_remote_model(model) if model
+        ensure_remotable_included!
+        self._remote_model_override = model
+        self._use_remote_model_override = true
         yield
       ensure
-        self.remote_model(original)
+        self._use_remote_model_override = false
       end
     else
       WithRemoteModelProxy.new(self, model)
@@ -151,6 +147,34 @@ module Remotable
 
 private
 
+  def override_remote_model?
+    !!_use_remote_model_override
+  end
+
+  def ensure_remotable_included!
+    @__remotable_included ||= begin
+      require "remotable/active_record_extender"
+      include Remotable::ActiveRecordExtender
+      true
+    end
+  end
+
+  def _remote_model_override
+    Thread.current.thread_variable_get "remotable._remote_model_override.#{self.object_id}"
+  end
+
+  def _remote_model_override=(value)
+    Thread.current.thread_variable_set "remotable._remote_model_override.#{self.object_id}", value
+  end
+
+  def _use_remote_model_override
+    Thread.current.thread_variable_get "remotable._use_remote_model_override.#{self.object_id}"
+  end
+
+  def _use_remote_model_override=(value)
+    Thread.current.thread_variable_set "remotable._use_remote_model_override.#{self.object_id}", value
+  end
+
   def extend_remote_model(remote_model)
     if remote_model.is_a?(Class) and (remote_model < ActiveResource::Base)
       require "remotable/adapters/active_resource"

data/lib/remotable/active_record_extender.rb

@@ -1,7 +1,6 @@
 require "remotable/core_ext"
 require "active_support/concern"
 require "active_support/core_ext/array/wrap"
-require "active_resource/threadsafe_attributes"
 require "benchmark"
 
 
@@ -43,10 +42,9 @@ 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
+      attr_accessor :_remote_attribute_map, :_local_attribute_routes, :_expires_after,
+        :_remote_timeout, :remotable_skip_validation_on_sync
 
       def nosync?
         return true if remote_model.nil?
@@ -83,9 +81,9 @@ module Remotable
           # Set up a finder method for the remote_key
           fetch_with(local_key(remote_key), options)
 
-          self._remote_key = remote_key
+          @remote_key = remote_key
         else
-          _remote_key || generate_default_remote_key
+          @remote_key || generate_default_remote_key
         end
       end
 
@@ -431,7 +429,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

data/lib/remotable/nosync.rb

@@ -1,5 +1,3 @@
-require "active_resource/threadsafe_attributes"
-
 module Remotable
   module Nosync
 
@@ -50,7 +48,6 @@ module Remotable
     end
 
     module ClassMethods
-      include ThreadsafeAttributes
       include InstanceMethods
 
       def reset_nosync!
@@ -62,7 +59,15 @@ module Remotable
       end
 
     private
-      threadsafe_attribute :_nosync
+
+      def _nosync
+        Thread.current.thread_variable_get "remotable.nosync.#{self.object_id}"
+      end
+
+      def _nosync=(value)
+        Thread.current.thread_variable_set "remotable.nosync.#{self.object_id}", value
+      end
+
     end
 
   end

data/lib/remotable/version.rb

@@ -1,3 +1,3 @@
 module Remotable
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remotable
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Robert Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource