i18nliner 0.0.9 → 0.0.10

data/lib/i18nliner/call_helpers.rb

@@ -8,7 +8,7 @@ module I18nliner
     REQUIRED_PLURALIZATION_KEYS = [:one, :other]
 
     def normalize_key(key, scope, inferred, i18n_scope)
-      scope.normalize_key(key.to_s, inferred, i18n_scope)
+      scope.normalize_key(key, inferred, i18n_scope)
     end
 
     def normalize_default(default, translate_options = {}, options = {})
@@ -77,8 +77,8 @@ module I18nliner
     # default_hash, options
     def key_provided?(key_or_default = nil, default_or_options = nil, maybe_options = nil, *others)
       return false if key_or_default.is_a?(Hash)
-      return true if key_or_default.is_a?(Symbol)
-      raise ArgumentError.new("invalid key_or_default argument. expected String, Symbol or Hash, got #{key_or_default.class}") unless key_or_default.is_a?(String)
+      return true if key_or_default.is_a?(Symbol) || key_or_default.nil? || key_or_default.is_a?(Array)
+      raise ArgumentError.new("invalid key_or_default argument. expected String, Symbol, Array, Hash or nil, got #{key_or_default.class}") unless key_or_default.is_a?(String)
       return true if default_or_options.is_a?(String)
       return true if maybe_options
       return true if key_or_default =~ /\A\.?(\w+\.)+\w+\z/

data/lib/i18nliner/extractors/translate_call.rb

@@ -34,11 +34,15 @@ module I18nliner
       end
 
       def translations
-        return [] unless @default
-        return [[@key, @default]] if @default.is_a?(String)
-        @default.map { |key, value|
-          ["#{@key}.#{key}", value]
-        }
+        return [] unless default
+        keys = Array(key)
+        keys.inject([]) do |result, key|
+          if default.is_a?(String)
+            result << [key, default]
+          else
+            result.concat default.map { |dk, dv| ["#{key}.#{dk}", dv] }
+          end
+        end
       end
 
       def validate_key
@@ -79,6 +83,8 @@ module I18nliner
       def normalize_arguments(args)
         @key, @options = infer_arguments(args)
         @default = @options.delete(:default)
+        @default = nil if @default.is_a?(Symbol)
+        @default = @default.detect { |d| d.is_a?(String) } if @default.is_a?(Array)
         raise InvalidSignatureError.new(@line, args) unless @default.nil? || @default.is_a?(String) || @default.is_a?(Hash)
       rescue ArgumentError
         raise InvalidSignatureError.new(@line, args)

data/lib/i18nliner/scope.rb

@@ -15,7 +15,13 @@ module I18nliner
     end
 
     def normalize_key(key, inferred, i18n_scope)
-      if allow_relative? && (key = key.dup) && key.sub!(/\A\./, '')
+      return key if key.nil?
+      if key.is_a?(Array)
+        return key.map { |k| normalize_key(k, inferred, i18n_scope) }
+      end
+
+      key = key.to_s.dup
+      if allow_relative? && key.sub!(/\A\./, '')
         scope + key
       else
         key

data/spec/extensions/core_spec.rb

@@ -33,6 +33,16 @@ describe I18nliner::Extensions::Core do
       i18n.translate("light", :count => 1)
     end
 
+    it "should not stringify nil keys" do
+      expect(i18n).to receive(:simple_translate).with(nil, {:default => [:foo, :bar]})
+      i18n.translate(nil, {:default => [:foo, :bar]})
+    end
+
+    it "should stringify array keys, but not the array itself" do
+      expect(i18n).to receive(:simple_translate).with(["bar", "baz"], {})
+      i18n.translate([:bar, :baz])
+    end
+
     context "with wrappers" do
       it "should apply a single wrapper" do
         result = i18n.translate("Hello *bob*.", :wrapper => '<b>\1</b>')

data/spec/extractors/translate_call_spec.rb

@@ -50,6 +50,16 @@ describe I18nliner::Extractors::TranslateCall do
       call.default.should == "foo"
     end
 
+    it "should not extract symbol defaults" do
+      call = call(no_scope, :key, :default => :bar_key)
+      call.default.should be_nil
+    end
+
+    it "should extract the first string default" do
+      call = call(no_scope, :key, :default => [:foo_key, :bar_key, "baz"])
+      call.default.should == "baz"
+    end
+
     it "should ensure options is a hash, if provided" do
       expect {
         call(no_scope, :key, "value", Object.new)
@@ -103,6 +113,7 @@ describe I18nliner::Extractors::TranslateCall do
   describe "normalization" do
     it "should make keys absolute if scoped" do
       call(scope, '.key', "value").translations[0][0].should =~ /\Afoo\.key/
+      call(scope, ['.key1', '.key2'], "value").translations.map(&:first).should == ['foo.key1', 'foo.key2']
     end
 
     it "should strip whitespace from defaults" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18nliner
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport