sproutcore 1.0.1046 → 1.0.1049.pre.1

data/lib/sproutcore/builders/combine.rb

@@ -5,7 +5,7 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+require "sproutcore/builders/base"
 require 'fileutils'
 
 module SC
@@ -16,13 +16,13 @@ module SC
   # build directives such sc_static().
   #
   class Builder::Combine < Builder::Base
-    
+
     def build(dst_path)
       lines = []
-      entries = entry.ordered_entries || entry.source_entries
-      
-      target_name = entry.target.target_name.to_s.sub(/^\//,'')
-      if entry.top_level_lazy_instantiation && entry.combined
+      entries = entry[:ordered_entries] || entry[:source_entries]
+
+      target_name = entry.target[:target_name].to_s.sub(/^\//,'')
+      if entry[:top_level_lazy_instantiation] && entry[:combined]
         lines << ";
 if ((typeof SC !== 'undefined') && SC && !SC.LAZY_INSTANTIATION) {
   SC.LAZY_INSTANTIATION = {};
@@ -33,19 +33,19 @@ if(!SC.LAZY_INSTANTIATION['#{target_name}']) {
 SC.LAZY_INSTANTIATION['#{target_name}'].push(
   (
     function() {
-"        
-      end  
+"
+      end
 
       entries.each do |entry|
-        src_path = entry.stage!.staging_path
+        src_path = entry.stage![:staging_path]
         next unless File.exist?(src_path)
-        
-        lines << "/* >>>>>>>>>> BEGIN #{entry.filename} */\n"
+
+        lines << "/* >>>>>>>>>> BEGIN #{entry[:filename]} */\n"
         lines += readlines(src_path)
         lines << "\n"
       end
 
-      if entry.top_level_lazy_instantiation && entry.combined
+      if entry[:top_level_lazy_instantiation] && entry[:combined]
         lines << "
     }
   )
@@ -54,7 +54,7 @@ SC.LAZY_INSTANTIATION['#{target_name}'].push(
     end
       writelines dst_path, lines
     end
-    
+
   end
-  
+
 end

data/lib/sproutcore/builders/html.rb

@@ -5,119 +5,124 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+require "sproutcore/builders/base"
 
 module SC
 
   # Builds an HTML files.  This will setup an HtmlContext and then invokes
   # the render engines for each source before finally rendering the layout.
   class Builder::Html < Builder::Base
-    
+
     include SC::Helpers::TagHelper
     include SC::Helpers::TextHelper
     include SC::Helpers::CaptureHelper
     include SC::Helpers::StaticHelper
     include SC::Helpers::DomIdHelper
     include SC::ViewHelpers
-    
+
     # the entry we are building
     attr_reader :entry
-    
+
     # bundle is an alias for target included for backwards compatibility
     attr_reader :target, :bundle
-    
+
     # the full set of entries we plan to build
     attr_reader :entries
-    
+
     # the final filename
     attr_reader :filename
-    
+
     # the current builder language
     attr_reader :language
-    
+
     # library is an alias for project for backwards compatibility
     attr_reader :project, :library
-    
+
     # the current render
     attr_reader :renderer
-    
+
     # manifest owning the current entry
     attr_reader :manifest
-    
-    def target_name; target.target_name.to_s.sub(/^\//,''); end
+
+    def target_name; target[:target_name].to_s.sub(/^\//,''); end
     alias_method :bundle_name, :target_name # backwards compat
-    
+
     def config; target.config; end
-    
-    # The entry for the layout we want to build.  this will be used to 
+
+    # The entry for the layout we want to build.  this will be used to
     # stage the layout if needed..
     def layout_entry
       @manifest.entry_for(@layout) || @manifest.entry_for(@layout, :hidden => true)
     end
-    
-    # the path to the current layout for the resource.  this is computed 
+
+    # the path to the current layout for the resource.  this is computed
     # from the layout property, which is a relative pathname.
     def layout_path
       entry = layout_entry
-      entry.nil? ? nil : entry.staging_path
+      entry.nil? ? nil : entry[:staging_path]
     end
-    
+
     def initialize(entry)
       super(entry)
       @target = @bundle = entry.manifest.target
-      @filename = entry.filename
-      @language = @entry.manifest.language
+      @filename = entry[:filename]
+      @language = @entry.manifest[:language]
       @project = @library = @target.project
       @manifest = entry.manifest
       @renderer = nil
-      
+
       # set the current layout from the target's config.layout
-      @layout = @target.config.layout || 'lib/index.rhtml'
-      
+      @layout = @target.config[:layout] || 'lib/index.rhtml'
+
       # find all entries -- use source_Entries + required if needed
-      @entries = entry.source_entries.dup
+      @entries = entry[:source_entries].dup
       if entry.include_required_targets?
         @target.expand_required_targets.each do |target|
           cur_manifest = target.manifest_for(@manifest.variation).build!
-          cur_entry = cur_manifest.entry_for(entry.filename, :combined => true) || cur_manifest.entry_for(entry.filename, :hidden => true, :combined => true)
+          cur_entry = cur_manifest.entry_for(entry[:filename], :combined => true) || cur_manifest.entry_for(entry[:filename], :hidden => true, :combined => true)
           next if cur_entry.nil?
-          @entries += cur_entry.source_entries
+          @entries += cur_entry[:source_entries]
         end
       end
     end
 
     # Returns the expanded list of required targets for the passed target.
-    # This method can be overridden by subclasses to provide specific 
+    # This method can be overridden by subclasses to provide specific
     # config settings.
     def expand_required_targets(target, opts = {})
-      opts[:debug] = target.config.load_debug
+      opts[:debug] = target.config[:load_debug]
       opts[:theme] = true
       return target.expand_required_targets(opts)
     end
-    
-    # Renders the html file, returning the resulting string which can be 
+
+    # Renders the html file, returning the resulting string which can be
     # written to a file.
     def render
-      
+
       # render each entry...
       @entries.each { |entry| render_entry(entry) }
-      
+
       # then finally compile the layout.
       if self.layout_path.nil?
-        raise "html_builder could not find a layout file for #{@layout}" 
+        raise "html_builder could not find a layout file for #{@layout}"
       end
-      
+
       compile(SC::RenderEngine::Erubis.new(self), self.layout_path, :_final_)
       return @content_for__final_
     end
-      
+
     def build(dst_path)
+      if CONFIG[:html5_manifest]
+        $to_html5_manifest << dst_path
+        $to_html5_manifest_networks = CONFIG[:html5_manifest_networks]
+        @content_for_html5_manifest = true
+      end
       writelines dst_path, [self.render]
     end
-    
+
     def default_content_for_key; :resources; end
-    
-    # Loads the passed input file and then hands it to the render_engine 
+
+    # Loads the passed input file and then hands it to the render_engine
     # instance to compile th file.  the results will be targeted at the
     # @content_for_resources area by default unless you pass an optional
     # content_for_key or otherwise override in your template.
@@ -131,37 +136,37 @@ module SC
     #  self
     #
     def compile(render_engine, input_path, content_for_key = nil)
-      
+
       if content_for_key.nil?
         if @in_partial
-          content_for_key = :_partial_ 
+          content_for_key = :_partial_
         else
-          content_for_key = self.default_content_for_key 
+          content_for_key = self.default_content_for_key
         end
       end
-      
+
       if !File.exist?(input_path)
-        raise "html_builder could compile file at #{input_path} because the file could not be found" 
+        raise "html_builder could compile file at #{input_path} because the file could not be found"
       end
 
       old_renderer = @renderer
       @renderer = render_engine  # save for capture...
-      
+
       input = File.read(input_path)
-      
+
       content_for content_for_key do
-        _render_compiled_template( render_engine.compile(input) )
+        _render_compiled_template( render_engine.compile(input), input_path )
       end
-      
+
       @render = old_renderer
       return self
     end
 
     private
-    
+
     # Renders an entry as a partial.  This will insert the results inline
     # instead of into a content div.
-    def render_partial(entry) 
+    def render_partial(entry)
 
       # save off
       old_partial = @content_for__partial_
@@ -173,24 +178,25 @@ module SC
       ret = @content_for__partial_
       @content_for__partial_ = old_partial
       @in_partial = old_in_partial
-      
+
       return ret
-      
+
     end
-    
-    # Renders a single entry.  The entry will be staged and then its 
+
+    # Renders a single entry.  The entry will be staged and then its
     # render task will be executed.
     def render_entry(entry)
+      @content_for_designer = '<script type="text/javascript">SC.suppressMain = YES;</script>' if $design_mode
       entry.stage!
-      entry.target.buildfile.invoke entry.render_task,
-        :entry    => entry, 
-        :src_path => entry.staging_path,
+      entry.target.buildfile.invoke entry[:render_task],
+        :entry    => entry,
+        :src_path => entry[:staging_path],
         :context  => self
     end
-    
+
     # Renders a compiled template within this context
-    def _render_compiled_template(compiled_template)
-      self.instance_eval "def __render(); #{compiled_template}; end"
+    def _render_compiled_template(compiled_template, input_path="(compiled erb)")
+      self.instance_eval "def __render(); #{compiled_template}; end", input_path
       begin
         self.send(:__render) do |*names|
           self.instance_variable_get("@content_for_#{names.first}")
@@ -199,7 +205,7 @@ module SC
         class << self; self end.class_eval{ remove_method(:__render) } rescue nil
       end
     end
-    
+
   end
-  
+
 end

data/lib/sproutcore/builders/javascript.rb

@@ -5,23 +5,38 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+require "sproutcore/builders/base"
 require 'fileutils'
 
 module SC
 
   # This build is used to process a single javascript file.  It will
-  # substitute any calls to sc_super and sc_static() (or static_url()).  It 
-  # does NOT product a combined JavaScript for production.  See the 
+  # substitute any calls to sc_super and sc_static() (or static_url()).  It
+  # 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 writelines(dst_path, lines)
+      FileUtils.mkdir_p(File.dirname(dst_path))
+      File.open(dst_path, 'w') do |f|
+        f.write lines
+      end
+    end
+
     def build(dst_path)
-      lines = []
-      target_name = entry.target.target_name.to_s.sub(/^\//,'')
-      
-      if entry.lazy_instantiation && entry.notify_onload
-        lines << ";
+      lines = ""
+      target_name = entry.target[:target_name].to_s.sub(/^\//,'')
+
+      if entry[:lazy_instantiation] && entry[:notify_onload]
+      lines << ";
 if ((typeof SC !== 'undefined') && SC && !SC.LAZY_INSTANTIATION) {
   SC.LAZY_INSTANTIATION = {};
 }
@@ -34,54 +49,53 @@ SC.LAZY_INSTANTIATION['#{target_name}'].push(
 "
       end
 
-      lines << readlines(entry.source_path).map { |l| rewrite_inline_code(l) }
+      lines << rewrite_inline_code(readlines(entry[:source_path]))
 
       # Try to load dependencies if we're not combining javascript.
-      if entry.notify_onload
+      if entry[:notify_onload]
         lines << "; if ((typeof SC !== 'undefined') && SC && SC.scriptDidLoad) SC.scriptDidLoad('#{target_name}');"
       end
 
-      if entry.lazy_instantiation && entry.notify_onload
+      if entry[:lazy_instantiation] && entry[:notify_onload]
         lines << "
     }
   )
 );
 "
       end
-      
+
       writelines dst_path, lines
     end
 
     # Returns true if the current entry is a localized strings file.  These
     # files receive some specialized processing to allow for server-side only
-    # strings.  -- You can name a string key beginning with "@@" and it will 
+    # strings.  -- You can name a string key beginning with "@@" and it will
     # be removed.
     def localized_strings?
-      @lstrings ||= entry.localized? && entry.filename =~ /strings.js$/
+      @lstrings ||= entry[:localized] && entry[:filename] =~ /strings.js$/
     end
 
     # Rewrites inline content for a single line
-    def rewrite_inline_code(line)
+    def rewrite_inline_code(code)
 
       # Fors strings file, remove server-side keys (i.e '@@foo' = 'bar')
       if localized_strings?
-        line = line.gsub(/["']@@.*["']\s*?:\s*?["'].*["']\s*,\s*$/,'')
+        code.gsub!(/["']@@.*["']\s*?:\s*?["'].*["']\s*,\s*$/,'')
 
-      # Otherwise process sc_super 
+      # Otherwise process sc_super
       else
-        return unless (line.valid_encoding?)
-        if line.match(/sc_super\(\s*\)/)
-          line = line.gsub(/sc_super\(\s*\)/, 'arguments.callee.base.apply(this,arguments)')
-        elsif line.match(/sc_super\(.+?\)/)
+        code.gsub!(/sc_super\(\s*\)/, 'arguments.callee.base.apply(this,arguments)')
+        code.gsub!(/sc_super\((.+?)\)/) do
           SC.logger.warn "\nWARNING: Calling sc_super() with arguments is DEPRECATED. Please use sc_super() only.\n\n"
-          line = line.gsub(/sc_super\((.+?)\)/, 'arguments.callee.base.apply(this, \1)')
+          "arguments.callee.base.apply(this, #{$1})"
         end
       end
 
       # and finally rewrite static_url
-      return replace_static_url(line)
+      replace_static_url(code)
+      code
     end
-    
+
   end
-  
+
 end

data/lib/sproutcore/builders/less.rb

@@ -0,0 +1,41 @@
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2009 Apple Inc.
+#            portions copyright @2006-2009 Sprout Systems, Inc.
+#            and contributors
+# ===========================================================================
+
+require "sproutcore/builders/stylesheet"
+require 'fileutils'
+
+module SC
+
+  # This build can compile a Less stylesheet.
+  class Builder::Less < Builder::Stylesheet
+
+    def build(dst_path)
+      begin
+        require 'less'
+      rescue
+        raise "Cannot compile #{entry.source_path} because less is not installed.  Please try 'sudo gem install less' and try again"
+      end
+
+      begin
+        content = readlines(entry.source_path)*''
+        css = ::Less::Engine.new(content).to_css
+        lines = []
+        css.each_line { |l| lines << rewrite_inline_code(l) }
+        writelines dst_path, lines
+      rescue Exception => e
+
+        # explain sass syntax error a bit more...
+        if e.is_a? Less::SyntaxError
+          e.message << " of #{@entry.source_path}"
+        end
+        raise e # reraise
+      end # rescue
+    end # def
+
+  end
+
+end