rich_i18n 1.2.3 → 1.3.0

data/lib/generators/rich/translation/templates/migration.rb

@@ -0,0 +1,18 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %> do |t|
+      t.string  :locale
+      t.string  :key
+      t.text    :value
+      t.boolean :is_proc, :default => false
+      t.timestamps
+    end
+
+    add_index :<%= table_name %>, :locale
+    add_index :<%= table_name %>, :key
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end

data/lib/generators/rich/translation/templates/model.rb

@@ -0,0 +1,7 @@
+class <%= model_class_name %> < ActiveRecord::Base
+
+  def to_rich_cms_response(params)
+    {:value => value, :translations => Hash[*params[:derivative_keys].split(";").uniq.collect{|x| [x, x.t({:as => params[:editable_input_type]})]}.flatten]}
+  end
+
+end

data/lib/generators/rich/translation/translation_generator.rb

@@ -0,0 +1,59 @@
+require "generators/rich"
+
+module Rich
+  module Generators
+
+    class TranslationGenerator < Base
+
+      include Rails::Generators::Migration
+      include Rich::Generators::Migration
+
+      desc         "Creates Rich-i18n translation model and migration."
+      argument     :model_name, :type => :string , :default => "translation"
+      class_option :migrate   , :type => :boolean, :default => false, :aliases => "-m", :desc => "Run 'rake db:migrate' after generating model and migration"
+
+      def enable_i18n_cms
+        filename = "config/initializers/enrichments.rb"
+        line     = "\nRich::I18n::Engine.enable_i18n_cms"
+
+        return if File.open(filename, "a+").readlines.include? line.strip
+
+        File.open(filename, "a+") do |file|
+          file << line
+        end
+      end
+
+      def generate_model
+        template "model.rb", "app/models/#{model_file_name}.rb"
+      end
+
+      def generate_migration
+        migration_template "migration.rb", "db/migrate/create_#{table_name}"
+      end
+
+      def migrate
+        rake "db:migrate" if options[:migrate]
+      end
+
+    protected
+
+      def model_file_name
+        model_name.underscore
+      end
+
+      def model_class_name
+        model_name.classify
+      end
+
+      def migration_class_name
+        migration_file_name.pluralize.camelize
+      end
+
+      def table_name
+        model_file_name.underscore.gsub("/", "_").pluralize
+      end
+
+    end
+
+  end
+end

data/lib/rich/i18n.rb

@@ -2,10 +2,10 @@
 module Rich
   module I18n
     extend self
-    
+
     def method_missing(method, *args)
       ::I18n.send method, *args
     end
-    
+
   end
 end

data/lib/rich/i18n/actionpack.rb

@@ -1,5 +1,4 @@
 
 require File.join(File.dirname(__FILE__), "actionpack", "action_controller", "base.rb"      )
-require File.join(File.dirname(__FILE__), "actionpack", "action_controller", "dispatcher.rb")
 require File.join(File.dirname(__FILE__), "actionpack", "action_view"      , "base.rb"      )
 require File.join(File.dirname(__FILE__), "actionpack", "action_view"      , "sanitizor.rb" )

data/lib/rich/i18n/actionpack/action_controller/base.rb

@@ -3,7 +3,7 @@ module ActionController
   class Base
 
     around_filter :prepare_rich_i18n
-    
+
     def prepare_rich_i18n
       String.clear_translations
       ::Rich::I18n::Engine.current_controller = self
@@ -11,8 +11,8 @@ module ActionController
     ensure
       ::Rich::I18n::Engine.current_controller = nil
     end
-    
-    view_path = File.join File.dirname(__FILE__), "..", "..", "..", "..", "app", "views"
+
+    view_path = File.expand_path "../../../../../../app/views", __FILE__
     if respond_to? :append_view_path
       self.append_view_path view_path
     elsif respond_to? :view_paths

data/lib/rich/i18n/actionpack/action_view/base.rb

@@ -2,9 +2,9 @@
 module ActionView
   class Base
 
-  	def rich_i18n
-  	  render :file => File.join(File.dirname(__FILE__), "..", "..", "..", "..", "app", "views", "rich_i18n.html.erb")
-  	end
+    def rich_i18n
+      render :file => File.expand_path("../../../../../../app/views/rich_i18n.html.erb", __FILE__)
+    end
 
     def render_with_rich_i18n(*args, &block)
       (html = render_without_rich_i18n(*args, &block)).include?("<i18n ") ?

data/lib/rich/i18n/actionpack/action_view/sanitizor.rb

@@ -5,40 +5,36 @@ module Rich
       module ActionView
         module Sanitizor
           extend self
-    
+
           require "hpricot"
-    
+
           def sanitize_html(html)
             return html unless (html || "").include?("<i18n ")
-      
+
             doc = Hpricot html
 
-            (doc/"head i18n").each do |i18n|
-              i18n.swap CGI.unescapeHTML(i18n.raw_attributes["data-i18n_translation"])
+            (doc/"head i18n,select i18n").each do |i18n|
+              i18n.swap strip_tags(i18n.raw_attributes["data-i18n_translation"])
+            end
+
+            (doc/"input,textarea").each do |input|
+              sanitize_input(input)
             end
 
             (doc/"i18n").each do |i18n|
-              elem = Hpricot::Elem.new i18n.raw_attributes["data-editable_input_type"] == "html" ? "div" : "span",
+              elem = Hpricot::Elem.new i18n.raw_attributes["data-i18n_tag"] || (i18n.raw_attributes["data-editable_input_type"] == "html" ? "div" : "span"),
                                        i18n.raw_attributes.reject{|k, v| k == "data-i18n_translation"}.merge({:class => "i18n"})
               elem.inner_html = CGI.unescapeHTML(i18n.raw_attributes["data-i18n_translation"])
               i18n.swap elem.to_html
             end
 
-            (doc/"input").each do |input|
-              sanitize_input(input)
-            end
-
-            (doc/"textarea").each do |input|
-              sanitize_input(input)
-            end
-
             doc.to_html
           rescue
             html.gsub(/(\<i18n[^\>]+\>)|(\<\/i18n\>)/, "")
           end
-    
+
         private
-    
+
           def sanitize_input(input)
             %w(value seatholder).each do |input_attr|
               next unless input.attributes[input_attr].include?("<i18n ")
@@ -47,14 +43,12 @@ module Rich
               i18n.raw_attributes.each do |key, value|
                 input.attributes[key] = value unless key == "data-i18n_translation"
               end
-              
+
               input.attributes[input_attr] = CGI.unescapeHTML(i18n.raw_attributes["data-i18n_translation"])
               input.attributes["class"] = ["i18n", input.attributes["class"]].uniq.join(" ").strip
             end
-        
-            input
           end
-      
+
         end
       end
     end

data/lib/rich/i18n/activesupport.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), "activesupport", "active_support", "dependencies.rb")

data/lib/rich/i18n/activesupport/active_support/dependencies.rb

@@ -0,0 +1,12 @@
+module ActiveSupport
+  module Dependencies
+
+    extend self
+
+    unless respond_to? :autoload_paths
+      alias_method :autoload_paths     , :load_paths
+      alias_method :autoload_once_paths, :load_once_paths
+    end
+
+  end
+end

data/lib/rich/i18n/core/array.rb

@@ -1,8 +1,6 @@
 
-require "rich/i18n/core/enumerable/methods"
 require "rich/i18n/core/array/merging"
 
 class Array
-  include Rich::I18n::Core::Enumerable::Methods
   include Rich::I18n::Core::Array::Merging
 end

data/lib/rich/i18n/core/array/merging.rb

@@ -4,24 +4,22 @@ module Rich
     module Core
       module Array
         module Merging
-        
+
           def self.included(base)
             base.class_eval do
               alias_method_chain :join, :rich_i18n
             end
           end
-        
+
           def join_with_rich_i18n(sep = $,)
-            if size == 1 && first.is_a?(EnrichedString)
+            if size == 1 && first.enriched?
               first
             else
-              merged_strings = dup
               result = join_without_rich_i18n(sep)
-              result.merged_strings = merged_strings
-              result
+              any?(&:enriched?) ? EnrichedString.new(result, nil, dup) : result
             end
           end
-        
+
         end
       end
     end

data/lib/rich/i18n/core/enriched_string.rb

@@ -2,45 +2,88 @@
 module Rich
   module I18n
     module Core
+
       class EnrichedString
-        
-        delegate :empty?, :blank?, :to_json, :+, :<<, :concat, :to => :@string
-        
-        attr_reader :string
-      
-        def initialize(string = "", meta_data = nil)
-          @string    = string
-          @meta_data = meta_data || (s.meta_data.dup unless (string.meta_data.nil? rescue true)) || {}
-        end
-        
-        def enriched_string?
+        attr_reader :meta_data, :merged_strings
+
+        def initialize(string = "", meta = nil, merged = nil)
+          @string         = string.dup
+          @meta_data      = HashWithIndifferentAccess.new meta.try(:dup) || (string.meta_data.dup if string.enriched?) || {}
+          @merged_strings = merged
+        end
+
+        def enriched?
           true
         end
-      
-        def to_es
-          (@meta_data.filled? && Engine.can_enrich_output?) ? to_tag : @string
+
+        def html_safe?
+          true
         end
-        alias_method :to_s, :to_es
-        
-      private
-      
+
+        def concat(other)
+         (@merged_strings ||= [EnrichedString.new @string, @meta_data]) << other
+          @meta_data = nil
+          @string.concat other
+          self
+        end
+        alias_method :<<, :concat
+
+        def +(other)
+          dup.concat(other)
+        end
+
+        def to_str
+          @string
+        end
+
+        def to_s
+          (@merged_strings || [self]).collect(&:to_tag).join("").html_safe
+        end
+
+        def method_missing(method, *args)
+          if @string.respond_to? method
+            @string.send method
+          else
+            super
+          end
+        end
+
+      protected
+
         def to_tag
+          (!@meta_data.empty? && Engine.can_enrich_output?) ? to_enriched_tag : to_html
+        end
+
+        def to_enriched_tag
           tag   = :i18n
           attrs = []
 
           keys  = [:key, :value, :locale, :derivative_key]
           data  = @meta_data.reject{|k, v| !keys.include?(k.to_sym)}
 
-          data[:editable_input_type] = @meta_data[:as] if %w(string text html).include? @meta_data[:as].to_s.downcase
+          data[:editable_input_type] = editable_input_type
 
-          attrs << @meta_data[:html].collect{|k, v|      "#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ") if @meta_data[:html]
-          attrs << data             .collect{|k, v| "data-#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ")
-          attrs << "data-i18n_translation=\"#{::ERB::Util.html_escape @string}\""
-          
-          "<#{tag} #{attrs}></#{tag}>"
+          attrs << @meta_data[:html].collect{|k, v|      "#{k}='#{::ERB::Util.html_escape v}'"}.join(" ") if @meta_data[:html]
+          attrs << data             .collect{|k, v| "data-#{k}='#{::ERB::Util.html_escape v}'"}.join(" ")
+          attrs << "data-i18n_translation='#{::ERB::Util.html_escape to_str}'"
+          attrs << "data-i18n_tag='#{@meta_data[:tag]}'" if @meta_data[:tag]
+
+          "<#{tag} #{attrs.join(" ")}></#{tag}>"
         end
-        
+
+        def to_html
+          tag = (@meta_data[:tag] if @meta_data) || (:div if %w(text html).include?(editable_input_type))
+          tag ? "<#{tag}>#{to_str}</#{tag}>" : to_str
+        end
+
+      private
+
+        def editable_input_type
+          @meta_data[:as] if @meta_data && %w(string text html).include?(@meta_data[:as].try(:to_s).try(:downcase))
+        end
+
       end
+
     end
   end
 end

data/lib/rich/i18n/core/object.rb

@@ -1,6 +1,6 @@
 
-require "rich/i18n/core/object/output"
+require "rich/i18n/core/object/enriched"
 
 class Object
-  include Rich::I18n::Core::Object::Output
+  include Rich::I18n::Core::Object::Enriched
 end

data/lib/rich/i18n/core/object/enriched.rb

@@ -0,0 +1,16 @@
+
+module Rich
+  module I18n
+    module Core
+      module Object
+        module Enriched
+
+          def enriched?
+            false
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/rich/i18n/core/string.rb

@@ -1,10 +1,12 @@
 
 require "rich/i18n/core/string/inflections"
 require "rich/i18n/core/string/internationalization"
-require "rich/i18n/core/string/enrichments"
+require "rich/i18n/core/string/enriched"
+require "rich/i18n/core/string/html_safe"
 
 class String
   include Rich::I18n::Core::String::Inflections
   include Rich::I18n::Core::String::Internationalization
-  include Rich::I18n::Core::String::Enrichments
+  include Rich::I18n::Core::String::Enriched
+  include Rich::I18n::Core::String::HtmlSafe
 end

data/lib/rich/i18n/core/{object/output.rb → string/enriched.rb}

@@ -2,17 +2,17 @@
 module Rich
   module I18n
     module Core
-      module Object
-        module Output
-        
-          def to_output
-            to_es
+      module String
+        module Enriched
+
+          def to_tag
+            self
           end
-        
+
           def to_es
-            to_s
+            EnrichedString.new self
           end
-        
+
         end
       end
     end