sproutcore 1.5.0 → 1.6.0.beta.1

data/lib/sproutcore.rb

@@ -131,18 +131,11 @@ module SproutCore
 
   def self.yui_jar
     @yui_jar ||= begin
-      yui_root = File.expand_path("../sproutcore/vendor/sproutcore/lib", __FILE__)
-      File.join(yui_root, 'yuicompressor-2.4.4.jar')
+      yui_root = File.expand_path("../../vendor/sproutcore/lib", __FILE__)
+      File.join(yui_root, 'yuicompressor-2.4.6.jar')
     end
   end
 
-  # def self.closure_jar
-  #     @closure_jar ||= begin
-  #       closure_root = File.expand_path("../sproutcore/vendor/sproutcore/lib", __FILE__)
-  #       File.join(closure_root, 'compiler.jar')
-  #     end
-  #   end
-
   def self.profile(env)
     if ENV[env]
       require "ruby-prof"

data/spec/lib/builders/html_spec.rb

@@ -186,6 +186,11 @@ describe SC::Builder::Html do
     # such as static_url, sc_resource, etc.
     describe "StaticHelper" do
 
+      it "adds preferredLanguage definition" do
+        result = @builder.bootstrap
+        result.should =~ /String.preferredLanguage = "en"/
+      end
+
       it "exposes static_url() & sc_static() alias" do
         @builder.static_url('icons/image').should =~ /icons\/image.png/
         @builder.static_url('image.jpg').should =~ /image.jpg/
@@ -417,11 +422,6 @@ describe SC::Builder::Html do
           expect_scripts(result, urls)
         end
 
-        it "adds preferredLanguage definition" do
-          result = @builder.javascripts_for_client
-          result.should =~ /String.preferredLanguage = "en"/
-        end
-
         it "adds javascript_libs to end of scripts" do
           @target.config.javascript_libs = %w(foo bar)
           result = @builder.javascripts_for_client

data/sproutcore.gemspec

@@ -1,7 +1,9 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "sproutcore/version"
 
-is_jruby = Gem::Platform.local.os == "java"
+os = Gem::Platform.local.os
+is_jruby = (os == "java")
+is_mingw = (os == "mingw32")
 
 Gem::Specification.new do |s|
   s.name = 'sproutcore'
@@ -11,7 +13,8 @@ Gem::Specification.new do |s|
   s.homepage = 'http://www.sproutcore.com'
   s.summary = "SproutCore is a platform for building native look-and-feel applications on the web"
 
-  s.platform = 'java' if is_jruby
+  s.platform = 'java'        if is_jruby
+  s.platform = 'x86-mingw32' if is_mingw
 
   s.add_dependency 'rack', '~> 1.2.1'
   s.add_dependency 'json_pure', "~> 1.4.6"
@@ -19,15 +22,18 @@ Gem::Specification.new do |s|
   s.add_dependency 'erubis', "~> 2.6.6"
   s.add_dependency 'thor', '~> 0.14.3'
   s.add_dependency 'haml', '~> 3.0.24'
-  
+
   s.add_dependency 'compass', '~> 0.10.5'
   s.add_dependency 'chunky_png', '~> 1.1.0'
 
   if is_jruby
     s.add_dependency 'mongrel', '~> 1.1.5'
   else
-    s.add_dependency 'thin', '= 1.2.8'
-    s.add_dependency 'eventmachine', '>= 0.12.10' # Thin requires wrong version
+    s.add_dependency 'thin', '~> 1.2.11'
+  end
+
+  if is_mingw
+    s.add_dependency 'eventmachine', '~> 1.0.0.beta'
   end
 
   s.add_development_dependency 'gemcutter', "~> 0.6.0"

data/vendor/chance/lib/chance.rb

@@ -115,7 +115,7 @@ module Chance
       _preprocess_css(file) if file[:path] =~ /css$/
 
       _preprocess_png(file) if file[:path] =~ /png$/
-      _preprocess_img(file) if file[:path] =~ /gif$|jpg$/
+      _preprocess_rmagick_image(file) if file[:path] =~ /gif$|jpg$/
 
       file[:preprocessed] = true
     end
@@ -128,7 +128,9 @@ module Chance
       file[:canvas] = nil
       begin
         require "rmagick"
-      rescue Exception
+      rescue LoadError
+        file[:error] = "RMagick is require to process gifs and jpgs. (gem install rmagick)"
+        return
       end
 
       begin