ocean-rails 4.0.10 → 4.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 317a7b3fe5ce5e1f19753000f2b2fb6c1069e16f
|
|
4
|
+
data.tar.gz: ab30a360ebdd04014e673a0940f742d477df74a2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f155c6205085546361e0e2dfc5c211a7031af6b122dcc8c862b31c98ef3153457d88611127915f13181fced6fb5b66ca65a281f29690243100d369e0397cf593
|
|
7
|
+
data.tar.gz: cd1ec6d47cd35758df62f5261fe6ea3a2e92bedab18a22f86a15f08f4a59bcaba0823caf006c7d1a59391f77c2b6fae6ba2da2bcb1e40cc8ed171779de4880f7
|
|
@@ -20,8 +20,8 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
|
|
|
20
20
|
copy_file "application_controller.rb", "#{Rails.root}/app/controllers/application_controller.rb"
|
|
21
21
|
end
|
|
22
22
|
|
|
23
|
-
def
|
|
24
|
-
|
|
23
|
+
def remove_application_helper
|
|
24
|
+
remove_file "#{Rails.root}/app/helpers/application_helper.rb"
|
|
25
25
|
end
|
|
26
26
|
|
|
27
27
|
def install_spec_helper_and_support_files
|
|
@@ -118,7 +118,7 @@ module OceanApplicationController
|
|
|
118
118
|
# Renders a +HEAD+ response with HTTP status 204 No Content.
|
|
119
119
|
#
|
|
120
120
|
def render_head_204
|
|
121
|
-
render text: '', status: 204
|
|
121
|
+
render text: '', status: 204 #, content_type: 'application/json'
|
|
122
122
|
end
|
|
123
123
|
|
|
124
124
|
#
|
data/lib/ocean/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ocean-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.0.
|
|
4
|
+
version: 4.0.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Bengtson
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-11-
|
|
11
|
+
date: 2014-11-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: typhoeus
|
|
@@ -269,7 +269,6 @@ files:
|
|
|
269
269
|
- lib/generators/ocean_setup/ocean_setup_generator.rb
|
|
270
270
|
- lib/generators/ocean_setup/templates/Gemfile
|
|
271
271
|
- lib/generators/ocean_setup/templates/application_controller.rb
|
|
272
|
-
- lib/generators/ocean_setup/templates/application_helper.rb
|
|
273
272
|
- lib/generators/ocean_setup/templates/aws.yml.example
|
|
274
273
|
- lib/generators/ocean_setup/templates/config.yml.example
|
|
275
274
|
- lib/generators/ocean_setup/templates/gitignore
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
module ApplicationHelper
|
|
2
|
-
|
|
3
|
-
#
|
|
4
|
-
# Used in Jbuilder templates to build hyperlinks
|
|
5
|
-
#
|
|
6
|
-
def hyperlinks(links={})
|
|
7
|
-
result = {}
|
|
8
|
-
links.each do |qi, val|
|
|
9
|
-
next unless val
|
|
10
|
-
result[qi.to_s] = {
|
|
11
|
-
"href" => val.kind_of?(String) ? val : val[:href],
|
|
12
|
-
"type" => val.kind_of?(String) ? "application/json" : val[:type]
|
|
13
|
-
}
|
|
14
|
-
end
|
|
15
|
-
result
|
|
16
|
-
end
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
#
|
|
20
|
-
# This is needed everywhere except inside the Auth service to render creator
|
|
21
|
-
# and updater links correctly.
|
|
22
|
-
#
|
|
23
|
-
def api_user_url(x)
|
|
24
|
-
if x.blank?
|
|
25
|
-
"#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/0"
|
|
26
|
-
elsif x.is_a?(Integer)
|
|
27
|
-
"#{OCEAN_API_URL}/#{Api.version_for :api_user}/api_users/#{x}"
|
|
28
|
-
elsif x.is_a?(String)
|
|
29
|
-
x
|
|
30
|
-
else
|
|
31
|
-
raise "api_user_url takes an integer, a string, or nil"
|
|
32
|
-
end
|
|
33
|
-
end
|
|
34
|
-
|
|
35
|
-
end
|