i18nliner 0.0.10 → 0.0.11

data/lib/i18nliner/call_helpers.rb

@@ -1,5 +1,6 @@
 require 'zlib'
 require 'i18n'
+require 'active_support/core_ext/string/inflections'
 require 'i18nliner/base'
 
 module I18nliner
@@ -13,18 +14,20 @@ module I18nliner
 
     def normalize_default(default, translate_options = {}, options = {})
       default = infer_pluralization_hash(default, translate_options)
-      normalize_whitespace!(default, options)
+      default = normalize_whitespace(default, options)
       default
     end
 
-    def normalize_whitespace!(default, options)
+    def normalize_whitespace(default, options)
+      return default unless default.is_a?(String) || default.is_a?(Hash)
+
+      default = default.dup
+
       if default.is_a?(Hash)
-        default.each { |key, value| normalize_whitespace!(value, options) }
-        return
+        default.each { |key, value| default[key] = normalize_whitespace(value, options) }
+        return default
       end
 
-      return unless default.is_a?(String)
-
       if options[:remove_whitespace]
         default.gsub!(/\s+/, ' ')
         default.strip!
@@ -32,6 +35,7 @@ module I18nliner
         default.sub!(/\s*\n\z/, '')
         default.lstrip!
       end
+      default
     end
 
     def infer_pluralization_hash(default, translate_options)
@@ -43,8 +47,9 @@ module I18nliner
 
     def infer_key(default, translate_options = {})
       return unless default && (default.is_a?(String) || default.is_a?(Hash))
+      default = normalize_default(default, translate_options, :remove_whitespace => true)
       default = default[:other].to_s if default.is_a?(Hash)
-      keyify(normalize_default(default, translate_options, :remove_whitespace => true))
+      keyify(default)
     end
 
     def keyify_underscored(string)
@@ -98,7 +103,7 @@ module I18nliner
       end
 
       has_key = key_provided?(*args)
-      args.unshift infer_key(args[0]) unless has_key
+      args.unshift nil unless has_key
 
       default = nil
       default_or_options = args[1]
@@ -111,6 +116,9 @@ module I18nliner
       raise ArgumentError.new("invalid options argument. expected Hash, got #{options.class}") unless options.is_a?(Hash)
       options[:default] = default if default
       options[:i18nliner_inferred_key] = true unless has_key
+      unless has_key
+        args[0] = infer_key(default, options)
+      end
       args
     end
 

data/lib/i18nliner/pre_processors/erb_pre_processor.rb

@@ -229,7 +229,7 @@ module I18nliner
           default.strip!
           default.gsub!(/\s+/, ' ')
 
-          key = infer_key(default)
+          key = infer_key(default, options)
           default = default.inspect
           options = options_to_ruby(options)
           wrappers = wrappers_to_ruby(wrappers)

data/spec/extensions/core_spec.rb

@@ -28,8 +28,17 @@ describe I18nliner::Extensions::Core do
       i18n.translate("Hello %{name}", :name => "bob")
     end
 
+    it "should not mutate the arguments passed in" do
+      expect(i18n).to receive(:simple_translate).with("my.key", :default => "ohai whitespace ")
+      key = "my.key".freeze
+      default = " ohai whitespace ".freeze
+      expect {
+        i18n.translate(key, default)
+      }.to_not raise_error
+    end
+
     it "should infer pluralization hashes" do
-      expect(i18n).to receive(:simple_translate).with("light_6feedaaa", :default => {:one => "1 light", :other => "%{count} lights"}, count: 1)
+      expect(i18n).to receive(:simple_translate).with("count_lights_58339e29", :default => {:one => "1 light", :other => "%{count} lights"}, count: 1)
       i18n.translate("light", :count => 1)
     end
 

data/spec/extractors/translate_call_spec.rb

@@ -10,6 +10,7 @@ describe I18nliner::Extractors::TranslateCall do
 
   let(:no_scope) { I18nliner::Scope.new(nil) }
   let(:scope) { I18nliner::Scope.new("foo", :auto => true, :allow_relative => true) }
+  let(:erb_scope) { I18nliner::Scope.new(nil, :remove_whitespace => true) }
 
   describe "signature" do
     it "should reject extra arguments" do
@@ -116,12 +117,28 @@ describe I18nliner::Extractors::TranslateCall do
       call(scope, ['.key1', '.key2'], "value").translations.map(&:first).should == ['foo.key1', 'foo.key2']
     end
 
-    it "should strip whitespace from defaults" do
-      call(no_scope, "\t whitespace \n\t ").translations[0][1].should == "whitespace"
+    it "should strip leading whitespace from defaults" do
+      call(no_scope, "\t white  space \n\t ").translations[0][1].should == "white  space \n\t "
+    end
+
+    it "should strip all whitespace from defaults if the scope requests it" do
+      call(erb_scope, "\t white  space \n\t ").translations[0][1].should == "white space"
     end
   end
 
   describe "pluralization" do
+    describe "keys" do
+      it "should be inferred from a word" do
+        translations = call(no_scope, "person", {:count => Object.new}).translations
+        translations.map(&:first).sort.should == ["count_people_489946e7.one", "count_people_489946e7.other"]
+      end
+
+      it "should be inferred from a hash" do
+        translations = call(no_scope, {:one => "just you", :other => "lotsa peeps"}, {:count => Object.new}).translations
+        translations.map(&:first).sort.should == ["lotsa_peeps_41499c40.one", "lotsa_peeps_41499c40.other"]
+      end
+    end
+
     describe "defaults" do
       it "should be inferred" do
         translations = call(no_scope, "person", {:count => Object.new}).translations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18nliner
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -139,22 +139,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: I18n made simple