i18nliner 0.0.8 → 0.0.9

data/lib/i18nliner/call_helpers.rb

@@ -7,8 +7,8 @@ module I18nliner
     ALLOWED_PLURALIZATION_KEYS = [:zero, :one, :few, :many, :other]
     REQUIRED_PLURALIZATION_KEYS = [:one, :other]
 
-    def normalize_key(key, scope, inferred)
-      scope.normalize_key(key.to_s, inferred)
+    def normalize_key(key, scope, inferred, i18n_scope)
+      scope.normalize_key(key.to_s, inferred, i18n_scope)
     end
 
     def normalize_default(default, translate_options = {}, options = {})
@@ -110,7 +110,7 @@ module I18nliner
       raise ArgumentError.new("invalid default translation. expected Hash or String, got #{default.class}") unless default.nil? || default.is_a?(String) || default.is_a?(Hash)
       raise ArgumentError.new("invalid options argument. expected Hash, got #{options.class}") unless options.is_a?(Hash)
       options[:default] = default if default
-      options[:i18n_inferred_key] = true unless has_key
+      options[:i18nliner_inferred_key] = true unless has_key
       args
     end
 

data/lib/i18nliner/extensions/controller.rb

@@ -7,12 +7,12 @@ module I18nliner
     module Controller
       include Inferpolation
 
-      def i18n_scope; end
+      def i18nliner_scope; end
 
       def translate(*args)
         key, options = CallHelpers.infer_arguments(args)
         options = inferpolate(options) if I18nliner.infer_interpolation_values
-        options[:i18n_scope] = i18n_scope
+        options[:i18nliner_scope] = i18nliner_scope
         super(key, options)
       end
       alias :t :translate

data/lib/i18nliner/extensions/core.rb

@@ -8,9 +8,9 @@ module I18nliner
       def translate(*args)
         key, options = *CallHelpers.infer_arguments(args)
 
-        scope = options.delete(:i18n_scope) || Scope.root
-        inferred_key = options.delete(:i18n_inferred_key)
-        key = CallHelpers.normalize_key(key, scope, inferred_key)
+        scope = options.delete(:i18nliner_scope) || Scope.root
+        inferred_key = options.delete(:i18nliner_inferred_key)
+        key = CallHelpers.normalize_key(key, scope, inferred_key, options[:scope])
 
         if default = options[:default]
           options[:default] = CallHelpers.normalize_default(default, options)

data/lib/i18nliner/extensions/model.rb

@@ -7,12 +7,12 @@ module I18nliner
     module Model
       include Inferpolation
 
-      def i18n_scope; end
+      def i18nliner_scope; end
 
       def translate(*args)
         key, options = CallHelpers.infer_arguments(args)
         options = inferpolate(options) if I18nliner.infer_interpolation_values
-        options[:i18n_scope] = i18n_scope
+        options[:i18nliner_scope] = i18nliner_scope
         I18n.translate(key, options)
       end
       alias :t :translate

data/lib/i18nliner/extensions/view.rb

@@ -7,7 +7,7 @@ module I18nliner
     module View
       include Inferpolation
 
-      def i18n_scope; end
+      def i18nliner_scope; end
 
       def translate(*args)
         # if a block gets through to here, it either means:
@@ -16,7 +16,7 @@ module I18nliner
         raise InvalidBlockUsageError.new("block translate calls need to be output (i.e. `<%=`) and the block body must be of the form `%>your string<%`") if block_given?
         key, options = CallHelpers.infer_arguments(args)
         options = inferpolate(options) if I18nliner.infer_interpolation_values
-        options[:i18n_scope] = i18n_scope
+        options[:i18nliner_scope] = i18nliner_scope
         super(key, options)
       rescue ArgumentError
         raise

data/lib/i18nliner/extractors/translate_call.rb

@@ -29,7 +29,7 @@ module I18nliner
       end
 
       def normalize
-        @key = normalize_key(@key, @scope, @options[:i18n_inferred_key])
+        @key = normalize_key(@key, @scope, @options[:i18nliner_inferred_key], @options[:scope])
         @default = normalize_default(@default, @options || {}, {:remove_whitespace => @scope.remove_whitespace?})
       end
 

data/lib/i18nliner/pre_processors/erb_pre_processor.rb

@@ -237,7 +237,7 @@ module I18nliner
         end
 
         def options_to_ruby(options)
-          options["i18n_inferred_key"] = "true"
+          options["i18nliner_inferred_key"] = "true"
           options.map do |key, value|
             ":" << key << " => (" << value << ")"
           end.join(", ")

data/lib/i18nliner/scope.rb

@@ -14,7 +14,7 @@ module I18nliner
       @context = options.fetch(:context, nil)
     end
 
-    def normalize_key(key, inferred)
+    def normalize_key(key, inferred, i18n_scope)
       if allow_relative? && (key = key.dup) && key.sub!(/\A\./, '')
         scope + key
       else

data/lib/i18nliner.rb

@@ -3,6 +3,6 @@ require 'i18nliner/base'
 
 require 'i18nliner/extensions/core'
 I18n.send :extend, I18nliner::Extensions::Core
-I18n::RESERVED_KEYS << :i18n_scope << :i18n_inferred_key
+I18n::RESERVED_KEYS << :i18nliner_scope << :i18nliner_inferred_key
 
 require 'i18nliner/railtie' if defined?(Rails)

data/spec/extensions/controller_spec.rb

@@ -7,7 +7,7 @@ describe I18nliner::Extensions::Controller do
     Module.new do
       extend(Module.new do
         def translate(key, options)
-          options.delete(:i18n_inferred_key)
+          options.delete(:i18nliner_inferred_key)
           I18n.translate(key, options)
         end
 
@@ -25,12 +25,12 @@ describe I18nliner::Extensions::Controller do
       i18n.stub(:foo).and_return("FOO")
       I18nliner::CallHelpers.stub(:infer_key).and_return(:key)
 
-      expect(I18n).to receive(:translate).with(:key, :default => "hello %{foo}", :foo => "FOO", :i18n_scope => i18n.i18n_scope)
+      expect(I18n).to receive(:translate).with(:key, :default => "hello %{foo}", :foo => "FOO", :i18nliner_scope => i18n.i18nliner_scope)
       i18n.translate("hello %{foo}")
     end
 
     it "should pass along its scope to I18n.t" do
-      expect(I18n).to receive(:translate).with(:key, :default => "foo", :i18n_scope => i18n.i18n_scope)
+      expect(I18n).to receive(:translate).with(:key, :default => "foo", :i18nliner_scope => i18n.i18nliner_scope)
       i18n.translate(:key, "foo")
     end
   end

data/spec/extensions/model_spec.rb

@@ -15,12 +15,12 @@ describe I18nliner::Extensions::Model do
       i18n.stub(:foo).and_return("FOO")
       I18nliner::CallHelpers.stub(:infer_key).and_return(:key)
 
-      expect(I18n).to receive(:translate).with(:key, :default => "hello %{foo}", :foo => "FOO", :i18n_scope => i18n.i18n_scope, :i18n_inferred_key => true)
+      expect(I18n).to receive(:translate).with(:key, :default => "hello %{foo}", :foo => "FOO", :i18nliner_scope => i18n.i18nliner_scope, :i18nliner_inferred_key => true)
       i18n.translate("hello %{foo}")
     end
 
     it "should pass along its scope to I18n.t" do
-      expect(I18n).to receive(:translate).with(:key, :default => "foo", :i18n_scope => i18n.i18n_scope)
+      expect(I18n).to receive(:translate).with(:key, :default => "foo", :i18nliner_scope => i18n.i18nliner_scope)
       i18n.translate(:key, "foo")
     end
   end

data/spec/extensions/view_spec.rb

@@ -7,7 +7,7 @@ describe I18nliner::Extensions::View do
     Module.new do
       extend(Module.new do
         def translate(key, options)
-          options.delete(:i18n_inferred_key)
+          options.delete(:i18nliner_inferred_key)
           I18n.translate(key, options)
         end
       end)
@@ -21,7 +21,7 @@ describe I18nliner::Extensions::View do
       i18n.stub(:foo).and_return("FOO")
       I18nliner::CallHelpers.stub(:infer_key).and_return(:key)
 
-      expect(I18n).to receive(:translate).with(:key, :default => "hello %{foo}", :foo => "FOO", :i18n_scope => i18n.i18n_scope)
+      expect(I18n).to receive(:translate).with(:key, :default => "hello %{foo}", :foo => "FOO", :i18nliner_scope => i18n.i18nliner_scope)
       i18n.translate("hello %{foo}")
     end
 
@@ -40,7 +40,7 @@ describe I18nliner::Extensions::View do
     end
 
     it "should pass along its scope to I18n.t" do
-      expect(I18n).to receive(:translate).with(:key, :default => "foo", :i18n_scope => i18n.i18n_scope)
+      expect(I18n).to receive(:translate).with(:key, :default => "foo", :i18nliner_scope => i18n.i18nliner_scope)
       i18n.translate(:key, "foo")
     end
   end

data/spec/pre_processors/erb_pre_processor_spec.rb

@@ -17,12 +17,12 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
 
     it "should transform t block expressions" do
       process("<%= t do %>hello world!<% end %>").should ==
-        '<%= t :key, "hello world!", :i18n_inferred_key => (true) %>'
+        '<%= t :key, "hello world!", :i18nliner_inferred_key => (true) %>'
     end
 
     it "should remove extraneous whitespace from the default" do
       process("<%= t do %> ohai!  lulz\t <% end %>").should ==
-        '<%= t :key, "ohai! lulz", :i18n_inferred_key => (true) %>'
+        '<%= t :key, "ohai! lulz", :i18nliner_inferred_key => (true) %>'
     end
 
     # so that line numbers are close-ish when you get an error in a
@@ -39,7 +39,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED.strip_heredoc
-        <%= t :key, "ohai! %{test} lulz", :test => (test), :i18n_inferred_key => (true)
+        <%= t :key, "ohai! %{test} lulz", :test => (test), :i18nliner_inferred_key => (true)
 
 
 
@@ -57,7 +57,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         SOURCE
       should == <<-EXPECTED
         <%= form_for do %>
-          <%= t :key, "Your Name", :i18n_inferred_key => (true) %>
+          <%= t :key, "Your Name", :i18nliner_inferred_key => (true) %>
           <input>
         <% end %>
         EXPECTED
@@ -87,7 +87,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED
-        <%= t :key, "*bold*, or even **combos** get wrapper'd", :i18n_inferred_key => (true), :wrappers => ["<b>\\\\1</b>", "<a href=\\\"#\\\"><i><img>\\\\1</i></a>"] %>
+        <%= t :key, "*bold*, or even **combos** get wrapper'd", :i18nliner_inferred_key => (true), :wrappers => ["<b>\\\\1</b>", "<a href=\\\"#\\\"><i><img>\\\\1</i></a>"] %>
         EXPECTED
     end
 
@@ -104,7 +104,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED
-        <%= t :key, "You should *create a profile*. idk why **this link** has concatention", :i18n_inferred_key => (true), :wrappers => [link_to("\\\\1", "/profile"), link_to("\\\\1", "/zomg")] %>
+        <%= t :key, "You should *create a profile*. idk why **this link** has concatention", :i18nliner_inferred_key => (true), :wrappers => [link_to("\\\\1", "/profile"), link_to("\\\\1", "/zomg")] %>
         EXPECTED
     end
 
@@ -115,7 +115,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED
-        <%= t :key, "Your account rep is *%{user_name}*", :user_name => (@user.name), :i18n_inferred_key => (true), :wrappers => [link_to("\\\\1", "/user/\#{@user.id}")] %>
+        <%= t :key, "Your account rep is *%{user_name}*", :user_name => (@user.name), :i18nliner_inferred_key => (true), :wrappers => [link_to("\\\\1", "/user/\#{@user.id}")] %>
         EXPECTED
     end
 
@@ -129,7 +129,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED
-        <%= t :key, "the wrappers for **these** **links** are the same, as are the ones for *these* *tags*", :i18n_inferred_key => (true), :wrappers => ["<b>\\\\1</b>", link_to("\\\\1", url)] %>
+        <%= t :key, "the wrappers for **these** **links** are the same, as are the ones for *these* *tags*", :i18nliner_inferred_key => (true), :wrappers => ["<b>\\\\1</b>", link_to("\\\\1", url)] %>
         EXPECTED
     end
 
@@ -140,7 +140,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED
-        <%= t :key, "Hello, %{name}", :name => (name), :i18n_inferred_key => (true) %>
+        <%= t :key, "Hello, %{name}", :name => (name), :i18nliner_inferred_key => (true) %>
         EXPECTED
     end
 
@@ -151,7 +151,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED
-        <%= t :key, "Go to *your account*", :i18n_inferred_key => (true), :wrappers => ["<a href=\\"/asdf\\" title=\\"\#{name}\\">\\\\1</a>"] %>
+        <%= t :key, "Go to *your account*", :i18nliner_inferred_key => (true), :wrappers => ["<a href=\\"/asdf\\" title=\\"\#{name}\\">\\\\1</a>"] %>
         EXPECTED
     end
 
@@ -165,7 +165,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED
-        <%= t :key, "Go to *your account*", :i18n_inferred_key => (true), :wrappers => ["<a href=\\"/asdf\\" title=\\"\#{t :key, \"manage account stuffs, %{name}\", :name => (name), :i18n_inferred_key => (true)}\\">\\\\1</a>"] %>
+        <%= t :key, "Go to *your account*", :i18nliner_inferred_key => (true), :wrappers => ["<a href=\\"/asdf\\" title=\\"\#{t :key, \"manage account stuffs, %{name}\", :name => (name), :i18nliner_inferred_key => (true)}\\">\\\\1</a>"] %>
         EXPECTED
     end
 
@@ -176,7 +176,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED
-        <%= t :key, "Create %{input_name_count} groups", :input_name_count => ("<input name=\\"count\\">".html_safe), :i18n_inferred_key => (true) %>
+        <%= t :key, "Create %{input_name_count} groups", :input_name_count => ("<input name=\\"count\\">".html_safe), :i18nliner_inferred_key => (true) %>
         EXPECTED
     end
 
@@ -187,7 +187,7 @@ describe I18nliner::PreProcessors::ErbPreProcessor do
         <% end %>
         SOURCE
       should == <<-EXPECTED
-        <%= t :key, "© %{year} ACME Corp. All Rights Reserved. Our lawyers > your lawyers", :year => (year), :i18n_inferred_key => (true) %>
+        <%= t :key, "© %{year} ACME Corp. All Rights Reserved. Our lawyers > your lawyers", :year => (year), :i18nliner_inferred_key => (true) %>
         EXPECTED
     end
   end

metadata

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