hyper-resource 1.0.0.lap38 → 1.0.0.lap39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7b649c6ec2096366f08fa25d95af57a01e869b764534bc1ae93b0d10fc60497
-  data.tar.gz: b09a6a3ce5354eaf2731b427cb6b5a45c4901007448d96974f5d0acfa97e8fbd
+  metadata.gz: 81aa4247a77ddaa5de2bc89c0aff444b2679113598992d0e4bae9537921224a5
+  data.tar.gz: 82c7b2ae16f57887f2443f68b8f0a9d0399acd22adad131fb97b1d5917ea7014
 SHA512:
-  metadata.gz: 2d73031cd588bdb8b5e27976d947773316d69a3206053a4ce8a7a8187ab63f54eecaf55622eab3728ccd4b8ceb2dea916b7f9b082c95a6e8de4e3c30701c93a8
-  data.tar.gz: baace49e8182fbde221c2335dcdf56179237a8aa575630926d3a51c50c19822ae0d78edbe58419cbc0d7f9ee87d7b9a8df05f280827efef81cfa759352479a41
+  metadata.gz: 6bbe5b55732247244d67270e89e0f57bc699591cb2f59a41ed5ca1d860afcfd37c35063af068d7e5f65d28676f262b930a461fa0178d96686ee7d2c41b69d069
+  data.tar.gz: cc84c5fee0e51e57dadd4b569018eef9efc446d35a483d5bd67cfdb31dc08a0c3cd4eb87b464b45eca1801ad6491d262501dbc8e616a952a16346d5c0f14aa65

data/lib/hyper_record/class_methods.rb

@@ -82,41 +82,32 @@ module HyperRecord
     end
 
     def find(id)
-      return _record_cache[id] if _record_cache.has_key?(id)
-
+      return _record_cache[id] if _record_cache.has_key?(id) && _class_fetch_states["record_#{id}"] == 'f'
       observer = React::State.current_observer
-      record_in_progress = self.new
-
+      record_in_progress = if _record_cache.has_key?(id)
+                             _record_cache[id]
+                           else
+                             self.new
+                           end
       record_in_progress_key = "#{self.to_s}_#{record_in_progress.object_id}"
       React::State.get_state(observer, record_in_progress_key) if observer
-
-      _promise_get("#{resource_base_uri}/#{id}.json").then do |response|
-        klass_key = self.to_s.underscore
-        reflections.keys.each do |relation|
-          if response.json[klass_key].has_key?(relation)
-            response.json[klass_key][r_or_s] = _convert_array_to_collection(response.json[klass_key][relation])
-            record_in_progress.instance_variable_get(:@fetch_states)[relation] = 'f'
-          end
-        end
-        record_in_progress._initialize_from_hash(response.json[klass_key]) if response.json[klass_key]
-        _record_cache[record_in_progress.id] = record_in_progress
+      return _record_cache[id] if _record_cache.has_key?(id)
+      _record_cache[id] = record_in_progress
+      _find_record(id, record_in_progress, record_in_progress_key).then do
         React::State.set_state(observer, record_in_progress_key, `Date.now() + Math.random()`) if observer
-        record_in_progress
-      end.fail do |response|
-        error_message = "#{self.to_s}.find(#{id}) failed to fetch record!"
-        `console.error(error_message)`
-        response
       end
-
       record_in_progress
     end
 
     def find_record(id)
-      # TODO this is bogus, needs some attention
-      _promise_get("#{resource_base_uri}/#{id}.json").then do |response|
-        klass_name = self.to_s.underscore
-        self.new(response.json[klass_name])
-      end
+      record_in_progress = if _record_cache.has_key?(id)
+                             _record_cache[id]
+                           else
+                             self.new
+                           end
+      record_in_progress_key = "#{self.to_s}_#{record_in_progress.object_id}"
+      _record_cache[id] = record_in_progress unless _record_cache.has_key?(id)
+      _find_record(id, record_in_progress, record_in_progress_key)
     end
 
     def find_record_by(hash)
@@ -301,8 +292,8 @@ module HyperRecord
       define_method(name) do |*args|
         _register_observer
         if self.id && (@rest_methods_hash[name][:force] || !@rest_methods_hash[name].has_key?(:result))
-          self.class._promise_get_or_patch("#{resource_base_uri}/#{self.id}/methods/#{name}.json?timestamp=#{`Date.now() + Math.random()`}", *args).then do |result|
-            @rest_methods_hash[name][:result] = result # result is parsed json
+          self.class._promise_get_or_patch("#{resource_base_uri}/#{self.id}/methods/#{name}.json?timestamp=#{`Date.now() + Math.random()`}", *args).then do |response_json|
+            @rest_methods_hash[name][:result] = response_json[:result] # result is parsed json
             _notify_observers
             @rest_methods_hash[name][:result]
           end.fail do |response|
@@ -328,23 +319,30 @@ module HyperRecord
     end
 
     def scope(name, options)
-      scopes[name] = HyperRecord::Collection.new
       define_singleton_method(name) do |*args|
-        if _class_fetch_states[name] == 'f'
-          scopes[name]
+        name_args = if args.size > 0
+                      "#{name}_#{args.to_json}"
+                    else
+                      name
+                    end
+        scopes[name_args] = HyperRecord::Collection.new unless scopes.has_key?(name_args)
+        if _class_fetch_states[name_args] == 'f'
+          scopes[name_args]
         else
           _register_class_observer
-          self._promise_get_or_patch("#{resource_base_uri}/scopes/#{name}.json", *args).then do |response|
-            scopes[name] = _convert_array_to_collection(response.json[self.to_s.underscore][name])
-            _class_fetch_states[name] = 'f'
+          self._promise_get_or_patch("#{resource_base_uri}/scopes/#{name}.json", *args).then do |response_json|
+            ch = response_json[self.to_s.underscore]
+            nh = ch[name]
+            scopes[name_args] = _convert_array_to_collection(nh)
+            _class_fetch_states[name_args] = 'f'
             _notify_class_observers
-            scopes[name]
+            scopes[name_args]
           end.fail do |response|
-            error_message = "#{self.class.to_s}.#{name}, a scope, failed to fetch records!"
+            error_message = "#{self.to_s}.#{name_args}, a scope, failed to fetch records!"
             `console.error(error_message)`
             response
           end
-          scopes[name]
+          scopes[name_args]
         end
       end
     end
@@ -397,6 +395,25 @@ module HyperRecord
       @_class_state_key
     end
 
+    def _find_record(id, record_in_progress, record_in_progress_key)
+      _promise_get("#{resource_base_uri}/#{id}.json").then do |response|
+        klass_key = self.to_s.underscore
+        reflections.keys.each do |relation|
+          if response.json[klass_key].has_key?(relation)
+            response.json[klass_key][r_or_s] = _convert_array_to_collection(response.json[klass_key][relation])
+            record_in_progress.instance_variable_get(:@fetch_states)[relation] = 'f'
+          end
+        end
+        record_in_progress._initialize_from_hash(response.json[klass_key]) if response.json[klass_key]
+        _class_fetch_states["record_#{id}"] == 'f'
+        record_in_progress
+      end.fail do |response|
+        error_message = "#{self.to_s}.find(#{id}) failed to fetch record!"
+        `console.error(error_message)`
+        response
+      end
+    end
+
     def _notify_class_observers
       _class_observers.each do |observer|
         React::State.set_state(observer, _class_state_key, `Date.now() + Math.random()`)
@@ -411,12 +428,12 @@ module HyperRecord
     def _promise_get_or_patch(uri, *args)
       if args && args.size > 0
         payload = { params: args }
-        _promise_patch(uri, payload).then do |result|
-          result.json[:result]
+        _promise_patch(uri, payload).then do |response|
+          response.json
         end
       else
-        _promise_get(uri).then do |result|
-          result.json[:result]
+        _promise_get(uri).then do |response|
+          response.json
         end
       end
     end

data/lib/hyper_record/client_instance_methods.rb

@@ -69,7 +69,10 @@ module HyperRecord
     end
 
     def link(other_record)
-      link_record(other_record)
+      _register_observer
+      link_record(other_record).then do
+        _notify_observers
+      end
       self
     end
 
@@ -109,7 +112,10 @@ module HyperRecord
     end
 
     def save
-      save_record
+      _register_observer
+      save_record.then do
+        _notify_observers
+      end
       self
     end
 
@@ -126,7 +132,10 @@ module HyperRecord
     end
 
     def unlink(other_record)
-      unlink_record(other_record, observer)
+      _register_observer
+      unlink_record(other_record).then do
+        _notify_observers
+      end
       self
     end
 
@@ -144,7 +153,6 @@ module HyperRecord
     end
 
     def link_record(other_record, relation_name = nil)
-      _register_observer
       called_from_collection = relation_name ? true : false
       relation_name = other_record.class.to_s.underscore.pluralize unless relation_name
       if reflections.has_key?(relation_name)
@@ -157,7 +165,6 @@ module HyperRecord
       payload_hash = other_record.to_hash
       self.class._promise_post("#{resource_base_uri}/#{self.id}/relations/#{relation_name}.json", { data: payload_hash }).then do |response|
         other_record.instance_variable_get(:@properties_hash).merge!(response.json[other_record.class.to_s.underscore])
-        _notify_observers
         self
       end.fail do |response|
         error_message = "Linking record #{other_record} to #{self} failed!"
@@ -167,8 +174,7 @@ module HyperRecord
     end
 
     def save_record
-      _register_observer
-      payload_hash =  @properties_hash.merge(@changed_properties_hash) # copy hash, becasue we need to delete some keys
+      payload_hash = @properties_hash.merge(@changed_properties_hash) # copy hash, because we need to delete some keys
       (%i[id created_at updated_at] + reflections.keys).each do |key|
         payload_hash.delete(key)
       end
@@ -176,7 +182,6 @@ module HyperRecord
         reset
         self.class._promise_patch("#{resource_base_uri}/#{@properties_hash[:id]}", { data: payload_hash }).then do |response|
           @properties_hash.merge!(response.json[self.class.to_s.underscore])
-          _notify_observers
           self
         end.fail do |response|
           error_message = "Saving record #{self} failed!"
@@ -187,7 +192,6 @@ module HyperRecord
         reset
         self.class._promise_post(resource_base_uri, { data: payload_hash }).then do |response|
           @properties_hash.merge!(response.json[self.class.to_s.underscore])
-          _notify_observers
           self
         end.fail do |response|
           error_message = "Creating record #{self} failed!"
@@ -198,13 +202,11 @@ module HyperRecord
     end
 
     def unlink_record(other_record, relation_name = nil)
-      _register_observer
       called_from_collection = collection_name ? true : false
       relation_name = other_record.class.to_s.underscore.pluralize unless relation_name
       raise "No relation for record of type #{other_record.class}" unless reflections.has_key?(relation_name)
       self.send(relation_name).delete_if { |cr| cr == other_record } unless called_from_collection
       self.class._promise_delete("#{resource_base_uri}/#{@properties_hash[:id]}/relations/#{relation_name}.json?record_id=#{other_record.id}").then do |response|
-        _notify_observers
         self
       end.fail do |response|
         error_message = "Unlinking #{other_record} from #{self} failed!"

data/lib/hyperloop/resource/version.rb

@@ -1,5 +1,5 @@
 module Hyperloop
   module Resource
-    VERSION = '1.0.0.lap38'
+    VERSION = '1.0.0.lap39'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyper-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.0.lap38
+  version: 1.0.0.lap39
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal