caprese 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a9e6756d45e03f3c91b1c6481aec5b57032a103
-  data.tar.gz: 70d8e1b6c043dab986369ac84c3cf2912a44700d
+  metadata.gz: 0802a72a6fea0cdf81ac59f8642e41311eec6fe2
+  data.tar.gz: 095bf0cebda59ca5853e0bdf2376725a39220cbe
 SHA512:
-  metadata.gz: 1c144ac674470aeeabecd13910a0ec0ec3cd6ce2a3621c7c2eccc75783aeceb9f2996b2dff1b85e42ba5155db19b39307214a647a0c834a58df0edd3e3ff95a4
-  data.tar.gz: dd3a0c1156512e15efd759a8cc03d8d76695ff9db17a3098884939c6c42578f5cea864436a2edad6e7bb2dca46038be85d378b7dc92988e8fd91880e2ad5de84
+  metadata.gz: 4ce5e1ffef8d695e65b69973be4a078364a29a8af8f801e087fd7287714c5ea89f01a7ac594a57923a4527fd84a6086af72f4b03e66cc1dd67fd9f7df83cf66b
+  data.tar.gz: d89cf6f8f61b18c9e483b4b776f26bc5d67f9decc06f7f334c62a5989519fb3d08d42a1a2f365aee7115c2eea3374039e57eb40350b744ad0c325ae188c2edb1

data/CHANGELOG.md

@@ -63,3 +63,7 @@
 ## 0.3.11
 
 * Allow `record_scope` and `relationship_scope` to return `[]`
+
+## 0.3.12
+
+* Refactor RecordNotFoundError and AssociationNotFoundError to use separate `parameter` translations

data/lib/caprese/controller/concerns/query.rb

@@ -116,7 +116,6 @@ module Caprese
         scope.find_by!(column => value) unless scope.is_a?(Array) && scope.empty?
       rescue ActiveRecord::RecordNotFound => e
         fail RecordNotFoundError.new(
-          field: column,
           model: scope.name.underscore,
           value: value
         )

data/lib/caprese/errors.rb

@@ -24,10 +24,14 @@ module Caprese
   # @param [String] model the name of the model we searched for a record of
   # @param [Value] value the value we searched for a match with
   class RecordNotFoundError < Error
-    def initialize(field: :id, model: nil, value: nil)
-      super field: field, code: :not_found, t: { model: model, value: value }
+    def initialize(model: nil, value: nil)
+      super field: :id, code: :not_found, t: { model: model, value: value }
       @header = { status: :not_found }
     end
+
+    def full_message
+      I18n.t("#{i18n_scope}.parameters.not_found", t)
+    end
   end
 
   # Thrown when an association was not found when calling `record.association()`
@@ -35,9 +39,13 @@ module Caprese
   # @param [String] name the name of the association
   class AssociationNotFoundError < Error
     def initialize(name)
-      super field: name, code: :association_not_found
+      super field: :name, code: :not_found, t: { model: 'relationship', value: name }
       @header = { status: :not_found }
     end
+
+    def full_message
+      I18n.t("#{i18n_scope}.parameters.not_found", t)
+    end
   end
 
   # Thrown when an action that is forbidden was attempted

data/lib/caprese/version.rb

@@ -1,3 +1,3 @@
 module Caprese
-  VERSION = '0.3.11'
+  VERSION = '0.3.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caprese
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Nick Landgrebe
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers