sproutcore 1.6.0.beta.3-x86-mingw32 → 1.6.0.rc.1-x86-mingw32

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

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace) %>
 /*globals <%= namespace %> */
 
 // This is the theme that defines how your app renders.

data/lib/gen/controller/templates/controllers/{@filename@.js → @filename@_controller.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_instance_name %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace_instance_name) %>
 /*globals <%= namespace %> */
 
 /** @class

data/lib/gen/controller/templates/tests/controllers/{@filename@.js → @filename@_test.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_instance_name %> Unit Test
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace_instance_name} Unit Test") %>
 /*globals <%= namespace %> module test ok equals same stop start */
 
 module("<%= namespace_instance_name %>");

data/lib/gen/data-source/templates/data_sources/{@filename@.js → @filename@_data_source.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_class_name %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace_class_name) %>
 /*globals <%= namespace %> */
 
 /** @class

data/lib/gen/design/templates/resources/@filename@.js

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_instance_name %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace_instance_name) %>
 /*globals <%= namespace %> */
 
 // This page describes a part of the interface for your application.

data/lib/gen/framework/templates/frameworks/@target_name@/core.js

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace) %>
 /*globals <%= namespace %> */
 
 /** @namespace

data/lib/gen/framework/templates/frameworks/@target_name@/english.lproj/strings.js

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %> Strings
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace} Strings") %>
 /*globals <%= namespace %> */
 
 // Place strings you want to localize here.  In your app, use the key and

data/lib/gen/html_app/templates/apps/@target_name@/@target_name@.js

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace) %>
 /*globals <%= namespace %> */
 
 <%= namespace %> = SC.Application.create();

data/lib/gen/html_app/templates/apps/@target_name@/resources/stylesheets/@target_name@.css

@@ -1,3 +1,5 @@
+<%= copyright_block(namespace, :css) %>
+
 .sc-view {
   position: relative;
   overflow: visible;

data/lib/gen/html_project/templates/@filename@/Buildfile

@@ -1,7 +1,4 @@
-# ===========================================================================
-# Project:   <%= namespace %>
-# Copyright: ©<%= Time.now.year %> My Company, Inc.
-# ===========================================================================
+<%= copyright_block(namespace, :ruby) %>
 
 # Add initial buildfile information here
 config :all, :required => "sproutcore/core_foundation", :theme => "sproutcore/empty_theme"

data/lib/gen/html_project/templates/@filename@/README

@@ -1,7 +1,4 @@
-=============================================================================
-Project:   <%= namespace %>
-Copyright: ©<%= Time.now.year %> My Company, Inc.
-=============================================================================
+<%= copyright_block(namespace, false) %>
 
 TODO: Describe Your Project
 

data/lib/gen/language/templates/@filename@/strings.js

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %> Strings
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace} Strings") %>
 
 // Place strings you want to localize here.  In your app, use the key and
 // localize it using "key string".loc().  HINT: For your key names, use the

data/lib/gen/model/templates/fixtures/{@filename@.js → @filename@_fixtures.js}

@@ -1,10 +1,7 @@
-// ==========================================================================
-// Project:   <%= namespace_class_name %> Fixtures
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace_class_name} Fixtures") %>
 /*globals <%= namespace %> */
 
-sc_require('models/<%= filename.ext('') %>');
+sc_require('models/<%= filename.ext('') %>_model');
 
 <%= namespace_class_name %>.FIXTURES = [
 

data/lib/gen/model/templates/models/{@filename@.js → @filename@_model.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_class_name %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace_class_name) %>
 /*globals <%= namespace %> */
 
 /** @class

data/lib/gen/model/templates/tests/models/{@filename@.js → @filename@_test.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_class_name %> Unit Test
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace_class_name} Unit Test") %>
 /*globals <%= namespace %> module test ok equals same stop start */
 
 module("<%= namespace_class_name %>");

data/lib/gen/page/templates/pages/@target_name@/Buildfile

@@ -1,7 +1,4 @@
-#  ==========================================================================
-#  Project:   <%= namespace %> Buildfile
-#  Copyright: ©<%= Time.now.year %> My Company, Inc.
-#  ==========================================================================
+<%= copyright_block("#{namespace} Buildfile", :ruby) %>
 
 # You can use to buildfile to add a custom page title, set environment 
 # variables, and require any specific JavaScript or other libraries you want

data/lib/gen/page/templates/pages/@target_name@/core.js

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace) %>
 /*globals <%= namespace %> */
 
 /** @namespace

data/lib/gen/page/templates/pages/@target_name@/en.lproj/strings.js

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %> Strings
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace} Strings") %>
 
 // Place strings you want to localize here.  In your app, use the key and
 // localize it using "key string".loc().  HINT: For your key names, use the

data/lib/gen/page/templates/pages/@target_name@/resources/body.css

@@ -1 +1,3 @@
-/* Add any extra CSS for this page here.  You can also add other CSS files if you want */
+<%= copyright_block(namespace, :css) %>
+
+/* Add any extra CSS for this page here.  You can also add other CSS files if you want */

data/lib/gen/project/templates/@filename@/Buildfile

@@ -1,7 +1,4 @@
-# ===========================================================================
-# Project:   <%= namespace %>
-# Copyright: ©<%= Time.now.year %> My Company, Inc.
-# ===========================================================================
+<%= copyright_block(namespace, :ruby) %>
 
 # This is your Buildfile, which sets build settings for your project.
 # For example, this tells SproutCore's build tools that your requires

data/lib/gen/project/templates/@filename@/README

@@ -1,7 +1,3 @@
-=============================================================================
-Project:   <%= namespace %>
-Copyright: ©<%= Time.now.year %> My Company, Inc.
-=============================================================================
+<%= copyright_block(namespace, false) %>
 
 TODO: Describe Your Project
-

data/lib/gen/responder/templates/states/{@filename@.js → @filename@_state.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %>.<%= class_name.upcase %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace}.#{class_name.upcase}") %>
 /*globals <%= namespace %> */
 
 /** @class

data/lib/gen/test/templates/tests/{@filename@.js → @filename@_test.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %> Unit Test
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace} Unit Test") %>
 /*globals <%= namespace %> module test ok equals same stop start */
 
 module("<%= namespace %>");

data/lib/gen/theme/templates/themes/@target_name@/resources/theme_styles.css

@@ -1,8 +1,4 @@
-/* ==========================================================================
-*  Project:   <%= namespace %> Theme Styles
-*  Copyright: ©<%= Time.now.year %> My Company, Inc.
-*  ==========================================================================
-*/
+<%= copyright_block("#{namespace} Theme Styles", :css) %>
 
 /* 
   Place any styles you want to define in this file.  You can also break your

data/lib/gen/theme/templates/themes/@target_name@/theme.js

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace) %>
 /*globals <%= namespace %> */
 
 // This is the JavaScript representation of your theme.

data/lib/gen/view/templates/tests/views/{@filename@.js → @filename@_test.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_class_name %> Unit Test
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace_class_name} Unit Test") %>
 /*globals <%= namespace %> module test ok equals same stop start */
 
 module("<%= namespace_class_name %>");

data/lib/gen/view/templates/views/{@filename@.js → @filename@_view.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_class_name %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace_class_name) %>
 /*globals <%= namespace %> */
 
 /** @class

data/lib/sproutcore.rb

@@ -78,7 +78,7 @@ module SproutCore
 
       # if we are logging to the screen, no reason to use a std loggin fmt
       @logger.formatter = lambda do |severity, time, progname, msg|
-        [severity, '~', msg.to_s, "\n"].join(' ')
+        [severity, time.strftime("%H:%M:%S.") + "%.3d" % (time.usec / 100000), '~', msg.to_s, "\n"].join(' ')
       end
     end
 
@@ -150,6 +150,9 @@ module SproutCore
     end
   end
 
+  def self.attach_prefix(url)
+    $script_name ? "#{$script_name}#{url}" : url
+  end
 end  # module SC
 
 SC = SproutCore # alias

data/lib/sproutcore/builders/handlebars.rb

@@ -22,7 +22,7 @@ module SC
 
     def build(dst_path)
       template_name = entry.rootname[/^.*\/([^\/]*)$/, 1]
-      writelines dst_path, "SC.TEMPLATES[#{template_name.inspect}] = SC.Handlebars.compile(#{readlines(entry[:source_path]).to_json})"
+      writelines dst_path, "SC.TEMPLATES[#{template_name.inspect}] = SC.Handlebars.compile(#{readlines(entry[:source_path]).to_json});"
     end
   end
 

data/lib/sproutcore/builders/module.rb

@@ -27,7 +27,7 @@ module SC
           if (SC.MODULE_INFO[target_name]) return ; <%# not an error... %>
 
           <%# first time, so add a Hash with this target's module_info %>
-          SC.MODULE_INFO[target_name] = {
+          SC.MODULE_INFO[target_name] = SC.Object.create({
             dependencies:[<%= @dependencies.join(',') %>],
             styles:[<%= @styles.join(',') %>],
             styles2x: [<%= @styles2x.join(',') %>],
@@ -35,7 +35,7 @@ module SC
             stringURL:'<%= @string %>'<% if @prefetched %>,
             isPrefetched: YES
             <% end %>
-          }
+          })
         })();
       EOT
 

data/lib/sproutcore/helpers/static_helper.rb

@@ -191,8 +191,10 @@ module SC
           end
         end
 
-        ret << %(<script type="text/javascript">SC.buildMode = "#{SC.build_mode}";</script>)
-        
+        url_prefix = $script_name ? %("#{$script_name}") : "null";
+
+        ret << %(<script type="text/javascript">SC.buildMode = "#{SC.build_mode}"; \n SC.urlPrefix = #{url_prefix}; </script>)
+
         return ret * "\n"
       end
 

data/lib/sproutcore/models/generator.rb

@@ -293,6 +293,28 @@ module SC
       [self.namespace, self.instance_name].compact.join '.'
     end
 
+    def copyright_block(desc, commented=:javascript)
+      company = ENV['COMPANY'] || "My Company, Inc."
+
+      str = ["==========================================================================",
+             "Project:   #{desc}",
+             "Copyright: @#{Time.now.year} #{company}",
+             "=========================================================================="]
+
+      case commented
+      when true, :javascript, :js
+        str.map!{|s| "// #{s}" }
+      when :css
+        str[0] = "/* #{str[0]}"
+        str[1..-1].each{|s| s.replace "*  #{s}" }
+        str << "*/"
+      when :ruby
+        str.map!{|s| "# #{s}" }
+      end
+
+      str.join("\n")
+    end
+
     # Verifies that the passed array of keys are defined on the object.  If
     # you pass an optional block, the block will be invoked for each key so
     # you can validate the value as well.  Otherwise, this will raise an error

data/lib/sproutcore/models/manifest_entry.rb

@@ -167,6 +167,7 @@ module SC
     def cacheable_url
       ret = self[:url]
       ret = [ret, self.timestamp].join('?') if target.config[:timestamp_urls]
+      ret = SC.attach_prefix(ret)
       if target.config[:hyper_domaining]
         ret = [self.hyperdomain_prefix(ret), ret].join('')
       end

data/lib/sproutcore/models/target.rb

@@ -642,7 +642,10 @@ module SC
         js_urls = []
         javascript_entries.each do |resource_name, entries|
           resource_name = resource_name.ext('js')
-          pf = (resource_name == 'javascript.js') ? %w(source/lproj/strings.js source/core.js source/utils.js) : []
+          target_name = manifest.target.target_name.to_s.split('/')[-1]
+          pf = (resource_name == 'javascript.js') ?
+                  ['source/lproj/strings.js', 'source/core.js', "source/#{target_name}.js", 'source/utils.js'] :
+                  []
           SC::Helpers::EntrySorter.sort(entries, pf).each do |entry|
             if minify_js && entry[:minified]
               js_urls << entry.cacheable_url

data/lib/sproutcore/rack/builder.rb

@@ -89,6 +89,9 @@ module SC
         project_mutex.synchronize do
           did_reload = reload_project! # if needed
 
+          # set SCRIPT_NAME to correctly set namespaces
+          $script_name = env["SCRIPT_NAME"]
+
           # collect some standard info
           url = env['PATH_INFO']
           url = '/sproutcore/welcome' if url == '/'

data/lib/sproutcore/tools.rb

@@ -32,17 +32,17 @@ module SC
 
     # All sproutcore tools can take some standard options.  These are
     # processed automatically when the tool is loaded
-    class_option "project",      :type => :string
-    class_option "mode",         :type => :string
-    class_option "logfile",      :type => :string
-    class_option "build",        :type => :string
-    class_option "build-targets",:type => :string
-    class_option "yui-minification",     :type => :boolean
-    class_option "dont-minify",     :type => :boolean
-    class_option "verbose",      :type => :boolean, :aliases => "-v"
-    class_option "very-verbose", :type => :boolean, :aliases => "-V"
-    class_option "library",      :type => :string #deprecated
-    class_option "environment",  :type => :string #deprecated
+    class_option "project",           :type => :string
+    class_option "mode",              :type => :string
+    class_option "logfile",           :type => :string
+    class_option "build",             :type => :string, :aliases => "-b"
+    class_option "build-targets",     :type => :string
+    class_option "yui-minification",  :type => :boolean
+    class_option "dont-minify",       :type => :boolean
+    class_option "verbose",           :type => :boolean, :aliases => "-v"
+    class_option "very-verbose",      :type => :boolean, :aliases => "-V"
+    class_option "library",           :type => :string #deprecated
+    class_option "environment",       :type => :string #deprecated
 
     default_task :banner
 

data/lib/sproutcore/tools/init.rb

@@ -14,17 +14,11 @@ module SC
     def init(project_name, app_name=nil)
 
       # Generate the project
-      if (options[:template])
-        project_gen = SC.builtin_project.generator_for 'html_project',
-          :arguments => ['project', project_name],
-          :dry_run   => options['dry-run'],
-          :force     => options[:force]
-      else
-        project_gen = SC.builtin_project.generator_for 'project',
-          :arguments => ['project', project_name],
-          :dry_run   => options['dry-run'],
-          :force     => options[:force]
-      end
+      project_type = options[:template] ? 'html_project' : 'project'
+      project_gen = SC.builtin_project.generator_for project_type,
+        :arguments => ['project', project_name],
+        :dry_run   => options['dry-run'],
+        :force     => options[:force]
 
       project_gen.prepare!.build!
 
@@ -35,17 +29,11 @@ module SC
       # And get the app generator and run it
       project = SC::Project.load project_root, :parent => SC.builtin_project
 
-      if (options[:template])
-        generator = project.generator_for 'html_app',
-          :arguments => ['app', app_name],
-          :dry_run   => options['dry-run'],
-          :force     => options[:force]
-      else
-        generator = project.generator_for 'app',
-          :arguments => ['app', app_name],
-          :dry_run   => options['dry-run'],
-          :force     => options[:force]
-      end
+      app_type = options[:template] ? 'html_app' : 'app'
+      generator = project.generator_for app_type,
+        :arguments => ['app', app_name],
+        :dry_run   => options['dry-run'],
+        :force     => options[:force]
       generator.prepare!.build!
 
       project_gen.log_file(project_gen.source_root / 'INIT')