sproutcore 1.0.1046 → 1.0.1049.pre.1

data/{buildtasks → lib/buildtasks}/render.rake

@@ -9,13 +9,13 @@
 namespace :render do
 
   desc "renders erubis including .rhtml and .html.erb files"
-  task :erubis do
-    CONTEXT.compile SC::RenderEngine::Erubis.new(CONTEXT), SRC_PATH
+  task :erubis do |task, env|
+    env[:context].compile SC::RenderEngine::Erubis.new(env[:context]), env[:src_path]
   end
   
   desc "renders haml files"
-  task :haml do
-    CONTEXT.compile SC::RenderEngine::Haml.new(CONTEXT), SRC_PATH
+  task :haml do |task, env|
+    env[:context].compile SC::RenderEngine::Haml.new(env[:context]), env[:src_path]
   end
   
-end
+end

data/lib/buildtasks/target.rake

@@ -0,0 +1,65 @@
+# ===========================================================================
+# SC::Target Buildtasks
+# copyright 2008, Sprout Systems, Inc. and Apple Inc. all rights reserved
+# ===========================================================================
+
+# Tasks invoked while building Target objects.  You can override these methods
+# in your buildfiles.
+namespace :target do
+
+  # Invoked whenever a new target is created to prepare standard properties
+  # needed on the build system.  Extend this task to add other standard
+  # properties
+  task :prepare do |task, env|
+
+    target = env[:target]
+    config = CONFIG
+    project = env[:project]
+
+    # use url_root config or merge url_prefix + target_name
+    if (target[:url_root] = config[:url_root]).nil?
+      url = [nil, config[:url_prefix], target[:target_name]].join('/')
+      url = url.gsub(/([^:])\/+/,'\1/').gsub(/^\/+/,'/') # remove extra //
+      url = url[1..-1] if url.match(/^\/[^\/]+:\/\//) # look for protocol
+      target[:url_root] = url
+    end
+
+
+    # use index_root config or merge index_prefix + target_name
+    if (target[:index_root] = config[:index_root]).nil?
+      url = [nil, config[:index_prefix], target[:target_name]].join('/')
+      url = url.gsub(/([^:])\/+/,'\1/').gsub(/^\/+/,'/') # remove extra //
+      url = url[1..-1] if url.match(/^\/[^\/]+:\/\//) # look for protocol
+      target[:index_root] = url
+    end
+
+    url_prefix = config[:url_prefix]
+    url_prefix = url_prefix.gsub(/^[^\/]+:\/\/[^\/]+\//,'') if url_prefix
+
+    # Split all of these paths in case we are on windows...
+    target[:build_root] = File.expand_path(config[:build_root] ||
+      File.join(project.project_root.to_s,
+        (config[:build_prefix] || '').to_s.split('/'),
+        (url_prefix || '').to_s.split('/'),
+        target[:target_name].to_s.split('/')))
+
+    target[:staging_root] = File.expand_path(config[:staging_root] ||
+      File.join(project.project_root.to_s,
+        (config[:staging_prefix] || '').to_s.split('/'),
+        (url_prefix || '').to_s.split('/'),
+        target[:target_name].to_s))
+
+    # cache is used to store intermediate files
+    target[:cache_root] = File.expand_path(config[:cache_root] ||
+      File.join(project.project_root.to_s,
+        (config[:cache_prefix] || '').to_s.split('/'),
+        (url_prefix || '').to_s.split('/'),
+        target[:target_name].to_s))
+
+    target[:build_number] = target.compute_build_number
+
+    # The target is loadable if it is an app
+    target[:loadable] = target[:target_type] == :app
+  end
+
+end

data/lib/sproutcore.rb

@@ -9,6 +9,8 @@ require 'logger'
 require 'extlib'
 require 'yaml'
 
+$:.delete_if {|f| f =~ /json_pure-/ } if $:.any? {|f| f =~ /json-/ }
+
 # Ruby 1.8 Compatibility
 if (RUBY_VERSION.match(/1\.8/))
   $KCODE = 'u'
@@ -19,8 +21,8 @@ end
 # Ruby 1.9 Compatibility
 if (RUBY_VERSION.match(/1\.9/))
   # Fix for Rack Ruby 1.9 incompatibility. This makes 404s render again.
-  class String 
-    alias each each_line unless ''.respond_to?(:each) 
+  class String
+    alias each each_line unless ''.respond_to?(:each)
   end
 end
 
@@ -28,18 +30,9 @@ end
 YES = true
 NO = false
 
-module SproutCore
+require "sproutcore/version"
 
-  # :stopdoc:
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  
-  VERSION_PATH = PATH / 'VERSION.yml'
-  VERSION_INFO = YAML.load_file(VERSION_PATH)
-  
-  VERSION = [VERSION_INFO[:major], VERSION_INFO[:minor], VERSION_INFO[:patch]].join('.')
-  
-  # :startdoc:
+module SproutCore
 
   # Returns the version string for the library.
   #
@@ -63,19 +56,6 @@ module SproutCore
     args.empty? ? PATH : ::File.join(PATH, args.flatten)
   end
 
-  # Utility method used to rquire all files ending in .rb that lie in the
-  # directory below this file that has the same name as the filename passed
-  # in. Optionally, a specific _directory_ name can be passed in such that
-  # the _filename_ does not have to be equivalent to the directory.
-  #
-  def self.require_all_libs_relative_to( fname, dir = nil )
-    dir ||= ::File.basename(fname, '.*')
-    search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '*.rb'))
-
-    Dir.glob(search_me).sort.each {|rb| require rb}
-  end
-  
   # Global variable that can store specific environmental settings.  This is
   # where you will find the build mode among other things set by sc-build.
   #
@@ -83,62 +63,62 @@ module SproutCore
     @env ||= HashStruct.new(:build_mode => :debug, :buildfile_names => %w(Buildfile sc-config sc-config.rb))
   end
   def self.env=(hash); @env = HashStruct.new(hash); end
-  
+
   # Returns a standard logger object.  You can replace this with your own
   # logger to redirect all SproutCore log output if needed.  Otherwise, a
-  # logger will bre created based on your env.log_level and env.logfile 
+  # logger will bre created based on your env.log_level and env.logfile
   # options.
-  def self.logger 
+  def self.logger
     return @logger unless @logger.nil?
-    
-    if env.logfile
-      @logger = Logger.new env.logfile, 10, 1024000
+
+    if env[:logfile]
+      @logger = Logger.new env[:logfile], 10, 1024000
     else
       @logger = Logger.new $stderr
-      
+
       # 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, '~', msg.to_s, "\n"].join(' ')
       end
     end
-    
-    @logger.level = (env.log_level == :debug) ? Logger::DEBUG : ((env.log_level == :info) ? Logger::INFO : Logger::WARN)
-    
+
+    @logger.level = (env[:log_level] == :debug) ? Logger::DEBUG : ((env[:log_level] == :info) ? Logger::INFO : Logger::WARN)
+
     return @logger
   end
   attr_writer :logger
 
   # Returns the current build mode. The build mode is determined based on the
-  # current environment build_mode settings.  Note that for backwards 
-  # compatibility reasons, :development and :debug are treated as being 
+  # current environment build_mode settings.  Note that for backwards
+  # compatibility reasons, :development and :debug are treated as being
   # identical.
   def self.build_mode
-    ret = env.build_mode || :production
+    ret = env[:build_mode] || :production
     ret = ret.to_sym unless ret.nil?
     ret = :debug if ret == :development # backwards compatibility
     ret
   end
-  
+
   def self.build_mode=(new_mode)
     new_mode = new_mode.to_sym
     new_mode = :debug if new_mode == :development
-    env.build_mode = new_mode
+    env[:build_mode] = new_mode
     self.build_mode
   end
-  
+
   # Returns a project instance representing the builtin library
   def self.builtin_project
     @builtin_project ||= SC::Project.new(PATH)
   end
-  
-  # Returns the current project, if defined.  This is normally only set 
+
+  # Returns the current project, if defined.  This is normally only set
   # when you start sc-server in interactive mode.
   def self.project; @project; end
   def self.project=(project); @project = project; end
-  
+
   # Attempts to load a project for the current working directory or from the
   # passed directory location.  Returns nil if no project could be detected.
-  # This is just a shorthand for creating a Project object.  It is useful 
+  # This is just a shorthand for creating a Project object.  It is useful
   # when using the build tools as a Ruby library
   def self.load_project(path = nil, opts = {})
     path = File.expand_path(path.nil? ? Dir.pwd : path)
@@ -148,15 +128,40 @@ module SproutCore
       SC::Project.load_nearest_project path, :parent => SC.builtin_project
     end
   end
-    
+
+  def self.yui_jar
+    @yui_jar ||= begin
+      yui_root = File.expand_path("../sproutcore/vendor/yui-compressor", __FILE__)
+      File.join(yui_root, 'SCyuicompressor-2.4.2.jar')
+    end
+  end
+
+  def self.profile(env)
+    if ENV[env]
+      require "ruby-prof"
+      RubyProf.start
+      yield
+      result = RubyProf.stop
+      printer = RubyProf::CallStackPrinter.new(result)
+      printer.print(File.open("output.html", "w"), :min_percent => 0)
+      exit!
+    else
+      yield
+    end
+  end
+
 end  # module SC
 
 SC = SproutCore # alias
 
-
-SC.require_all_libs_relative_to(__FILE__)
-%w(buildfile models helpers deprecated builders render_engines tools rack).each do |dir|
-  SC.require_all_libs_relative_to(__FILE__, ['sproutcore', dir])
-end
+require "sproutcore/buildfile"
+require "sproutcore/tools"
+require "sproutcore/rack"
+require "sproutcore/helpers"
+require "sproutcore/deprecated/view_helper"
+require "sproutcore/builders"
+require "sproutcore/models"
+require "sproutcore/render_engines/erubis"
+require "sproutcore/render_engines/haml"
 
 # EOF

data/lib/sproutcore/builders.rb

@@ -0,0 +1,12 @@
+require "sproutcore/builders/base"
+require "sproutcore/builders/bundle"
+require "sproutcore/builders/combine"
+require "sproutcore/builders/html"
+require "sproutcore/builders/javascript"
+require "sproutcore/builders/minify"
+require "sproutcore/builders/sass"
+require "sproutcore/builders/strings"
+require "sproutcore/builders/stylesheet"
+require "sproutcore/builders/test"
+require "sproutcore/builders/test_index"
+

data/lib/sproutcore/builders/base.rb

@@ -6,21 +6,21 @@
 # ===========================================================================
 
 module SC
-  
-  # Builder classes implement the more complex algorithms for building 
-  # resources in SproutCore such as building HTML, JavaScript or CSS.  
+
+  # Builder classes implement the more complex algorithms for building
+  # resources in SproutCore such as building HTML, JavaScript or CSS.
   # Builders are usually invoked from within build tasks which are, in-turn,
   # selected by the manifest.
   #
-  module Builder    
-  
+  module Builder
+
     # The base class extended by most builder classes.  This contains some
     # default functionality for handling loading and writing files.  Usually
     # you will want to consult the specific classes instead for more info.
     #
     class Base
       # entry the current builder is working on
-      attr_accessor :entry 
+      attr_accessor :entry
 
       def initialize(entry=nil)
         @entry =entry
@@ -30,15 +30,15 @@ module SC
       def build(dst_path)
       end
 
-      # main entry called by build tasls
+      # main entry called by build tasks
       def self.build(entry, dst_path)
         new(entry).build(dst_path)
       end
 
-      # Reads the lines from the source file.  If the source file does not 
+      # Reads the lines from the source file.  If the source file does not
       # exist, returns empty array.
       def readlines(src_path)
-        if File.exist?(src_path) && !File.directory?(src_path) 
+        if File.exist?(src_path) && !File.directory?(src_path)
           File.readlines(src_path)
         else
           []
@@ -61,31 +61,30 @@ module SC
 
       # Handles occurances of sc_static() or static_url()
       def replace_static_url(line)
-        return unless (line.valid_encoding?)
-        line.gsub(/(sc_static|static_url|sc_target)\(\s*['"](.+)['"]\s*\)/) do | rsrc |
+        line.gsub!(/(sc_static|static_url|sc_target)\(\s*['"](.+)['"]\s*\)/) do | rsrc |
           entry_name = $2
           entry_name = "#{$2}:index.html" if $1 == 'sc_target'
           static_entry = entry.manifest.find_entry($2)
-          
-          if static_entry.nil?
+
+          if !static_entry
             url = ''
           elsif $1 == 'sc_target'
-            url = static_entry.friendly_url || static_entry.cacheable_url
+            url = static_entry[:friendly_url] || static_entry.cacheable_url
           else
-            url = static_entry.cacheable_url 
+            url = static_entry.cacheable_url
           end
-            
+
           static_url(url)
         end
       end
 
       # Generates the proper output for a given static url and a given target
-      # this is often overridden by subclasses.  the default just wraps in 
+      # this is often overridden by subclasses.  the default just wraps in
       # quotes.
       def static_url(url='')
-        ["'", url.gsub('"','\"'),"'"].join('')
+        "'#{url.gsub('"', '\"')}'"
       end
     end # class
-    
+
   end # module Builder
-end # module SC
+end # module SC

data/lib/sproutcore/builders/bundle.rb

@@ -5,37 +5,37 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+require "sproutcore/builders/base"
 
 module SC
 
   # Builds a bundle_loaded.js file which MUST be the last JavaScript to load
   # in a framework.
   class Builder::BundleLoaded < Builder::Base
-    
+
     def build(dst_path)
-      writelines dst_path, ["; if ((typeof SC !== 'undefined') && SC && SC.bundleDidLoad) SC.bundleDidLoad('#{entry.target.target_name.to_s.sub(/^\//,'')}');"]
+      writelines dst_path, ["; if ((typeof SC !== 'undefined') && SC && SC.bundleDidLoad) SC.bundleDidLoad('#{entry.target[:target_name].to_s.sub(/^\//,'')}');"]
     end
-    
+
   end
-  
-  # Builds a bundle_info.js file which MUST be run *before* the framework is 
+
+  # Builds a bundle_info.js file which MUST be run *before* the framework is
   # loaded by the application or framework doing the loading.
   class Builder::BundleInfo < Builder::Base
-    
+
     def build(dst_path)
       begin
         require 'erubis'
       rescue
         raise "Cannot render bundle_info.js because erubis is not installed. Try running 'sudo gem install erubis' and try again."
       end
-      
+
       eruby = Erubis::Eruby.new <<-EOT
         ;(function() {
           var target_name = '<%= @target_name %>' ;
           if (!SC.BUNDLE_INFO) throw "SC.BUNDLE_INFO is not defined!" ;
           if (SC.BUNDLE_INFO[target_name]) return ; <%# not an error... %>
-          
+
           <%# first time, so add a Hash with this target's bundle_info %>
           SC.BUNDLE_INFO[target_name] = {
             requires: [<%= @requires.join(',') %>],
@@ -44,20 +44,20 @@ module SC
           }
         })();
       EOT
-      
+
       output = ""
       entry.targets.each do |t|
-        bundle_info = t.bundle_info({ :debug => entry.debug, :test => entry.test, :theme => entry.theme, :variation => entry.variation })
+        bundle_info = t.bundle_info({ :debug => entry[:debug], :test => entry[:test], :theme => entry[:theme], :variation => entry[:variation] })
         output << eruby.evaluate({
-          :target_name => t.target_name.to_s.sub(/^\//,''),
-          :requires => bundle_info.requires.map{ |t| "'#{t.target_name.to_s.sub(/^\//,'')}'" },
-          :styles   => bundle_info.css_urls.map{ |url| "'#{url}'" },
-          :scripts  => bundle_info.js_urls.map{  |url| "'#{url}'" }
+          :target_name => t[:target_name].to_s.sub(/^\//,''),
+          :requires => bundle_info[:requires].map{ |t| "'#{t[:target_name].to_s.sub(/^\//,'')}'" },
+          :styles   => bundle_info[:css_urls].map{ |url| "'#{url}'" },
+          :scripts  => bundle_info[:js_urls].map{  |url| "'#{url}'" }
         })
       end
       writelines dst_path, [output]
     end
-    
+
   end
-  
+
 end