r18n-core 0.4.4 → 0.4.5

data/ChangeLog

@@ -1,3 +1,9 @@
+== 0.4.5 (Annual)
+* Filters for several types.
+* Global HTML escaping run before Markdown and Textile formatting.
+* Fix active filters after passive filters.
+* Fix human time formatting for dates with same month days.
+
 == 0.4.4 (Frank)
 * Use before filter to lazy set I18n object in Sinatra extension.
 * Set I18n object to thread (by Simon Hafner).

data/lib/r18n-core/filters.rb

@@ -147,8 +147,9 @@ module R18n
       #    Note that passive filters will be always run before active.
       # * +passive+ – if +true+, filter will process only on translation
       #   loading. Note that you must add all passive before load translation.
-      def add(type, name = nil, options = {}, &block)
+      def add(types, name = nil, options = {}, &block)
         options, name = name, nil if name.is_a? Hash
+        types = Array(types)
         
         unless name
           @last_auto_name ||= 0
@@ -160,17 +161,18 @@ module R18n
           delete(name)
         end
         
-        @by_type[type] = [] unless @by_type.has_key? type
-        
-        filter = Filter.new(name, type, block, true, options[:passive])
+        filter = Filter.new(name, types, block, true, options[:passive])
         @defined[name] = filter
         
-        if options.has_key? :position
-          @by_type[type].insert(options[:position], filter)
-        else
-          @by_type[type] << filter
+        types.each do |type|
+          @by_type[type] = [] unless @by_type.has_key? type
+          if options.has_key? :position
+            @by_type[type].insert(options[:position], filter)
+          else
+            @by_type[type] << filter
+          end
+          rebuild_enabled! type
         end
-        rebuild_enabled! type
         
         filter
       end
@@ -181,8 +183,10 @@ module R18n
         return unless filter
         
         @defined.delete(filter.name)
-        @by_type[filter.type].delete(filter)
-        rebuild_enabled! filter.type
+        filter.types.each do |type|
+          @by_type[type].delete(filter)
+          rebuild_enabled! type
+        end
       end
       
       # Disable +filter+ by name or Filter object.
@@ -191,7 +195,7 @@ module R18n
         return unless filter
         
         filter.enabled = false
-        rebuild_enabled! filter.type
+        filter.types.each { |type| rebuild_enabled! type }
       end
       
       # Turn on disabled +filter+ by name or Filter object.
@@ -200,17 +204,17 @@ module R18n
         return unless filter
         
         filter.enabled = true
-        rebuild_enabled! filter.type
+        filter.types.each { |type| rebuild_enabled! type }
       end
     end
     
-    Filters.defined = {}
-    Filters.by_type = Hash.new([])
-    Filters.active_enabled = Hash.new([])
+    Filters.defined         = {}
+    Filters.by_type         = Hash.new([])
+    Filters.active_enabled  = Hash.new([])
     Filters.passive_enabled = Hash.new([])
-    Filters.enabled = Hash.new([])
+    Filters.enabled         = Hash.new([])
   
-    Filter = Struct.new(:name, :type, :block, :enabled, :passive) do
+    Filter = Struct.new(:name, :types, :block, :enabled, :passive) do
       def call(*params); block.call(*params); end
       def enabled?; enabled; end
       def passive?; passive; end
@@ -253,10 +257,12 @@ module R18n
     content
   end
   
-  Filters.add(String, :global_escape_html, :passive => true) do |html, config|
+  Filters.add([String, 'markdown', 'textile'],
+              :global_escape_html, :passive => true) do |html, config|
     if config[:dont_escape_html]
       html
     else
+      config[:dont_escape_html] = true
       Utils.escape_html(html)
     end
   end

data/lib/r18n-core/locale.rb

@@ -221,7 +221,8 @@ module R18n
     # time. For special cases you can replace it in locale’s class.
     def format_time_human(time, i18n, now = Time.now, *params)
       minutes = (time - now) / 60.0
-      if time.mday != now.mday and minutes.abs > 720 # 12 hours
+      diff = minutes.abs
+      if (diff > 24 * 60) or (time.mday != now.mday and diff > 12 * 24)
         format_date_human(R18n::Utils.to_date(time), i18n,
                           R18n::Utils.to_date(now)) + format_time(time)
       else
@@ -233,7 +234,7 @@ module R18n
         when -1..1
           i18n.human_time.now
         else
-          hours = (minutes / 60.0).abs.floor
+          hours = (diff / 60.0).floor
           if time > now
             i18n.human_time.after_hours(hours)
           else

data/lib/r18n-core/translated_string.rb

@@ -32,7 +32,7 @@ module R18n
     def initialize(str, locale, path)
       super(str)
       @locale = locale
-      @path = path
+      @path   = path
     end
     
     # Return self for translated string.

data/lib/r18n-core/translation.rb

@@ -91,8 +91,9 @@ module R18n
           when Hash
             value = Translation.new(@locale, path, locale, value)
           when String
-            v = TranslatedString.new(value, locale, path)
-            value = Filters.process_string(Filters.passive_enabled, v, path, {})
+            c = { :locale => locale, :path => path }
+            v = Filters.process_string(Filters.passive_enabled, value, c, [])
+            value = TranslatedString.new(v, locale, path)
           when Typed
             value.locale = locale
             value.path = path

data/lib/r18n-core/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module R18n
-  VERSION = '0.4.4' unless defined? R18n::VERSION
+  VERSION = '0.4.5' unless defined? R18n::VERSION
 end

data/spec/filters_spec.rb

@@ -24,7 +24,7 @@ describe R18n::Filters do
     
     filter.should be_a(R18n::Filters::Filter)
     filter.name.should == :my_filter
-    filter.type.should == 'my'
+    filter.types.should == ['my']
     filter.should be_enabled
     
     R18n::Filters.defined.should have_key(:my_filter)
@@ -32,6 +32,12 @@ describe R18n::Filters do
     @i18n.my_tree_filter.should == {'name' => 'value'}
   end
   
+  it "should add filter for several types" do
+    filter = R18n::Filters.add(['my', 'your']) { |i, config| i + '1' }
+    @i18n.my_filter.should   == 'value1'
+    @i18n.your_filter.should == 'another1'
+  end
+  
   it "should use passive filters" do
     filter = mock()
     filter.should_receive(:process).twice.and_return(1)
@@ -187,11 +193,11 @@ describe R18n::Filters do
   end
   
   it "should have disabled global filter for escape HTML" do
-    @i18n.greater.should == '1 < 2 is true'
+    @i18n.greater('true').should == '1 < 2 is true'
     
     R18n::Filters.on(:global_escape_html)
     @i18n.reload!
-    @i18n.greater.should == '1 &lt; 2 is true'
+    @i18n.greater('true').should == '1 &lt; 2 is true'
     @i18n.html.should == '&lt;script&gt;true &amp;&amp; false&lt;/script&gt;'
   end
   
@@ -204,11 +210,21 @@ describe R18n::Filters do
   end
   
   it "should have Markdown filter" do
-    @i18n.markdown.should == '<p><strong>Hi!</strong></p>'
+    @i18n.markdown.simple.should == '<p><strong>Hi!</strong></p>'
   end
   
   it "should have Textile filter" do
-    @i18n.textile.should == '<p><em>Hi!</em></p>'
+    @i18n.textile.simple.should == '<p><em>Hi!</em></p>'
+  end
+  
+  it "should HTML escape before Markdown and Textile filters" do
+    @i18n.markdown.html.should == '<p><strong>Hi!</strong> <br /></p>'
+    @i18n.textile.html.should  == '<p><em>Hi!</em><br /></p>'
+    
+    R18n::Filters.on(:global_escape_html)
+    @i18n.reload!
+    @i18n.markdown.html.should == '<p><strong>Hi!</strong> &#60;br /&#62;</p>'
+    @i18n.textile.html.should  == '<p><em>Hi!</em>&lt;br /&gt;</p>'
   end
   
 end

data/spec/locale_spec.rb

@@ -105,7 +105,7 @@ describe R18n::Locale do
     zero   = Time.at(0).utc
     params = [:human, R18n::I18n.new('ru'), zero]
     
-    @ru.localize( zero + 7 * day,     *params).should == ' 8 января 00:00'
+    @ru.localize( zero + 7  * day,    *params).should == ' 8 января 00:00'
     @ru.localize( zero + 50 * hour,   *params).should == 'через 2 дня 02:00'
     @ru.localize( zero + 25 * hour,   *params).should == 'завтра 01:00'
     @ru.localize( zero + 70 * minute, *params).should == 'через 1 час'
@@ -113,10 +113,12 @@ describe R18n::Locale do
     @ru.localize( zero + 5,           *params).should == 'сейчас'
     @ru.localize( zero - 15,          *params).should == 'сейчас'
     @ru.localize( zero - minute,      *params).should == '1 минуту назад'
-    @ru.localize( zero - 2 * hour,    *params).should == '2 часа назад'
+    @ru.localize( zero - 2  * hour,   *params).should == '2 часа назад'
     @ru.localize( zero - 13 * hour,   *params).should == 'вчера 11:00'
     @ru.localize( zero - 50 * hour,   *params).should == '3 дня назад 22:00'
-    @ru.localize( zero - 9 * day,     *params).should == '23 декабря 1969 00:00'
+    @ru.localize( zero - 9  * day,    *params).should == '23 декабря 1969 00:00'
+    
+    @ru.localize( zero - 365 * day,   *params).should == ' 1 января 1969 00:00'
   end
   
   it "should use standard formatter by default" do

data/spec/translations/general/en.yml

@@ -21,16 +21,21 @@ files: !!pl
   1: 1 file
   n: %1 files
 
+your_filter:  !!your another
 my_filter:  !!my value
 my_tree_filter: !!my
     name: value
 
 html: !!escape
   <script>true && false</script>
-greater: 1 < 2 is true
+greater: 1 < 2 is %1
 no_escape: !!html
   <b>Warning</b>
 
-markdown: !!markdown **Hi!**
+markdown:
+  simple: !!markdown **Hi!**
+  html: !!markdown **Hi!** <br />
 
-textile: !!textile _Hi!_
+textile:
+  simple: !!textile _Hi!_
+  html: !!textile _Hi!_<br />

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-core
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +04:00
+date: 2010-04-19 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -82,18 +87,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: r18n-core
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: I18n tool to translate your Ruby application.