i18nliner 0.0.1 → 0.0.2

data/spec/extensions/inferpolation_spec.rb

@@ -0,0 +1,41 @@
+require 'i18nliner/extensions/inferpolation'
+require 'ostruct'
+
+describe I18nliner::Extensions::Inferpolation do
+
+  let(:foo) do
+    foo = OpenStruct.new(:bar => OpenStruct.new(:baz => "lol"), :bar2 => "foo")
+    foo.instance_variable_set(:@bar, foo.bar)
+    foo.instance_variable_set(:@bar2, "foo")
+    foo.extend I18nliner::Extensions::Inferpolation
+    foo
+  end
+
+  it "should inferpolate valid instance methods and chains" do
+    options = {:default => "hello %{bar.baz} %{bar2}"}
+    foo.inferpolate(options).should == {
+      :default => "hello %{bar_baz} %{bar2}",
+      :bar_baz => foo.bar.baz,
+      :bar2 => foo.bar2
+    }
+  end
+
+  it "should inferpolate valid instance variables and chains" do
+    options = {:default => "hello %{@bar.baz} %{@bar2}"}
+    foo.inferpolate(options).should == {
+      :default => "hello %{bar_baz} %{bar2}",
+      :bar_baz => foo.bar.baz,
+      :bar2 => foo.bar2
+    }
+  end
+
+  it "should not inferpolate invalid instance methods and chains" do
+    options = {:default => "hello %{lol} %{bar.baz.lol}"}
+    foo.inferpolate(options).should == options
+  end
+
+  it "should not inferpolate invalid instance variables and chains" do
+    options = {:default => "hello %{@lol} %{@bar.baz.lol}"}
+    foo.inferpolate(options).should == options
+  end
+end

data/spec/extensions/view_spec.rb

@@ -0,0 +1,42 @@
+# encoding: UTF-8
+require 'i18nliner/extensions/view'
+require 'i18nliner/call_helpers'
+
+describe I18nliner::Extensions::View do
+  let(:i18n) do
+    Module.new do
+      extend(Module.new do
+        def translate(*args)
+          I18n.translate(*args)
+        end
+      end)
+      extend I18nliner::Extensions::View
+    end
+  end
+
+
+  describe "#translate" do
+    it "should inferpolate" 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.translate("hello %{foo}")
+    end
+
+    it "should raise an error when given a block" do
+      expect {
+        i18n.translate(:foo) {
+          uhoh there was a bug with erb extraction or im doing it wrong
+        }
+      }.to raise_error I18nliner::InvalidBlockUsageError
+    end
+
+    it "should raise an error when given an incorrect number of arguments" do
+      expect {
+        i18n.translate
+      }.to raise_error /wrong number of arguments/
+    end
+  end
+end
+

data/spec/extractors/ruby_extractor_spec.rb

@@ -1,10 +1,7 @@
-require 'sexp_processor'
 require 'ruby_parser'
-require 'i18nliner'
 require 'i18nliner/errors'
 require 'i18nliner/scope'
 require 'i18nliner/extractors/ruby_extractor'
-require 'i18nliner/extractors/translate_call'
 
 describe I18nliner::Extractors::RubyExtractor do
   def extract(source, scope = I18nliner::Scope.new(nil))
@@ -27,12 +24,15 @@ describe I18nliner::Extractors::RubyExtractor do
       extract("foo 'Foo'").should == {}
     end
 
+    it "should ignore t! calls" do
+      extract("t! something").should == {}
+    end
+
     it "should not extract t calls with no default" do
       extract("t :foo").should == {}
     end
 
     it "should extract valid t calls" do
-      if false
       extract("t 'Foo'").should ==
         {"foo_f44ad75d" => "Foo"}
       extract("t :bar, 'Baz'").should ==
@@ -45,7 +45,6 @@ describe I18nliner::Extractors::RubyExtractor do
         {"zomg_lots_a54248c9.one" => "just one", "zomg_lots_a54248c9.other" => "zomg lots"}
       extract("t 'foo2', <<-STR\nFoo\nSTR").should ==
         {'foo2' => "Foo"}
-      end
       extract("t 'foo', 'F' + 'o' + 'o'").should ==
         {'foo' => "Foo"}
     end

data/spec/extractors/translate_call_spec.rb

@@ -1,10 +1,11 @@
-require 'i18nliner'
+# encoding: UTF-8
+require 'i18nliner/base'
 require 'i18nliner/scope'
 require 'i18nliner/extractors/translate_call'
 
 describe I18nliner::Extractors::TranslateCall do
   def call(scope, *args)
-    I18nliner::Extractors::TranslateCall.new(scope, nil, nil, :t, args)
+    I18nliner::Extractors::TranslateCall.new(scope, nil, :t, args)
   end
 
   let(:no_scope) { I18nliner::Scope.new(nil) }
@@ -43,6 +44,12 @@ describe I18nliner::Extractors::TranslateCall do
       }.to raise_error(I18nliner::InvalidSignatureError)
     end
 
+    # for legacy calls, e.g. t :key, :default => "foo"
+    it "should allow the default to be specified in the options hash" do
+      call = call(no_scope, :key, :default => "foo")
+      call.default.should == "foo"
+    end
+
     it "should ensure options is a hash, if provided" do
       expect {
         call(no_scope, :key, "value", Object.new)
@@ -65,6 +72,26 @@ describe I18nliner::Extractors::TranslateCall do
       end
     end
 
+    it "should transliterate underscored keys according to the default locale" do
+      orig_locale = I18n.default_locale
+      I18n.backend.store_translations(:de, :i18n => {
+        :transliterate => {
+          :rule => {
+            "ü" => "ue",
+            "ö" => "oe"
+          }
+        }
+      })
+
+      I18nliner.inferred_key_format :underscored do
+        I18n.default_locale = :en
+        call(no_scope, "Jürgen").translations[0][0].should == "jurgen"
+        I18n.default_locale = :de
+        call(no_scope, "Jürgen").translations[0][0].should == "juergen"
+      end
+      I18n.default_locale = orig_locale
+    end
+
     it "should generate underscored + crc32 keys" do
       I18nliner.inferred_key_format :underscored_crc32 do
         call(no_scope, "zOmg key!!").translations.should ==

data/spec/fixtures/app/models/invalid.rb

@@ -0,0 +1,5 @@
+class User < ActiveRecord::Base
+  def welcome_message
+    t "welcome, #{name}"
+  end
+end

data/spec/fixtures/app/models/valid.rb

@@ -0,0 +1,5 @@
+class Group < ActiveRecord::Base
+  def welcome_message
+    t "welcome, %{name}"
+  end
+end

data/spec/pre_processors/erb_pre_processor_spec.rb

@@ -0,0 +1,194 @@
+# encoding: UTF-8
+require 'i18nliner/pre_processors/erb_pre_processor'
+require 'i18nliner/errors'
+require 'active_support/core_ext/string/strip.rb'
+
+describe I18nliner::PreProcessors::ErbPreProcessor do
+  before do
+    I18nliner::PreProcessors::ErbPreProcessor::TBlock.any_instance.stub(:infer_key).and_return(:key)
+  end
+
+  describe ".process" do
+    def process(string, remove_blank_lines = true)
+      result = I18nliner::PreProcessors::ErbPreProcessor.process(string)
+      result.gsub!(/\n+%>/, " %>") if remove_blank_lines
+      result
+    end
+
+    it "should transform t block expressions" do
+      process("<%= t do %>hello world!<% end %>").should ==
+        '<%= t :key, "hello world!" %>'
+    end
+
+    it "should remove extraneous whitespace from the default" do
+      process("<%= t do %> ohai!  lulz\t <% end %>").should ==
+        '<%= t :key, "ohai! lulz" %>'
+    end
+
+    # so that line numbers are close-ish when you get an error in a
+    # multi-line t-block... an exception from an expression might not
+    # match up perfectly, but it will at least point to the start of the
+    # t-block
+    it "should preserve all newlines in the generated erb" do
+      process(<<-SOURCE.strip_heredoc, false).
+        <%= t do
+        %>
+          ohai!
+          <%= test %>
+          lulz
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED.strip_heredoc
+        <%= t :key, "ohai! %{test} lulz", :test => (test)
+
+
+
+
+        %>
+        EXPECTED
+    end
+
+    it "should not translate other block expressions" do
+      process(<<-SOURCE).
+        <%= form_for do %>
+          <%= t do %>Your Name<% end %>
+          <input>
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= form_for do %>
+          <%= t :key, "Your Name" %>
+          <input>
+        <% end %>
+        EXPECTED
+    end
+
+    it "should reject malformed erb" do
+      expect { process("<%= t do %>") }.
+        to raise_error(I18nliner::MalformedErbError)
+    end
+
+    it "should disallow nesting non-t block expressions in a t block expression" do
+      expect { process("<%= t { %><%= s { %>nope<% } %><% } %>") }.
+        to raise_error(I18nliner::TBlockNestingError)
+      expect { process("<%= t { %><%= s(:some, :args) { |args, here, too| %>nope<% } %><% } %>") }.
+        to raise_error(I18nliner::TBlockNestingError)
+    end
+
+    it "should disallow statements in a t block expression" do
+      expect { process("<%= t { %>I am <% if happy %>happy<% else %>sad<% end %><% } %>") }.
+        to raise_error(I18nliner::TBlockNestingError)
+    end
+
+    it "should create wrappers for markup" do
+      process(<<-SOURCE).
+        <%= t do %>
+          <b>bold</b>, or even <a href="#"><i><img>combos</i></a> get wrapper'd
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= t :key, "*bold*, or even **combos** get wrapper'd", :wrappers => ["<b>\\\\1</b>", "<a href=\\\"#\\\"><i><img>\\\\1</i></a>"] %>
+        EXPECTED
+    end
+
+    it "should not create wrappers for markup with multiple text nodes" do
+      expect { puts process("<%= t do %>this is <b><i>too</i> complicated</b><% end %>") }.
+        to raise_error(I18nliner::UnwrappableContentError)
+    end
+
+    it "should create wrappers for link_to calls with string content" do
+      process(<<-SOURCE).
+        <%= t do %>
+          You should <%= link_to("create a profile", "/profile") %>.
+          idk why <%= link_to "this " + "link", "/zomg" %> has concatention
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= t :key, "You should *create a profile*. idk why **this link** has concatention", :wrappers => [link_to("\\\\1", "/profile"), link_to("\\\\1", "/zomg")] %>
+        EXPECTED
+    end
+
+    it "should create wrappers for link_to calls with other content" do
+      process(<<-SOURCE).
+        <%= t do %>
+          Your account rep is <%= link_to(@user.name, "/user/\#{@user.id}") %>
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= t :key, "Your account rep is *%{user_name}*", :user_name => (@user.name), :wrappers => [link_to("\\\\1", "/user/\#{@user.id}")] %>
+        EXPECTED
+    end
+
+    it "should reuse identical wrappers" do
+      process(<<-SOURCE).
+        <%= t do %>
+          the wrappers for
+          <%= link_to "these", url %> <%= link_to "links", url %> are the same,
+          as are the ones for
+          <b>these</b> <b>tags</b>
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= t :key, "the wrappers for **these** **links** are the same, as are the ones for *these* *tags*", :wrappers => ["<b>\\\\1</b>", link_to("\\\\1", url)] %>
+        EXPECTED
+    end
+
+    it "should generate placeholders for inline expressions" do
+      process(<<-SOURCE).
+        <%= t do %>
+          Hello, <%= name %>
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= t :key, "Hello, %{name}", :name => (name) %>
+        EXPECTED
+    end
+
+    it "should generate placeholders for inline expressions in wrappers" do
+      process(<<-SOURCE).
+        <%= t do %>
+          Go to <a href="/asdf" title="<%= name %>">your account</a>
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= t :key, "Go to *your account*", :wrappers => ["<a href=\\"/asdf\\" title=\\"\#{name}\\">\\\\1</a>"] %>
+        EXPECTED
+    end
+
+    # this is really the same as the one above, but it's good to have a
+    # spec for this in case the underlying implementation changes
+    # dramatically
+    it "should transform nested t block expressions in wrappers" do
+      process(<<-SOURCE).
+        <%= t do %>
+          Go to <a href="/asdf" title="<%= t do %>manage account stuffs, <%= name %><% end %>">your account</a>
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= t :key, "Go to *your account*", :wrappers => ["<a href=\\"/asdf\\" title=\\"\#{t :key, \"manage account stuffs, %{name}\", :name => (name)}\\">\\\\1</a>"] %>
+        EXPECTED
+    end
+
+    it "should generate placeholders for empty markup" do
+      process(<<-SOURCE).
+        <%= t do %>
+          Create <input name="count"> groups
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= t :key, "Create %{input_name_count} groups", :input_name_count => ("<input name=\\"count\\">".html_safe) %>
+        EXPECTED
+    end
+
+    it "should unescape entities" do
+      process(<<-SOURCE).
+        <%= t do %>
+          &copy; <%= year %> ACME Corp. All Rights Reserved. Our lawyers &gt; your lawyers
+        <% end %>
+        SOURCE
+      should == <<-EXPECTED
+        <%= t :key, "© %{year} ACME Corp. All Rights Reserved. Our lawyers > your lawyers", :year => (year) %>
+        EXPECTED
+    end
+  end
+end

data/spec/processors/erb_processor_spec.rb

@@ -0,0 +1,28 @@
+require 'i18nliner/processors/erb_processor'
+require 'i18nliner/extractors/translation_hash'
+
+describe I18nliner::Processors::ErbProcessor do
+  before do
+    @translations = I18nliner::Extractors::TranslationHash.new
+    @processor = I18nliner::Processors::ErbProcessor.new(@translations)
+  end
+  
+  describe "#check_contents" do
+    it "should extract valid translation calls" do
+      @processor.check_contents(<<-SOURCE)
+        <%= t "Inline!" %>
+        <%= t do %>
+          Zomg a block
+          <a href="/nesting"
+             title="<%= t do %>what is this?<% end %>"
+             >with nesting</a>!!!
+        <% end %>
+        SOURCE
+      @translations.values.sort.should == [
+        "Inline!",
+        "Zomg a block *with nesting*!!!",
+        "what is this?"
+      ]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18nliner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.4.0
+- !ruby/object:Gem::Dependency
+  name: ruby2ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: globby
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: ya2yaml
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +123,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '0.31'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
@@ -123,9 +171,25 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.0
 description: No .yml files. Inline defaults. Optional keys. Inferred interpolation
   values. Wrappers and blocks, so your templates look template-y and your translations
-  HTML-free.
+  stay HTML-free.
 email: jenseng@gmail.com
 executables: []
 extensions: []
@@ -134,6 +198,7 @@ files:
 - LICENSE.txt
 - Rakefile
 - README.md
+- lib/i18nliner/base.rb
 - lib/i18nliner/call_helpers.rb
 - lib/i18nliner/commands/basic_formatter.rb
 - lib/i18nliner/commands/check.rb
@@ -141,19 +206,37 @@ files:
 - lib/i18nliner/commands/dump.rb
 - lib/i18nliner/commands/generic_command.rb
 - lib/i18nliner/errors.rb
+- lib/i18nliner/erubis.rb
+- lib/i18nliner/extensions/controller.rb
+- lib/i18nliner/extensions/core.rb
+- lib/i18nliner/extensions/inferpolation.rb
+- lib/i18nliner/extensions/model.rb
+- lib/i18nliner/extensions/view.rb
 - lib/i18nliner/extractors/abstract_extractor.rb
 - lib/i18nliner/extractors/ruby_extractor.rb
+- lib/i18nliner/extractors/sexp_helper.rb
 - lib/i18nliner/extractors/translate_call.rb
 - lib/i18nliner/extractors/translation_hash.rb
+- lib/i18nliner/pre_processors/erb_pre_processor.rb
 - lib/i18nliner/processors/abstract_processor.rb
 - lib/i18nliner/processors/erb_processor.rb
 - lib/i18nliner/processors/ruby_processor.rb
 - lib/i18nliner/processors.rb
+- lib/i18nliner/railtie.rb
 - lib/i18nliner/scope.rb
 - lib/i18nliner.rb
 - lib/tasks/i18nliner.rake
+- spec/commands/check_spec.rb
+- spec/commands/dump_spec.rb
+- spec/extensions/core_spec.rb
+- spec/extensions/inferpolation_spec.rb
+- spec/extensions/view_spec.rb
 - spec/extractors/ruby_extractor_spec.rb
 - spec/extractors/translate_call_spec.rb
+- spec/fixtures/app/models/invalid.rb
+- spec/fixtures/app/models/valid.rb
+- spec/pre_processors/erb_pre_processor_spec.rb
+- spec/processors/erb_processor_spec.rb
 homepage: http://github.com/jenseng/i18nliner
 licenses: []
 post_install_message: