errawr 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cdb0163333b17834affa6e46695e686854e55af
-  data.tar.gz: 03d483953b7d9475bda81f4736374ab14f7af06f
+  metadata.gz: be2440444126c0bf8520e79f82f1390e69840420
+  data.tar.gz: 54c653df41721042a39e81858e3f2fc9d5bc164b
 SHA512:
-  metadata.gz: f7e2436befdf2d0bde0d5cbaa3ce7966e13a44e7dbd7e33472086386e4754a475728518051980d9fd53728f404ef424bb4cbc6d1d4832471a31ed082d6c6967b
-  data.tar.gz: e5697f37f96b376adbc6b3705cbef2e1adfa6d6e2607dd995cb585a91a3fc6140649c6a06d688245f28fa0c6c7d92cbb0e4bf64c0e694451624948cd45610517
+  metadata.gz: eebb52e2d62840f94662258155c5d65b3b1d247b7d35ff89a6c0e8f1f6feb59332f7b1d55d7f797b4a23668c1009c000b9be67c9cf9669168b78795ff197b3ee
+  data.tar.gz: 789f8f217c980bd913d90bb0825631e8e79dba6c4f195a94b0acb7aea0bfd38f18f27a6d3dc767199d800ef3a037af1a240aac3e3253b69ac9ec85f64e2d12c7

data/.travis.yml

@@ -5,4 +5,4 @@ rvm:
   - ruby-head
   - jruby-19mode
   - jruby-head
-  - rbx-19mode
+  - rbx

data/Gemfile

@@ -12,4 +12,11 @@ end
 group :test do
   gem 'rspec'
   gem 'simplecov'
+end
+
+platforms :rbx do
+  gem 'racc'
+  gem 'rubinius-coverage', github: 'rubinius/rubinius-coverage'
+  gem 'rubysl'
+  gem 'rubysl-json'
 end

data/lib/errawr/error.rb

@@ -4,45 +4,40 @@ module Errawr
     
     def initialize(key = :unknown, context = {})
       @key = key
+      @context = context
+      @metadata = {}
       @i18n = I18n.t('errawr.' + @key.to_s)
-      process_context(context)
-      process_metadata(context)
-      process_message
+      update_context(@context)
     end
     
     def message
-      @context[:message]
+      process_message
+    end
+    
+    def update_context(context)
+      process_context(context)
     end
     
     private
     def process_context(context)
+      @message_overridden = context.include?(:message)
       if @i18n.kind_of?(Hash)
-        @context = @i18n.merge(context)
-        @context.delete(:metadata)
-        @message_overridden = context.include?(:message)
+        @context.merge!(@i18n.merge(context))
       else
-        @context = context
-      end
-    end
-    
-    def process_metadata(context)
-      if @i18n.kind_of?(Hash)
-        context = @i18n.merge(context)
+        @context.merge!(context)
       end
-      @metadata = context.fetch(:metadata, {})
+      @metadata.merge!(@context.delete(:metadata)) if @context.has_key?(:metadata)
     end
     
     def process_message
+      return @context[:message] if @message_overridden
       if @i18n.kind_of?(Hash)
-        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
+        key = 'errawr.' + @key.to_s + '.message'
+        @context[:message] = I18n.t(key, @context.merge({ default: I18n.t('errawr.unknown', @context) }))
       else
         @context[:message] = I18n.t('errawr.' + @key.to_s, @context) unless @context[:message]
       end
+      @context[:message]
     end
   end
 end

data/lib/errawr/version.rb

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

data/lib/errawr.rb

@@ -15,8 +15,7 @@ module Errawr
   module ClassMethods
     def error!(name, context = {})
       klass = Mapper[name] || Mapper[:unknown]
-      klass.metadata.merge!(context.delete(:metadata) || {})
-      klass.context.merge!(context)
+      klass.update_context(context) unless context.empty?
       raise klass
     end
 

data/spec/errawr_spec.rb

@@ -34,15 +34,6 @@ describe Errawr do
       end
     end
     
-    it '#register! should override custom metadata values from locale file' do
-      Errawr.register!(:error_hash, metadata: { name: 'register!_name' })
-      begin
-        Errawr.error!(:error_hash)
-      rescue => e
-        e.metadata[:name].should == 'register!_name'
-      end
-    end
-    
     it 'should override custom metadata values from #register! and locale file' do
       Errawr.register!(:error_hash, metadata: { name: 'register!_name' })
       begin
@@ -52,15 +43,6 @@ describe Errawr do
       end
     end
     
-    it 'should interpolate locales' do
-      Errawr.register!(:interpolated_error, error_message: 'interpolated message')
-      begin
-        Errawr.error!(:interpolated_error)
-      rescue => e
-        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')
@@ -76,5 +58,14 @@ describe Errawr do
         e.message.should == 'Overridden error message'
       end
     end
+    
+    it 'should pass in interpolated params' do
+      Errawr.register!(:interpolated_error)
+      begin
+        Errawr.error!(:interpolated_error, error_message: 'interpolated message')
+      rescue => e
+        e.message.should == 'Some error has occurred: interpolated message'
+      end
+    end
   end
 end

data/spec/mapper_spec.rb

@@ -54,5 +54,23 @@ describe Errawr::Mapper do
         e.message.should == 'Overridden error message'
       end
     end
+    
+    it 'should override custom metadata values from locale file' do
+      Errawr.register!(:error_hash, metadata: { name: 'register!_name' })
+      begin
+        Errawr.error!(:error_hash)
+      rescue => e
+        e.metadata[:name].should == 'register!_name'
+      end
+    end
+    
+    it 'should interpolate locales' do
+      Errawr.register!(:interpolated_error, error_message: 'interpolated message')
+      begin
+        Errawr.error!(:interpolated_error)
+      rescue => e
+        e.message.should == 'Some error has occurred: interpolated message'
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: errawr
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n