errawr 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445bc92a0e798063b53eca8e4b89f255e5b4bd16
-  data.tar.gz: 50e6dfac8f166b94ed58b439c6a365c76c02be1c
+  metadata.gz: 9cdb0163333b17834affa6e46695e686854e55af
+  data.tar.gz: 03d483953b7d9475bda81f4736374ab14f7af06f
 SHA512:
-  metadata.gz: 17af17bb709bf0596340f53344e98a16039fa4b401fd8926605d20fb969ee580b2b040693c575b43d55f4c7cdc5e8822681bf4f086da9de2568196e3b3e64047
-  data.tar.gz: 3e4426437cfceb2c5e43a952b95337c85fb5e783f0f2c87f7c2d7c02eb30fae01c4ea5a7f020d5f09fd423e376838ff6afe076bf6c6083b8d3a6a1d0b3f8b689
+  metadata.gz: f7e2436befdf2d0bde0d5cbaa3ce7966e13a44e7dbd7e33472086386e4754a475728518051980d9fd53728f404ef424bb4cbc6d1d4832471a31ed082d6c6967b
+  data.tar.gz: e5697f37f96b376adbc6b3705cbef2e1adfa6d6e2607dd995cb585a91a3fc6140649c6a06d688245f28fa0c6c7d92cbb0e4bf64c0e694451624948cd45610517

data/lib/errawr/error.rb

@@ -1,6 +1,6 @@
 module Errawr
   class Error < StandardError
-    attr_reader :key, :context, :metadata, :message
+    attr_reader :key, :context, :metadata
     
     def initialize(key = :unknown, context = {})
       @key = key
@@ -10,13 +10,18 @@ module Errawr
       process_message
     end
     
+    def message
+      @context[:message]
+    end
+    
     private
     def process_context(context)
       if @i18n.kind_of?(Hash)
         @context = @i18n.merge(context)
         @context.delete(:metadata)
+        @message_overridden = context.include?(:message)
       else
-        @context = {}
+        @context = context
       end
     end
     
@@ -29,10 +34,14 @@ module Errawr
     
     def process_message
       if @i18n.kind_of?(Hash)
-        key = 'errawr.' + @key.to_s + '.message'
-        @message = I18n.t(key, @context.merge({ default: I18n.t('errawr.unknown', @context) }))
+        if @message_overridden
+          @context[:message]
+        else
+          key = 'errawr.' + @key.to_s + '.message'
+          @context[:message] = I18n.t(key, @context.merge({ default: I18n.t('errawr.unknown', @context) }))
+        end
       else
-        @message = I18n.t('errawr.' + @key.to_s, @context)
+        @context[:message] = I18n.t('errawr.' + @key.to_s, @context) unless @context[:message]
       end
     end
   end

data/lib/errawr/version.rb

@@ -1,3 +1,3 @@
 module Errawr
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/spec/errawr_spec.rb

@@ -60,5 +60,21 @@ describe Errawr do
         e.message.should == 'Some error has occurred: interpolated message'
       end
     end
+    
+    it 'should return an overridden message for a non-hashed locale' do
+      begin
+        Errawr.error!(:some_error, message: 'Overridden error message')
+      rescue => e
+        e.message.should == 'Overridden error message'
+      end
+    end
+    
+    it 'should return an overridden message for a hashed locale' do
+      begin
+        Errawr.error!(:error_hash, message: 'Overridden error message')
+      rescue => e
+        e.message.should == 'Overridden error message'
+      end
+    end
   end
 end

data/spec/error_spec.rb

@@ -20,9 +20,4 @@ describe Errawr::Error do
     error = Errawr::Error.new(:bad_error_hash)
     error.message.should == 'An unknown error has occurred'
   end
-  
-  it 'should insert custom values into the context if I18n value is a hash' do
-    error = Errawr::Error.new(:error_hash)
-    error.metadata[:name].should == 'error_name'
-  end
 end

data/spec/mapper_spec.rb

@@ -36,5 +36,23 @@ describe Errawr::Mapper do
         e.metadata.include?(:error).should be_false
       end
     end
+    
+    it 'should return an overridden message for a non-hashed locale' do
+      Errawr.register!(:some_error, message: 'Overridden error message')
+      begin
+        Errawr.error!(:some_error)
+      rescue => e
+        e.message.should == 'Overridden error message'
+      end
+    end
+    
+    it 'should return an overridden message for a hashed locale' do
+      Errawr.register!(:error_hash, message: 'Overridden error message')
+      begin
+        Errawr.error!(:error_hash)
+      rescue => e
+        e.message.should == 'Overridden error message'
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errawr
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Anthony Smith