ocean-rails 1.18.7 → 1.18.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dab442a00f1ed9883d5f2c8c6b70b95714fd5f27
-  data.tar.gz: e0fe79ace58d02d351686a4c878ca0e6690ef947
+  metadata.gz: f723a5789804d1b39bb4397d61b7ec794102b403
+  data.tar.gz: b12da0d1f18218b212734998cd21b2274b7d55d5
 SHA512:
-  metadata.gz: e00047b3b4d2b75057228fb32c6a0cd3d1d7b81eaa57d3b2c84a6dd2f20b52793eed7368f309a907c4f8b3f5cf40ef926b294fdb586795a47e5f6c4992d3189e
-  data.tar.gz: f56cef940ae21aa37d84c9f135b2a6d24dbf67dabd6f460a6b6c746477c86d0eac732521cb3ae6fb3af545a33bd889993647c456a0639169e6358f84b583c2a7
+  metadata.gz: 142402aad49ef24e397d48ec62873ef430aea063da8a24802e13e6f41107607715c446ccb5f50ac450bcf23d85a51a3aa53858c8525a712321f99f40c5eada8e
+  data.tar.gz: d15c893f5f6b302c16ef1af3eeeeeab20c361ad5ee639849c39b2804678e77c46d99cc77463e1a5203580cbbcb6f651f112667940849af4e8b31c062db16a273

data/app/helpers/application_helper.rb

@@ -19,20 +19,16 @@ module ApplicationHelper
   # This is needed everywhere except inside the Auth service to render creator
   # and updater links correctly.
   #
-  unless method_defined?(:api_user_url)
-
-    def api_user_url(x)
-      if x.blank?
-        "#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/0"
-      elsif x.is_a?(Integer)
-        "#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/#{x}"
-      elsif x.is_a?(String)
-        x
-      else
-        raise "api_user_url takes an integer, a string, or nil"
-      end
+  def api_user_url(x)
+    if x.blank?
+      "#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/0"
+    elsif x.is_a?(Integer)
+      "#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/#{x}"
+    elsif x.is_a?(String)
+      x
+    else
+      raise "api_user_url takes an integer, a string, or nil"
     end
-
-  end 
+  end
 
 end

data/lib/ocean/engine.rb

@@ -1,4 +1,6 @@
 module Ocean
   class Engine < ::Rails::Engine
+    config.generators.integration_tool :rspec
+    config.generators.test_framework :rspec
   end
 end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.18.7"
+  VERSION = "1.18.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.18.7
+  version: 1.18.8
 platform: ruby
 authors:
 - Peter Bengtson