sproutcore 1.5.0-java → 1.6.0.beta.2-java

data/lib/frameworks/sproutcore/frameworks/testing/system/plan.js

@@ -25,25 +25,25 @@ var QUNIT_BREAK_ON_TEST_FAIL = false;
   wrapper methods.  The methods must accept a Plan object as their first 
   parameter.
   
-  h2. Results 
+  ## Results 
   
   The results hash contains a summary of the results of running the test 
   plan.  It includes the following properties:
   
-  - *assertions* - the total number of assertions
-  - *tests* - the total number of tests
-  - *passed* - number of assertions that passed
-  - *failed* - number of assertions that failed
-  - *errors* - number of assertions with errors
-  - *warnings* - number of assertions with warnings
+   - *assertions* -- the total number of assertions
+   - *tests* -- the total number of tests
+   - *passed* -- number of assertions that passed
+   - *failed* -- number of assertions that failed
+   - *errors* -- number of assertions with errors
+   - *warnings* -- number of assertions with warnings
   
   You can also consult the log property, which contains an array of hashes -
   one for each assertion - with the following properties:
   
-  - *module* - module descriptions
-  - *test* - test description
-  - *message* - assertion description
-  - *result* - CoreTest.OK, CoreTest.FAILED, CoreTest.ERROR, CoreTest.WARN
+   - *module* -- module descriptions
+   - *test* -- test description
+   - *message* -- assertion description
+   - *result* -- CoreTest.OK, CoreTest.FAILED, CoreTest.ERROR, CoreTest.WARN
   
   @since SproutCore 1.0
 */

data/lib/frameworks/sproutcore/frameworks/testing/system/suite.js

@@ -16,7 +16,7 @@
   types of objects to ensure that both the mixin and the object implementing
   the mixin use the API properly.
   
-  h1. Using a Suite
+  ## Using a Suite
   
   To use a Suite, call the generate() method on the suite inside on of your
   unit test files.  This will generate new modules and tests in the suite
@@ -27,16 +27,14 @@
   generate() method.  See the documentation on the specific test suite for
   information on the kind of customizations you may need to provide.
   
-  h2. Example
+  ### Example
   
-  {{{
-    // generates the SC.ArrayTestSuite tests for a built-in array.
-    SC.ArrayTests.generate('Array', {
-      newObject: function() { return []; }
-    });
-  }}}
+      // generates the SC.ArrayTestSuite tests for a built-in array.
+      SC.ArrayTests.generate('Array', {
+        newObject: function() { return []; }
+      });
   
-  h1. Defining a Suite
+  ## Defining a Suite
   
   To define a test suite, simply call the extend() method, passing any 
   attributs you want to define on the stuie along with this method.  You can
@@ -45,24 +43,22 @@
   Functions you pass to define will have an instance of the test suite passed
   as their first parameter when invoked.
 
-  h2. Example 
+  ### Example 
   
-  {{{
-    SC.ArrayTests = CoreTest.Suite.create("Verify SC.Array compliance", {
+      SC.ArrayTests = CoreTest.Suite.create("Verify SC.Array compliance", {
       
-      // override to generate a new object that implements SC.Array
-      newObject: function() { return null; }
-    });
+        // override to generate a new object that implements SC.Array
+        newObject: function() { return null; }
+      });
     
-    SC.ArrayTests.define(function(T) {
-      T.module("length tests");
+      SC.ArrayTests.define(function(T) {
+        T.module("length tests");
       
-      test("new length", function() {
-        equals(T.object.get('length'), 0, 'array length');
-      });
+        test("new length", function() {
+          equals(T.object.get('length'), 0, 'array length');
+        });
       
-    });
-  }}}
+      });
   
   @since SproutCore 1.0
   
@@ -206,13 +202,11 @@ CoreTest.Suite = /** @scope CoreTest.Suite.prototype */ {
     a convenience function for use inside of a definition function.  You could
     do the same thing by calling:
     
-    {{{
-      var T = this ;
-      module(T.desc(description), {
-        setup: function() { T.setup(); },
-        teardown: function() { T.teardown(); }
-      }
-    }}}
+        var T = this ;
+        module(T.desc(description), {
+          setup: function() { T.setup(); },
+          teardown: function() { T.teardown(); }
+        }
     
     @param {String} desc detailed descrition
     @returns {CoreTest.Suite} receiver

data/lib/frameworks/sproutcore/lib/index.rhtml

@@ -127,9 +127,12 @@
    # set.
 -%>
 <% if config.html5_history %>
+<%# TODO: Can we check for the framework in Ruby instead? %>
 <script>
-  SC.routes.wantsHistory = true;
-  SC.routes.baseURI = <%= "#{@bundle.index_root}/#{language}".to_json %>;
+  if (SC.routes) {
+    SC.routes.wantsHistory = true;
+    SC.routes.baseURI = <%= "#{@bundle.index_root}/#{language}".to_json %>;
+  }
 </script>
 <% end %>
 <% #

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/lib/sproutcore/builders/minify.rb

@@ -35,12 +35,12 @@ module SC
     def build_css(dst_path)
       a = Regexp.new('^'+MANIFEST.build_root)
       if dst_path =~ a
-		# $to_minify << dst_path
+        # $to_minify << dst_path
         FileUtils.mkdir_p(File.dirname(dst_path))
         FileUtils.copy(entry.source_path, dst_path)
       else
         FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-        filecompress = "java -Xmx128m -jar \"" + SC.yui_jar + "\" --charset utf-8 --line-break 0 --nomunge --preserve-semi --disable-optimizations \"" + entry.source_path + "\" -o \"" + dst_path + "\" 2>&1"
+        filecompress = "java -Xmx128m -jar \"" + SC.yui_jar + "\" --type css --charset utf-8 --line-break 0 --nomunge --preserve-semi --disable-optimizations \"" + entry.source_path + "\" -o \"" + dst_path + "\" 2>&1"
         SC.logger.info  'Compressing CSS with YUI .... '+ dst_path
         SC.logger.debug `#{filecompress}`
 
@@ -50,12 +50,12 @@ module SC
           SC.logger.fatal("!!!!Failed compressing CSS... "+ dst_path)
         end
       end
-  	end
+    end
 
     # Minify some javascript by invoking the YUI compressor.
     def build_javascript(dst_path)
       entry.source_entry.build!
-      
+
       # Minify module JavaScript immediately so it can be string-wrapped
       if entry.target[:target_type] == :module
         SC::Helpers::Minifier.minify dst_path
@@ -67,7 +67,7 @@ module SC
     def build_inline_javascript(dst_path)
       SC.logger.info  'Compiling inline Javascript with YUI: ' + dst_path + "..."
       FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-      filecompress = "java -Xmx128m -jar \"" + SC.yui_jar + "\" --js \"" + entry.source_path + "\" --js_output_file \"" + dst_path + "\" 2>&1"
+      filecompress = "java -Xmx128m -jar \"" + SC.yui_jar + "\" --type js \"" + entry.source_path + "\" -o \"" + dst_path + "\" 2>&1"
       SC.logger.info  'Compiling with YUI:  '+ filecompress + "..."
 
       output = `#{filecompress}`      # It'd be nice to just read STDERR, but

data/lib/sproutcore/helpers/minifier.rb

@@ -80,20 +80,16 @@ module SC::Helpers
     end
 
     def minify(paths)
-      # Convert to string if an array
-      if paths.respond_to? :join
-        paths = paths * "\" \""
-      end
-
-      yui_root = File.expand_path("../../../../vendor/sproutcore", __FILE__)
-      jar_path = File.join(yui_root, "SCCompiler.jar")
+      paths = paths.first if paths.is_a?(Array) && paths.length == 1
 
-      if SC.env[:yui_minification]
-        command = "java -Xmx256m -jar \"" + jar_path + "\" -yuionly \"" + paths + "\" 2>&1"
+      if paths.is_a?(Array)
+        paths = paths.map{|p| '"'+p+'"'}.join(' ')
+        outfile = '".js$:.js"'
       else
-        command = "java -Xmx256m -jar \"" + jar_path + "\" \"" + paths + "\" 2>&1"
+        paths = outfile = '"'+paths+'"'
       end
 
+      command = %{java -Xmx256m -jar "#{SC.yui_jar}" -o #{outfile} #{paths} 2>&1}
       output = `#{command}`
 
       SC.logger.info output

data/lib/sproutcore/models/target.rb

@@ -656,7 +656,7 @@ module SC
           end
         end
 
-        SC::HashStruct.new ({
+        SC::HashStruct.new({
           :requires => requires,
           :css_urls => css_urls,
           :css_2x_urls => css_2x_urls,
@@ -820,7 +820,7 @@ module SC
       FileUtils.mkdir_p(build_root)
 
       # Prepare jsdoc opts
-      jsdoc_root    = SC::LIBPATH / 'vendor' / 'jsdoc'
+      jsdoc_root    = File.expand_path('../../../../', __FILE__) / 'vendor' / 'jsdoc'
       jar_path      = jsdoc_root / 'jsrun.jar'
       runjs_path    = jsdoc_root / 'app' / 'run.js'
 

data/lib/sproutcore/rack/proxy.rb

@@ -60,7 +60,9 @@ module SC
 
         # Rack documentation says CONTENT_TYPE and CONTENT_LENGTH aren't prefixed by HTTP_
         headers['Content-Type'] = env['CONTENT_TYPE'] if env['CONTENT_TYPE']
-        headers['Content-Length'] = env['CONTENT_LENGTH'] if env['CONTENT_LENGTH']
+
+        length = env['CONTENT_LENGTH']
+        headers['Content-Length'] = length if length
 
         http_host, http_port = proxy[:to].split(':')
         http_port = proxy[:secure] ? '443' : '80' if http_port.nil?
@@ -95,13 +97,12 @@ module SC
               response = web.send(http_method, http_path, headers)
             else
               http_body = env['rack.input']
-              http_body.rewind
-
-              some_request = Net::HTTPGenericRequest.new http_method.upcase,
-                              true, true, http_path, headers
+              http_body.rewind # May not be necessary but can't hurt
 
-              some_request.body_stream = http_body
-              response = web.request(some_request)
+              req = Net::HTTPGenericRequest.new(http_method.upcase,
+                                                  true, true, http_path, headers)
+              req.body_stream = http_body if length.to_i > 0
+              response = web.request(req)
             end
           end
 

data/lib/sproutcore/tools.rb

@@ -44,6 +44,22 @@ module SC
     class_option "library",      :type => :string #deprecated
     class_option "environment",  :type => :string #deprecated
 
+    default_task :banner
+
+    desc "help", "How to use the sproutcore command"
+    def banner
+      str = "SproutCore #{SC::VERSION} Usage"
+      puts "#{str}\n"+('='*str.length)+"\n\n"
+
+      help
+    end
+
+    map "--version" => :version
+    desc "version", "Show the SproutCore version number"
+    def version
+      puts "SproutCore #{SC::VERSION}"
+    end
+
     # This is the core entry method used to run every tool.  Extend this
     # method with any standard preprocessing you want all tools to do before
     # they do their specific thing.
@@ -51,7 +67,6 @@ module SC
       super
       prepare_logger!
       prepare_mode!
-      yui_minification!
       dont_minify!
       prepare_app!
       prepare_build_numbers!
@@ -124,10 +139,6 @@ module SC
         end
       end
       
-      def yui_minification!
-        SC.env[:yui_minification] = options[:'yui-minification']
-      end
-      
       def dont_minify!
         SC.env[:dont_minify] = options[:'dont-minify']
       end

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