ocean-rails 2.10.3 → 2.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e5e6d3b94515ee373358aae99846d94daff3a8
-  data.tar.gz: 6b592671bad06a2ba115209512c77cfe3d2f7e9b
+  metadata.gz: 194dc8997fa09688ddc4dbeb258de8937ece9d58
+  data.tar.gz: 000d7f44e2b7f732bdb90c2c1a6755c623e27345
 SHA512:
-  metadata.gz: 3db4f983fd490edf415c983e70a043780de561c0cf4fd4858130c80c020922345e7fd40493685387fe8fbe60a812a42de400b51702191b45475b1dfed6acb9e1
-  data.tar.gz: aa3e9ad5863a938f9365d59bd79c23bcbac6dda5110526207ef723f566dec9d8cae827794c370a8f16e23b88392d92ebf77399cf990711209dd3989a4840c214
+  metadata.gz: c2651cc88e85c8e044a9fd5efcf2425248581f44cde4312663fe5eb55e30129f8d059ae5efec1123cb0cbfcd8ed5331ebb4d1d909f3ecfb235257d1a9550dc89
+  data.tar.gz: 7ea95d42c3fe69d5505817cedb047ce0f9afcd35829113ebb53bc7ad7a0e514a1da66f15fbf9b284aaa561c561adcee1cec82b99eb67872f959bc966b12b7b48

data/lib/ocean/ocean_application_controller.rb

@@ -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.unscope(:limit, :offset).count
+      total_count = x.respond_to?(:unscope) ? x.unscope(:limit, :offset).count : count
       attrs = {count: count,
                total_count: total_count
               }

data/lib/ocean/version.rb

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

metadata

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