ymdp 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/ymdp/compiler/template.rb

@@ -284,7 +284,15 @@ module YMDP
         end
 
         def process_scss(template, filename=nil)
-          ::Sass.compile(process_erb(template))
+          options = {
+            :syntax => :scss
+          }
+          if filename
+            options[:filename] = filename
+          end
+          ::Sass::Engine.new(template, options).render(self) do
+            yield
+          end
         end
   
         # Write this template with the application layout applied.

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

@@ -10,7 +10,7 @@
   GLOBAL CONSTANTS 
 ###
 
-window.View = 
+window.View =
   application: "<%= @application_name %>"
   domain: "<%= @domain %>"
   page_loaded: false
@@ -31,7 +31,7 @@ String.prototype.capitalize = () ->
 
 
 
-window.YMDP = 
+window.YMDP =
   Constants: {}
   
   # Shows the error view.
@@ -77,10 +77,13 @@ window.YMDP =
     setTimeout(callback_function, interval * 1000)
 
   showTranslations: () ->
-    Debug.log("begin YMDP.showTranslations")
-    I18n.findAndTranslateAll()
-
-    # define I18n.localTranslations in the view template
-    I18n.localTranslations()
-  
-    Debug.log("end YMDP.showTranslations")
+    try
+      Debug.log("begin YMDP.showTranslations")
+      I18n.findAndTranslateAll()
+
+      # define I18n.localTranslations in the view template
+      I18n.localTranslations()
+    
+      Debug.log("end YMDP.showTranslations")
+    catch omg
+      Debug.error(omg.message)

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

@@ -55,15 +55,23 @@ I18n.translate_element = function(element) {
 // the returned translated string
 //
 I18n.translate = function(key, args) {
+  Debug.log("I18n.translate", key, args);
+
 	key = key.toUpperCase();
 	key = key.replace(" ", "_");
+
+  Debug.log("key", key);
+  
 	if (args) {
 		var m;
 		m = I18n.translate_sentence(key, args);
+    Debug.log("args existed");
 	} else
 	{
 		m = I18n.translate_phrase(key);
+    Debug.log("no args");
 	}
+  Debug.log("Here is m", m);
 	return m;
 };
 I18n.t = I18n.translate;

data/lib/ymdp/view/application_view.rb

@@ -27,6 +27,7 @@ module YMDP
       Dir["./config/locales/**/*.yml"].each do |file|
         @translations.merge!(YAML.load_file(file))
       end
+
       @translations
     end
 
@@ -397,7 +398,12 @@ module YMDP
       
       filenames.map! do |filename|
         filename.gsub!(/\.css$/, "")
-        "#{BASE_PATH}/app/stylesheets/#{filename}.css"
+        f = "#{BASE_PATH}/app/stylesheets/#{filename}.css"
+        if !File.exists?(f)
+          f = "#{BASE_PATH}/app/stylesheets/#{filename}.scss"
+        else
+          $stdout.puts("Could not find #{filename}.css or #{filename}.scss")
+        end
       end
       
       output = combine_files(filenames)
@@ -420,7 +426,8 @@ module YMDP
     # Renders together a set of files without 
     # compression, so they can be compressed as a single block.
     #
-    def render_without_compression(path, tags=true)
+    def render_without_compression(path="", tags=true)
+      path ||= ""
       output = ""
     
       if File.exists?("#{path}.coffee")

data/ymdp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ymdp"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Isaac Priestley"]
-  s.date = "2012-05-24"
+  s.date = "2012-06-01"
   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: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Isaac Priestley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-24 00:00:00 Z
+date: 2012-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime