remarkable 3.0.4 → 3.0.5

data/lib/remarkable/dsl/matches.rb

@@ -119,9 +119,14 @@ module Remarkable
           methods.each do |method|
             bool, hash = send(method)
 
-            unless bool
-              @expectation ||= Remarkable.t "expectations.#{method.to_s.gsub(/(\?|\!)$/, '')}",
-                                            default_i18n_options.merge(hash || {})
+            unless bool
+              parent_scope = matcher_i18n_scope.split('.')
+              matcher_name = parent_scope.pop
+              lookup       = :"expectations.#{method.to_s.gsub(/(\?|\!)$/, '')}"
+
+              hash = { :scope => parent_scope, :default => lookup }.merge(hash || {})
+              @expectation ||= Remarkable.t "#{matcher_name}.#{lookup}", default_i18n_options.merge(hash)
+
               return false
             end
           end

data/lib/remarkable/dsl/optionals.rb

@@ -116,25 +116,38 @@ module Remarkable
         message.strip!
 
         optionals = self.class.matcher_optionals.map do |optional|
-          scope = matcher_i18n_scope + ".optionals.#{optional}"
-
           if @options.key?(optional)
             value = @options[optional]
             defaults = [ (value ? :positive : :negative) ]
 
             # If optional is a symbol and it's not any to any of the reserved symbols, search for it also
-            defaults.unshift(value) if value.is_a?(Symbol) && !OPTIONAL_KEYS.include?(value)
-
-            Remarkable.t defaults.shift, :default => defaults, :raise => true, :scope => scope,
-                                         :inspect => value.inspect, :value => value.to_s
-          else
-            Remarkable.t :not_given, :raise => true, :scope => scope
-          end rescue nil
+            defaults.unshift(value) if value.is_a?(Symbol) && !OPTIONAL_KEYS.include?(value)
+            defaults << ''
+
+            options = { :default => defaults, :inspect => value.inspect, :value => value.to_s }
+            translate_optionals_with_namespace(optional, defaults.shift, options)
+          else
+            translate_optionals_with_namespace(optional, :not_given, :default => '')
+          end
         end.compact
 
         message << ' ' << array_to_sentence(optionals)
         message.strip!
         message
+      end
+
+      def translate_optionals_with_namespace(optional, key, options={}) #:nodoc:
+        scope = "#{matcher_i18n_scope}.optionals.#{optional}"
+
+        translation = Remarkable.t key, options.merge!(:scope => scope)
+        return translation unless translation.empty?
+
+        parent_scope = scope.split('.')
+        parent_scope.delete_at(-3)
+        translation = Remarkable.t key, options.merge!(:scope => parent_scope)
+        return translation unless translation.empty?
+
+        nil
       end
 
     end

data/lib/remarkable/version.rb

@@ -1,3 +1,3 @@
 module Remarkable
-  VERSION = '3.0.4' unless self.const_defined?('VERSION')
+  VERSION = '3.0.5' unless self.const_defined?('VERSION')
 end

data/spec/dsl/optionals_spec.rb

@@ -38,5 +38,16 @@ describe Remarkable::DSL::Optionals do
 
     @matcher.allow_nil(false)
     @matcher.description.should == 'contain 1 not allowing nil and with blank equal true'
+  end
+
+  it 'should provide a description with optionals through namespace lookup' do
+    @matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1)
+    @matcher.description.should == 'contain 1'
+
+    @matcher.allow_nil(true)
+    @matcher.description.should == 'contain 1 allowing nil'
+
+    @matcher.allow_nil(false)
+    @matcher.description.should == 'contain 1 not allowing nil'
   end
 end

data/spec/locale/en.yml

@@ -1,11 +1,15 @@
 en:
   remarkable:
-    specs:
+    specs:
+      optionals:
+        allow_nil:
+          positive: "allowing nil"
+          negative: "not allowing nil"
       contain:
         description: "contain the given values"
       single_contain:
         description: "contain {{value}}"
-        optionals:
+        optionals:
           allow_nil:
             positive: "allowing nil"
             negative: "not allowing nil"

data/spec/matchers/collection_contain_matcher.rb

@@ -4,7 +4,7 @@ module Remarkable
       class CollectionContainMatcher < Remarkable::Base
         arguments :collection => :values, :as => :value
 
-        optional :working
+        optional :working, :allow_nil
         default_options :working => true
 
         assertion :is_array? do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable
 version: !ruby/object:Gem::Version 
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-18 00:00:00 +02:00
+date: 2009-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency