jsonapi-resources 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 693f8ed867afa11d9d23f0631bdf2ccd7e19acbe
-  data.tar.gz: 5a0edbc2ab2a5f7c801c3120307c54c7c6a1142a
+  metadata.gz: 8dde1ba06781fcada973e949ba64e7b7821c8b23
+  data.tar.gz: cf3aefe531485a4ed3efeba48cf9b7deecf78a74
 SHA512:
-  metadata.gz: e5f18920d6adee8dd748507071addacc51f58ba2719bf0961fb4fad01de7fb4af229755f90eb22b7c06ec20772fdff835fb6b7234b54c7a341d1eb6885ea879d
-  data.tar.gz: 83901cfc4f1d2dad3883e782bf90cef7cbf62873faba9b872fb84b756ec71c5020bca86acba72cbc72617a55b2cc58bab3b12152a89cf20e5f9e6a2c40aaa9aa
+  metadata.gz: 89cb1ccd8c7b620cced0007df3735ddec354e972e2a7f1a88907277089a5e509a23c7e90bb877bf676fd5edd6e71a49028b698fb888656a37854361e40a25c83
+  data.tar.gz: 2a7211219f7ae1849220122d49fc785b41639a48b79d3666fa8da553957ed6f09031e61c2aad6311117b558f8fc73232f9094ebd8c2bc914ff6c73e1779a0202

data/lib/jsonapi/exceptions.rb

@@ -223,9 +223,23 @@ module JSONAPI
     end
 
     class ValidationErrors < Error
-      attr_accessor :errors
-      def initialize(errors)
-        @errors = errors
+      attr_accessor :messages
+      def initialize(messages)
+        @messages = messages
+      end
+
+      def errors
+        messages.inject([]) do |arr, element|
+          arr.concat(
+            element[1].map do |message|
+              JSONAPI::Error.new(code: JSONAPI::VALIDATION_ERROR,
+                                 status: :unprocessable_entity,
+                                 title: "#{element[0]} - #{message}",
+                                 detail: message,
+                                 path: "/#{element[0]}")
+            end
+          )
+        end
       end
     end
 

data/lib/jsonapi/operation.rb

@@ -27,7 +27,7 @@ module JSONAPI
       return JSONAPI::OperationResult.new(:created, resource)
 
     rescue JSONAPI::Exceptions::Error => e
-      return JSONAPI::OperationResult.new(e.errors.count == 1 ? e.errors[0].code : :bad_request, nil, e.errors)
+      return JSONAPI::OperationResult.new(e.errors[0].code, nil, e.errors)
     end
   end
 
@@ -48,7 +48,7 @@ module JSONAPI
       record_locked_error = JSONAPI::Exceptions::RecordLocked.new(e.message)
       return JSONAPI::OperationResult.new(record_locked_error.errors[0].code, nil, record_locked_error.errors)
     rescue JSONAPI::Exceptions::Error => e
-      return JSONAPI::OperationResult.new(e.errors.count == 1 ? e.errors[0].code : :bad_request, nil, e.errors)
+      return JSONAPI::OperationResult.new(e.errors[0].code, nil, e.errors)
     end
   end
 
@@ -185,4 +185,4 @@ module JSONAPI
       return JSONAPI::OperationResult.new(:no_content)
     end
   end
-end
+end

data/lib/jsonapi/resource.rb

@@ -100,18 +100,7 @@ module JSONAPI
     def save
       @model.save!
     rescue ActiveRecord::RecordInvalid => e
-      errors = []
-      e.record.errors.messages.each do |element|
-        element[1].each do |message|
-          errors.push(JSONAPI::Error.new(
-                          code: JSONAPI::VALIDATION_ERROR,
-                          status: :bad_request,
-                          title: "#{element[0]} - #{message}",
-                          detail: "can't be blank",
-                          path: "\\#{element[0]}"))
-        end
-      end
-      raise JSONAPI::Exceptions::ValidationErrors.new(errors)
+      raise JSONAPI::Exceptions::ValidationErrors.new(e.record.errors.messages)
     end
 
     # Override this on a resource instance to override the fetchable keys

data/lib/jsonapi/resource_controller.rb

@@ -120,7 +120,8 @@ module JSONAPI
     end
 
     def parse_key_array(raw)
-      return resource_klass.verify_keys(raw.split(/,/), context)
+      keys = raw.nil? || raw.empty? ? [] : raw.split(',')
+      resource_klass.verify_keys(keys, context)
     end
 
     # override to set context
@@ -142,8 +143,8 @@ module JSONAPI
       {}
     end
 
-    def render_errors(errors, status = :bad_request)
-      render(json: {errors: errors}, status: errors.count == 1 ? errors[0].status : status)
+    def render_errors(errors)
+      render(json: {errors: errors}, status: errors[0].status)
     end
 
     def process_request_operations
@@ -163,17 +164,17 @@ module JSONAPI
       end
 
       if errors.count > 0
-        render :status => errors.count == 1 ? errors[0].status : :bad_request, json: {errors: errors}
+        render status: errors[0].status, json: {errors: errors}
       else
         if results.length > 0 && resources.length > 0
-          render :status => results[0].code,
+          render status: results[0].code,
                  json: JSONAPI::ResourceSerializer.new.serialize_to_hash(resources.length > 1 ? resources : resources[0],
                                                                          include: @request.include,
                                                                          fields: @request.fields,
                                                                          attribute_formatters: attribute_formatters,
                                                                          key_formatter: key_formatter)
         else
-          render :status => results[0].code, json: nil
+          render status: results[0].code, json: nil
         end
       end
     rescue => e

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/test/controllers/controller_test.rb

@@ -285,7 +285,7 @@ class PostsControllerTest < ActionController::TestCase
            }
          }
 
-    assert_response :bad_request
+    assert_response :unprocessable_entity
     # Todo: check if this validation is working
     assert_match /author - can't be blank/, response.body
   end
@@ -307,6 +307,29 @@ class PostsControllerTest < ActionController::TestCase
     assert_match /asdfg is not allowed/, response.body
   end
 
+  def test_create_with_invalid_data
+    post :create,
+         {
+           posts: {
+             title: 'JSONAPIResources is the greatest thing...',
+             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
+             links: {
+               author: nil
+             }
+           }
+         }
+
+    assert_response :unprocessable_entity
+
+    assert_equal "/author", json_response['errors'][0]['path']
+    assert_equal "can't be blank", json_response['errors'][0]['detail']
+    assert_equal "author - can't be blank", json_response['errors'][0]['title']
+
+    assert_equal "/title", json_response['errors'][1]['path']
+    assert_equal "is too long (maximum is 35 characters)", json_response['errors'][1]['detail']
+    assert_equal "title - is too long (maximum is 35 characters)", json_response['errors'][1]['title']
+  end
+
   def test_create_multiple
     post :create,
          {
@@ -1198,7 +1221,7 @@ class PeopleControllerTest < ActionController::TestCase
            }
          }
 
-    assert_response :bad_request
+    assert_response :unprocessable_entity
     assert_equal 2, json_response['errors'].size
     assert_equal JSONAPI::VALIDATION_ERROR, json_response['errors'][0]['code']
     assert_equal JSONAPI::VALIDATION_ERROR, json_response['errors'][1]['code']
@@ -1215,7 +1238,7 @@ class PeopleControllerTest < ActionController::TestCase
           }
         }
 
-    assert_response :bad_request
+    assert_response :unprocessable_entity
     assert_equal 1, json_response['errors'].size
     assert_equal JSONAPI::VALIDATION_ERROR, json_response['errors'][0]['code']
     assert_match /name - can't be blank/, response.body
@@ -1350,3 +1373,10 @@ class BreedsControllerTest < ActionController::TestCase
   end
 
 end
+
+class Api::V2::PreferencesControllerTest < ActionController::TestCase
+  def test_show_singleton_resource_without_id
+    get :show
+    assert_response :success
+  end
+end

data/test/fixtures/active_record.rb

@@ -5,12 +5,17 @@ require 'jsonapi/exceptions'
 require 'rails'
 require 'rails/all'
 
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.uncountable 'preferences'
+end
+
 ### DATABASE
 ActiveRecord::Schema.define do
   create_table :people, force: true do |t|
     t.string     :name
     t.string     :email
     t.datetime   :date_joined
+    t.belongs_to :preferences
     t.timestamps
   end
 
@@ -94,6 +99,7 @@ class Person < ActiveRecord::Base
   has_many :posts, foreign_key: 'author_id'
   has_many :comments, foreign_key: 'author_id'
   has_many :expense_entries, foreign_key: 'employee_id', dependent: :restrict_with_exception
+  belongs_to :preferences
 
   ### Validations
   validates :name, presence: true
@@ -107,6 +113,7 @@ class Post < ActiveRecord::Base
   belongs_to :section
 
   validates :author, presence: true
+  validates :title, length: { maximum: 35 }
 end
 
 class Comment < ActiveRecord::Base
@@ -148,6 +155,11 @@ class Moon < ActiveRecord::Base
   belongs_to :planet
 end
 
+class Preferences < ActiveRecord::Base
+  has_one :author, class_name: 'Person'
+  has_many :friends, class_name: 'Person'
+end
+
 class Breed
 
   def initialize(id = nil, name = nil)
@@ -470,8 +482,12 @@ class PreferencesResource < JSONAPI::Resource
   attribute :id
   attribute :advanced_mode
 
-  has_one :author, class_name: 'Person'
-  has_many :friends, class_name: 'Person'
+  has_one :author, foreign_key: :person_id
+  has_many :friends
+
+  def self.find_by_key(key, context: nil)
+    new(Preferences.first)
+  end
 end
 
 warn 'start testing Name Collisions'
@@ -643,3 +659,4 @@ betay = Planet.create(name: 'Beta X', description: 'Newly discovered Planet Y',
 betaz = Planet.create(name: 'Beta X', description: 'Newly discovered Planet Z', planet_type_id: unknown.id)
 betaw = Planet.create(name: 'Beta W', description: 'Newly discovered Planet W')
 
+preference = Preferences.create

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler