ocean-rails 4.0.10 → 4.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8428b54104958053416521f95a4dfad5b1df204
-  data.tar.gz: bb5ff30b4d567ddbe38f1a4f18750686150ffad5
+  metadata.gz: 317a7b3fe5ce5e1f19753000f2b2fb6c1069e16f
+  data.tar.gz: ab30a360ebdd04014e673a0940f742d477df74a2
 SHA512:
-  metadata.gz: a70bb2a9e22a2e975106551817ccb9e9d87df364e018f3742f0454496abcec6baa70a02cad1cfc2d13fbcd0b7b0ea0d5b2e83b4af98ffb080ee34e7ca64aea01
-  data.tar.gz: 1773aba1c65c2ee0d6172db689feed21686fd941aafc6ec7dd70b732c9f326f789d995030aaea7664d0d27db3b31d7c2fb6f04e3fd4334443981dd1c4419f8df
+  metadata.gz: f155c6205085546361e0e2dfc5c211a7031af6b122dcc8c862b31c98ef3153457d88611127915f13181fced6fb5b66ca65a281f29690243100d369e0397cf593
+  data.tar.gz: cd1ec6d47cd35758df62f5261fe6ea3a2e92bedab18a22f86a15f08f4a59bcaba0823caf006c7d1a59391f77c2b6fae6ba2da2bcb1e40cc8ed171779de4880f7

data/lib/generators/ocean_setup/ocean_setup_generator.rb

@@ -20,8 +20,8 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     copy_file "application_controller.rb", "#{Rails.root}/app/controllers/application_controller.rb"
   end
 
-  def install_application_helper
-    copy_file "application_helper.rb", "#{Rails.root}/app/helpers/application_helper.rb"
+  def remove_application_helper
+    remove_file "#{Rails.root}/app/helpers/application_helper.rb"
   end
 
   def install_spec_helper_and_support_files

data/lib/ocean/ocean_application_controller.rb

@@ -118,7 +118,7 @@ module OceanApplicationController
   # Renders a +HEAD+ response with HTTP status 204 No Content.
   #
   def render_head_204
-    render text: '', status: 204, content_type: 'application/json'
+    render text: '', status: 204 #, content_type: 'application/json'
   end
   
   #

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "4.0.10"
+  VERSION = "4.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.10
+  version: 4.0.11
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -269,7 +269,6 @@ files:
 - lib/generators/ocean_setup/ocean_setup_generator.rb
 - lib/generators/ocean_setup/templates/Gemfile
 - lib/generators/ocean_setup/templates/application_controller.rb
-- lib/generators/ocean_setup/templates/application_helper.rb
 - lib/generators/ocean_setup/templates/aws.yml.example
 - lib/generators/ocean_setup/templates/config.yml.example
 - lib/generators/ocean_setup/templates/gitignore

data/lib/generators/ocean_setup/templates/application_helper.rb

@@ -1,35 +0,0 @@
-module ApplicationHelper
-
-  #
-  # Used in Jbuilder templates to build hyperlinks
-  #
-  def hyperlinks(links={})
-    result = {}
-    links.each do |qi, val|
-      next unless val
-      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"
-    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