ymdp 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/ymdp/compiler/base.rb

@@ -57,7 +57,7 @@ module YMDP
         ["views", "assets"].each do |dir|
           process_path("#{base_path}/app/#{dir}/")
         end
-        process_all_translations
+        # process_all_translations
         copy_config_files
         copy_images
       end
@@ -156,13 +156,14 @@ module YMDP
     
         # Concatenate together all the YRB ".pres" files for this language into one file in the tmp dir.
         #
-        F.concat_files("#{yrb_path}/#{lang}/*", tmp_file)
+        # F.concat_files("#{yrb_path}/#{lang}/*", tmp_file)
     
-        yrb = YMDP::Compiler::Template::YRB.new(:file => tmp_file, :domain => domain)
-        yrb.build
-        yrb.validate if CONFIG.validate_json_assets?
+        # yrb = YMDP::Compiler::Template::YRB.new(:file => tmp_file, :domain => domain)
+        # yrb = YMDP::Compiler::Template::Yaml.new(:file => tmp_file, :domain => domain)
+        # yrb.build
+        # yrb.validate if CONFIG.validate_json_assets?
         
-        FileUtils.rm(tmp_file)
+        # FileUtils.rm(tmp_file)
       end
   
       # Creates a fresh destination directory structure for the code to be compiled into.
@@ -256,7 +257,7 @@ module YMDP
       end
       
       def yrb_path
-        "#{assets_path}/yrb"
+        "#{config_path}/locales"
       end
       
       def images_path

data/lib/ymdp/compiler/template.rb

@@ -339,6 +339,88 @@ module YMDP
         end
       end
 
+      # Process YAML format translation files.
+      #
+      # Convert them to a hash and write the hash to a JSON file.
+      #
+      # Each language can have as many YAML translation files as necessary.
+      # The files are converted into a single JSON file for each language.
+      #
+      class Yaml < Base
+        # Base directory for translations for this domain.
+        #
+        def directory
+          directory = "#{paths[:base_path]}/servers/#{@domain}/assets/yrb"
+          FileUtils.mkdir_p(directory)
+          directory
+        end
+  
+        # The destination of the compiled JSON file.
+        #
+        def destination_path
+          filename = convert_filename(@file.split("/").last)
+          "#{directory}/#{filename}"
+        end  
+  
+        # JSON values of the compiled translations.
+        #
+        def to_json
+          processed_template
+        end
+  
+        # Turn it back into a hash.
+        #
+        def to_hash
+          yaml
+        end
+        
+        # Parse Yaml file
+        #
+        def yaml
+          @yaml ||= ::YAML.load_file(@file)
+        end
+  
+        # Convert the hash to Yaml if you should want to do that.
+        #
+        def to_yaml
+          to_hash.to_yaml
+        end
+  
+        # This function is the file which is written to the destination--in this
+        # case, the JSON file.
+        #
+        def processed_template
+          yaml.to_json
+        end
+  
+        # Validate the JSON file.
+        #
+        def validate
+          Epic::Validator::JSON.new.validate(destination_path)
+        end
+  
+        private
+      
+        # Strip off the extension from original Yaml files.
+        #
+        def base_filename(filename)    
+          filename.gsub(/\.yaml/, "")
+        end
+  
+        # Take the base filename and add the ".json" extension.
+        #
+        def convert_filename(filename)
+          "#{base_filename(filename)}.json"
+        end
+  
+        # Write JSON file to its destination.
+        #
+        def write_template(result)
+          $stdout.puts destination_path if CONFIG.verbose?
+          write_template_without_layout(result)
+        end
+      end
+
       # Process Yahoo! Resource Bundle format translation files.
       #
       # Convert them to a hash and write the hash to a JSON file.

data/lib/ymdp/javascripts/jquery/i18n.js

@@ -32,16 +32,7 @@ I18n.init = function() {
 };
 
 I18n.setResources = function() {
-  var asset_path;
-  
-  Debug.log("begin I18n.setResources for language " + I18n.currentLanguage);
-  asset_path = "<%= @assets_directory %>/yrb/";
-	I18n.keys = OpenMailIntl.getResources(asset_path, "keys", I18n.currentLanguage) || {};
-  if (I18n.currentLanguage !== "en-US") {
-		I18n.default_keys = OpenMailIntl.getResources(asset_path, "keys", "en-US") || {};
-	} else {
-	  I18n.default_keys = I18n.keys;
-	}
+  I18n.keys = <%= translations.to_json  %>;
 };
 
 I18n.english = function() {
@@ -52,17 +43,6 @@ I18n.translate_element = function(element) {
   element = $(element);
   
   var e;
-  // 
-  //   e = element.inspect();
-  //   if (e.match(/<input/)) {
-  //     I18n.v(element.attr("id"));
-  //   } else {
-  //     if (e.match(/<img/)) {
-  //       I18n.src(element.attr("id"));
-  //     } else {
-  //    I18n.u(element.attr("id");
-  //  }
-  // }
   I18n.u(element.attr("id"));
 };
 
@@ -83,16 +63,13 @@ I18n.translate = function(key, args) {
 	} else
 	{
 		m = I18n.translate_phrase(key);
-		if (!m) {
-			m = I18n.default_keys[key];
-		}
 	}
 	return m;
 };
 I18n.t = I18n.translate;
 
 I18n.translate_phrase = function(key) {
-	return I18n["keys"][key];
+	return I18n["keys"][I18n.currentLanguage][key];
 };
 
 I18n.translate_sentence = function(key, args) {

data/lib/ymdp/javascripts/jquery/user.js.coffee

@@ -137,7 +137,10 @@ window.User =
     
       Debug.log("YMDP.ymail_wssid is defined", YMDP.ymail_wssid)
     
-      success_function(YMDP.ymail_wssid)
+      try
+        success_function(YMDP.ymail_wssid)
+      catch wtf
+        Debug.log wtf
 
   # gets the guid from the Yahoo! environment and executes the success callback
   # if there is a guid, and the error callback if it's undefined

data/lib/ymdp/view/application_view.rb

@@ -18,19 +18,18 @@ module YMDP
     #   # => ["en-US", "de-DE", "es-ES", "es-MX"]
     #
     def supported_languages
-      dirs = Dir["#{BASE_PATH}/app/assets/yrb/*"].map do |path|
-        filename = path.split("/").last
-        
-        filename
-      end
-      
-      dirs.unshift(dirs.delete("en-US"))
-      
-      raise "Default YRB key en-US not found" unless dirs.include?("en-US") 
+      YAML.load_file("./config/idiom.yml")["locales"].keys
+    end
+
+    def translations
+      @translations ||= {}
       
-      dirs
+      Dir["./config/locales/**/*.yml"].each do |file|
+        @translations.merge!(YAML.load_file(file))
+      end
+      @translations
     end
-    
+
     # Returns an array of country codes of English-speaking countries supported
     # by the application, based on the language-specific folders located in "app/assets/yrb".
     #

data/ymdp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ymdp"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Isaac Priestley"]
-  s.date = "2012-05-01"
+  s.date = "2012-05-24"
   s.description = "Framework for developing applications in the Yahoo! Mail Development Platform."
   s.email = "progressions@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ymdp
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Isaac Priestley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-01 00:00:00 Z
+date: 2012-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime