sproutcore 1.5.0.pre.3 → 1.5.0.pre.4

data/lib/gen/html_app/USAGE

@@ -0,0 +1,15 @@
+html_app - Create a new HTML-based SproutCore application target.
+
+USAGE:
+
+  sc-gen html_app AppName [--filename=FILENAME] [--target=TARGET_NAME]
+
+DISCUSSION:
+
+This generator will create a new SproutCore application for a particular project.  You should pass as the first parameter your AppName you want to create.  For example:
+
+sc-gen app Todos
+
+defines a new application called Todos in the file apps/todos/.
+
+Your application will be setup for using Handlebars to describe the view layer.

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

@@ -0,0 +1,14 @@
+// ==========================================================================
+// Project:   <%= namespace %>
+// Copyright: ©<%= Time.now.year %> My Company, Inc.
+// ==========================================================================
+/*globals <%= namespace %> */
+
+<%= namespace %> = SC.Application.create();
+
+jQuery(document).ready(function() {
+  <%= namespace %>.mainPane = SC.TemplatePane.append({
+    layerId: '<%= target_name %>',
+    templateName: '<%= target_name %>'
+  });
+});

data/lib/gen/html_app/templates/apps/@target_name@/resources/templates/@target_name@.handlebars

@@ -0,0 +1 @@
+<h1>Welcome to SproutCore!</h1>

data/lib/gen/html_project/Buildfile

@@ -0,0 +1,45 @@
+# ==========================================================================
+# Generator: PROJECT
+# Copyright: ©2006-2011 Strobe Inc. and contributors
+#            portions copyright ©2009 Apple Inc.
+# ==========================================================================
+
+namespace :generator do
+
+  # Accept the following types of arguments:
+  #
+  #  project .             #=> Make current working directory. like sc-init
+  #  project project_name  #=> Create project_name, namespace: ProjectName
+  #  project ProjectName   #=> Create project_name, namespace: ProjectName
+  #  project NameSpace path/to/project #=> Create path/to/project, NameSpace
+  #
+  task :prepare do
+    # get arguments & normalize
+    gen = GENERATOR
+    namespace = gen.arguments[1]
+    project_path = gen.arguments[2]
+    
+    if project_path
+      project_path = File.expand_path(project_path)
+      namespace = File.basename(project_path) if namespace == '.'
+    elsif namespace == '.'
+      project_path = Dir.pwd
+      namespace = File.basename(project_path)
+    else
+      project_path = Dir.pwd / gen.snake_case(namespace)
+    end
+      
+    # Setup standard options for generating a project
+    gen.target_name = gen.target = gen.method_name = gen.class_name = nil
+    gen.build_root = File.dirname(project_path) # dir where project dir lives
+    gen.filename = File.basename(project_path) # project dir name
+    gen.namespace = gen.camel_case namespace
+  end
+  
+end
+
+# default behavior for a template is to just copy the contents of the
+# templates directory to the end destination. Add any additional configs here.
+config :templates,
+  :root_dir   => '_file_path_'
+  

data/lib/gen/html_project/INIT

@@ -0,0 +1,3 @@
+Your new SproutCore project is ready!
+
+To get started, you can find your initial application in the "apps" directory.

data/lib/gen/html_project/README

@@ -0,0 +1 @@
+Your project is now ready to use!

data/lib/gen/html_project/USAGE

@@ -0,0 +1,2 @@
+Usage:
+	sc-gen project project_name

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

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

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

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

data/lib/sproutcore/builders/handlebars.rb

@@ -0,0 +1,30 @@
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
+
+require "sproutcore/builders/base"
+require "fileutils"
+require "json"
+
+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]
+      writelines dst_path, "SC.TEMPLATES[#{template_name.inspect}] = SC.Handlebars.compile(#{readlines(entry[:source_path]).to_json})"
+    end
+  end
+
+end
+

data/lib/sproutcore/builders.rb

@@ -11,4 +11,4 @@ require "sproutcore/builders/stylesheet"
 require "sproutcore/builders/test"
 require "sproutcore/builders/test_index"
 require "sproutcore/builders/string_wrapper"
-
+require "sproutcore/builders/handlebars"

data/lib/sproutcore/helpers/static_helper.rb

@@ -272,11 +272,11 @@ module SC
       # theme framework, if set.
       def theme_name(opts ={})
         ret = opts[:default] || 'sc-theme'
-        if target.config[:theme_name]
-          ret = target.config[:theme_name]
+        if target.config[:css_theme]
+          ret = target.config[:css_theme]
         elsif target.config[:theme]
           if theme_target = target.target_for(target.config[:theme])
-            ret = theme_target.config[:theme_name] || ret
+            ret = theme_target.config[:css_theme] || ret
           end
         end
         return ret

data/lib/sproutcore/tools/init.rb

@@ -10,14 +10,22 @@ module SC
 
     desc "PROJECT [APP]",
       "Generates a SproutCore project with an initial application"
-    method_options('--dry-run' => false, :force => false)
+    method_options('--dry-run' => false, :force => false, '--template' => false)
     def init(project_name, app_name=nil)
 
       # Generate the project
-      project_gen = SC.builtin_project.generator_for 'project',
-        :arguments => ['project', project_name],
-        :dry_run   => options['dry-run'],
-        :force     => options[:force]
+      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_gen.prepare!.build!
 
       # Next, get the project root & app name
@@ -26,10 +34,18 @@ module SC
 
       # And get the app generator and run it
       project = SC::Project.load project_root, :parent => SC.builtin_project
-      generator = project.generator_for 'app',
-        :arguments => ['app', app_name],
-        :dry_run   => options['dry-run'],
-        :force     => options[:force]
+
+      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
       generator.prepare!.build!
 
       project_gen.log_file(project_gen.source_root / 'INIT')

data/spec/buildtasks/manifest/prepare_build_tasks/handlebars_spec.rb

@@ -0,0 +1,39 @@
+require "buildtasks/manifest/spec_helper"
+
+describe "manifest:prepare_build_tasks:handlebars" do
+
+  include SC::SpecHelpers
+  include SC::ManifestSpecHelpers
+
+  before do
+    std_before
+  end
+
+  def run_task
+    @manifest.prepare!
+    super('manifest:prepare_build_tasks:handlebars')
+  end
+
+  it "should run manifest:prepare_build_tasks:setup as a prereq" do
+    should_run("manifest:prepare_build_tasks:setup") { run_task }
+  end
+
+  it "creates a transform entry for each handlebars entry" do
+    run_task
+
+    originals = @manifest.entries(:hidden => true).select do |entry|
+      entry.original? && entry.ext == 'handlebars'
+    end
+
+    originals.size.should > 0
+
+    entries = @manifest.entries.select { |e| e.entry_type == :javascript }
+    entries.size.should == originals.size
+
+    entries.each do |entry|
+      entry.should be_transform
+      entry.source_entry.should_not be_nil
+      originals.should include(entry.source_entry)
+    end
+  end
+end

data/spec/fixtures/builder_tests/apps/handlebars_test/template.handlebars

@@ -0,0 +1,5 @@
+Pour {{unfortunate}} {{souls}}
+
+Yes ma'am
+
+INCEPTION ><>

data/spec/fixtures/real_world/frameworks/sproutcore/english.lproj/templates/demo.handlebars

@@ -0,0 +1,4 @@
+We have achieved {{INCEPTION}}
+Yes we have.
+So much 'inception'
+"Inception" has been achieved. ><<>>

data/spec/lib/builders/handlebars_spec.rb

@@ -0,0 +1,29 @@
+require "lib/builders/spec_helper"
+
+describe SC::Builder::Handlebars do
+
+  include SC::SpecHelpers
+  include SC::BuilderSpecHelper
+
+  before do
+    std_before :handlebars_test
+  end
+
+  after do
+    std_after
+  end
+
+  def run_builder(filename)
+    super do |entry, dst_path|
+      SC::Builder::Handlebars.build(entry, dst_path)
+    end
+  end
+
+  it "converts Handlebars to JavaScript" do
+    lines = run_builder 'template.handlebars'
+    lines.each do |line|
+      line.should =~ /SC\.TEMPLATES/
+    end
+  end
+
+end

data/vendor/chance/lib/chance/imagers/data_url.rb

@@ -6,19 +6,32 @@ module Chance
 
   # The DataURL Imager creates CSS with data urls for each slice.
   class DataURLImager < Chance::Imager
-    
+
     def css
       output = ""
       slices = @slices
-      
+
       slices.each do |name, slice|
         # so, the path should be the path in the chance instance
         output += "." + slice[:css_name] + " { "
         output += "background: url("
-        output += '"data:image/png;base64,'
-        
-        base64Image = Base64.encode64(slice[:image].to_blob(:fast_rgba))
-        
+
+        # set the mime type from the extension (while taking care of .jpg extensions)
+        mimeType = (slice[:path] =~ /jpg$/) ? "image/jpeg" : "image/" + slice[:path].slice(/(gif|jpeg|png)$/)
+
+        output += '"data:' + mimeType
+        output += ';base64,'
+
+        # ChunkyPNG & RMagick images respond to to_blob, other images will be encoded from their contents
+        if (slice[:image].respond_to? "to_blob")
+          method = slice[:image].method(:to_blob)
+
+          # ChunkyPNG takes an argument to to_blob
+          slice[:image] = (method.arity == 1) ? slice[:image].to_blob(:fast_rgba) : slice[:image].to_blob
+        end
+
+        base64Image = Base64.encode64(slice[:image])
+
         output += base64Image
 
         output += '"'
@@ -28,7 +41,7 @@ module Chance
 
       return output
     end
-    
+
   end
 
 end

data/vendor/chance/lib/chance/instance.rb

@@ -8,6 +8,7 @@ require 'chance/sass_extensions'
 require 'chance/perf'
 require 'chance/slicing'
 
+require 'digest/md5'
 
 
 Compass.discover_extensions!
@@ -207,7 +208,9 @@ module Chance
         #if Chance::SUPPORTS_IMPORTERS
         #  css = "@import \"" + file [:path] + ".scss\";"
         #else
-          tmp_path = "./tmp/chance/" + file[:path] + ".scss"
+
+          path_hash = Digest::MD5.hexdigest(file[:path])
+          tmp_path = "./tmp/chance/#{path_hash}.scss"
           FileUtils.mkdir_p(File.dirname(tmp_path))
           
           f = File.new(tmp_path, "w")

data/vendor/chance/lib/chance/parser.rb

@@ -28,7 +28,7 @@
 #   debugging, and 2) if using Chance in a standalone way and committing
 #   the output to a source control system, the output can change dramatically
 #   between runs, even if the input CSS is unchanged.
-#   
+#
 #   As the most common use of Chance is as part of the SC build tools,
 #   and this debugging support is usually only required to debug Chance
 #   itself, :compress defaults to true
@@ -36,7 +36,7 @@
 # How Slice & Slices work
 # -------------------------------
 # @include slice() and @include slices() are not actually responsible
-# for slicing the image. They do not know the image's with or height.
+# for slicing the image. They do not know the image's width or height.
 #
 # All that they do is determine the slice's configuration, including
 # its file name, the rectangle to slice, etc.
@@ -49,10 +49,10 @@ module Chance
 
   class Parser
     attr_reader :slices, :css
-    
+
     UNTIL_SINGLE_QUOTE = /(?!\\)'/
     UNTIL_DOUBLE_QUOTE = /(?!\\)"/
-    
+
     BEGIN_SCOPE = /\{/
     END_SCOPE = /\}/
     THEME_DIRECTIVE = /@theme\s*/
@@ -69,14 +69,14 @@ module Chance
       @opts.merge!(opts)
       @path = ""
 
-      
+
       @input = string
       @css = ""
 
       @slices = @opts[:slices]  # we update the slices given to us
-      
+
       @theme = @opts[:theme]
-      
+
       @@uid += 1
       @uid = @@uid
 
@@ -102,7 +102,7 @@ module Chance
 
       # we add a bit to the path: the slice info
       rect_params = [:left, :top, :width, :height, :bottom, :right, :offset_x, :offset_y]
-      
+
       # Generate string-compatible params
       slice_name_params = rect_params.map {|param|
         ret = ""
@@ -131,7 +131,7 @@ module Chance
         slice = @slices[slice_path]
         slice[:min_offset_x] = [slice[:min_offset_x], opts[:offset_x]].min
         slice[:min_offset_y] = [slice[:min_offset_y], opts[:offset_y]].min
-        
+
         slice[:max_offset_x] = [slice[:max_offset_x], opts[:offset_x]].max
         slice[:max_offset_y] = [slice[:max_offset_y], opts[:offset_y]].max
       else
@@ -159,29 +159,29 @@ module Chance
 
       return slice
     end
-    
+
     def normalize_rectangle(rect)
       # try to make the rectangle somewhat standard: that is, make it have
       # all units which make sense
-      
+
       # it must have either a left or a right, no matter what
       rect[:left] = 0 if rect[:left].nil? and rect[:right].nil?
-      
+
       # if there is no width, it must have a both left and right
       if rect[:width].nil?
         rect[:left] = 0 if rect[:left].nil?
         rect[:right] = 0 if rect[:right].nil?
       end
-      
+
       # it must have either a top or a bottom, no matter what
       rect[:top] = 0 if rect[:top].nil? and rect[:bottom].nil?
-      
+
       # if there is no height, it must have _both_ top and bottom
       if rect[:height].nil?
         rect[:top] = 0 if rect[:top].nil?
         rect[:bottom] = 0 if rect[:bottom].nil?
       end
-      
+
       return rect
     end
 
@@ -205,7 +205,7 @@ module Chance
     # to mean that this is a recursive call.
     def _parse
       scanner = @scanner
-      
+
       output = []
 
       while not scanner.eos? do
@@ -236,7 +236,7 @@ module Chance
           output << handle_slice_include
           next
         end
-        
+
         if scanner.match?(CHANCE_FILE_DIRECTIVE)
           handle_file_change
           next
@@ -251,7 +251,7 @@ module Chance
         else
           output << res
         end
-        
+
       end
 
       output = output.join
@@ -267,7 +267,7 @@ module Chance
     def parse_string(cssString)
       # I cheat: to parse strings, I use JSON.
       # This will fail with strings quoted with "'", so I'm
-      # just not bothering for now. At some point, I should either make 
+      # just not bothering for now. At some point, I should either make
       # this function more proper or use some other function...
       if not cssString[0..0] == '"'
         return cssString
@@ -288,7 +288,7 @@ module Chance
     def handle_empty
       scanner = @scanner
       output = ""
-      
+
       while true do
         if scanner.match?(/\s+/)
           output += scanner.scan /\s+/
@@ -338,7 +338,7 @@ module Chance
       output = ""
       output += "\n$theme: '" + @theme + "';\n"
       output += _parse
-      
+
       @theme = old_theme
       output += "$theme: '" + @theme + "';\n"
 
@@ -363,7 +363,7 @@ module Chance
     def handle_file_change
       scanner = @scanner
       scanner.scan CHANCE_FILE_DIRECTIVE
-      
+
       path = scanner.scan_until /;/
       path = path[0..-1]
 
@@ -383,7 +383,7 @@ module Chance
       # this holds the value as we are parsing it
       parsing_value = ""
 
-      
+
       # The key MAY be present if we are starting with a $.
       # But remember: it could be $abc: $abc + $def
       key = :NO_KEY
@@ -407,7 +407,7 @@ module Chance
       end
 
       value = nil
-      
+
       # we stop when we either a) reach the end of the arglist, or
       # b) reach the end of the argument. Argument ends at ',', list ends
       # at ')'
@@ -436,7 +436,7 @@ module Chance
       scanner = @scanner
 
       raise SyntaxError, "Expected ( to begin argument list." unless scanner.scan /\(/
-      
+
       idx = 0
       args = {}
       until scanner.match?(/\)/) or scanner.eos? do
@@ -527,7 +527,7 @@ module Chance
       end
 
       layout_properties.each {|prop|
-        unless slice[prop].nil? 
+        unless slice[prop].nil?
           output += prop.to_s + ": " + slice[prop].to_s + "px; \n"
         end
       }
@@ -546,7 +546,7 @@ module Chance
         arguments[key] = Integer(arguments[key]) if not arguments[key].nil?
         arguments[key] = 0 if arguments[key].nil?
       }
-      
+
       values = arguments.values
 
       left = arguments[:left]
@@ -563,11 +563,11 @@ module Chance
       skip_top_left = values.include? 'skip-top-left'
       skip_top = values.include? 'skip-top'
       skip_top_right = values.include? 'skip-top-right'
-      
+
       skip_left = values.include? 'skip-left'
       skip_middle = values.include? 'skip-middle'
       skip_right = values.include? 'skip-right'
-      
+
       skip_bottom_left = values.include? 'skip-bottom-left'
       skip_bottom = values.include? 'skip-bottom'
       skip_bottom_right = values.include? 'skip-bottom-right'
@@ -577,8 +577,8 @@ module Chance
       # we are going to form 9 slices. If any are empty we'll skip them
 
       # top-left
-      top_left_slice = { 
-        :left => 0, 
+      top_left_slice = {
+        :left => 0,
         :top => 0,
         :width => left,
         :height => top,