i18nliner 0.0.1 → 0.0.2

data/lib/i18nliner/errors.rb

@@ -6,7 +6,8 @@ module I18nliner
     end
 
     def to_s
-      error = self.class.name.humanize.sub(/ error\z/, '')
+      error = self.class.name.underscore.humanize
+      error.gsub!(/\AI18nliner\/| error\z/, '')
       error = "#{error} on line #{@line}"
       @detail ?
         error + " (got #{@detail.inspect})" :
@@ -14,6 +15,7 @@ module I18nliner
     end
   end
 
+  # extraction errors
   class InvalidSignatureError < ExtractionError; end
   class MissingDefaultError < ExtractionError; end
   class AmbiguousKeyError < ExtractionError; end
@@ -26,4 +28,12 @@ module I18nliner
   class InvalidOptionKeyError < ExtractionError; end
   class KeyAsScopeError < ExtractionError; end
   class KeyInUseError < ExtractionError; end
+
+  # pre-processing errors
+  class TBlockNestingError < StandardError; end
+  class MalformedErbError < StandardError; end
+  class UnwrappableContentError < StandardError; end
+
+  # runtime errors
+  class InvalidBlockUsageError < ArgumentError; end
 end

data/lib/i18nliner/erubis.rb

@@ -0,0 +1,12 @@
+require 'action_view/template/handlers/erb'
+require 'i18nliner/pre_processors/erb_pre_processor'
+
+module I18nliner
+  class Erubis < ::ActionView::Template::Handlers::Erubis
+    def initialize(source, options = {})
+      source = I18nliner::PreProcessors::ErbPreProcessor.new(source).result
+      super(source, options)
+    end
+  end
+end
+

data/lib/i18nliner/extensions/controller.rb

@@ -0,0 +1,25 @@
+require 'i18nliner/base'
+require 'i18nliner/call_helpers'
+require 'i18nliner/extensions/inferpolation'
+
+module I18nliner
+  module Extensions
+    module Controller
+      include Inferpolation
+
+      PATH = "app/controllers"
+      ALLOW_RELATIVE = Rails.version >= '4'
+
+      def translate(*args)
+        key, options = CallHelpers.infer_arguments(args)
+        options = inferpolate(options) if I18nliner.infer_interpolation_values
+        super(key, options)
+      end
+      alias :t :translate
+      alias :t! :translate
+      alias :translate! :translate
+    end
+  end
+end
+
+

data/lib/i18nliner/extensions/core.rb

@@ -0,0 +1,61 @@
+require 'i18nliner/scope'
+require 'i18nliner/call_helpers'
+require 'active_support/core_ext/string/output_safety'
+
+module I18nliner
+  module Extensions
+    module Core
+      def translate(*args)
+        key, options = *CallHelpers.infer_arguments(args)
+        wrappers = options.delete(:wrappers)
+        result = super(key, options)
+        if wrappers
+          result = apply_wrappers(result, wrappers)
+        end
+        result
+      end
+      alias :t :translate
+      alias :t! :translate
+      alias :translate! :translate
+
+      # can't super this one yet :-/
+      def interpolate_hash_with_html_safety(string, values)
+        if string.html_safe? || values.values.any?(&:html_safe?)
+          string = ERB::Util.h(string) unless string.html_safe?
+          values.each do |key, value|
+            values[key] = ERB::Util.h(value) unless value.html_safe?
+          end
+          interpolate_hash_without_html_safety(string.to_str, values).html_safe
+        else
+          interpolate_hash_without_html_safety(string, values)
+        end
+      end
+
+      def self.extended(base)
+        base.instance_eval do
+          alias :interpolate_hash_without_html_safety :interpolate_hash
+          alias :interpolate_hash :interpolate_hash_with_html_safety
+        end
+      end
+
+     private
+
+      def apply_wrappers(string, wrappers)
+        string = string.html_safe? ? string.dup : ERB::Util.h(string)
+        if wrappers.is_a?(Array)
+          wrappers = Hash[wrappers.each_with_index.map{ |w, i| ['*' * (1 + i), w]}]
+        end
+        wrappers.sort_by{ |k, v| -k.length }.each do |k, v|
+          pattern = pattern_for(k)
+          string.gsub!(pattern, v)
+        end
+        string.html_safe
+      end
+
+      def pattern_for(key)
+        escaped_key = Regexp.escape(key)
+        /#{escaped_key}(.*?)#{escaped_key}/
+      end
+    end
+  end
+end

data/lib/i18nliner/extensions/inferpolation.rb

@@ -0,0 +1,28 @@
+module I18nliner
+  module Extensions
+    module Inferpolation
+      def inferpolate(options)
+        default = options[:default]
+        return options unless default
+
+        default.gsub!(/%\{((@)?\w+(.\w+)*)\}/).each do
+          match = $~
+          key = $1
+          ivar = $2
+          next match if options[key] || options[key.to_sym]
+          parts = key.split('.')
+          receiver = ivar ? instance_variable_get(parts.shift) : self
+          value = parts.inject(receiver) do |obj, message|
+            obj.respond_to?(message) ? obj.send(message) : nil
+          end
+
+          next match if value.nil?
+          new_key = key.sub(/\@/, '').gsub('.', '_')
+          options[new_key.to_sym] = value
+          "%{#{new_key}}"
+        end
+        options
+      end
+    end
+  end
+end

data/lib/i18nliner/extensions/model.rb

@@ -0,0 +1,29 @@
+require 'i18nliner/base'
+require 'i18nliner/call_helpers'
+require 'i18nliner/extensions/inferpolation'
+
+module I18nliner
+  module Extensions
+    module Model
+      include Inferpolation
+
+      PATH = "app/models"
+      ALLOW_RELATIVE = false
+
+      def translate(*args)
+        key, options = CallHelpers.infer_arguments(args)
+        options = inferpolate(options) if I18nliner.infer_interpolation_values
+        I18n.t(key, options)
+      end
+      alias :t :translate
+      alias :t! :translate
+      alias :translate! :translate
+
+      def localize(*args)
+        I18n.localize(*args)
+      end
+      alias :l :localize
+    end
+  end
+end
+

data/lib/i18nliner/extensions/view.rb

@@ -0,0 +1,28 @@
+require 'i18nliner/base'
+require 'i18nliner/call_helpers'
+require 'i18nliner/extensions/inferpolation'
+
+module I18nliner
+  module Extensions
+    module View
+      include Inferpolation
+
+      PATH = "app/views"
+      ALLOW_RELATIVE = true
+
+      def translate(*args)
+        # if a block gets through to here, it either means:
+        # 1. the user did something weird (e.g. <%= t{ "haha" } %>)
+        # 2. the erb pre processor missed it somehow (bug)
+        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?
+        raise ArgumentError.new("wrong number of arguments (0 for 1..3)") if args.empty? || args.size > 3
+        key, options = CallHelpers.infer_arguments(args)
+        options = inferpolate(options) if I18nliner.infer_interpolation_values
+        super(key, options)
+      end
+      alias :t :translate
+      alias :t! :translate
+      alias :translate! :translate
+    end
+  end
+end

data/lib/i18nliner/extractors/ruby_extractor.rb

@@ -1,6 +1,13 @@
+require 'sexp_processor'
+require 'i18nliner/errors'
+require 'i18nliner/extractors/translate_call'
+require 'i18nliner/extractors/sexp_helper'
+
 module I18nliner
   module Extractors
-    class RubyExtractor < SexpProcessor
+    class RubyExtractor < ::SexpProcessor
+      include SexpHelper
+
       TRANSLATE_CALLS = [:t, :translate]
       attr_reader :current_line
 
@@ -20,7 +27,7 @@ module I18nliner
         receiver = process(exp.shift)
         receiver = receiver.last if receiver
         method = exp.shift
-  
+
         if extractable_call?(receiver, method)
           @current_line = exp.line
 
@@ -33,7 +40,7 @@ module I18nliner
           # one
           process exp.shift until exp.empty?
         end
-  
+
         s
       end
 
@@ -44,7 +51,8 @@ module I18nliner
       end
 
       def process_translate_call(receiver, method, args)
-        call = TranslateCall.new(@scope, @current_line, receiver, method, args)
+        scope = receiver ? Scope.root : @scope
+        call = TranslateCall.new(@scope, @current_line, method, args)
         call.translations.each &@block
       end
 
@@ -57,38 +65,14 @@ module I18nliner
         end
         values
       end
-  
+
       def evaluate_expression(exp)
-        if exp.sexp_type == :lit || exp.sexp_type == :str
-          exp.shift
-          return exp.shift
-        end
-        return string_from(exp) if string_concatenation?(exp)
+        return raw(exp) if exp.sexp_type == :lit
+        return string_from(exp) if stringish?(exp)
         return hash_from(exp) if exp.sexp_type == :hash
         process(exp)
         UnsupportedExpression
       end
-  
-      def string_concatenation?(exp)
-        exp.sexp_type == :call &&
-        exp[2] == :+ &&
-        exp.last &&
-        exp.last.sexp_type == :str
-      end
-  
-      def string_from(exp)
-        exp.shift
-        lhs = exp.shift
-        exp.shift
-        rhs = exp.shift
-        if lhs.sexp_type == :str
-          lhs.last + rhs.last
-        elsif string_concatenation?(lhs)
-          string_from(lhs) + rhs.last
-        else
-          return UnsupportedExpression
-        end
-      end
 
       def hash_from(exp)
         exp.shift
@@ -96,7 +80,5 @@ module I18nliner
         Hash[*values]
       end
     end
-
-    class UnsupportedExpression; end
   end
 end

data/lib/i18nliner/extractors/sexp_helper.rb

@@ -0,0 +1,38 @@
+module I18nliner
+  module Extractors
+    module SexpHelper
+      def stringish?(exp)
+        exp && (exp.sexp_type == :str || string_concatenation?(exp))
+      end
+
+      def string_concatenation?(exp)
+        exp.sexp_type == :call &&
+        exp[2] == :+ &&
+        exp.last &&
+        exp.last.sexp_type == :str
+      end
+
+      def raw(exp)
+        exp.shift
+        return exp.shift
+      end
+
+      def string_from(exp)
+        return raw(exp) if exp.sexp_type == :str
+        exp.shift
+        lhs = exp.shift
+        exp.shift
+        rhs = exp.shift
+        if lhs.sexp_type == :str
+          lhs.last + rhs.last
+        elsif stringish?(lhs)
+          string_from(lhs) + rhs.last
+        else
+          UnsupportedExpression
+        end
+      end
+
+      class UnsupportedExpression; end
+    end
+  end
+end

data/lib/i18nliner/extractors/translate_call.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string/inflections'
+require 'i18nliner/base'
 require 'i18nliner/call_helpers'
 require 'i18nliner/errors'
 
@@ -6,10 +8,11 @@ module I18nliner
     class TranslateCall
       include CallHelpers
 
-      def initialize(scope, line, receiver, method, args)
+      attr_reader :key, :default
+
+      def initialize(scope, line, method, args)
         @scope = scope
         @line = line
-        @receiver = receiver
         @method = method
 
         normalize_arguments(args)
@@ -25,7 +28,7 @@ module I18nliner
       end
 
       def normalize
-        @key = normalize_key(@key, @scope, @receiver)
+        @key = normalize_key(@key, @scope)
         @default = normalize_default(@default, @options || {})
       end
 
@@ -75,18 +78,13 @@ module I18nliner
       def normalize_arguments(args)
         raise InvalidSignatureError.new(@line, args) if args.empty?
 
-        has_key = key_provided?(@scope, @receiver, *args)
-        args.unshift infer_key(args[0]) if !has_key && args[0].is_a?(String) || args[0].is_a?(Hash)
-
-        # [key, options] -> [key, nil, options]
-        args.insert(1, nil) if has_key && args[1].is_a?(Hash) && args[2].nil?
-
-        @key, @default, @options, *others = args
+        @key, @options, *others = infer_arguments(args)
 
         raise InvalidSignatureError.new(@line, args) if !others.empty?
         raise InvalidSignatureError.new(@line, args) unless @key.is_a?(Symbol) || @key.is_a?(String)
-        raise InvalidSignatureError.new(@line, args) unless @default.nil? || @default.is_a?(String) || @default.is_a?(Hash)
         raise InvalidSignatureError.new(@line, args) unless @options.nil? || @options.is_a?(Hash)
+        @default = @options.delete(:default) if @options
+        raise InvalidSignatureError.new(@line, args) unless @default.nil? || @default.is_a?(String) || @default.is_a?(Hash)
       end
 
       def validate_interpolation_values(key, default)

data/lib/i18nliner/extractors/translation_hash.rb

@@ -1,10 +1,10 @@
-module I18nLine
+module I18nliner
   module Extractors
     class TranslationHash < Hash
       attr_accessor :line
 
-      def self.new(hash)
-        hash.is_a?(self) ? hash : super
+      def self.new(hash = {})
+        hash.is_a?(self) ? hash : super().replace(hash)
       end
   
       def initialize(*args)
@@ -23,7 +23,7 @@ module I18nLine
               raise KeyAsScopeError, intermediate_key
             end
           else
-            hash[part] = {}
+            hash.store(part, {})
           end
           hash = hash[part]
         end
@@ -37,9 +37,9 @@ module I18nLine
           end
         else
           @total_size += 1
-          hash[key] = value
+          hash.store(leaf, value)
         end
       end
     end
   end
-end
+end