ocean-rails 1.30.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d76ced15f8336158e759da79f1252633740310d
-  data.tar.gz: c23c43d05f9267fd84a6a02603b171eb83232c4f
+  metadata.gz: 8d50f55650536248f495678bc60191b637fea7b5
+  data.tar.gz: 8924c3a57ae0ed5098015df1471a1858c15aa86f
 SHA512:
-  metadata.gz: 38119444895e482b49738c21fe2e8efa2af3448d5d220b775a10e8428b4ee6132696777f6a9f0447707bc9e490da78fb1d9f17eee5ca399350a6fe8d392cd193
-  data.tar.gz: b783f1a258eacf8b154ff79441625e4474304a84b3ff71db48993c4e77d653a0519c02bb82fdefc031148abf12d07cab7cd97efbe1da8e50e571df2abafe6233
+  metadata.gz: 89c81188c0778ff56b56a0278b09e3ab215208e425f14a9a118151836404d6d1ddeb64a88b0c8a7b44c0aab917dbb850b243056fbfcd70a1d371c3d91e92772a
+  data.tar.gz: 98370a8598bf8716a4b77362062637fc1d80f24d25d97eba8434eecf5a3b39ad3f74ba0eb77beba05c9d990e33036d641e392c10377b79607cf08cb23252a083

data/lib/generators/ocean_scaffold/templates/controller_specs/index_spec.rb

@@ -37,7 +37,13 @@ describe <%= class_name.pluralize %>Controller do
     it "should return a collection" do
       get :index
       response.status.should == 200
-      JSON.parse(response.body).should be_an Array
+      wrapper = JSON.parse(response.body)
+      wrapper.should be_a Hash
+      resource = wrapper['_collection']
+      resource.should be_a Hash
+      coll = resource['resources']
+      coll.should be_an Array
+      coll.count.should == 3
     end
 
   end

data/lib/generators/ocean_setup/templates/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "ocean-rails", "~> 1.0"
+gem "ocean-rails", "~> 2.0"
 
 gem "rails", "~> 4.0"
 gem "pg"

data/lib/ocean/ocean_application_controller.rb

@@ -174,9 +174,14 @@ module OceanApplicationController
       end
       return
     else
-      partials = x.collect { |m| render_to_string(partial: m.to_partial_path, 
-                                                  locals: {m.class.model_name.i18n_key => m}) }
-      render text: '[' + partials.join(',') + ']'
+      resources = x.collect { |m| render_to_string(partial: m.to_partial_path, 
+                                                   locals: {m.class.model_name.i18n_key => m}) }
+      attrs = {count: resources.count}
+      render text: '{"_collection":{"resources":[' + resources.join(',') + ']' + 
+        (attrs.collect do |k, v|
+           ',"' + k.to_s + '":' + v.to_s
+         end).join('') +
+        '}}'
     end
   end
 

data/lib/ocean/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.30.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter Bengtson