ocean-rails 1.24.0 → 1.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87bd08f85671c4992c934ca277f6722b41469593
-  data.tar.gz: 7da2a2cb455fca206f1bba21ae1e6de64bf20c49
+  metadata.gz: a12616144c2d08098abcda551448945597bbc4dc
+  data.tar.gz: 0e805c2dd8ff776d17af51eae166c20a3e7ddd7a
 SHA512:
-  metadata.gz: 353eea4d78b9229655cf5188b818fe17ba1bdb3c4848d4f2159bee1453979d6b4e4807d05b150800a8dc79fafc69034216a3ef92f0fdfc6690b2d570e9568aff
-  data.tar.gz: a55267c566fc79d7331a0ea80051cc4e06b5f5e1de629d56f0c3dfc96bbc5a268de73899be12c01a0ab52e5e20ec8d9ce97411e79fee0a6130ae9d2244f0e1d8
+  metadata.gz: 30f51aa0e64e47f1b8ff6157b67f1ecc73052ed08d018606571897d98d243a2477272b68f0acf630ea9bc1b12092f36cf98d1fae376fbe60ef3f248e8c8d3e69
+  data.tar.gz: 1d58fe96c820eae7dc1da7f49ed68ab0a8b721f42cce3f839f7e2b12e4661bd2f952ab2456367c5f2f84fc49eadd37d73c2077ad172abb0d10bdc921fa8518ff

data/lib/generators/ocean_setup/ocean_setup_generator.rb

@@ -20,6 +20,10 @@ 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_controller.rb"
+  end
+
   def install_spec_helper_and_support_files
     copy_file "spec_helper.rb", "#{Rails.root}/spec/spec_helper.rb"
     copy_file "hyperlinks.rb", "#{Rails.root}/spec/support/hyperlinks.rb"

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

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

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.24.0"
+  VERSION = "1.24.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.24.1
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -278,6 +278,7 @@ files:
 - lib/generators/ocean_scaffold/USAGE
 - lib/generators/ocean_setup/ocean_setup_generator.rb
 - lib/generators/ocean_setup/templates/application_controller.rb
+- lib/generators/ocean_setup/templates/application_helper.rb
 - lib/generators/ocean_setup/templates/config.yml.example
 - lib/generators/ocean_setup/templates/Gemfile
 - lib/generators/ocean_setup/templates/gitignore
@@ -322,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: This gem implements common Ocean behaviour for Ruby and Ruby on Rails.