chronic18n 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/chronic18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chronic18n}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-06-16}
+  s.date = %q{2010-06-21}
   s.description = %q{One 'way' to i18n chronic}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
@@ -26,8 +26,11 @@ Gem::Specification.new do |s|
      "chronic18n.gemspec",
      "lib/chronic18n.rb",
      "lib/chronic18n/dics/es.yml",
+     "lib/chronic18n/dics/es_regex.yml",
      "lib/chronic18n/dics/it.yml",
+     "lib/chronic18n/dics/it_regex.yml",
      "lib/chronic18n/dics/pt.yml",
+     "lib/chronic18n/dics/pt_regex.yml",
      "lib/chronic18n/translator.rb",
      "spec/chronic18n/en_spec.rb",
      "spec/chronic18n/es_spec.rb",

data/lib/chronic18n.rb

@@ -5,8 +5,18 @@ require "chronic18n/translator"
 
 module Chronic18n
 
-  def self.parse(txt, lang = nil)
-    Chronic.parse(lang ? Translator.new(txt, lang).work : txt)
+  #
+  # Try to get a Time object out of a chunk of text.
+  #
+  #  Chronic18n.parse("hoje", "pt")
+  #  Chronic18n.parse("oggi", "it")
+  #
+  # Falls back to Chronic with "en" or w/o params:
+  #
+  #  Chronic18n.parse("today")
+  #
+  def self.parse(txt, lang = "en")
+    Chronic.parse(lang != "en" ? Translator.new(txt, lang).work : txt)
   end
 
 end

data/lib/chronic18n/dics/es.yml

@@ -1,4 +1,4 @@
-:es:
+es:
   # Misc
   manana: morning
   mañana: morning

data/lib/chronic18n/dics/es_regex.yml

@@ -0,0 +1 @@
+es_regex:

data/lib/chronic18n/dics/it.yml

@@ -1,4 +1,4 @@
-:it:
+it:
   # Misc
   mattina: morning
   pomeriggio: afternoon

data/lib/chronic18n/dics/it_regex.yml

@@ -0,0 +1 @@
+it_regex:

data/lib/chronic18n/dics/pt.yml

@@ -1,4 +1,4 @@
-:pt:
+pt:
   # Misc
   manhã: morning
   manha: morning

data/lib/chronic18n/dics/pt_regex.yml

@@ -0,0 +1,5 @@
+pt_regex:
+  !ruby/regexp '/semana qu?e? vem/': next week
+  !ruby/regexp '/mes qu?e? vem/': next month
+  !ruby/regexp '/ano qu?e? vem/': next year
+

data/lib/chronic18n/translator.rb

@@ -1,20 +1,28 @@
 module Chronic18n
 
+  DICS = Dir[File.join(File.dirname(__FILE__), 'dics', '') + "*.yml"].reduce({}) do |h,y|
+    h.merge YAML.load(File.read(y))
+  end
 
   class Translator
 
     def initialize(txt, lang)
-      @txt = txt
-      @dic = load_dic(lang)
-    end
-
-    def load_dic(lang)
-      YAML.load(File.read(File.join(File.dirname(__FILE__), "dics", "#{lang}.yml")))[lang]
+      @txt, @lang = txt, lang.to_s
     end
 
     def work
-      @txt.split(/\s/).map { |w| @dic[w] || w }.join(" ")
+      # Return the text if we don't have the dictionary
+      return @txt unless dic = DICS[@lang]
+
+      # Regex gsub!
+      if rxp = DICS["#{@lang}_regex"]
+        rxp.each { |k, v| @txt.gsub!(k, v)}
+      end
+
+      # Match translate
+      @txt.split(/\s/).map { |w| dic[w] || w }.join(" ")
     end
+
   end
 
 end

data/spec/chronic18n/en_spec.rb

@@ -6,5 +6,12 @@ describe "English" do
     Chronic18n.parse("sunday").wday.should eql(0)
   end
 
+  it "should fallback to en fine" do
+    Chronic18n.parse("sunday", "en").wday.should eql(0)
+  end
+
+  it "should fallback to en fine" do
+    Chronic18n.parse("sunday", :en).wday.should eql(0)
+  end
 
 end

data/spec/chronic18n/pt_spec.rb

@@ -1,5 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
+HOUR = HOURS = 3600
+DAY = DAYS = 86400
+
+def get_time(t)
+  Time.at(Time.now + t)
+end
+
 describe "Portuguese" do
 
   it "should parse something" do
@@ -7,7 +14,7 @@ describe "Portuguese" do
   end
 
   it "should parse hour" do
-    Chronic18n.parse("daqui 7 horas", :pt).hour.should eql(Time.now.hour + 7)
+    Chronic18n.parse("daqui 7 horas", :pt).hour.should eql(get_time(7 * HOURS).hour)
   end
 
   it "should parse hour" do
@@ -27,12 +34,16 @@ describe "Portuguese" do
     Chronic18n.parse("maio 3", :pt).month.should eql(5)
   end
 
-  # it "should parse month" do
-  #   Chronic18n.parse("daqui 3 dias", :pt).day.should eql(Time.now.day + 3)
-  # end
+  it "should parse next week" do
+    Chronic18n.parse("mes que vem", :pt).month.should eql((Time.now.month + 1 % 12))
+  end
 
-  # it "should parse month" do
-  #   Chronic18n.parse("daqui 3 semanas", :pt).day.should eql(Time.now.day + 3)
-  # end
+  it "should parse month" do
+    Chronic18n.parse("daqui 3 dias", :pt).day.should eql(get_time(3 * DAYS).day)
+  end
+
+  it "should parse month" do
+    Chronic18n.parse("daqui 3 semanas", :pt).day.should eql(get_time(21 * DAYS).day)
+  end
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: chronic18n
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -03:00
+date: 2010-06-21 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 2
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -69,8 +66,11 @@ files:
 - chronic18n.gemspec
 - lib/chronic18n.rb
 - lib/chronic18n/dics/es.yml
+- lib/chronic18n/dics/es_regex.yml
 - lib/chronic18n/dics/it.yml
+- lib/chronic18n/dics/it_regex.yml
 - lib/chronic18n/dics/pt.yml
+- lib/chronic18n/dics/pt_regex.yml
 - lib/chronic18n/translator.rb
 - spec/chronic18n/en_spec.rb
 - spec/chronic18n/es_spec.rb
@@ -92,7 +92,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -101,7 +100,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"