rich_i18n 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,5 +1,11 @@
 = Rich-i18n CHANGELOG
 
+== Version 1.2.1 (October 2, 2010)
+
+* Altered the default delimiter (separator) of Array.join
+* Being able to concatenate (+, <<, concat) Strings with EnrichedStrings
+* Not overriding ERB::Compiler::Buffer.push anymore
+
 == Version 1.2.0 (October 1, 2010)
 
 * Fixed bug: corrected String.to_output

data/README.textile

@@ -244,16 +244,18 @@ This Rails gem / plugin depends on:
 i18n<br>
 "http://github.com/svenfuchs/i18n":http://github.com/svenfuchs/i18n
 
+Formtastic (optional)<br>
+"http://github.com/justinfrench/formtastic":http://github.com/justinfrench/formtastic
+
 Hpricot<br>
 "http://github.com/whymirror/hpricot":http://github.com/whymirror/hpricot (thanks Why!)
 
 Rich-CMS (optional)<br>
+"http://codehero.es/rails_gems_plugins/rich_cms":http://codehero.es/rails_gems_plugins/rich_cms <br>
 "http://github.com/archan937/rich_cms":http://github.com/archan937/rich_cms
 
-Formtastic (optional)<br>
-"http://github.com/justinfrench/formtastic":http://github.com/justinfrench/formtastic
-
 SeatHolder (optional)<br>
+"http://codehero.es/jquery_libraries/seat_holder":http://codehero.es/jquery_libraries/seat_holder <br>
 "http://github.com/archan937/seat_holder":http://github.com/archan937/seat_holder
 
 h2. ToDo's
@@ -262,15 +264,15 @@ h2. ToDo's
 * Use a better implementation to tackle String interpolation (e.g. "foo #{"bar".t}") to preserve meta data
 * Most String inflection methods are also defined in rich_pluralization (keep it DRY)
 
-h2. E9s
+h2. Enrichments
 
-E9s - "http://github.com/archan937/e9s":http://github.com/archan937/e9s
+The all-in-one gem at - "http://codehero.es/rails_gems_plugins/e9s":http://codehero.es/rails_gems_plugins/e9s - "http://github.com/archan937/e9s":http://github.com/archan937/e9s
 
 h3. E9s modules
 
-* Rich-CMS - "http://github.com/archan937/rich_cms":http://github.com/archan937/rich_cms
-* Rich-i18n - "http://github.com/archan937/rich_i18n":http://github.com/archan937/rich_i18n
-* Rich-pluralization - "http://github.com/archan937/rich_pluralization":http://github.com/archan937/rich_pluralization
+* Rich-CMS <br> "http://codehero.es/rails_gems_plugins/rich_cms":http://codehero.es/rails_gems_plugins/rich_cms <br> "http://github.com/archan937/rich_cms":http://github.com/archan937/rich_cms
+* Rich-i18n <br> "http://codehero.es/rails_gems_plugins/rich_i18n":http://codehero.es/rails_gems_plugins/rich_i18n <br> "http://github.com/archan937/rich_i18n":http://github.com/archan937/rich_i18n
+* Rich-pluralization <br> "http://codehero.es/rails_gems_plugins/rich_pluralization":http://codehero.es/rails_gems_plugins/rich_pluralization <br> "http://github.com/archan937/rich_pluralization":http://github.com/archan937/rich_pluralization
 
 h2. License
 

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gemspec.summary     = "Enrichments (e9s) module for internationalization (i18n)"
     gemspec.description = "Rich-i18n is a module of E9s (http://github.com/archan937/e9s) which enriches I18n, Formtastic, the String and Symbol classes. This simplifies internationalization of your Rails application making a Rails developers life much easier."
     gemspec.email       = "paul.engel@holder.nl"
-    gemspec.homepage    = "http://github.com/archan937/rich_i18n"
+    gemspec.homepage    = "http://codehero.es/rails_gems_plugins/rich_i18n"
     gemspec.author      = "Paul Engel"
 
     gemspec.add_dependency "i18n"      , "0.3.7"

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

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

@@ -11,7 +11,7 @@ module Rich
             end
           end
         
-          def join_with_rich_i18n(sep = "")
+          def join_with_rich_i18n(sep = $,)
             if size == 1 && first.is_a?(EnrichedString)
               first
             else

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

@@ -4,12 +4,18 @@ module Rich
     module Core
       class EnrichedString
         
-        delegate :empty?, :blank?, :to_json, :to => :@string
+        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?
+          true
+        end
       
         def to_es
           (@meta_data.filled? && Engine.can_enrich_output?) ? to_tag : @string

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

@@ -26,7 +26,7 @@ module Rich
           end
 
           def add_with_rich_i18n(other)
-            strings, result = self.merged_strings.try(:dup) || [], add_without_rich_i18n(other)
+            strings, result = self.merged_strings.try(:dup) || [], add_without_rich_i18n(other.enriched_string? ? other.string : other)
           
             if (result.merged_strings = strings).empty?
               result.merged_strings << self.dup
@@ -50,7 +50,7 @@ module Rich
           end
         
           def enriched_string?
-            is_a?(EnrichedString) or (merged_strings || []).any?(&:enriched_string?)
+            (merged_strings || []).any?(&:enriched_string?)
           end
         
           def to_output

data/rich_i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_i18n}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2010-10-01}
+  s.date = %q{2010-10-02}
   s.description = %q{Rich-i18n is a module of E9s (http://github.com/archan937/e9s) which enriches I18n, Formtastic, the String and Symbol classes. This simplifies internationalization of your Rails application making a Rails developers life much easier.}
   s.email = %q{paul.engel@holder.nl}
   s.extra_rdoc_files = [
@@ -42,8 +42,6 @@ Gem::Specification.new do |s|
      "lib/rich/i18n/core/array/merging.rb",
      "lib/rich/i18n/core/enriched_string.rb",
      "lib/rich/i18n/core/enumerable/methods.rb",
-     "lib/rich/i18n/core/erb.rb",
-     "lib/rich/i18n/core/erb/output.rb",
      "lib/rich/i18n/core/hash.rb",
      "lib/rich/i18n/core/nil_class.rb",
      "lib/rich/i18n/core/object.rb",
@@ -73,7 +71,7 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "uninstall.rb"
   ]
-  s.homepage = %q{http://github.com/archan937/rich_i18n}
+  s.homepage = %q{http://codehero.es/rails_gems_plugins/rich_i18n}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rich_i18n
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 +02:00
+date: 2010-10-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,8 +115,6 @@ files:
 - lib/rich/i18n/core/array/merging.rb
 - lib/rich/i18n/core/enriched_string.rb
 - lib/rich/i18n/core/enumerable/methods.rb
-- lib/rich/i18n/core/erb.rb
-- lib/rich/i18n/core/erb/output.rb
 - lib/rich/i18n/core/hash.rb
 - lib/rich/i18n/core/nil_class.rb
 - lib/rich/i18n/core/object.rb
@@ -146,7 +144,7 @@ files:
 - test/test_helper.rb
 - uninstall.rb
 has_rdoc: true
-homepage: http://github.com/archan937/rich_i18n
+homepage: http://codehero.es/rails_gems_plugins/rich_i18n
 licenses: []
 
 post_install_message: 

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

@@ -1,6 +0,0 @@
-
-require "rich/i18n/core/erb/output"
-
-class ERB::Compiler::Buffer
-  include Rich::I18n::Core::ERB::Output
-end

data/lib/rich/i18n/core/erb/output.rb

@@ -1,22 +0,0 @@
-
-module Rich
-  module I18n
-    module Core
-      module ERB
-        module Output
-        
-          def self.included(base)
-            base.class_eval do
-              alias_method_chain :push, :rich_i18n
-            end
-          end
-      
-          def push_with_rich_i18n(cmd)
-            push_without_rich_i18n cmd.match(/^#{@compiler.insert_cmd}\(\(.*\)\.to_s\)$/) ? cmd.gsub(/to_s\)$/, "to_output)") : cmd
-          end
-        
-        end
-      end
-    end
-  end
-end