hyper-resource 1.0.0.lap37 → 1.0.0.lap38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d97e990da393fe7171a941e1a983f90864bb873314cf51fa1160cb40b7c89e30
-  data.tar.gz: 76a994108050b12d21474d4aeb43e49ad5343bed5fe0bcf7df14c2da3b1a1a24
+  metadata.gz: d7b649c6ec2096366f08fa25d95af57a01e869b764534bc1ae93b0d10fc60497
+  data.tar.gz: b09a6a3ce5354eaf2731b427cb6b5a45c4901007448d96974f5d0acfa97e8fbd
 SHA512:
-  metadata.gz: 10cbff697773ae684420356beba06168db1e9e843d36acacb070cb8b4df194e5333479da7cb4d0aa8ef57676a485edbea7e003af303b49db102dbbcd73e8e1fa
-  data.tar.gz: 00fa3cefc9e6b59fc5d94948484d2e11b4e12177051f23d27ee72ba98e54e8007e90fa1eaff0a21afd00643bab75f6e120a3e0b5ec79c4a1fcebd3512a8c91c3
+  metadata.gz: 2d73031cd588bdb8b5e27976d947773316d69a3206053a4ce8a7a8187ab63f54eecaf55622eab3728ccd4b8ceb2dea916b7f9b082c95a6e8de4e3c30701c93a8
+  data.tar.gz: baace49e8182fbde221c2335dcdf56179237a8aa575630926d3a51c50c19822ae0d78edbe58419cbc0d7f9ee87d7b9a8df05f280827efef81cfa759352479a41

data/lib/hyper_record/class_methods.rb

@@ -301,7 +301,7 @@ 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._rest_method_get_or_patch(name, self.id, *args).then do |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
             _notify_observers
             @rest_methods_hash[name][:result]
@@ -329,12 +329,12 @@ module HyperRecord
 
     def scope(name, options)
       scopes[name] = HyperRecord::Collection.new
-      define_singleton_method(name) do
+      define_singleton_method(name) do |*args|
         if _class_fetch_states[name] == 'f'
           scopes[name]
         else
           _register_class_observer
-          self._promise_get("#{resource_base_uri}/scopes/#{name}.json").then do |response|
+          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'
             _notify_class_observers
@@ -408,6 +408,19 @@ module HyperRecord
       Hyperloop::Resource::HTTP.get(uri, headers: { 'Content-Type' => 'application/json' })
     end
 
+    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]
+        end
+      else
+        _promise_get(uri).then do |result|
+          result.json[:result]
+        end
+      end
+    end
+
     def _promise_delete(uri)
       Hyperloop::Resource::HTTP.delete(uri, headers: { 'Content-Type' => 'application/json' })
     end
@@ -439,20 +452,6 @@ module HyperRecord
         _class_observers << observer # @observers is a set, observers get added only once
       end
     end
-
-    def _rest_method_get_or_patch(name, id, *args)
-      uri = "#{resource_base_uri}/#{id}/methods/#{name}.json?timestamp=#{`Date.now() + Math.random()`}" # timestamp to invalidate browser caches
-      if args && args.size > 0
-        payload = { params: args }
-        _promise_patch(uri, payload).then do |result|
-          result.json[:result]
-        end
-      else
-        _promise_get(uri).then do |result|
-          result.json[:result]
-        end
-      end
-    end
   end
 
 end

data/lib/hyperloop/resource/rails/controller_templates/scopes_controller.rb

@@ -17,8 +17,8 @@ class Hyperloop::Resource::ScopesController < ApplicationController
     @record_class = guarded_record_class_from_param(mc_param)
     @scope_name = params[:id].to_sym # :id is the scope name
     @collection = nil
-    if @record_class && @record_class.scopes.has_key?(@scope_name)  # guard  
-      @collection = @record_class.send(@scope_name) 
+    if @record_class && @record_class.scopes.has_key?(@scope_name) # guard
+      @collection = @record_class.send(@scope_name)
     end
     respond_to do |format|
       if @record_class && @collection
@@ -29,8 +29,26 @@ class Hyperloop::Resource::ScopesController < ApplicationController
     end
   end
 
+  def update
+    mc_param = record_class_param
+    mc_param = mc_param.chop if mc_param.end_with?('s')
+    @model_klass = guarded_record_class_from_param(mc_param)
+    @scope_name = params[:id].to_sym # :id is the scope name
+    @collection = nil
+    if @model_klass && @model_klass.scopes.has_key?(@scope_name) # guard
+      @collection = @model_klass.send(@scope_name, params[:params])
+    end
+    respond_to do |format|
+      if @model_klass && @collection
+        format.json
+      else
+        format.json { render json: {}, status: :unprocessable_entity }
+      end
+    end
+  end
+
   private
-  
+
   def record_class_param
     params.require(:record_class)
   end

data/lib/hyperloop/resource/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.0.lap37
+  version: 1.0.0.lap38
 platform: ruby
 authors:
 - Jan Biedermann