caprese 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f20459249bd9aa768296fff0603eacaec3d53c99
-  data.tar.gz: 667f7a0cd853d8f69099a78ecfaa76c48d15f5de
+  metadata.gz: 7099eedd3a4b000bb8750e27d9fe55b02381e2e2
+  data.tar.gz: 6d8697e726e6b306c5091f22574daeb790c2d920
 SHA512:
-  metadata.gz: 17f2e85ce1abeddd71ee15ce76c68e425b7f6cc8a4e2f71732cdebcd37df424dd8927716a6927cdb05ed861bd09cc3b1fdddb0ad8f8f39ba18b7cf1b905e6a17
-  data.tar.gz: f936557de63859192d37419ba50df905949835df4359e0ccfde5ea058b7093f4a7b4f538a5e76496accc17e8dfc55ff1f169a56950685fe47bddb7254cd76b79
+  metadata.gz: 10a73eae7ff8a403c3f68946c476228dfda16b2cff0a4775b167d962e07e4ed6242d0ff946989c09d7fbbc1b75d6e412a6b31d8752d3675d80807f77f82f81a9
+  data.tar.gz: d4f5e94178e5e0d6a01bfe511f1337d50a49f9e4c2d6162686a7701ea810d9cb85bc13603cbfe7f87ac72d7527003b10f2e7a38c8a876ba23d3c337b51c5a8e3

data/CHANGELOG.md

@@ -117,3 +117,7 @@
 * Add `Caprese::Controller#resource_type_aliases` method that returns object mapping type aliases to actual types for the application
 * Add `Caprese::Record.caprese_field_aliases` method that returns object mapping field aliases to actual fields for the record
 * Add `Caprese::Record.caprese_type` method that returns singular symbol indicating the type to use when serializing the record. (`Caprese::Serializer.json_api_key` now uses this.)
+
+## 0.3.21
+
+* Change `::Record.caprese_style_errors` to false by default so non-Caprese errors render normally

data/lib/caprese/record/associated_validator.rb

@@ -13,23 +13,24 @@ module Caprese
     #   [
     #     { "key"=>"not_found", "field"=>"attachment.file", "message"=>"Could not find a file at ..."}
     #   ]
-    class AssociatedValidator < ActiveModel::EachValidator
+    class AssociatedValidator < ActiveRecord::Validations::AssociatedValidator
       def validate_each(record, attribute, value)
-        Array(value).reject { |r| r.marked_for_destruction? || r.valid? }.each do |invalid_record|
-          invalid_record.errors.to_a.each do |error|
-            field_name = error.field ? "#{attribute}.#{error.field}" : attribute
-            record.errors.add(field_name, error.code, { t: error.t }.merge(value: invalid_record))
+        if Caprese::Record.caprese_style_errors
+          Array(value).reject { |r| r.marked_for_destruction? || r.valid? }.each do |invalid_record|
+            invalid_record.errors.to_a.each do |error|
+              field_name = error.field ? "#{attribute}.#{error.field}" : attribute
+              record.errors.add(field_name, error.code, { t: error.t }.merge(value: invalid_record))
+            end
           end
+        else
+          super
         end
       end
     end
 
     module ClassMethods
       def validates_associated(*attr_names)
-        validates_with(
-          (Caprese::Record.caprese_style_errors ? Caprese::Record : ActiveRecord::Validations)::AssociatedValidator,
-          _merge_attributes(attr_names)
-        )
+        validates_with Caprese::Record::AssociatedValidator, _merge_attributes(attr_names)
       end
     end
   end

data/lib/caprese/record.rb

@@ -12,7 +12,7 @@ module Caprese
     include Aliasing
 
     mattr_accessor :caprese_style_errors
-    @@caprese_style_errors = true
+    @@caprese_style_errors = false
 
     # @return [Errors] a cached instance of the model errors class
     def errors

data/lib/caprese/version.rb

@@ -1,3 +1,3 @@
 module Caprese
-  VERSION = '0.3.20'
+  VERSION = '0.3.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caprese
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Nick Landgrebe
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers