ocean-rails 1.22.1 → 1.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3a42a43e7f34158de4bfb09d4f2d90c81d44eb0
-  data.tar.gz: 69db544e332db4166ae928f6c9ceccb65e841e8e
+  metadata.gz: ae76a813526fd9e589aae072a88b81869bcef2f2
+  data.tar.gz: 699fc1d9b6813bf369441b27a66a97c6b85e54a2
 SHA512:
-  metadata.gz: 4caa4fca1975ebd2d6fc93c58e174694e3616943718ad48db410ead18bb3fd0f73b45c4612abd18264e3e5f2818b1da09f876e9271f9c2ce23026e1dbcd4646a
-  data.tar.gz: c955925c5de020c0e58b3a723794f597f0e981aec00d3c6fcb3b7f2b59e252bb5c5334616cf6f8ddea84c85acb8ac066df81680f8962766c14eceea091262042
+  metadata.gz: 225320d7dcec73b64e9bae71b37b2938b7c690842b1bdb800fce89659fac9ee939e31fe8ba2cf75df972d69fa10e1d633b66366a99f2e70f10a063f0ad60ea11
+  data.tar.gz: ed09ac4816da7c799f00abb0ca493ceed540a877575455bc5f7ab3e82e8ce51d85c235a887cf1c9a2a0c56304c55adcfd678b9348f0545356d4eadd7e3e27f53

data/README.rdoc

@@ -9,8 +9,8 @@ Ocean requires Ruby 2.0 and Ruby on Rails 4.0.0 or later.
 
 
 === Documentation
-* Ocean gem API: http://rdoc.info/github/OceanDev/ocean-rails/frames
 * Ocean gem on Rubygems: https://rubygems.org/gems/ocean-rails
+* Ocean gem API: http://rdoc.info/github/OceanDev/ocean-rails/frames
 * Ocean framework: http://wiki.oceanframework.net
 * Ocean mailing list: http://groups.google.com/group/oceanframework
 * Ocean blog: http://blog.oceanframework.net

data/lib/ocean-rails.rb

@@ -3,7 +3,7 @@ require "ocean/engine"
 require "ocean-dynamo"
 require "ocean/api"
 require "ocean/api_resource"
-require "ocean/ocean_resource_model" if defined? ActiveRecord
+require "ocean/ocean_resource_model" if defined? ActiveRecord || defined? OceanDynamo
 require "ocean/ocean_resource_controller" if defined? ActionController
 require "ocean/ocean_application_controller"
 require "ocean/zero_log"

data/lib/ocean/ocean_resource_model.rb

@@ -58,5 +58,5 @@ module Ocean
 end
 
 
-ActiveRecord::Base.send :include, Ocean::OceanResourceModel
-OceanDynamo::Base.send :include, Ocean::OceanResourceModel
+ActiveRecord::Base.send :include, Ocean::OceanResourceModel if defined? ActiveRecord
+OceanDynamo::Base.send :include, Ocean::OceanResourceModel if defined? OceanDynamo

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.22.1"
+  VERSION = "1.22.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.22.1
+  version: 1.22.2
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday