sproutcore 1.7.1.beta → 1.8.0

data/lib/gen/statechart_app/templates/apps/@target_name@/main.js

@@ -0,0 +1,26 @@
+<%= copyright_block(namespace) %>
+/*globals <%= namespace %> */
+
+// This is the function that will start your app running.  The default
+// implementation will load any fixtures you have created then instantiate
+// your controllers and awake the elements on your page.
+//
+// As you develop your application you will probably want to override this.
+// See comments for some pointers on what to do next.
+//
+<%= namespace %>.main = function main() {
+
+  // Step 1: Tell your app it will load via states
+  var statechart = <%= namespace %>.statechart;
+  SC.RootResponder.responder.set('defaultResponder', statechart); 
+  statechart.initStatechart();
+
+  // Step 2. Set the content property on your primary controller.
+  // This will make your app come alive!
+
+  // TODO: Set the content property on your primary controller
+  // ex: MyApp.contactsController.set('content', MyApp.contacts);
+
+} ;
+
+function main() { <%= namespace %>.main(); }

data/lib/gen/statechart_app/templates/apps/@target_name@/resources/_theme.css

@@ -0,0 +1,18 @@
+/*
+  This defines the global $theme variable for use inside your CSS.
+  The $theme variable holds the CSS class names for your theme.
+  
+  You can then theme your app by using CSS like this:
+
+      $theme.button {
+        color: blue;
+        @include slices('white-button.png', $left: 3, $right: 3);
+      }
+  
+  Any _theme.css file is prepended to all files inside its directory,
+  and any subdirectories that don't define their own _theme.css file.
+  
+  This allows you to give different directories different values for
+  $theme if you wish.
+*/
+$theme: '.ace.<%= css_name %>';

data/lib/gen/statechart_app/templates/apps/@target_name@/resources/loading.rhtml

@@ -0,0 +1,9 @@
+<%% content_for :loading do %>
+<%% # Any HTML in this file will be visible on screen while your page loads
+   # its application JavaScript.  SproutCore applications are optimized for 
+   # caching and startup very fast, so your users will often only see this 
+   # content for a brief moment on their first app load, if at all.
+%>
+<p class="loading">Loading...<p>
+
+<%% end %>

data/lib/gen/statechart_app/templates/apps/@target_name@/resources/main_page.js

@@ -0,0 +1,21 @@
+<%= copyright_block("#{namespace} - mainPage") %>
+/*globals <%= namespace %> */
+
+// This page describes the main user interface for your application.  
+<%= namespace %>.mainPage = SC.Page.design({
+
+  // The main pane is made visible on screen as soon as your app is loaded.
+  // Add childViews to this pane for views to display immediately on page 
+  // load.
+  mainPane: SC.MainPane.design({
+    childViews: 'labelView'.w(),
+    
+    labelView: SC.LabelView.design({
+      layout: { centerX: 0, centerY: 0, width: 200, height: 18 },
+      textAlign: SC.ALIGN_CENTER,
+      tagName: "h1", 
+      value: "Welcome to SproutCore!"
+    })
+  })
+
+});

data/lib/gen/statechart_app/templates/apps/@target_name@/statechart.js

@@ -0,0 +1,8 @@
+<%= namespace %>.statechart = SC.Statechart.create({
+
+  initialState: 'readyState',
+  
+  readyState: SC.State.plugin('<%= namespace %>.ReadyState'),
+  // someOtherState: SC.State.plugin('<%= namespace %>.SomeOtherState')
+
+});

data/lib/gen/statechart_app/templates/apps/@target_name@/states/ready_state.js

@@ -0,0 +1,12 @@
+<%= namespace %>.ReadyState = SC.State.extend({ 
+  
+  enterState: function() {
+    <%= namespace %>.getPath('mainPage.mainPane').append();
+  },
+
+  exitState: function() {
+    <%= namespace %>.getPath('mainPage.mainPane').remove();
+  }
+
+});
+

data/lib/gen/statechart_app/templates/apps/@target_name@/theme.js

@@ -0,0 +1,24 @@
+<%= copyright_block(namespace) %>
+/*globals <%= namespace %> */
+
+// This is the theme that defines how your app renders.
+//
+// Your app is given its own theme so it is easier and less
+// messy for you to override specific things just for your
+// app.
+//
+// You don't have to create the whole theme on your own, though:
+// your app's theme is based on SproutCore's Ace theme.
+//
+// NOTE: if you want to change the theme this one is based on, don't
+// forget to change the :css_theme property in your buildfile.
+<%= namespace %>.Theme = SC.AceTheme.create({
+  name: '<%= css_name %>'
+});
+
+// SproutCore needs to know that your app's theme exists
+SC.Theme.addTheme(<%= namespace %>.Theme);
+
+// Setting it as the default theme makes every pane SproutCore
+// creates default to this theme unless otherwise specified.
+SC.defaultTheme = '<%= css_name %>';

data/lib/sproutcore/builders.rb

@@ -14,3 +14,4 @@ require "sproutcore/builders/test_index"
 require "sproutcore/builders/string_wrapper"
 require "sproutcore/builders/handlebars"
 require "sproutcore/builders/split"
+require "sproutcore/builders/json"

data/lib/sproutcore/builders/base.rb

@@ -34,6 +34,16 @@ module SC
       def self.build(entry, dst_path)
         new(entry).build(dst_path)
       end
+      
+      # Reads the content of the source file. If the source file does not exist,
+      # returns an empty array.
+      def read(src_path)
+        if File.exist?(src_path) && !File.directory?(src_path)
+          File.read(src_path)
+        else
+          ""
+        end        
+      end
 
       # Reads the lines from the source file.  If the source file does not
       # exist, returns empty array.
@@ -58,7 +68,15 @@ module SC
           f.write line
         end
       end
-
+      
+      # writes the passed lines to the named file as binary
+      def writelinebinary(dst_path, line)
+        FileUtils.mkdir_p(File.dirname(dst_path))
+        File.open(dst_path, 'wb') do |f|
+          f.write line
+        end
+      end
+      
       # writes the passed lines to the named file
       def writelines(dst_path, lines)
         writeline(dst_path,joinlines(lines))

data/lib/sproutcore/builders/chance_file.rb

@@ -36,7 +36,12 @@ module SC
 
       # Don't write empty files... but keep in mind that hte 
       if src.length > 0
-        writeline dst_path, src
+        if chance_file.end_with?("png")
+          # Writing it as binary to avoid newline problems on Windows
+          writelinebinary dst_path, src
+        else
+          writeline dst_path, src
+        end
       end
     end
 

data/lib/sproutcore/builders/handlebars.rb

@@ -12,17 +12,9 @@ module SC
 
   class Builder::Handlebars < Builder::Base
 
-    def readlines(src_path)
-      if File.exist?(src_path) && !File.directory?(src_path)
-        File.read(src_path)
-      else
-        ""
-      end
-    end
-
     def build(dst_path)
       template_name = entry.rootname[/^.*\/([^\/]*)$/, 1]
-      template_code = readlines(entry[:source_path])
+      template_code = read(entry[:source_path])
       replace_static_url(template_code)
       writelines dst_path, "SC.TEMPLATES[#{template_name.inspect}] = SC.Handlebars.compile(#{template_code.to_json});"
     end

data/lib/sproutcore/builders/javascript.rb

@@ -15,15 +15,6 @@ module SC
   # does NOT product a combined JavaScript for production.  See the
   # Builder::CombinedJavaScript for more.
   class Builder::JavaScript < Builder::Base
-
-    def readlines(src_path)
-      if File.exist?(src_path) && !File.directory?(src_path)
-        File.read(src_path)
-      else
-        ""
-      end
-    end
-
     def build(dst_path)
       lines = ""
       target_name = entry.target[:target_name].to_s.sub(/^\//,'')
@@ -42,7 +33,7 @@ SC.LAZY_INSTANTIATION['#{target_name}'].push(
 "
       end
 
-      code = rewrite_inline_code(readlines(entry[:source_path]))
+      code = rewrite_inline_code(read(entry[:source_path]))
       code = handle_debug_code(code)
       lines << code
 

data/lib/sproutcore/builders/json.rb

@@ -0,0 +1,25 @@
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2009 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
+
+require "sproutcore/builders/base"
+require 'fileutils'
+
+module SC
+
+  # This build is used to process a single JSON file. It will substitute static_url
+  # and the like as needed.
+  class Builder::JSON < Builder::Base
+
+    def build(dst_path)
+      lines = read(entry[:source_path])
+      replace_static_url(lines)
+      writelines dst_path, lines
+    end
+
+  end
+
+end

data/lib/sproutcore/builders/less.rb

@@ -21,7 +21,7 @@ module SC
       end
 
       begin
-        content = readlines(entry.source_path)
+        content = read(entry.source_path)
         css = ::Less::Engine.new(content).to_css
         lines = []
         css.each_line { |l| lines << rewrite_inline_code(l) }

data/lib/sproutcore/builders/sass.rb

@@ -31,7 +31,7 @@ module SC
       end
 
       begin
-        content = readlines(entry.source_path)
+        content = read(entry.source_path)
         load_paths = [entry.source_path[0..entry.source_path.rindex('/')]]
         css = ::Sass::Engine.new(content, :syntax => @@sass_syntax, :load_paths => load_paths).render
         lines = []

data/lib/sproutcore/builders/stylesheet.rb

@@ -18,16 +18,8 @@ module SC
   #
   class Builder::Stylesheet < Builder::Base
 
-    def readlines(src_path)
-      if File.exist?(src_path) && !File.directory?(src_path)
-        File.read(src_path)
-      else
-        ""
-      end
-    end
-
     def build(dst_path)
-      code = rewrite_inline_code(readlines(entry[:source_path]))
+      code = rewrite_inline_code(read(entry[:source_path]))
       writelines dst_path, code
     end
 

data/lib/sproutcore/helpers/html5_manifest.rb

@@ -29,7 +29,7 @@ module SC::Helpers
         @files << "\n"
       end
 
-      manifest_path = dst_path.sub('index.html', '') + 'app.manifest'
+      manifest_path = dst_path.sub('index.html', '') + 'manifest.appcache'
       writelines manifest_path, @files
     end
 

data/lib/sproutcore/helpers/static_helper.rb

@@ -13,6 +13,48 @@ module SC
   module Helpers
 
     module StaticHelper
+      
+      # This method will return the urls of all the stylesheets
+      # required by the named bundle.
+      
+      # This method will return teh URLs of all the images required
+      # by the named target. If no named target is provided then images
+      # from all targets will be returned.
+      #
+      # You can filter the images that are returned using the following
+      # options:
+      #
+      #  :language  => The language to render. Defaults to the current language
+      #  :sprited   => Only those images that have been sprited by Chance
+      #  :x2        => Only those images that are two-times resolution (@2x)
+      #
+      def image_urls_for_client(target_name=nil, opts=nil) 
+        opts = {} if opts.nil?
+        t = target_name ? target.target_for(target_name) : target
+        v = opts[:language] ? { :language => opts[:language] } : manifest.variation
+        targets = expand_required_targets(t)
+        targets << t
+        
+        urls = []
+        
+        targets.each do |t|
+          cur_manifest = t.manifest_for(v).build!
+          cur_manifest.entries.each do |entry|
+            if (entry[:entry_type] === :image)
+              url = entry.cacheable_url
+              url = nil if (opts[:sprited] and (url =~ /stylesheet-[-\w@]*\.png/).nil?)
+              if opts[:x2]
+                url = nil if (url =~ /@2x/).nil?
+              else 
+                url = nil if not (url =~ /@2x/).nil?
+              end
+              urls << url if (not url.nil?)
+            end
+          end
+        end
+        
+        urls
+      end
 
       # This method will return the HTML to link to all the stylesheets
       # required by the named bundle.  If you pass no options, the current

data/lib/sproutcore/rack/proxy.rb

@@ -18,7 +18,7 @@ begin
   require 'eventmachine'
   require 'em-http'
   require 'thin'
-  
+
   SC::PROXY_ENABLED = true
 rescue LoadError => e
   SC::PROXY_ENABLED = false
@@ -26,7 +26,7 @@ end
 
 if SC::PROXY_ENABLED
   # There are cases where we cannot load the proxy and don't need to (build environment)
-  
+
   module SC
 
     module Rack
@@ -66,6 +66,18 @@ if SC::PROXY_ENABLED
       end
 
 
+      # clears host field from request header if it's redirected request
+      class RedirectHostHeaderKiller
+
+        def response(r)
+          if r.redirect?
+            puts r.req.headers
+            r.req.headers.delete('Host')
+          end
+        end
+
+      end
+
 
       # Rack application proxies requests as needed for the given project.
       class Proxy
@@ -131,7 +143,12 @@ if SC::PROXY_ENABLED
           request_options = {}
           request_options[:head] = headers
           request_options[:body] = req_body if !!req_body
-          request_options[:timeout] = proxy[:timeout] if proxy[:timeout]
+          if proxy[:inactivity_timeout] # allow the more verbose setting to take precedence
+            request_options[:inactivity_timeout] = proxy[:inactivity_timeout]
+          elsif proxy[:timeout] # check the legacy and simpler setting
+            request_options[:inactivity_timeout] = proxy[:timeout]
+          end
+          request_options[:connect_timeout] = proxy[:connect_timeout] if proxy[:connect_timeout]
           request_options[:redirects] = 10 if proxy[:redirect] != false
           request_options[:decoding] = false  # don't decode gzipped content
 
@@ -142,6 +159,7 @@ if SC::PROXY_ENABLED
             headers = {}
             method = env['REQUEST_METHOD'].upcase
             status = 0
+            conn.use RedirectHostHeaderKiller
 
             case method
               when 'GET'

data/lib/sproutcore/rack/service.rb

@@ -59,7 +59,7 @@ module SC
         self.filesystem = opts[:Filesystem]
 
         projects = opts.delete(:projects) || [opts.delete(:project)].compact
-        app = self.new(*projects, opts)
+        app = self.new(*(projects+[opts]))
 
         opts[:Host] ||= opts[:host] # allow either case.
         opts[:Port] ||= opts[:port] || '4020'
@@ -93,7 +93,8 @@ module SC
         server.run app, opts
       end
 
-      def initialize(*projects, opts)
+      def initialize(*projects)
+        opts = projects.pop
         @projects = projects.flatten
 
         # Get apps for each project & cascade if needed

data/lib/sproutcore/tools.rb

@@ -38,20 +38,13 @@ module SC
     class_option "build",        :type => :string, :aliases => "-b"
     class_option "build-targets",:type => :string,
       :desc => "Targets to build (excluding their dependencies)"
-    
-    class_option "yui-minification",     :type => :boolean,
-      :desc => "Deprecated. Does nothing."
-    
+
     class_option "dont-minify",     :type => :boolean,
       :desc => "Disables minification for the build."
-    
+
     class_option "verbose",      :type => :boolean, :aliases => "-v"
     class_option "very-verbose", :type => :boolean, :aliases => "-V"
-    
-    class_option "library",      :type => :string, #deprecated
-      :desc => "Deprecated."
-    class_option "environment",  :type => :string, #deprecated
-      :desc => "Deprecated."
+
     class_option "help",         :type => :boolean
 
     default_task :banner
@@ -140,7 +133,7 @@ module SC
         build_mode = (options[:mode] || options[:environment] || preferred_mode).to_s.downcase.to_sym
         SC.build_mode = build_mode
       end
-      
+
       def prepare_app!
         if options[:'build-targets']
           SC.env[:build_targets] = options[:'build-targets'].split(',')
@@ -148,7 +141,7 @@ module SC
           SC.env[:build_targets] = ''
         end
       end
-      
+
       def dont_minify!
         SC.env[:dont_minify] = options[:'dont-minify']
       end
@@ -247,7 +240,7 @@ module SC
 
         # Filter out any empty target names.  Sometimes this happens when
         # processing arguments.
-        
+
         targets.reject! { |x| x.nil? || x.size == 0}
 
         # If targets are specified, find the targets project or parents...
@@ -279,8 +272,8 @@ module SC
 
         appnames = SC.env[:build_targets]
 
-        # if it has the appname argument only build the target with the appname        
-        if appnames.size > 0 
+        # if it has the appname argument only build the target with the appname
+        if appnames.size > 0
           tar = []
           targets.each do |target|
             appnames.each do |appname|
@@ -346,36 +339,36 @@ module SC
           SC.logger.info "Using build numbers: #{numbers.map { |k,v| "#{k}: #{v}" }.join(',')}"
         end
       end
-      
+
       def each_manifest_for_targets(*targets)
         # setup build numbers
         find_build_numbers(*targets)
 
         requires_project! # get project
-        
+
         targets = find_targets(*targets) # get targets
 
         # log output
         SC.logger.info "Building targets: #{targets.map { |t| t.target_name } * ","}"
-        
+
         languages = find_languages(*targets) # get languages
         SC.logger.info "Building languages: #{ languages * "," }"
-        
+
         index = 1
         count = targets.length * languages.length
         SC.logger.info "Total target/language combinations to build: #{count}"
-        
+
         targets.each {|target|
           languages.each {|l|
             manifest = target.manifest_for :language => l
             SC.logger.info "Creating manifest #{index} of #{count} for: #{manifest.target.target_name}:#{manifest.language}"
-            
+
             yield manifest
-            
+
             index += 1
           }
         }
-        
+
       end
 
       # Core method to process command line options and then build a manifest.
@@ -384,11 +377,11 @@ module SC
         # Build'em
         each_manifest_for_targets(*targets) do |manifest|
           manifest.build!
-          
+
           yield manifest
         end
       end
-      
+
       # Loops over all of the manifest's entries and builds all essential entries.
       # Entries such as javascript.js are considered non-essential because they will
       # not actually be used in a fully built app (except for modules).