ocean-rails 4.1.6 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ca7637df130db08dda89487685ab261006299d
-  data.tar.gz: 2ad788ad6233fa6c819deaba1bc9e615bf9f3fc7
+  metadata.gz: 64668e1ca09bd9c947e446be490c552d737030a6
+  data.tar.gz: 5e7bee38908ac4bb03ac768d34aab6b4fb78ad48
 SHA512:
-  metadata.gz: 48512b574084859bb88862cfc565e74fece0c52ae8f15138a013a2852dd8a2f3b4341a5773239a0680108862d444f010604f4f4bc61e22ee42746c280a3d6382
-  data.tar.gz: dbfb5e8a596c89e3812a8eb9d4c1c8534068a407d38d83699bb342a464dc1a9d8a8175f554a6db1f33e58fa577ac1fc24c8f53c636578770deb16c30adde6868
+  metadata.gz: 2803f8a963a01bd1b3e81e625d9aaad670e406c97c9637467634f2a0c8b42e0cc3b2a0496a0f19d2831c76b3a09dbebf2c9de41d2c16edce900fb0c24eb22843
+  data.tar.gz: 9c299822c58f17b33d131c1e635ad51dc9aabf8ce58f8c3103e0a4c5c514febe612d220026dc9689c0a4a1c17dc39132bd9372c25829e2fae24c7a3ccdd652bc

data/lib/ocean-rails.rb

@@ -96,3 +96,51 @@ def add_right_restrictions(rel, restrictions)
     rel.where(cond)
   end
 end
+
+
+#
+# Used in Jbuilder templates to build hyperlinks
+#
+def hyperlinks(links={})
+  result = {}
+  links.each do |qi, val|
+    next unless val.present?
+    result[qi.to_s] = { 
+               "href" => val.kind_of?(String) ? val : val[:href], 
+               "type" => val.kind_of?(String) ? "application/json" : val[:type]
+            }
+  end
+  result
+end
+
+#
+# This renders creator and updater links correctly.
+#
+def smart_api_user_url(x)
+  if x.blank?
+    "#{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 =~ /^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
+
+
+#
+# View helper predicates to determine if the ApiUser behind the current
+# authorisation belongs to one or more of a list of Groups.
+#
+def member_of_group?(*names)
+  @group_names && @group_names.intersect?(names.to_set) 
+end
+
+#
+# Returns true if the ApiUser behind the current authorisation belongs 
+# to the Ocean Group "Superusers".
+#
+def superuser?
+  member_of_group?("Superusers")
+end

data/lib/ocean/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 5.0.0
 platform: ruby
 authors:
 - Peter Bengtson
@@ -206,7 +206,6 @@ files:
 - Rakefile
 - app/controllers/alive_controller.rb
 - app/controllers/errors_controller.rb
-- app/helpers/application_helper.rb
 - config/initializers/_api_constants.rb
 - config/initializers/_aws_config.rb
 - config/initializers/_ocean_constants.rb

data/app/helpers/application_helper.rb

@@ -1,58 +0,0 @@
-module ApplicationHelper
-
-  #
-  # Used in Jbuilder templates to build hyperlinks
-  #
-  def hyperlinks(links={})
-    result = {}
-    links.each do |qi, val|
-      next unless val.present?
-      result[qi.to_s] = { 
-                 "href" => val.kind_of?(String) ? val : val[:href], 
-                 "type" => val.kind_of?(String) ? "application/json" : val[:type]
-              }
-    end
-    result
-  end
-  
-
-  #
-  # This is needed everywhere except inside the Auth service to render creator
-  # and updater links correctly.
-  #
-  def api_user_url(x)
-    if x.blank?
-      "#{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 =~ /^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
-  # authorisation belongs to one or more of a list of Groups.
-  #
-  def member_of_group?(*names)
-    @group_names && @group_names.intersect?(names.to_set) 
-  end
-
-  #
-  # Returns true if the ApiUser behind the current authorisation belongs 
-  # to the Ocean Group "Superusers".
-  #
-  def superuser?
-    member_of_group?("Superusers")
-  end
-end