jsonapi-resources 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f8dd7b98dfa7f20a9b75456fd8ca066ae807fd0
-  data.tar.gz: 4aaa07053a74089ef0880f4154e79261a97529d9
+  metadata.gz: c58427d88b5c0bbe33915d8039ac02a1f6ea260b
+  data.tar.gz: 62dcacd2190abc5bffe3a10cefe1bba9d50a56b7
 SHA512:
-  metadata.gz: 06358dd197a8efa202d8c3b82493be75c5bb65d22338dd78bf56b3475093879ee93703ea99c450d377962ec0dcfe4ff9165c52ce0cac2157be59b45722b121f0
-  data.tar.gz: 077d88d176ed150fe694fc105f57f0092526139b628ab9c7bb3b38d37c6e8b14ce367ccee4ccac4cbbcf8da57f6e606b658e65c8fabec7b5b629f534790a4bae
+  metadata.gz: 5ae8e6c9e4c87a8b5848110cd2acd98f98b6a1ab202edd83b62aabd9806df7880d4345a1678b551ed054706aaae14227261f07f9dce77161e3dbf260dcf1236c
+  data.tar.gz: 1d528f86653c12a040dbb52b1db0d0f8affbf7b11440ceb0a75e3eae17d70a219872cbbb34d7fcb7ad3d04ccd366921ba146f00023a7b0910a4e74ae5f40c86a

data/README.md

@@ -4,7 +4,7 @@
 
 Like JSON API itself, JR's design is focused on the resources served by an API. JR needs little more than a definition of your resources, including their attributes and relationships, to make your server compliant with JSON API.
 
-JR is designed to work with Rails, and provides custom routes, controllers, and serializers. JR's resources may be backed by ActiveRecord models or by custom objects.
+JR is designed to work with Rails 4.0+, and provides custom routes, controllers, and serializers. JR's resources may be backed by ActiveRecord models or by custom objects.
 
 ## Demo App
 

data/jsonapi-resources.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-spec-rails'
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'rails', '>= 4.0'
+  spec.add_dependency 'rails', '>= 4.0'
 end

data/lib/jsonapi/request.rb

@@ -198,16 +198,9 @@ module JSONAPI
     end
 
     def parse_add_operation(data)
-      if data.is_a?(Array)
-        data.each do |p|
-          @operations.push JSONAPI::CreateResourceOperation.new(@resource_klass,
-                                                                parse_params(verify_and_remove_type(p),
-                                                                             @resource_klass.createable_fields(@context)))
-        end
-      else
-        @operations.push JSONAPI::CreateResourceOperation.new(@resource_klass,
-                                                              parse_params(verify_and_remove_type(data),
-                                                                           @resource_klass.createable_fields(@context)))
+      Array.wrap(data).each do |p|
+        values = parse_params(verify_and_remove_type(p), @resource_klass.createable_fields(@context))
+        @operations.push JSONAPI::CreateResourceOperation.new(@resource_klass, values)
       end
     rescue JSONAPI::Exceptions::Error => e
       @errors.concat(e.errors)

data/lib/jsonapi/resource.rb

@@ -46,7 +46,7 @@ module JSONAPI
           @changing = true
           run_callbacks callback do
             yield
-            save if @save_needed
+            save if @save_needed || is_new?
           end
         end
       end

data/lib/jsonapi/resource_serializer.rb

@@ -110,6 +110,8 @@ module JSONAPI
           add_included_object(@primary_class_name, id, object_hash(resource,  requested_associations), true)
         end
       else
+        return {} if source.nil?
+
         resource = source
         id = resource.id
         # ToDo: See if this is actually needed

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/test/controllers/controller_test.rb

@@ -1335,6 +1335,19 @@ class PostsControllerTest < ActionController::TestCase
     assert_response :bad_request
     assert_match /2,1 is not a valid value for id/, response.body
   end
+
+  def test_show_has_one_relationship_nil
+    get :show_association, {post_id: '17', association: 'author'}
+    assert_response :success
+    assert_hash_equals json_response,
+                       {
+                         data: nil,
+                         links: {
+                           self: 'http://test.host/posts/17/links/author',
+                           related: 'http://test.host/posts/17/author'
+                         }
+                       }
+  end
 end
 
 class TagsControllerTest < ActionController::TestCase
@@ -1678,6 +1691,50 @@ class PeopleControllerTest < ActionController::TestCase
     assert_equal json_response['data'][0]['id'], '1'
     assert_equal json_response['data'][0]['name'], 'Joe Author'
   end
+
+  def test_get_related_resource
+    get :get_related_resource, {post_id: '2', association: 'author', :source=>'posts'}
+    assert_response :success
+    assert_hash_equals json_response,
+                       {
+                         data: {
+                           id: '1',
+                           type: 'people',
+                           name: 'Joe Author',
+                           email: 'joe@xyz.fake',
+                           dateJoined: '2013-08-07 16:25:00 -0400',
+                           links: {
+                             self: 'http://test.host/people/1',
+                             comments: {
+                               self: 'http://test.host/people/1/links/comments',
+                               related: 'http://test.host/people/1/comments'
+                             },
+                             posts: {
+                               self: 'http://test.host/people/1/links/posts',
+                               related: 'http://test.host/people/1/posts'
+                             },
+                             preferences: {
+                               self: 'http://test.host/people/1/links/preferences',
+                               related: 'http://test.host/people/1/preferences',
+                               linkage: {
+                                 type: 'preferences',
+                                 id: '1'
+                               }
+                             }
+                           }
+                         }
+                       }
+  end
+
+  def test_get_related_resource_nil
+    get :get_related_resource, {post_id: '17', association: 'author', :source=>'posts'}
+    assert_response :success
+    assert_hash_equals json_response,
+                       {
+                         data: nil
+                       }
+
+  end
 end
 
 class Api::V5::AuthorsControllerTest < ActionController::TestCase

data/test/fixtures/posts.yml

@@ -93,4 +93,10 @@ post_16:
   id: 16
   title: SDFGH
   body: Not First!!!!
-  author_id: 3
+  author_id: 3
+
+post_17:
+  id: 17
+  title: No Author!!!!!!
+  body: This post has no Author
+  author_id:

data/test/integration/requests/request_test.rb

@@ -156,6 +156,41 @@ class RequestTest < ActionDispatch::IntegrationTest
     assert_equal 201, status
   end
 
+  def test_post_single_missing_data_contents
+    post '/posts',
+         {
+           'data' => {
+           }
+         }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+
+    assert_equal 400, status
+  end
+
+  def test_post_single_minimal_valid
+    post '/comments',
+         {
+           'data' => {
+             'type' => 'comments'
+           }
+         }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+
+    assert_equal 201, status
+    assert_nil json_response['data']['body']
+    assert_nil json_response['data']['links']['post']['linkage']
+    assert_nil json_response['data']['links']['author']['linkage']
+  end
+
+  def test_post_single_minimal_invalid
+    post '/posts',
+      {
+        'data' => {
+          'type' => 'posts'
+        }
+      }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+
+    assert_equal 422, status
+  end
+
   def test_update_association_without_content_type
     ruby = Section.find_by(name: 'ruby')
     patch '/posts/3/links/section', { 'data' => {type: 'sections', id: ruby.id.to_s }}.to_json
@@ -189,7 +224,7 @@ class RequestTest < ActionDispatch::IntegrationTest
   def test_post_update_association_has_many
     rogue = Comment.find_by(body: 'Rogue Comment Here')
     post '/posts/5/links/comments', { 'data' => [{type: 'comments', id: rogue.id.to_s }]}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
-    
+
     assert_equal 204, status
   end
 

data/test/test_helper.rb

@@ -27,6 +27,7 @@ end
 puts "Testing With RAILS VERSION #{Rails.version}"
 
 class TestApp < Rails::Application
+  config.eager_load = false
   config.root = File.dirname(__FILE__)
   config.session_store :cookie_store, key: 'session'
   config.secret_key_base = 'secret'

data/test/unit/serializer/serializer_test.rb

@@ -57,6 +57,15 @@ class SerializerTest < ActionDispatch::IntegrationTest
     )
   end
 
+  def test_serializer_nil_handling
+    assert_hash_equals(
+      {
+        data: nil
+      },
+      JSONAPI::ResourceSerializer.new(PostResource).serialize_to_hash(nil)
+    )
+  end
+
   def test_serializer_namespaced_resource
     assert_hash_equals(
       {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: