ymdp 0.1.9 → 0.1.10

data/.base

@@ -0,0 +1,5 @@
+[load_paths]
+
+[requires]
+
+[consts]

data/.gitignore

@@ -19,3 +19,7 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+
+vendor/bin/*
+vendor/gems/*
+!vendor/gems/cache/

data/Gemfile

@@ -3,11 +3,15 @@ gem "haml"
 gem "json"
 gem "hpricot"
 gem "ruby-growl"
-gem "activesupport"
+gem "activesupport", :require_as => "active_support"
 gem "sishen-rtranslate"
 gem "progressions-basepath", :require_as => "basepath"
-gem "progessions-g", :require_as => "g"
+gem "progressions-g", :require_as => "g"
 gem "timer"
 gem "serenity"
 gem "ymdp_generator"
 gem "ymdt"
+gem "yrb"
+gem "idiom"
+
+bin_path "vendor/bin"

data/History.txt

@@ -1,3 +1,14 @@
+== in Git
+  
+
+== 0.1.10 2010-01-22
+  * minor enhancements
+    * use YRB gem to parse .pres files
+
+== 0.1.9 2010-01-22
+  * major enhancements
+    * extract translation into new gem, Idiom
+    
 == 0.1.8.1 2010-01-20
   * bug fixes
     * fix typo in constants.rb

data/Rakefile

@@ -24,6 +24,7 @@ begin
     gem.add_runtime_dependency "serenity", ">= 0"
     gem.add_runtime_dependency "ymdp_generator", ">= 0"
     gem.add_runtime_dependency "ymdt", ">= 0"
+    gem.add_runtime_dependency "yrb", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -46,7 +47,12 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
+task :bundle do
+  require 'vendor/gems/environment'
+  Bundler.require_env
+end
+
+task :spec => [:bundle, :check_dependencies]
 
 task :default => :spec
 

data/VERSION

@@ -1 +1 @@
-0.1.8.1
+0.1.10

data/lib/ymdp/base.rb

@@ -130,7 +130,7 @@ module YMDP
           end
         )
       end
-    end 
+    end
   end
 end
 

data/lib/ymdp/commands/generate.rb

@@ -1,10 +1,10 @@
-require 'translator/base'
-
 if ARGV[0] == "view"
   p = {
     :template_path => File.join(File.dirname(__FILE__), "..", "generator", "templates"),
     :application_path => APPLICATION_PATH
   }
   YMDP::Generator::Base.new(p).generate(ARGV[1])
-  YMDP::Translator::YRB.translate
+  Dir["#{BASE_PATH}/app/assets/yrb/en-US/new_#{ARGV[1]}_en-US.pres"].each do |path|
+    Idiom::Base.translate(:source => path)
+  end  
 end

data/lib/ymdp/compiler/template.rb

@@ -1,3 +1,5 @@
+require 'yrb'
+
 module YMDP
   module Compiler #:nodoc:
     module Template #:nodoc:
@@ -294,7 +296,7 @@ module YMDP
       # Convert them to a hash and write the hash to a JSON file.
       #
       # Each language can have as many YRB translation files (with an extension of ".pres")
-      # as necessary.  The files are concatenated together and translated into a single JSON file
+      # as necessary.  The files are concatenated together and converted into a single JSON file
       # for each language.
       #
       class YRB < Base
@@ -322,7 +324,13 @@ module YMDP
         # Turn it back into a hash.
         #
         def to_hash
-          JSON.parse(to_json)
+          yrb
+        end
+        
+        # Parse YRB file
+        #
+        def yrb
+          ::YRB.load_file(@file)
         end
   
         # Convert the hash to Yaml if you should want to do that.
@@ -340,7 +348,7 @@ module YMDP
         # case, the JSON file.
         #
         def processed_template
-          super.to_json
+          yrb.to_json
         end
   
         # Validate the JSON file.
@@ -362,49 +370,6 @@ module YMDP
         def convert_filename(filename)
           "#{base_filename(filename)}.json"
         end
-      
-        # Is this line a valid comment in YRB?
-        def comment?(line)
-          line =~ /^[\s]*#/
-        end
-      
-        # Is this line valid YRB syntax?
-        #
-        def key_and_value_from_line(line)
-          if line =~ /^([^\=]+)=(.+)/
-            return $1, $2.strip
-          else
-            return nil, nil
-          end
-        end
-  
-        # Parse YRB and add it to a hash.  Raise an error if the key already exists in the hash.
-        #
-        def process_template(template)
-          @hash = {}
-          lines = template.split("\n")
-          lines.each do |line|
-            unless comment?(line)
-              key, value = key_and_value_from_line(line)
-              unless key.blank?
-                if @hash.has_key?(key)
-                  $stdout.puts
-                  $stdout.puts "Duplicate value in #{destination_path}"
-                  $stdout.puts "  #{key}=#{@hash[key]}"
-                  $stdout.puts "  #{key}=#{value}"
-                  $stdout.puts
-                  if @hash[key] == value
-                    $stdout.puts "  Values are the same but duplicate values still should not exist!"
-                    $stdout.puts
-                  end
-                  raise "Duplicate key error"
-                end
-                @hash[key] = value
-              end
-            end
-          end
-          @hash
-        end
   
         # Write JSON file to its destination.
         #

data/lib/ymdp/tasks/keys.rake

@@ -1,7 +1,5 @@
 require 'lib/init'
 
-require 'translator/base'
-
 @key = ENV["key"] || ""
 @key = @key.upcase
 
@@ -77,7 +75,9 @@ namespace :keys do
   
   desc "Translate any new keys into non-US languages"
   task :translate do
-    YMDP::Translator::YRB.translate
+    Dir["#{BASE_PATH}/app/assets/yrb/en-US/*.pres"].each do |path|
+      Idiom::Base.translate(:source => path)
+    end
   end
   
   task :rename do

data/spec/compiler_template_spec.rb

@@ -63,7 +63,7 @@ describe "Template" do
         File.stub!(:read).with("filename.pres").and_return("KEY=value\nKEY=value\n")
         lambda {
           @js_template.build
-        }.should raise_error("Duplicate key error")
+        }.should raise_error(/Duplicate key error/)
       end
       
       describe "methods" do

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+
 BASE_PATH = File.dirname(__FILE__) + "/data"
 CONFIG_PATH = "#{BASE_PATH}/config"
 SERVERS_PATH = "#{BASE_PATH}/servers"
@@ -13,6 +14,8 @@ require 'g'
 require 'active_support'
 require 'spec'
 require 'spec/autorun'
+require 'yrb'
+require 'timer'
 
 require 'stubs'
 require 'default_settings'

data/spec/stubs.rb

@@ -3,6 +3,7 @@ def stub_io
   stub_file_io
   stub_file_utils
   stub_yaml
+  stub_yrb
   stub_growl
 end
 
@@ -40,6 +41,10 @@ def stub_yaml(output_hash={})
   YAML.stub!(:load_file).and_return(output_hash)
 end
 
+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)

data/ymdp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ymdp}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Coleman"]
@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    ".document",
+    ".base",
+     ".document",
      ".gitignore",
      "Gemfile",
      "History.txt",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ymdp
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Jeff Coleman
@@ -172,6 +172,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .base
 - .document
 - .gitignore
 - Gemfile