ocean-rails 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79cfdbb9fd109b9b240836259183c5269af1dcd5
-  data.tar.gz: fa8a5c44c6004df123e70c7efdd22dfc6d99b84d
+  metadata.gz: 63ca7637df130db08dda89487685ab261006299d
+  data.tar.gz: 2ad788ad6233fa6c819deaba1bc9e615bf9f3fc7
 SHA512:
-  metadata.gz: a45ac48ba046f42223ad48471017c99092697372ba5238bfb3b639a140a9198d76ec757a7ed8acbf10d19afd1f668907aabc1a36a272cb57f3d59bd23d03b0fd
-  data.tar.gz: b9eff2df4942131bc76bc898db290de2776c2cc3007ea4362d16c7fc51fe7ae716106b372b078e10be6d4d47a0aef2b329d1202a5eb351ce59a49726ec19cc7c
+  metadata.gz: 48512b574084859bb88862cfc565e74fece0c52ae8f15138a013a2852dd8a2f3b4341a5773239a0680108862d444f010604f4f4bc61e22ee42746c280a3d6382
+  data.tar.gz: dbfb5e8a596c89e3812a8eb9d4c1c8534068a407d38d83699bb342a464dc1a9d8a8175f554a6db1f33e58fa577ac1fc24c8f53c636578770deb16c30adde6868

data/app/helpers/application_helper.rb

@@ -22,16 +22,23 @@ module ApplicationHelper
   #
   def api_user_url(x)
     if x.blank?
-      "#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/0"
+      "#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/0-0-0-0-0"
     elsif x.is_a?(Integer)
       "#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/#{x}"
     elsif x.is_a?(String)
-      x
+      x =~ /^http(s)?:\/\// ? x : "#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/#{x}"
     else
       raise "api_user_url takes an integer, a string, or nil"
     end
   end
 
+  #
+  # This is an alias of +api_user_url+.
+  #
+  def api_user_url_smart(x)
+    api_user_url(x)
+  end
+
 
   #
   # View helper predicates to determine if the ApiUser behind the current

data/lib/ocean-rails.rb

@@ -39,12 +39,12 @@ end
 # and +creator_uri+ given by the parameters. It also allows the value of 'right' to
 # be specified: this will restrict all SQL queries accordingly.
 #
-def permit_with(status, user_id: 123, creator_uri: "https://api.example.com/v1/api_users/#{user_id}",
+def permit_with(status, user_id: "1-2-3-4-5", creator_uri: "https://api.example.com/v1/api_users/#{user_id}",
                         right: nil, group_names: [])
   allow(Api).to receive(:permitted?).
     and_return(double(:status => status, 
                       :body => {'authentication' => 
-                                 {'user_id' => user_id,
+                                 {#'user_id' => user_id,
                                   'right' => right,
                                   'group_names' => group_names,
                                   '_links' => { 'creator' => {'href' => creator_uri,

data/lib/ocean/ocean_application_controller.rb

@@ -68,7 +68,7 @@ module OceanApplicationController
     response = Api.permitted?(@x_api_token, query: qs)                                   
     if response.status == 200
       a = response.body['authentication']
-      @auth_api_user_id = a['user_id']  # Deprecate and remove
+      #@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']
@@ -91,7 +91,7 @@ module OceanApplicationController
   #
   def set_updater(obj)
     id_or_uri = obj.created_by.is_a?(Integer) ? @auth_api_user_id : @auth_api_user_uri
-    obj.created_by = id_or_uri if obj.created_by.blank? || obj.created_by == 0
+    obj.created_by = id_or_uri if obj.created_by.blank? || obj.created_by == 0 || obj.created_by == "0-0-0-0-0"
     obj.updated_by = id_or_uri
   end
   

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "4.1.5"
+  VERSION = "4.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus