ocean-rails 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d50f55650536248f495678bc60191b637fea7b5
-  data.tar.gz: 8924c3a57ae0ed5098015df1471a1858c15aa86f
+  metadata.gz: d8d0e06a51eb9695e45cbd3117875807398ad746
+  data.tar.gz: bc840097a5de048b4b8256ad656b8618abb1a4b5
 SHA512:
-  metadata.gz: 89c81188c0778ff56b56a0278b09e3ab215208e425f14a9a118151836404d6d1ddeb64a88b0c8a7b44c0aab917dbb850b243056fbfcd70a1d371c3d91e92772a
-  data.tar.gz: 98370a8598bf8716a4b77362062637fc1d80f24d25d97eba8434eecf5a3b39ad3f74ba0eb77beba05c9d990e33036d641e392c10377b79607cf08cb23252a083
+  metadata.gz: f72419c440325db8eb7d82f9d5f397c93e0c007c068738ab00842246a70a7619a7ca067f54b3d6f562bf25adc8a41685eec066a069a2e3dbc8ad130736f2d63d
+  data.tar.gz: dff353241989bd4c3bbb4a8ff65e6e93b5bb6640698d0cd808c6f5201a9cfc58e2a3067e7796394458a00b9bbf77754cb80e364ac05d611c58c4dbca051c622e

data/lib/ocean/ocean_application_controller.rb

@@ -176,10 +176,14 @@ module OceanApplicationController
     else
       resources = x.collect { |m| render_to_string(partial: m.to_partial_path, 
                                                    locals: {m.class.model_name.i18n_key => m}) }
-      attrs = {count: resources.count}
+      attrs = {count: resources.count,
+               total_count: x.unscope(:where, :order, :limit, :offset, :group, :having).count,
+               _links: {self: {href: request.url, type: 'application/json'}
+                       }
+              }
       render text: '{"_collection":{"resources":[' + resources.join(',') + ']' + 
         (attrs.collect do |k, v|
-           ',"' + k.to_s + '":' + v.to_s
+           ',"' + k.to_s + '":' + v.to_json
          end).join('') +
         '}}'
     end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday