ocean-rails 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c40e04d9a10d45f336d5c870c88bb78520d5fc90
-  data.tar.gz: 42d04e38d27d92bd906daeca2d817a5dc80c8ddb
+  metadata.gz: 9a61b3ff0ce74f62050af6db2e58870eea435f15
+  data.tar.gz: 119e575e58675abcac2920ab8316bf688a913981
 SHA512:
-  metadata.gz: 0ce76c663f2a663a91d6262f73f98e9e99a1f834053731ac66712a429c159f9a3ab6d88d32c0f338913d17bf288fd13a32abbbfdd539698a4bcbd75e64389c90
-  data.tar.gz: 97fd6522add6458b8e98e1801ee66f286a984f37484da1351c1b8bf7825361decdf86f2f552992839c544176fe3ef4bfe791046a700f09434e348fdab079cf25
+  metadata.gz: 619aa4bbbb4a6897d04292337b2e1f81acba21d5346a0f7e9d11350ffdd868648cd1009bbd416c4f85de040d957b5f3a4e55937545c88ae53db858dc31652bdc
+  data.tar.gz: 296feb56d1e75d9f83c40d69e3e21c3f22aeff6ec0071d54c2d477e9fa6c9fa42a758221a0f2552db38c21937a501d4c38a32b04c9f8f78a9727c3bf5898b88a

data/app/helpers/application_helper.rb

@@ -31,4 +31,16 @@ module ApplicationHelper
     end
   end
 
+
+  #
+  # View helper predicates to determine whether the ApiUser belongs
+  # to one or more of a list of Groups.
+  #
+  def member_of_group?(*names)
+    @group_names && @group_names.intersect?(names.to_set) 
+  end
+
+  def superuser?
+    member_of_group?("Superusers")
+  end
 end

data/lib/ocean-rails.rb

@@ -50,6 +50,7 @@ def permit_with(status, user_id: 123, creator_uri: "https://api.example.com/v1/a
                                                               'type' => 'application/json'}}}}))
 end
 
+
 #
 # For stubbing failed authorisation calls. Makes <tt>Api.permitted?</tt> return the
 # given status and a body containing a standard API error with the given error messages.
@@ -73,5 +74,3 @@ def add_right_restrictions(rel, restrictions)
   end
   rel
 end
-
-

data/lib/ocean/api_resource.rb

@@ -40,6 +40,9 @@ module ApiResource
     # to calculate OFFSET and LIMIT. The default +page_size+ for a resource class can
     # also be declared using +ocean_resource_model+.
     #
+    # Right restrictions, if provided, will be added to the relation before it is
+    # returned.
+    #
     def collection(bag={})
       collection_internal bag, bag[:group], bag[:search], bag[:page], bag[:page_size],
                           bag['_right_restrictions']

data/lib/ocean/ocean_application_controller.rb

@@ -64,12 +64,13 @@ module OceanApplicationController
     qs = Api.authorization_string(@@extra_actions, controller_name, action_name)
     response = Api.permitted?(@x_api_token, query: qs)                                   
     if response.status == 200
-      @authentication = response.body['authentication']
-      @auth_api_user_id = @authentication['user_id']  # Deprecate and remove
-      @auth_api_user_uri = @authentication['_links']['creator']['href']  # Keep
-      Thread.current[:username] = @authentication['username']
-      @right_restrictions = @authentication['right']
+      a = response.body['authentication']
+      @auth_api_user_id = a['user_id']  # Deprecate and remove
+      @auth_api_user_uri = a['_links']['creator']['href']  # Keep
+      Thread.current[:username] = a['username']
+      @right_restrictions = a['right']
       params['_right_restrictions'] = @right_restrictions if @right_restrictions
+      @group_names = a['group_names'].to_set if a['group_names']
       return true
     end
     error_messages = response.body['_api_error']

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.8.0"
+  VERSION = "2.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus