sproutcore 1.5.0 → 1.6.0.beta.1

data/lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js

@@ -25,14 +25,10 @@ sc_require('system/state');
   
   The following example shows how states are nested within a statechart:
   
-    {{{
-    
       MyApp.Statechart = SC.Object.extend(SC.StatechartManager, {
-      
         rootState: SC.State.design({
-      
           initialSubstate: 'stateA',
-        
+
           stateA: SC.State.design({
             // ... can continue to nest further states
           }),
@@ -41,10 +37,7 @@ sc_require('system/state');
             // ... can continue to nest further states
           })
         })
-      
-      })
-    
-    }}}
+      });
   
   Note how in the example above, the root state as an explicit initial substate to enter into. If no
   initial substate is provided, then the statechart will default to the the state's first substate.
@@ -53,12 +46,9 @@ sc_require('system/state');
   on your object that represents states. Upon initialization, a root state will be constructed automatically
   by the mixin and make the states on the object substates of the root state. As an example:
   
-    {{{
-  
       MyApp.Statechart = SC.Object.extend(SC.StatechartManager, {
-    
         initialState: 'stateA',
-      
+
         stateA: SC.State.design({
           // ... can continue to nest further states
         }),
@@ -66,10 +56,7 @@ sc_require('system/state');
         stateB: SC.State.design({
           // ... can continue to nest further states
         })
-    
-      })
-  
-    }}} 
+      });
   
   If you liked to specify a class that should be used as the root state but using the above method to defined
   states, you can set the rootStateExample property with a class that extends from SC.State. If the 
@@ -80,14 +67,10 @@ sc_require('system/state');
   independent state structure from other concurrent states. The following example shows how to provide your
   statechart with concurrent states:
   
-    {{{
-    
       MyApp.Statechart = SC.Object.extend(SC.StatechartManager, {
-      
         rootState: SC.State.design({
-      
           substatesAreConcurrent: YES,
-        
+
           stateA: SC.State.design({
             // ... can continue to nest further states
           }),
@@ -96,10 +79,7 @@ sc_require('system/state');
             // ... can continue to nest further states
           })
         })
-      
-      })
-    
-    }}}
+      });
   
   Above, to indicate that a state's substates are concurrent, you just have to set the substatesAreConcurrent to 
   YES. Once done, then stateA and stateB will be independent of each other and each will manage their
@@ -108,12 +88,9 @@ sc_require('system/state');
   To define concurrent states directly on the object without explicitly defining a root, you can do the 
   following:
   
-    {{{
-
       MyApp.Statechart = SC.Object.extend(SC.StatechartManager, {
-  
         statesAreConcurrent: YES,
-    
+
         stateA: SC.State.design({
           // ... can continue to nest further states
         }),
@@ -121,94 +98,67 @@ sc_require('system/state');
         stateB: SC.State.design({
           // ... can continue to nest further states
         })
-  
-      })
-
-    }}}
+      });
   
   Remember that a startchart can have a mixture of nested and concurrent states in order for you to 
   create as complex of statecharts that suite your needs. Here is an example of a mixed state structure:
   
-    {{{
-    
       MyApp.Statechart = SC.Object.extend(SC.StatechartManager, {
-      
         rootState: SC.State.design({
-      
           initialSubstate: 'stateA',
-        
+
           stateA: SC.State.design({
-          
             substatesAreConcurrent: YES,
-          
+
             stateM: SC.State.design({ ... })
             stateN: SC.State.design({ ... })
             stateO: SC.State.design({ ... })
-          
           }),
         
           stateB: SC.State.design({
-          
             initialSubstate: 'stateX',
-          
+
             stateX: SC.State.design({ ... })
             stateY: SC.State.desgin({ ... })
-          
           })
         })
-      
-      })
-    
-    }}}
+      });
   
   Depending on your needs, a statechart can have lots of states, which can become hard to manage all within
   one file. To modularize your states and make them easier to manage and maintain, you can plug-in states
   into other states. Let's say we are using the statechart in the last example above, and all the code is 
   within one file. We could update the code and split the logic across two or more files like so:
-  
-    {{{
-      ---- state_a.js
-  
+
+      // state_a.js
+
       MyApp.StateA = SC.State.extend({
-    
         substatesAreConcurrent: YES,
-    
+
         stateM: SC.State.design({ ... })
         stateN: SC.State.design({ ... })
         stateO: SC.State.design({ ... })
-    
       });
-    
-      ---- state_b.js
-    
+
+      // state_b.js
+
       MyApp.StateB = SC.State.extend({
-    
         substatesAreConcurrent: YES,
-    
+
         stateM: SC.State.design({ ... })
         stateN: SC.State.design({ ... })
         stateO: SC.State.design({ ... })
-    
       });
-    
-      ---- statechart.js
-    
+
+      // statechart.js
+
       MyApp.Statechart = SC.Object.extend(SC.StatechartManager, {
-    
         rootState: SC.State.design({
-    
           initialSubstate: 'stateA',
-      
           stateA: SC.State.plugin('MyApp.StateA'),
-      
           stateB: SC.State.plugin('MyApp.StateB')
-        
         })
-    
-      })
-  
-    }}}
-    
+      });
+
   Using state plug-in functionality is optional. If you use the plug-in feature you can break up your statechart
   into as many files as you see fit.
 
@@ -552,22 +502,18 @@ SC.StatechartManager = {
     
     Method can be called in the following ways:
     
-    {{{
-    
-      // With one argument. 
-      gotoState(<state>)
+        // With one argument. 
+        gotoState(<state>)
       
-      // With two argument.
-      gotoState(<state>, <state | boolean | hash>)
+        // With two argument.
+        gotoState(<state>, <state | boolean | hash>)
       
-      // With three argument.
-      gotoState(<state>, <state>, <boolean | hash>)
-      gotoState(<state>, <boolean>, <hash>)
+        // With three argument.
+        gotoState(<state>, <state>, <boolean | hash>)
+        gotoState(<state>, <boolean>, <hash>)
       
-      // With four argument.
-      gotoState(<state>, <state>, <boolean>, <hash>)
-    
-    }}}
+        // With four argument.
+        gotoState(<state>, <state>, <boolean>, <hash>)
     
     where <state> is either a SC.State object or a string and <hash> is a regular JS hash object.
     
@@ -885,22 +831,18 @@ SC.StatechartManager = {
     
     Method can be called in the following ways:
     
-    {{{
-    
-      // With one arguments. 
-      gotoHistorytate(<state>)
+        // With one arguments. 
+        gotoHistorytate(<state>)
       
-      // With two arguments. 
-      gotoHistorytate(<state>, <state | boolean | hash>)
+        // With two arguments. 
+        gotoHistorytate(<state>, <state | boolean | hash>)
       
-      // With three arguments.
-      gotoHistorytate(<state>, <state>, <boolean | hash>)
-      gotoHistorytate(<state>, <boolean>, <hash>)
+        // With three arguments.
+        gotoHistorytate(<state>, <state>, <boolean | hash>)
+        gotoHistorytate(<state>, <boolean>, <hash>)
       
-      // With four argumetns
-      gotoHistorytate(<state>, <state>, <boolean>, <hash>)
-    
-    }}}
+        // With four argumetns
+        gotoHistorytate(<state>, <state>, <boolean>, <hash>)
     
     where <state> is either a SC.State object or a string and <hash> is a regular JS hash object.
     
@@ -1208,23 +1150,18 @@ SC.StatechartManager = {
     
     A few notes: 
     
-      1) Calling this is not the same as calling sendEvent or sendAction.
-         Rather, this should be seen as calling normal methods on a state that 
-         will *not* call gotoState or gotoHistoryState. 
-      
-      2) A state will only ever be invoked once per call. So if there are two 
-         or more current states that have the same parent state, then that parent 
-         state will only be invoked once if none of the current states are able
-         to invoke the given method.
+     1. Calling this is not the same as calling sendEvent or sendAction.
+        Rather, this should be seen as calling normal methods on a state that 
+        will *not* call gotoState or gotoHistoryState.
+     2. A state will only ever be invoked once per call. So if there are two 
+        or more current states that have the same parent state, then that parent 
+        state will only be invoked once if none of the current states are able
+        to invoke the given method.
     
     When calling this method, you are able to supply zero ore more arguments
     that can be pass onto the method called on the states. As an example
     
-    {{{
-    
-      invokeStateMethod('render', context, firstTime);
-    
-    }}}
+        invokeStateMethod('render', context, firstTime);
     
     The above call will invoke the render method on the current states
     and supply the context and firstTime arguments to the method. 
@@ -1235,14 +1172,10 @@ SC.StatechartManager = {
     we want to call a calculate method on the current states where the method
     will return a value when invoked. We can handle the returned values like so:
     
-    {{{
-    
-      invokeStateMethod('calculate', value, function(state, result) {
-        // .. handle the result returned from calculate that was invoked
-        //    on the given state
-      })
-    
-    }}}
+        invokeStateMethod('calculate', value, function(state, result) {
+          // .. handle the result returned from calculate that was invoked
+          //    on the given state
+        })
     
     If the method invoked does not return a value and a callback function is
     supplied, then result value will simply be undefined. In all cases, if
@@ -1414,9 +1347,9 @@ SC.StatechartManager = {
     it based on properties found on this state that derive from a SC.State class. For the
     root state to be successfully built, the following much be met:
     
-      - The rootStateExample property must be defined with a class that derives from SC.State
-      - Either the initialState or statesAreConcurrent property must be set, but not both
-      - There must be one or more states that can be added to the root state
+     - The rootStateExample property must be defined with a class that derives from SC.State
+     - Either the initialState or statesAreConcurrent property must be set, but not both
+     - There must be one or more states that can be added to the root state
       
   */
   _constructRootStateClass: function() {
@@ -1585,25 +1518,21 @@ SC.Async.mixin({
     
     Examples:
     
-    {{
+        SC.State.extend({
     
-      SC.State.extend({
-    
-        enterState: function() {
-          return SC.Async.perform('foo');
-        },
+          enterState: function() {
+            return SC.Async.perform('foo');
+          },
       
-        exitState: function() {
-          return SC.Async.perform('bar', 100);
-        }
+          exitState: function() {
+            return SC.Async.perform('bar', 100);
+          }
       
-        foo: function() { ... },
+          foo: function() { ... },
       
-        bar: function(arg) { ... }
-    
-      });
+          bar: function(arg) { ... }
     
-    }}
+        });
     
     @param func {String|Function} the functio to be invoked on a state
     @param arg1 Optional. An argument to pass to the given function

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/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