ocean-rails 1.22.1 → 1.22.2

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: c3a42a43e7f34158de4bfb09d4f2d90c81d44eb0
4
- data.tar.gz: 69db544e332db4166ae928f6c9ceccb65e841e8e
3
+ metadata.gz: ae76a813526fd9e589aae072a88b81869bcef2f2
4
+ data.tar.gz: 699fc1d9b6813bf369441b27a66a97c6b85e54a2
5
5
  SHA512:
6
- metadata.gz: 4caa4fca1975ebd2d6fc93c58e174694e3616943718ad48db410ead18bb3fd0f73b45c4612abd18264e3e5f2818b1da09f876e9271f9c2ce23026e1dbcd4646a
7
- data.tar.gz: c955925c5de020c0e58b3a723794f597f0e981aec00d3c6fcb3b7f2b59e252bb5c5334616cf6f8ddea84c85acb8ac066df81680f8962766c14eceea091262042
6
+ metadata.gz: 225320d7dcec73b64e9bae71b37b2938b7c690842b1bdb800fce89659fac9ee939e31fe8ba2cf75df972d69fa10e1d633b66366a99f2e70f10a063f0ad60ea11
7
+ data.tar.gz: ed09ac4816da7c799f00abb0ca493ceed540a877575455bc5f7ab3e82e8ce51d85c235a887cf1c9a2a0c56304c55adcfd678b9348f0545356d4eadd7e3e27f53
data/README.rdoc CHANGED
@@ -9,8 +9,8 @@ Ocean requires Ruby 2.0 and Ruby on Rails 4.0.0 or later.
9
9
 
10
10
 
11
11
  === Documentation
12
- * Ocean gem API: http://rdoc.info/github/OceanDev/ocean-rails/frames
13
12
  * Ocean gem on Rubygems: https://rubygems.org/gems/ocean-rails
13
+ * Ocean gem API: http://rdoc.info/github/OceanDev/ocean-rails/frames
14
14
  * Ocean framework: http://wiki.oceanframework.net
15
15
  * Ocean mailing list: http://groups.google.com/group/oceanframework
16
16
  * Ocean blog: http://blog.oceanframework.net
data/lib/ocean-rails.rb CHANGED
@@ -3,7 +3,7 @@ require "ocean/engine"
3
3
  require "ocean-dynamo"
4
4
  require "ocean/api"
5
5
  require "ocean/api_resource"
6
- require "ocean/ocean_resource_model" if defined? ActiveRecord
6
+ require "ocean/ocean_resource_model" if defined? ActiveRecord || defined? OceanDynamo
7
7
  require "ocean/ocean_resource_controller" if defined? ActionController
8
8
  require "ocean/ocean_application_controller"
9
9
  require "ocean/zero_log"
@@ -58,5 +58,5 @@ module Ocean
58
58
  end
59
59
 
60
60
 
61
- ActiveRecord::Base.send :include, Ocean::OceanResourceModel
62
- OceanDynamo::Base.send :include, Ocean::OceanResourceModel
61
+ ActiveRecord::Base.send :include, Ocean::OceanResourceModel if defined? ActiveRecord
62
+ OceanDynamo::Base.send :include, Ocean::OceanResourceModel if defined? OceanDynamo
data/lib/ocean/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Ocean
2
- VERSION = "1.22.1"
2
+ VERSION = "1.22.2"
3
3
  end
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: 1.22.1
4
+ version: 1.22.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter Bengtson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-09-09 00:00:00.000000000 Z
11
+ date: 2013-09-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday