hyper-resource 1.0.0.lap40 → 1.0.0.lap41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bae140804e9630f4b1187a1f06cb8441cf40d784ebd6cd2dbd4c00851806a5
-  data.tar.gz: 632f717c16f5023cf55cb323bc481025fc25be3c203fce90b3866f438c882684
+  metadata.gz: 7f03f528e8e3a65402ffabbf5805326de64d87c9bfc3bbe781dcf7077364008f
+  data.tar.gz: e3f976305a3674a6304279cb873a5a4669a470ebf422adba29b2219bb22222e7
 SHA512:
-  metadata.gz: 537abb30fdfa234afa6dbb8f4751655859d615ff582b58916d30d7e0e5ed78223e551a451b34b36c569a3f7599da384ebcdaee67cd1d0c396d826bffb1a6c63c
-  data.tar.gz: 86c8360462145706f9f978df2d2bd6664f15a93235cb90fe28c60637f9559095e2f3b254fc164d344b8d69c6d3e72db6f93116f533cb841552dd43d0ac0da74e
+  metadata.gz: f53d17dca78441ce59c18f3057b2a16916aac0b47996a0e2cdc430888ec043db6516a873ede2e6712d53d4389123d3539d0fabf35092efa6e37da5355f93f6f8
+  data.tar.gz: c595b76a5b550ac95b7fe7fb0aa1e28f2bd936ffd5e92a60f2093ba1f4c08c206b3f9d99549cad5ea3d6f2c244e58c99a8ebd303d3c1037db915d397b510d66d

data/lib/hyper_record/class_methods.rb

@@ -3,7 +3,7 @@ module HyperRecord
 
     def new(record_hash = {})
       if record_hash.has_key?(:id)
-        record = _record_cache[record_hash[:id]]
+        record = _record_cache[record_hash[:id].to_s]
         if record
           record.instance_variable_get(:@properties_hash).merge!(record_hash)
           return record
@@ -15,21 +15,15 @@ module HyperRecord
     def all
       _register_class_observer
       if _class_fetch_states[:all] == 'f'
-        record_collection = HyperRecord::Collection.new
-        _record_cache.each_value { |record| record_collection.push(record) }
-        return record_collection
+        collection = HyperRecord::Collection.new
+        _record_cache.each_value { |record| collection.push(record) }
+        return collection
       end
       _promise_get("#{resource_base_uri}.json").then do |response|
-        klass_name = self.to_s.underscore
-        klass_key = klass_name.pluralize
-        response.json[klass_key].each do |record_json|
-          self.new(record_json[klass_name])
-        end
+        collection = _convert_array_to_collection(response.json[self.to_s.underscore.pluralize])
         _class_fetch_states[:all] = 'f'
         _notify_class_observers
-        record_collection = HyperRecord::Collection.new
-        _record_cache.each_value { |record| record_collection.push(record) }
-        record_collection
+        collection
       end.fail do |response|
         error_message = "#{self.to_s}.all failed to fetch records!"
         `console.error(error_message)`
@@ -82,16 +76,17 @@ module HyperRecord
     end
 
     def find(id)
-      return _record_cache[id] if _record_cache.has_key?(id) && _class_fetch_states["record_#{id}"] == 'f'
+      sid = id.to_s
+      return _record_cache[sid] if _record_cache.has_key?(sid) && _class_fetch_states["record_#{id}"] == 'f'
       observer = React::State.current_observer
-      record_in_progress = if _record_cache.has_key?(id)
-                             _record_cache[id]
+      record_in_progress = if _record_cache.has_key?(sid)
+                             _record_cache[sid]
                            else
                              self.new(id: id)
                            end
       record_in_progress_key = "#{self.to_s}_#{record_in_progress.object_id}"
       React::State.get_state(observer, record_in_progress_key) if observer
-      return _record_cache[id] if _record_cache.has_key?(id) && _class_fetch_states["record_#{id}"] == 'i'
+      return _record_cache[sid] if _record_cache.has_key?(sid) && _class_fetch_states["record_#{id}"] == 'i'
       _find_record(id, record_in_progress).then do
         React::State.set_state(observer, record_in_progress_key, `Date.now() + Math.random()`) if observer
       end
@@ -99,8 +94,9 @@ module HyperRecord
     end
 
     def find_record(id)
-      record_in_progress = if _record_cache.has_key?(id)
-                             _record_cache[id]
+      sid = id.to_s
+      record_in_progress = if _record_cache.has_key?(sid)
+                             _record_cache[sid]
                            else
                              self.new(id: id)
                            end
@@ -108,11 +104,20 @@ module HyperRecord
     end
 
     def find_record_by(hash)
-      return _record_cache[hash] if _record_cache.has_key?(hash)
+      if hash.has_key?[:id] && _record_cache.has_key?(hash[:id].to_s)
+        record = _record_cache[hash[:id].to_s]
+        found = true
+        hash.each do |k,v|
+          if record.send(k) != v
+            found = false
+            break
+          end
+        end
+        return record if found
+      end
       # TODO needs clarification about how to call the endpoint
-      _promise_get("#{resource_base_uri}/#{id}.json").then do |reponse|
-        record = self.new(response.json[self.to_s.underscore])
-        _record_cache[hash] = record
+      _promise_get("#{resource_base_uri}/#{id}.json").then do |response|
+        self.new(response.json[self.to_s.underscore])
       end
     end
 
@@ -244,7 +249,7 @@ module HyperRecord
     end
 
     def record_cached?(id)
-      _record_cache.has_key?(id)
+      _record_cache.has_key?(id.to_s)
     end
 
     def property(name, options = {})
@@ -328,9 +333,7 @@ module HyperRecord
         else
           _register_class_observer
           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)
+            scopes[name_args] = _convert_array_to_collection(response_json[self.to_s.underscore][name])
             _class_fetch_states[name_args] = 'f'
             _notify_class_observers
             scopes[name_args]
@@ -367,7 +370,7 @@ module HyperRecord
       if record_hash[klass_key][:id].nil?
         record_class.new(record_hash[klass_key])
       else
-        record = record_class._record_cache[record_hash[klass_key][:id]]
+        record = record_class._record_cache[record_hash[klass_key][:id].to_s]
         if record.nil?
           record = record_class.new(record_hash[klass_key])
         else

data/lib/hyper_record/client_instance_methods.rb

@@ -54,7 +54,7 @@ module HyperRecord
       _mutate_state
 
       # cache in global cache
-      self.class._record_cache[@properties_hash[:id]] = self if @properties_hash.has_key?(:id)
+      self.class._record_cache[@properties_hash[:id].to_s] = self if @properties_hash.has_key?(:id)
     end
 
     ### reactive api
@@ -77,11 +77,10 @@ module HyperRecord
     end
 
     def method_missing(method, arg)
+      _register_observer
       if method.end_with?('=')
-        _register_observer
         @changed_properties_hash[method.chop] = arg
       else
-        _register_observer
         if @changed_properties_hash.has_key?(method)
           @changed_properties_hash[method]
         else
@@ -220,7 +219,7 @@ module HyperRecord
     def _local_destroy
       _register_observer
       @destroyed = true
-      self.class._record_cache.delete(@properties_hash[:id])
+      self.class._record_cache.delete(@properties_hash[:id].to_s)
       @registered_collections.dup.each do |collection|
         collection.delete(self)
       end
@@ -260,7 +259,7 @@ module HyperRecord
           # are a workaround for safari, to get it updating correctly
           klass_name = data[:cause][:record_type]
           c_record_class = Object.const_get(klass_name)
-          if c_record_class._record_cache.has_key?(data[:cause][:id])
+          if c_record_class._record_cache.has_key?(data[:cause][:id].to_s)
             c_record = c_record_class.find(data[:cause][:id])
             if `Date.parse(#{c_record.updated_at}) >= Date.parse(#{data[:cause][:updated_at]})`
               if @fetch_states[data[:relation]] == 'f'

data/lib/hyperloop/resource/version.rb

@@ -1,5 +1,5 @@
 module Hyperloop
   module Resource
-    VERSION = '1.0.0.lap40'
+    VERSION = '1.0.0.lap41'
   end
 end

metadata

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