collection_json_rails 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0acab955df5e8a66e5509f4d16de0509290c11c
-  data.tar.gz: 01a5073c1d15aa36e3d7da87457d56a1bdce86c3
+  metadata.gz: 9b9a0ef79365cfef15b52ed9e26cbd29c22bd01e
+  data.tar.gz: cc72ff0b9a2da4a313e07da85d0806e8d67cbcf6
 SHA512:
-  metadata.gz: 7e43aa15b8063738c814b8ea27ef129485d504a0ca79e426f6a976f3af872d7571fefd00750c33d53c2eec6a5e27c83f3b66e62b0147ee2f8e36a13c861a5ac1
-  data.tar.gz: c8fb74497b2dbbab51e57942e6e2d49ba79daa9d30130c3681d00e3af62c050896833456b1cd3d6347c9abd423d6493dc9f39d80af469caa237bed210fb56125
+  metadata.gz: 3a65e5746f40197a9f62410b230bf52f1a2c4aaca5ec6d21c8639601f2d5fb10113aa1e9faac7ae4bec5058eb7d33880269a2a1cf9f96adeb54b4de5e85aca0c
+  data.tar.gz: 6b52b1fb434f03f5e185c6c94260f3aedf752fc76113a4dcd0906dc19783bcec7cf67b9836c804642dc2f159b0c052fe0e54e8c480a62ea79ba5ab02bcf3b73e

data/collection_json_rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "collection_json_serializer", "~> 0.3.4"
+  spec.add_runtime_dependency "collection_json_serializer", "~> 0.3.5"
 
   spec.add_dependency "actionpack", "~> 4.0"
   spec.add_dependency "railties", "~> 4.0"

data/lib/collection_json_rails/action_controller/render.rb

@@ -12,6 +12,9 @@ module CollectionJson::Rails
       if options[:json]
         result[:json] = serialize(options[:json])
         result[:status] = options[:status] || :ok
+        if is_collection_json?(result[:json])
+          result[:content_type] = CollectionJson::MIME_TYPE
+        end
       end
 
       result
@@ -42,6 +45,10 @@ module CollectionJson::Rails
       resource_class = serializer_for(resource)
       "#{resource_class}Serializer".safe_constantize
     end
+
+    def is_collection_json?(hash)
+      hash.key?(:collection)
+    end
   end
 end
 

data/lib/collection_json_rails/version.rb

@@ -1,5 +1,5 @@
 module CollectionJson
   module Rails
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/test/controller/render_test.rb

@@ -13,16 +13,24 @@ end
 class TestRender < ActionController::TestCase
   tests PostsController
 
+  def test_that_responds_with_collection_json
+    get :index, {}
+
+    assert_equal "application/vnd.collection+json", response.content_type
+  end
+
   def test_that_objects_without_serializer_are_rendered_as_plain_json
     get :without_serializer
 
     assert_response :ok
+    assert_equal Mime::JSON, response.content_type
   end
 
   def test_that_render_behaves_as_usual
     get :without_json
 
     assert_response :ok
+    assert_equal Mime::TEXT, response.content_type
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collection_json_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Carles Jove i Buxeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: collection_json_serializer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement