adeia 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81d2d0a434685e7b16bff8d0803c04baa84da393
-  data.tar.gz: a5067a6f38c733b0dfa7462a23765f43358fa598
+  metadata.gz: 7c12c59830d8fe3c488630410560fcd8cfe27f50
+  data.tar.gz: 4a0ab18a8f0df82924f344b9cd89bf376a01722e
 SHA512:
-  metadata.gz: aff98a001374ef10190b2a0aea55691838137facab69d94b9408f59db39d48c6030640a85a6e70b26343844d915fdfdc527e1c85a57e4a6f5ff870c41d705c2f
-  data.tar.gz: 7e8c2cd42e38b26e2cf091bcda0ee0bc825fff4849ac5c185ccc17bc4173d82967bbe9ef9431f80736146c9016318e7b53d69bb9a9bc76f54815cb2f16e81691
+  metadata.gz: 740b5861b98ab7cd216618892599680f498e8cbc5e3697889280723178fe699863b7c297ee6d541a762b246e21e9de0c75c8e73418150e947ef7d7c29ef58e87
+  data.tar.gz: 6859f560bca9a3bec5642a0819c990c12ae3030680766b3e4affcab659c10d7eee156eb668d7691cd023fabc56d955b089ee9126a75ba7075ad614b3c20c75e5

data/lib/adeia/controller_resource.rb

@@ -32,6 +32,7 @@ module Adeia
       @controller_name = args.fetch(:controller, @controller.controller_path)
       @token = args.fetch(:token, @controller.request.GET[:token])
       @resource = args[:resource]
+      @model = args.fetch(:model, resource_class)
       @user = @controller.current_user
       @controller.current_user ||= GuestUser.new # if not signed in but authorized
       @controller.store_location
@@ -39,7 +40,7 @@ module Adeia
 
     def load_resource
       begin
-        @resource ||= resource_class.find(@controller.params.fetch(:id))
+        @resource ||= @model.find(@controller.params.fetch(:id))
         @controller.instance_variable_set("@#{resource_name}", @resource)
       rescue KeyError
         raise MissingParams.new(:id)
@@ -50,13 +51,13 @@ module Adeia
       rights = authorization.read_rights.merge(authorization.token_rights(:read)) { |key, v1, v2| v1 + v2 }
       rights, resource_ids = rights[:rights], rights[:resource_ids]
       @records ||= if rights.any? { |r| r.permission_type == "all_entries" }
-        resource_class.all
+        @model.all
       elsif rights.any? { |r| r.permission_type == "on_ownerships" }
-        resource_class.where("user_id = ? OR id IN (?)", @user.id, resource_ids)
+        @model.where("user_id = ? OR id IN (?)", @user.id, resource_ids)
       elsif rights.any? { |r| r.permission_type == "on_entry" }
-        resource_class.where(id: resource_ids)
+        @model.where(id: resource_ids)
       else
-        resource_class.none
+        @model.none
       end
       @controller.instance_variable_set("@#{resource_name.pluralize}", @records)
     end
@@ -89,7 +90,7 @@ module Adeia
     end
 
     def resource_name
-      resource_class.model_name.element
+      @model.model_name.element
     end
 
     def controller_name(resource)

data/lib/adeia/version.rb

@@ -1,3 +1,3 @@
 module Adeia
-  VERSION = "0.11.4"
+  VERSION = "0.11.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adeia
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - khcr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails