hyper-resource 1.0.0.lap53 → 1.0.0.lap55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fdb0a8d50f4f15b310d470b2e409627c2793c0512907b643b57919d204f58bb
-  data.tar.gz: b61972174d030887f5d07b4a3a299f77ce0b7c816a97b4c882d18e26d9c28235
+  metadata.gz: 2f0ff6a1a9ad1ecd8ed92b3d96cab2fbe6965fcd86dfd41d0b9ffa4173f47f90
+  data.tar.gz: e7cc3aadbcc04ca3942c6f1550562ca063cd1e53943febe573277f8d8edf507d
 SHA512:
-  metadata.gz: 3a4c12776795ea0c9cfbc88af0114e436b7b774fe7ddea644bbf06ef8d922721c8e5d290805c3bd148edcbda23c828c402a144a61eca4e6249ae68928bd2d0f1
-  data.tar.gz: 3577ebf9be0425fad5d02e0a4151b3915b96cb037155c663c3a2f8333b1471f565d3fb494917d2f6e5fc2ebb1dac02be3ac531f86345a4adb179dbaacf203423
+  metadata.gz: 6bae29ddaf1e2fa9b5e48071cbeaa3cb4431a36bc0cb1681e8493d5f5a04c833d249550fb314f0f69a939c24e08048fe1b213a2cc98b976420c842a53ac9679c
+  data.tar.gz: 413c863a6c1c88e2a2dc69a4cc54a84b6269551ef7360b1d3e8bd532278ad522f6f83383b8f973c679990e20d90259c48ec62bb2ae1eb6503283054674a47ab0

data/lib/hyper_record/class_methods.rb

@@ -14,11 +14,17 @@ module HyperRecord
 
     def all
       _register_class_observer
-      if _class_fetch_states[:all] == 'f'
+      if _class_fetch_states.has_key?(:all) && 'fi'.include?(_class_fetch_states[:all]) # if f_etched or i_n progress of fetching
         collection = HyperRecord::Collection.new
         _record_cache.each_value { |record| collection.push(record) }
         return collection
       end
+      promise_all
+      HyperRecord::Collection.new
+    end
+
+    def promise_all
+      _class_fetch_states[:all] = 'i'
       _promise_get("#{resource_base_uri}.json").then do |response|
         collection = _convert_array_to_collection(response.json[self.to_s.underscore.pluralize])
         _class_fetch_states[:all] = 'f'
@@ -29,7 +35,6 @@ module HyperRecord
         `console.error(error_message)`
         response
       end
-      HyperRecord::Collection.new
     end
 
     def belongs_to(direction, name = nil, options = { type: nil })
@@ -44,21 +49,25 @@ module HyperRecord
         name = direction
       end
       reflections[name] = { direction: direction, type: options[:type], kind: :belongs_to }
+      define_method("promise_#{name}") do
+        @fetch_states[name] = 'i'
+        self.class._promise_get("#{self.class.resource_base_uri}/#{self.id}/relations/#{name}.json").then do |response|
+          @relations[name] = self.class._convert_json_hash_to_record(response.json[self.class.to_s.underscore][name])
+          @fetch_states[name] = 'f'
+          _notify_observers
+          @relations[name]
+        end.fail do |response|
+          error_message = "#{self.class.to_s}[#{self.id}].#{name}, a belongs_to association, failed to fetch records!"
+          `console.error(error_message)`
+          response
+        end
+      end
       define_method(name) do
         _register_observer
-        if @fetch_states[name] == 'f'
+        if 'fi'.include?(@fetch_states[name])
           @relations[name]
         elsif self.id
-          self.class._promise_get("#{self.class.resource_base_uri}/#{self.id}/relations/#{name}.json").then do |response|
-            @relations[name] = self.class._convert_json_hash_to_record(response.json[self.class.to_s.underscore][name])
-            @fetch_states[name] = 'f'
-            _notify_observers
-            @relations[name]
-          end.fail do |response|
-            error_message = "#{self.class.to_s}[#{self.id}].#{name}, a belongs_to association, failed to fetch records!"
-            `console.error(error_message)`
-            response
-          end
+          send("promise_#{name}")
           @relations[name]
         else
           @relations[name]
@@ -67,12 +76,13 @@ module HyperRecord
       define_method("update_#{name}") do
         @fetch_states[name] = 'u'
       end
-      define_method("#{name}=") do |arg|
-        _register_observer
-        @relations[name] = arg
-        @fetch_states[name] = 'f'
-        @relations[name]
-      end
+      # TODO
+      # define_method("#{name}=") do |arg|
+      #   _register_observer
+      #   @relations[name] = arg
+      #   @fetch_states[name] = 'f'
+      #   @relations[name]
+      # end
     end
 
     def create(record_hash = {})
@@ -80,9 +90,9 @@ module HyperRecord
       record.save
     end
 
-    def create_record(record_hash = {})
+    def promise_create(record_hash = {})
       record = new(record_hash)
-      record.save_record
+      record.promise_save
     end
 
     def find(id)
@@ -97,39 +107,40 @@ module HyperRecord
       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[sid] if _record_cache.has_key?(sid) && _class_fetch_states["record_#{id}"] == 'i'
-      _find_record(id, record_in_progress).then do
+      _promise_find(id, record_in_progress).then do
         React::State.set_state(observer, record_in_progress_key, `Date.now() + Math.random()`) if observer
       end
       record_in_progress
     end
 
-    def find_record(id)
+    def promise_find(id)
       sid = id.to_s
       record_in_progress = if _record_cache.has_key?(sid)
                              _record_cache[sid]
                            else
                              self.new(id: id)
                            end
-      _find_record(id, record_in_progress)
-    end
-
-    def find_record_by(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 |response|
-        self.new(response.json[self.to_s.underscore])
-      end
-    end
+      _promise_find(id, record_in_progress)
+    end
+
+    # TODO find_by
+    # def promise_find_by(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 |response|
+    #     self.new(response.json[self.to_s.underscore])
+    #   end
+    # end
 
     def has_and_belongs_to_many(direction, name = nil, options = { type: nil })
       if name.is_a?(Hash)
@@ -143,22 +154,26 @@ module HyperRecord
         name = direction
       end
       reflections[name] = { direction: direction, type: options[:type], kind: :has_and_belongs_to_many }
+      define_method("promise_#{name}") do
+        @fetch_states[name] = 'i'
+        self.class._promise_get("#{self.class.resource_base_uri}/#{self.id}/relations/#{name}.json").then do |response|
+          collection = self.class._convert_array_to_collection(response.json[self.class.to_s.underscore][name], self, name)
+          @relations[name] = collection
+          @fetch_states[name] = 'f'
+          _notify_observers
+          @relations[name]
+        end.fail do |response|
+          error_message = "#{self.class.to_s}[#{self.id}].#{name}, a has_and_belongs_to_many association, failed to fetch records!"
+          `console.error(error_message)`
+          response
+        end
+      end
       define_method(name) do
         _register_observer
-        if @fetch_states[name] == 'f'
+        if @fetch_states.has_key?(name) && 'fi'.include?(@fetch_states[name])
           @relations[name]
         elsif self.id
-          self.class._promise_get("#{self.class.resource_base_uri}/#{self.id}/relations/#{name}.json").then do |response|
-            collection = self.class._convert_array_to_collection(response.json[self.class.to_s.underscore][name], self, name)
-            @relations[name] = collection
-            @fetch_states[name] = 'f'
-            _notify_observers
-            @relations[name]
-          end.fail do |response|
-            error_message = "#{self.class.to_s}[#{self.id}].#{name}, a has_and_belongs_to_many association, failed to fetch records!"
-            `console.error(error_message)`
-            response
-          end
+          send("promise_#{name}")
           @relations[name]
         else
           @relations[name]
@@ -167,19 +182,20 @@ module HyperRecord
       define_method("update_#{name}") do
         @fetch_states[name] = 'u'
       end
-      define_method("#{name}=") do |arg|
-        _register_observer
-        collection = if arg.is_a?(Array)
-                       HyperRecord::Collection.new(arg, self, name)
-                     elsif arg.is_a?(HyperRecord::Collection)
-                       arg
-                     else
-                       raise "Argument must be a HyperRecord::Collection or a Array"
-                     end
-        @relations[name] = collection
-        @fetch_states[name] = 'f'
-        @relations[name]
-      end
+      # TODO
+      # define_method("#{name}=") do |arg|
+      #   _register_observer
+      #   collection = if arg.is_a?(Array)
+      #                  HyperRecord::Collection.new(arg, self, name)
+      #                elsif arg.is_a?(HyperRecord::Collection)
+      #                  arg
+      #                else
+      #                  raise "Argument must be a HyperRecord::Collection or a Array"
+      #                end
+      #   @relations[name] = collection
+      #   @fetch_states[name] = 'f'
+      #   @relations[name]
+      # end
     end
 
     def has_many(direction, name = nil, options = { type: nil })
@@ -194,22 +210,26 @@ module HyperRecord
         name = direction
       end
       reflections[name] = { direction: direction, type: options[:type], kind: :has_many }
+      define_method("promise_#{name}") do
+        @fetch_states[name] = 'i'
+        self.class._promise_get("#{self.class.resource_base_uri}/#{self.id}/relations/#{name}.json").then do |response|
+          collection = self.class._convert_array_to_collection(response.json[self.class.to_s.underscore][name], self, name)
+          @relations[name] = collection
+          @fetch_states[name] = 'f'
+          _notify_observers
+          @relations[name]
+        end.fail do |response|
+          error_message = "#{self.class.to_s}[#{self.id}].#{name}, a has_many association, failed to fetch records!"
+          `console.error(error_message)`
+          response
+        end
+      end
       define_method(name) do
         _register_observer
-        if @fetch_states[name] == 'f'
+        if @fetch_states.has_key?(name) && 'fi'.include?(@fetch_states[name])
           @relations[name]
         elsif self.id
-          self.class._promise_get("#{self.class.resource_base_uri}/#{self.id}/relations/#{name}.json").then do |response|
-            collection = self.class._convert_array_to_collection(response.json[self.class.to_s.underscore][name], self, name)
-            @relations[name] = collection
-            @fetch_states[name] = 'f'
-            _notify_observers
-            @relations[name]
-          end.fail do |response|
-            error_message = "#{self.class.to_s}[#{self.id}].#{name}, a has_many association, failed to fetch records!"
-            `console.error(error_message)`
-            response
-          end
+          send("promise_#{name}")
           @relations[name]
         else
           @relations[name]
@@ -218,19 +238,19 @@ module HyperRecord
       define_method("update_#{name}") do
         @fetch_states[name] = 'u'
       end
-      define_method("#{name}=") do |arg|
-        _register_observer
-        collection = if arg.is_a?(Array)
-          HyperRecord::Collection.new(arg, self, name)
-        elsif arg.is_a?(HyperRecord::Collection)
-          arg
-        else
-          raise "Argument must be a HyperRecord::Collection or a Array"
-        end
-        @relations[name] = collection
-        @fetch_states[name] = 'f'
-        @relations[name]
-      end
+      # define_method("#{name}=") do |arg|
+      #   _register_observer
+      #   collection = if arg.is_a?(Array)
+      #     HyperRecord::Collection.new(arg, self, name)
+      #   elsif arg.is_a?(HyperRecord::Collection)
+      #     arg
+      #   else
+      #     raise "Argument must be a HyperRecord::Collection or a Array"
+      #   end
+      #   @relations[name] = collection
+      #   @fetch_states[name] = 'f'
+      #   @relations[name]
+      # end
     end
 
     def has_one(direction, name, options = { type: nil })
@@ -245,21 +265,25 @@ module HyperRecord
         name = direction
       end
       reflections[name] = { direction: direction, type: options[:type], kind: :has_one }
+      define_method("promise_#{name}") do
+        @fetch_states[name] = 'i'
+        self.class._promise_get("#{self.class.resource_base_uri}/#{self.id}/relations/#{name}.json").then do |response|
+          @relations[name] = self.class._convert_json_hash_to_record(response.json[self.class.to_s.underscore][name])
+          @fetch_states[name] = 'f'
+          _notify_observers
+          @relations[name]
+        end.fail do |response|
+          error_message = "#{self.class.to_s}[#{self.id}].#{name}, a has_one association, failed to fetch records!"
+          `console.error(error_message)`
+          response
+        end
+      end
       define_method(name) do
         _register_observer
-        if @fetch_states[name] == 'f'
+        if @fetch_states.has_key?(name) && 'fi'.include?(@fetch_states[name])
           @relations[name]
         elsif self.id
-          self.class._promise_get("#{self.class.resource_base_uri}/#{self.id}/relations/#{name}.json").then do |response|
-            @relations[name] = self.class._convert_json_hash_to_record(response.json[self.class.to_s.underscore][name])
-            @fetch_states[name] = 'f'
-            _notify_observers
-            @relations[name]
-          end.fail do |response|
-            error_message = "#{self.class.to_s}[#{self.id}].#{name}, a has_one association, failed to fetch records!"
-            `console.error(error_message)`
-            response
-          end
+          send("promise_#{name}")
           @relations[name]
         else
           @relations[name]
@@ -268,12 +292,12 @@ module HyperRecord
       define_method("update_#{name}") do
         @fetch_states[name] = 'u'
       end
-      define_method("#{name}=") do |arg|
-        _register_observer
-        @relations[name] = arg
-        @fetch_states[name] = 'f'
-        @relations[name]
-      end
+      # define_method("#{name}=") do |arg|
+      #   _register_observer
+      #   @relations[name] = arg
+      #   @fetch_states[name] = 'f'
+      #   @relations[name]
+      # end
     end
 
     def record_cached?(id)
@@ -393,6 +417,7 @@ module HyperRecord
                     else
                       name
                     end
+        _class_fetch_states[name_args] = 'i'
         self._promise_get_or_patch("#{resource_base_uri}/scopes/#{name}.json", *args).then do |response_json|
           scopes[name_args] = _convert_array_to_collection(response_json[self.to_s.underscore][name])
           _class_fetch_states[name_args] = 'f'
@@ -411,7 +436,7 @@ module HyperRecord
                       name
                     end
         scopes[name_args] = HyperRecord::Collection.new unless scopes.has_key?(name_args)
-        if _class_fetch_states[name_args] == 'f'
+        if _class_fetch_states.has_key?(name_args) && 'fi'.include?(_class_fetch_states[name_args])
           scopes[name_args]
         else
           _register_class_observer
@@ -477,7 +502,7 @@ module HyperRecord
       @_class_state_key
     end
 
-    def _find_record(id, record_in_progress)
+    def _promise_find(id, record_in_progress)
       _class_fetch_states["record_#{id}"] = 'i'
       _promise_get("#{resource_base_uri}/#{id}.json").then do |response|
         klass_key = self.to_s.underscore

data/lib/hyper_record/client_instance_methods.rb

@@ -70,7 +70,7 @@ module HyperRecord
 
     def link(other_record)
       _register_observer
-      link_record(other_record).then do
+      promise_link(other_record).then do
         _notify_observers
       end
       self
@@ -112,7 +112,7 @@ module HyperRecord
 
     def save
       _register_observer
-      save_record.then do
+      promise_save.then do
         _notify_observers
       end
       self
@@ -132,7 +132,7 @@ module HyperRecord
 
     def unlink(other_record)
       _register_observer
-      unlink_record(other_record).then do
+      promise_unlink(other_record).then do
         _notify_observers
       end
       self
@@ -151,7 +151,7 @@ module HyperRecord
       end
     end
 
-    def link_record(other_record, relation_name = nil)
+    def promise_link(other_record, relation_name = nil)
       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)
@@ -172,7 +172,7 @@ module HyperRecord
       end
     end
 
-    def save_record
+    def promise_save
       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)
@@ -200,7 +200,7 @@ module HyperRecord
       end
     end
 
-    def unlink_record(other_record, relation_name = nil)
+    def promise_unlink(other_record, relation_name = nil)
       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)
@@ -254,27 +254,24 @@ module HyperRecord
 
     def _update_record(data)
       if data.has_key?(:relation)
-        if data.has_key?(:cause)
-          # this creation of variables for things that could be done in one line
-          # 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].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'
-                if send(data[:relation]).include?(c_record)
-                  return
-                end
-              end
-            end
-          end
-        end
-        relation_fetch_state = @fetch_states[data[:relation]]
-        if relation_fetch_state == 'f'
-          @fetch_states[data[:relation]] = 'u'
-          send(data[:relation])
-        end
+        # if data.has_key?(:cause)
+        #   # this creation of variables for things that could be done in one line
+        #   # 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].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'
+        #         if send(data[:relation]).include?(c_record)
+        #           return
+        #         end
+        #       end
+        #     end
+        #   end
+        # end
+        @fetch_states[data[:relation]] = 'u'
+        send(data[:relation])
         return
       end
       if data[:destroyed]

data/lib/hyper_record/collection.rb

@@ -14,7 +14,7 @@ module HyperRecord
 
     def <<(other_record)
       if @record && @relation_name
-        @record.link_record(other_record, @relation_name)
+        @record.promise_link(other_record, @relation_name)
       end
       other_record._register_collection(self)
       @record._notify_observers if @record
@@ -23,7 +23,7 @@ module HyperRecord
 
     def delete(other_record)
       if @record && @relation_name && !other_record.instance_variable_get(:@remotely_destroyed)
-        @record.unlink_record(other_record, @relation_name)
+        @record.promise_unlink(other_record, @relation_name)
       end
       other_record._unregister_collection(self)
       @record._notify_observers if @record

data/lib/hyperloop/resource/client_drivers.rb

@@ -93,16 +93,14 @@ module Hyperloop
         def self.process_notification(data)
           record_class = Object.const_get(data[:record_type])
           if data[:scope]
-            scope_fetch_state = record_class._class_fetch_states[data[:scope]]
-            if scope_fetch_state == 'f'
+            scope_name, scope_params = data[:scope].split('_[')
+            if scope_params
+              scope_params = '[' + scope_params
               record_class._class_fetch_states[data[:scope]] = 'u'
-              scope_name, scope_params = data[:scope].split('_[')
-              if scope_params
-                scope_params = '[' + scope_params
-                record_class.send(scope_name, JSON.parse(scope_params))
-              else
-                record_class.send(data[:scope])
-              end
+              record_class.send(scope_name, JSON.parse(scope_params))
+            else
+              record_class._class_fetch_states[data[:scope]] = 'u'
+              record_class.send(data[:scope])
             end
           elsif record_class.record_cached?(data[:id])
             record = record_class.find(data[:id])

data/lib/hyperloop/resource/version.rb

@@ -1,5 +1,5 @@
 module Hyperloop
   module Resource
-    VERSION = '1.0.0.lap53'
+    VERSION = '1.0.0.lap55'
   end
 end

metadata

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