idiom 0.0.3.2 → 0.0.4

data/History.txt

@@ -1,3 +1,9 @@
-== 0.0.2 (1/22/2010)
+== 0.0.4 2010-01-22
+  * minor enhancements
+    * use wildcards for Idiom::Base.translate
+  * bug fixes
+    * smarter understanding of what is a directory
+
+== 0.0.2 2010-01-22
   * major enhancements
     * don't write duplicate keys

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Capital Thought
+Copyright (c) 2010 Capital Thought
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-0.0.3.2
+0.0.4

data/idiom.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{idiom}
-  s.version = "0.0.3.2"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Coleman"]

data/lib/idiom.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'active_support'
 require 'rtranslate'
 require 'timer'
 require 'yrb'
@@ -33,7 +34,7 @@ module Idiom #:nodoc:
       "id-ID" => "id",
       "pt-BR" => "PORTUGUESE",
       "zh-Hant-HK" => "zh-CN",
-    }    
+    }
 
     # Original filename to translate.
     #
@@ -58,7 +59,7 @@ module Idiom #:nodoc:
         @destination = options[:destination]
         @use_dirs = options[:use_dirs]
         Timer.new.time do
-          @source.to_a.each do |path|
+          Dir[@source].each do |path|
             $stdout.puts "Processing #{path}"
             if path =~ /\.yml$/i
               Idiom::Yaml.new({:source => path}.merge(options)).generate
@@ -73,7 +74,7 @@ module Idiom #:nodoc:
     end
     
     def initialize(options={})
-      @source = options[:source]
+      @source = File.expand_path(options[:source])
       @overwrite = options[:overwrite]
       @languages = options[:languages]
       

data/spec/idiom_spec.rb

@@ -2,11 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Idiom" do
   before(:each) do
-    stub_timer
-    stub_yrb
-    stub_yaml
-    stub_screen_io
-    stub_file_io
+    stub_io
   end
   
   describe "base" do
@@ -17,13 +13,17 @@ describe "Idiom" do
     end
     
     it "should create an Idiom for each Yaml file" do
+      @source = "path.yml"
+      Dir.stub!(:[]).and_return([@source])
       Idiom::Yaml.should_receive(:new).and_return(@translator)
-      Idiom::Base.translate(:source => "path.yml")
+      Idiom::Base.translate(:source => @source)
     end
     
     it "should create an Idiom for each YRB file" do
+      @source = "path.pres"
+      Dir.stub!(:[]).and_return([@source])
       Idiom::Yrb.should_receive(:new).and_return(@translator)
-      Idiom::Base.translate(:source => "path.pres")
+      Idiom::Base.translate(:source => @source)
     end
   end
   
@@ -41,14 +41,14 @@ SECOND=second key
     
     it "should create the destination path if it does not exist" do
       Idiom::Yrb::LOCALES.each do |lang, code|
-        FileUtils.should_receive(:mkdir_p).with("./translations") unless lang == "en-US"
+        FileUtils.should_receive(:mkdir_p).with(/\/translations/) unless lang == "en-US"
       end
       Idiom::Yrb.new(:source => @source).generate
     end
     
     it "should write to the destination path" do
       Idiom::Yrb::LOCALES.each do |lang, code|
-        File.should_receive(:open).with("./translations/path_#{lang}.pres", "a") unless lang == "en-US"
+        File.should_receive(:open).with(/\/translations\/path_#{lang}.pres/, "a") unless lang == "en-US"
       end
       Idiom::Yrb.new(:source => @source).generate
     end
@@ -60,17 +60,24 @@ SECOND=second key
     
       it "should write to directories" do
         Idiom::Yrb::LOCALES.each do |lang, code|
-          File.should_receive(:open).with("./translations/#{lang}/path_#{lang}.pres", "a") unless lang == "en-US"
+          File.should_receive(:open).with(/\/translations\/#{lang}\/path_#{lang}.pres/, "a") unless lang == "en-US"
         end
         Idiom::Yrb.new(:source => @source, :use_dirs => true).generate
       end
     
       it "should create the destination path with directories if it does not exist" do
         Idiom::Yrb::LOCALES.each do |lang, code|
-          FileUtils.should_receive(:mkdir_p).with("./translations/#{lang}") unless lang == "en-US"
+          FileUtils.should_receive(:mkdir_p).with(/\/translations\/#{lang}/) unless lang == "en-US"
         end
         Idiom::Yrb.new(:source => @source, :use_dirs => true).generate
       end
+      
+      it "should recognize a directory" do
+        Idiom::Yrb::LOCALES.each do |lang, code|
+          File.should_receive(:open).with(/\/#{lang}\/path_#{lang}.pres/, "a") unless lang == "en-US"
+        end
+        Idiom::Yrb.new(:source => "en-US/path.pres", :use_dirs => true).generate
+      end
     end
     
     it "should translate the first string" do
@@ -83,30 +90,14 @@ SECOND=second key
       Idiom::Yrb.new(:source => @source).generate
     end
     
-    # describe "key exists" do
-    #   before(:each) do
-    #     YRB.stub!(:load_file).and_return({"FIRST" => "old translated first key"})
-    #   end
-    #   
-    #   it "should not translate a key that is already translated" do
-    #     @file.should_not_receive(:puts).with(/FIRST=translated first key/)
-    #     Idiom::Yrb.new(:source => @source).generate
-    #   end
-    #   
-    #   it "should translate a key that is already translated if overwrite is true" do
-    #     @file.should_receive(:puts).with(/FIRST=translated first key/)
-    #     Idiom::Yrb.new(:source => @source, :overwrite => true).generate
-    #   end
-    # end
-    
     describe "languages" do
       it "should only translate the specified set of languages" do
         @languages = ["de-DE", "zh-Hant-HK"]
         Idiom::Yrb::LOCALES.each do |lang, code|
           if @languages.include?(lang)
-            File.should_receive(:open).with("./translations/path_#{lang}.pres", "a")
+            File.should_receive(:open).with(/\/translations\/path_#{lang}.pres/, "a")
           else
-            File.should_not_receive(:open).with("./translations/path_#{lang}.pres", "a")
+            File.should_not_receive(:open).with(/\/translations\/path_#{lang}.pres/, "a")
           end
         end
         Idiom::Yrb.new(:source => @source, :languages => @languages).generate
@@ -128,14 +119,14 @@ second: second key
     
     it "should create the destination path if it does not exist" do
       Idiom::Yaml::LOCALES.each do |lang, code|
-        FileUtils.should_receive(:mkdir_p).with("./translations") unless lang == "en-US"
+        FileUtils.should_receive(:mkdir_p).with(/\/translations/) unless lang == "en-US"
       end
       Idiom::Yaml.new(:source => @source).generate
     end
     
     it "should write to the destination path" do
       Idiom::Yaml::LOCALES.each do |lang, code|
-        File.should_receive(:open).with("./translations/path_#{lang}.yml", "a") unless lang == "en-US"
+        File.should_receive(:open).with(/\/translations\/path_#{lang}.yml/, "a") unless lang == "en-US"
       end
       Idiom::Yaml.new(:source => @source).generate
     end
@@ -147,14 +138,14 @@ second: second key
           
       it "should write to directories" do
         Idiom::Yaml::LOCALES.each do |lang, code|
-          File.should_receive(:open).with("./translations/#{lang}/path_#{lang}.yml", "a") unless lang == "en-US"
+          File.should_receive(:open).with(/\/translations\/#{lang}\/path_#{lang}.yml/, "a") unless lang == "en-US"
         end
         Idiom::Yaml.new(:source => @source, :use_dirs => true).generate
       end
     
       it "should create the destination path with directories if it does not exist" do
         Idiom::Yrb::LOCALES.each do |lang, code|
-          FileUtils.should_receive(:mkdir_p).with("./translations/#{lang}") unless lang == "en-US"
+          FileUtils.should_receive(:mkdir_p).with(/\/translations\/#{lang}/) unless lang == "en-US"
         end
         Idiom::Yrb.new(:source => @source, :use_dirs => true).generate
       end
@@ -170,32 +161,14 @@ second: second key
       Idiom::Yaml.new(:source => @source).generate
     end
     
-    # describe "key exists" do
-    #   before(:each) do
-    #     Dir.stub!(:[]).and_return(["./translations/path_lang-CODE.yml"])
-    #     File.should_receive(:exists?).with("./translations/path_lang-CODE.yml").and_return(true)
-    #     YAML.should_receive(:load_file).and_return({"first" => "old translated first key"})
-    #   end
-    #   
-    #   it "should not translate a key that is already translated" do
-    #     @file.should_not_receive(:puts).with(/first: translated first key/)
-    #     Idiom::Yaml.new(:source => @source).generate
-    #   end
-    #   
-    #   it "should translate a key that is already translated if overwrite is true" do
-    #     @file.should_receive(:puts).with(/first: translated first key/)
-    #     Idiom::Yaml.new(:source => @source, :overwrite => true).generate
-    #   end
-    # end
-    
     describe "languages" do
       it "should only translate the specified set of languages" do
         @languages = ["de-DE", "zh-Hant-HK"]
         Idiom::Yaml::LOCALES.each do |lang, code|
           if @languages.include?(lang)
-            File.should_receive(:open).with("./translations/path_#{lang}.yml", "a")
+            File.should_receive(:open).with(/\/translations\/path_#{lang}.yml/, "a")
           else
-            File.should_not_receive(:open).with("./translations/path_#{lang}.yml", "a")
+            File.should_not_receive(:open).with(/\/translations\/path_#{lang}.yml/, "a")
           end
         end
         Idiom::Yaml.new(:source => @source, :languages => @languages).generate

data/spec/stubs.rb

@@ -30,11 +30,6 @@ def stub_file_utils
   FileUtils.stub!(:rm_rf)
   FileUtils.stub!(:cp_r)
   FileUtils.stub!(:mkdir_p)
-  F.stub!(:concat_files)
-  F.stub!(:get_line_from_file).and_return("")
-  F.stub!(:save_to_file)
-  F.stub!(:save_to_tmp_file)
-  F.stub!(:execute).and_return("")
 end
 
 def stub_yaml(output_hash={})
@@ -45,32 +40,6 @@ def stub_yrb(output_hash={})
   YRB.stub!(:load_file).and_return(output_hash)
 end
 
-def stub_erb(processed_file="")
-  @erb ||= mock('erb').as_null_object
-  @erb.stub!(:result).and_return(processed_file)
-  ERB.stub!(:new).and_return(@erb)
-end
-
-def stub_haml_class
-  eval %(
-  module Haml
-    class Engine
-    end
-  end
-  )
-end
-
-def stub_haml(processed_file)
-  @haml = mock('haml').as_null_object
-  @haml.stub!(:render).and_return(processed_file)
-  Haml::Engine.stub!(:new).and_return(@haml)
-end
-
-def stub_git_helper
-  @git_helper = mock('git_helper').as_null_object
-  YMDP::GitHelper.stub!(:new).and_return(@git_helper)
-end
-
 def stub_timer
   @timer = mock('timer').as_null_object
   @timer.stub!(:time).and_yield
@@ -87,12 +56,3 @@ def reset_constant(constant, value)
   Object.send(:remove_const, constant)
   Object.const_set(constant, value)
 end
-
-def stub_config
-  @config = mock('config')
-  @config.stub!(:[]).with("doctype").and_return("HTML 4.0 Transitional")
-  @config.stub!(:validate_html?).and_return(false)
-  @config.stub!(:compress_embedded_js?).and_return(false)
-  @config.stub!(:verbose?).and_return(false)
-  reset_constant(:CONFIG, @config)
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: idiom
 version: !ruby/object:Gem::Version 
-  version: 0.0.3.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jeff Coleman