ocean-rails 2.10.5 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 194dc8997fa09688ddc4dbeb258de8937ece9d58
-  data.tar.gz: 000d7f44e2b7f732bdb90c2c1a6755c623e27345
+  metadata.gz: 6c8b9c444c3baca4602cd4c1aaa72dd72ef648cb
+  data.tar.gz: 0334d29530642790a43fb697482f7fb4def744ba
 SHA512:
-  metadata.gz: c2651cc88e85c8e044a9fd5efcf2425248581f44cde4312663fe5eb55e30129f8d059ae5efec1123cb0cbfcd8ed5331ebb4d1d909f3ecfb235257d1a9550dc89
-  data.tar.gz: 7ea95d42c3fe69d5505817cedb047ce0f9afcd35829113ebb53bc7ad7a0e514a1da66f15fbf9b284aaa561c561adcee1cec82b99eb67872f959bc966b12b7b48
+  metadata.gz: 4d61c35e1cc0caf14d6dbaae57f0d4d03b5ba07265cf4f771b07a9b7cbb2ac0c225f55ee91b897392b34883e5fec60f8ebab01877f041715c2e9758c4715509d
+  data.tar.gz: a8c1cb5d6d9684100b062c650728b2f096f1337ebd5bb70e680dfb839c641138c4b53d2095d43f5e0d78c247cbd1ae05e12fec309f72b5f395cb052955001c52

data/lib/ocean/ocean_application_controller.rb

@@ -170,9 +170,9 @@ module OceanApplicationController
   # their standard position, begin with an underscore, etc. The +ocean+ gem generator
   # for resources creates a partial in the proper location.
   #
-  def api_render(x, new: false, href: url_for(params))
+  def api_render(x, new: false, href: url_for(params), override_partial: false)
     if !x.is_a?(Array) && !(defined?(ActiveRecord) && x.is_a?(ActiveRecord::Relation))
-      partial = x.to_partial_path
+      partial = override_partial || x.to_partial_path
       if new
         render partial: partial, object: x, status: 201, location: x
       else
@@ -183,7 +183,7 @@ module OceanApplicationController
       resources = x.dup.collect { |m| render_to_string(partial: m.to_partial_path, 
                                                    locals: {m.class.model_name.i18n_key => m}) }
       count = resources.count
-      total_count = x.respond_to?(:unscope) ? x.unscope(:limit, :offset).count : count
+      total_count = x.unscope(:limit, :offset).count
       attrs = {count: count,
                total_count: total_count
               }

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.10.5"
+  VERSION = "2.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.10.5
+  version: 2.11.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement