sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/sproutcore/version.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 module SproutCore
   # :stopdoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR

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

@@ -106,7 +106,7 @@ describe "manifest:prepare_build_tasks:bundle_loaded" do
 
 end
 
-describe "manifest:prepare_build_tasks:bundle_info" do
+describe "manifest:prepare_build_tasks:module_info" do
 
   include SC::SpecHelpers
   include SC::ManifestSpecHelpers
@@ -126,7 +126,7 @@ describe "manifest:prepare_build_tasks:bundle_info" do
     @manifest.build!
   end
 
-  it "should create a bundle_info.js for a dynamic_required target" do
+  it "should create a module_info.js for a deferred_modules target" do
     # run_task
     # entries = @manifest.entries.select { |e| e.entry_type == :javascript }
     # entries.each do |entry|
@@ -154,7 +154,7 @@ describe "manifest:prepare_build_tasks:bundle_info" do
       end
 
       # make sure all targets have the same settings...
-      @target.dynamic_required_targets.each do |t|
+      @target.modules.each do |t|
         t.config.timestamp_urls = false
       end
 
@@ -206,7 +206,7 @@ describe "manifest:prepare_build_tasks:bundle_info" do
     end
 
     it "should not require a dynamic framework" do
-      (req = @target.dynamic_required_targets).size.should == 0
+      (req = @target.modules).size.should == 0
     end
 
     it "should not create a bundle_info.js entry" do
@@ -242,7 +242,7 @@ describe "manifest:prepare_build_tasks:bundle_info" do
     end
 
     it "should require its own dynamic framework" do
-      (req = @target.dynamic_required_targets).size.should == 1
+      (req = @target.modules).size.should == 1
     end
 
     it "should create a bundle_info.js entry" do

data/spec/fixtures/builder_tests/Buildfile

@@ -7,7 +7,7 @@ config :html_test,
   
 config :req_target_2,
   :required => [:req_target_1],
-  :dynamic_required => [:dynamic_req_target_1]
+  :deferred_modules => [:dynamic_req_target_1]
 
 config :test_test,
   :test_layout   => 'lib/test_layout.rhtml',
@@ -17,4 +17,4 @@ config :test_test,
 
 config :bundle_test,
   :required => [:req_target_1],
-  :dynamic_required => [:req_target_2]
+  :deferred_modules => [:req_target_2]

data/spec/lib/builders/bundle_spec.rb

@@ -36,7 +36,7 @@ describe 'SC::Builder::BundleLoaded' do
     end
 
     it "should require one dynamic target" do
-      (req = @target.dynamic_required_targets).size.should == 1
+      (req = @target.modules).size.should == 1
       req.first.target_name.should == :'/req_target_2'
     end
 
@@ -133,7 +133,7 @@ describe 'SC::Builder::BundleInfo' do
       end
 
       # make sure all targets have the same settings...
-      @target.dynamic_required_targets.each do |t|
+      @target.modules.each do |t|
         t.config.timestamp_urls = false
       end
 
@@ -157,7 +157,7 @@ describe 'SC::Builder::BundleInfo' do
     end
 
     it "should require one dynamic target" do
-      (req = @target.dynamic_required_targets).size.should == 1
+      (req = @target.modules).size.should == 1
       req.first.target_name.should == :'/req_target_2'
     end
 
@@ -168,7 +168,7 @@ describe 'SC::Builder::BundleInfo' do
     describe "bundle_info.js" do
 
       it "should have SC::Target#bundle_info return the correct requires, css_urls and js_urls" do
-        dynamic_target = @target.dynamic_required_targets[0]
+        dynamic_target = @target.modules[0]
         dynamic_target.should_not be_nil
 
         bundle_info = dynamic_target.bundle_info({ :variation => @manifest.variation })
@@ -217,7 +217,7 @@ describe 'SC::Builder::BundleInfo' do
     end
 
     it "should not require a dynamic framework" do
-      (req = @target.dynamic_required_targets).size.should == 0
+      (req = @target.modules).size.should == 0
     end
 
     it "should not create a bundle_info.js entry" do
@@ -243,7 +243,7 @@ describe 'SC::Builder::BundleInfo' do
       end
 
       # make sure all targets have the same settings...
-      @target.dynamic_required_targets.each do |t|
+      @target.modules.each do |t|
         t.config.timestamp_urls = false
       end
 
@@ -262,7 +262,7 @@ describe 'SC::Builder::BundleInfo' do
     end
 
     it "should require its own dynamic framework" do
-      (req = @target.dynamic_required_targets).size.should == 1
+      (req = @target.modules).size.should == 1
     end
 
     it "should create a bundle_info.js entry" do
@@ -272,7 +272,7 @@ describe 'SC::Builder::BundleInfo' do
     describe "bundle_info.js" do
 
       it "should have SC::Target#bundle_info return the correct requires, css_urls and js_urls" do
-        dynamic_target = @target.dynamic_required_targets[0]
+        dynamic_target = @target.modules[0]
         dynamic_target.should_not be_nil
 
         bundle_info = dynamic_target.bundle_info({ :variation => @manifest.variation })

data/spec/lib/builders/strings_spec.rb

@@ -1,4 +1,5 @@
 require "lib/builders/spec_helper"
+require 'yaml'
 
 describe SC::Builder::Strings do
 

data/sproutcore.gemspec

@@ -6,7 +6,7 @@ is_jruby = Gem::Platform.local.os == "java"
 Gem::Specification.new do |s|
   s.name = 'sproutcore'
   s.version = SproutCore::VERSION
-  s.authors = 'Strobe Inc., Apple Inc. and contributors'
+  s.authors = 'Strobe, Inc., Apple Inc. and contributors'
   s.email = 'contact@sproutcore.com'
   s.homepage = 'http://www.sproutcore.com'
   s.summary = "SproutCore is a platform for building native look-and-feel applications on the web"
@@ -18,6 +18,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'extlib', "~> 0.9.15"
   s.add_dependency 'erubis', "~> 2.6.6"
   s.add_dependency 'thor', '~> 0.14.3'
+  s.add_dependency 'haml', '~> 3.0.24'
+  
+  s.add_dependency 'compass', '~> 0.10.5'
+  s.add_dependency 'chunky_png', '~> 0.12.0'
 
   if is_jruby
     s.add_dependency 'mongrel', '~> 1.1.5'
@@ -31,10 +35,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
 
   # Optional features, used in tests
-  s.add_development_dependency 'haml', "~> 3.0.18"
   s.add_development_dependency 'less', "~> 1.2.21"
   s.add_development_dependency 'RedCloth', "~> 4.2.3"
   s.add_development_dependency 'BlueCloth', "~> 1.0.1"
+  
+  s.require_paths << 'lib'
+  s.require_paths << 'vendor/chance/lib'
+
 
   s.rubyforge_project = "sproutcore"
   s.extra_rdoc_files  = %w[History.txt README.txt]

data/vendor/chance/.gitignore

@@ -0,0 +1,5 @@
+*.swp
+pkg/*
+*.gem
+.bundle
+.DS_Store

data/vendor/chance/Gemfile

@@ -0,0 +1,4 @@
+source :gemcutter
+
+# Specify your gem's dependencies in chance.gemspec
+gemspec

data/vendor/chance/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/vendor/chance/bin/chance

@@ -0,0 +1,72 @@
+#!/usr/bin/ruby
+
+require "pathname"
+require "rubygems"
+require "thor"
+
+require "fssm"
+require 'chance'
+
+
+
+class ChanceRunner < Thor
+  #tasks
+  namespace :chance
+
+  desc "watch [folder]", "Watches the folder for changes."
+  method_option :verbose, :type => :boolean, :default => false
+
+  def watch(folder)
+    Chance::CONFIG[:verbose] = options["verbose"]
+
+    folder = Pathname.new(folder).expand_path
+    chance = Chance::Instance.new
+
+    Dir.glob(File.expand_path(File.join(folder, "**/*"))) do |f|
+      if not File.directory?(f)
+        Chance.add_file f
+
+        chance.map_file(Pathname.new(f).relative_path_from(folder), f)
+        chance.update
+        puts chance.css
+
+      end
+    end
+
+    FSSM.monitor(folder, "**/*") do
+      update {|base, relative|
+        path = File.join(base, relative)
+
+        Chance.update_file path
+
+        chance.update
+        puts chance.css
+      }
+
+      delete {|base, relative|
+        path = File.join(base, relative)
+
+        chance.unmap_file Pathname.new(path).relative_path_from(folder)
+        Chance.remove_file path
+
+        chance.update
+        puts chance.css
+      }
+
+      create {|base, relative|
+        path = File.join(base, relative)
+
+        Chance.add_file path
+        chance.map_file Pathname.new(path).relative_path_from(folder), path
+
+        chance.update
+        puts chance.css
+
+      }
+    end
+  end
+
+end
+
+
+ChanceRunner.start

data/vendor/chance/chance.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/chance/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "chance"
+  s.version     = Chance::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = []
+  s.email       = []
+  s.homepage    = "http://rubygems.org/gems/chance"
+  s.summary     = "Builds SproutCore themes."
+  s.description = "Builds SproutCore themes, with spriting, data-urls, SCSS, and more."
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "chance"
+
+  s.add_dependency "thor", "~>0.14.2"
+  s.add_dependency "fssm", "~>0.1.4"
+  s.add_dependency "haml", "~>3.0.24"
+  s.add_dependency "compass", "~>0.10.5"
+  s.add_dependency 'chunky_png', '~> 0.12.0'
+  
+  s.add_development_dependency "bundler", ">= 1.0.0"
+
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files bin`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
+end

data/vendor/chance/lib/chance.rb

@@ -0,0 +1,139 @@
+require "chance/instance"
+
+require 'sass'
+
+# If available, use oily_png, which is faster
+begin
+  require "oily_png"
+rescue Exception
+  require "chunky_png"
+end
+
+module Chance
+  
+  CONFIG = {
+    :verbose => false
+  }
+
+  @_current_instance = nil
+
+  @files = {}
+  
+  class << self
+    attr_accessor :files, :_current_instance
+
+    def add_file(path, content=nil)
+      mtime = 0
+      if content.nil?
+        mtime = File.mtime(path).to_f
+      end
+      
+      if @files[path]
+        mtime = File.mtime(path).to_f
+        update_file(path, content) if mtime > @files[path][:mtime]
+        return
+      end
+      
+      file = {
+        :mtime => mtime,
+        :path => path,
+        :content => content,
+        :preprocessed => false
+      }
+
+      @files[path] = file
+      #puts "Added " + path if Chance::CONFIG[:verbose]
+    end
+
+    def update_file(path, content=nil)
+      if not @files.has_key? path
+        puts "Could not update " + path + " because it is not in system."
+        return
+      end
+      
+      mtime = 0
+      if content.nil?
+        mtime = File.mtime(path).to_f
+      end
+
+      file = {
+        :mtime => mtime,
+        :path => path,
+        :content => content,
+        :preprocessed => false
+      }
+
+      @files[path] = file
+      puts "Updated " + path if Chance::CONFIG[:verbose]
+    end
+
+    def remove_file(path)
+      if not @files.has_key? path
+        puts "Could not remove " + path + " because it is not in system."
+        return
+      end
+
+      @files.delete(path)
+
+      puts "Removed " + path if Chance::CONFIG[:verbose]
+    end
+    
+    def remove_all_files
+      #@files = {}
+    end
+    
+    def has_file(path)
+      return false if not @files.has_key? path
+      return true
+    end
+    
+    def get_file(path)
+      if not @files.has_key? path
+        puts "Could not find " + path + " in Chance."
+        return nil
+      end
+      
+      file = @files[path]
+      
+      if file[:content].nil?
+        # note: CSS files should be opened as UTF-8.
+        f = File.open(path, path =~ /css$/ ? 'r:UTF-8' : 'rb')
+        file[:content] = f.read
+        f.close
+      end
+      
+      if not file[:preprocessed]
+        _preprocess file
+      end
+      
+      return file
+    end
+
+  private
+    def _preprocess(file)
+      _preprocess_css(file) if file[:path] =~ /css$/
+      _preprocess_png(file) if file[:path] =~ /png$/
+      
+      file[:preprocessed] = true
+    end
+
+    def _preprocess_png(file)
+      file[:content] = ChunkyPNG::Canvas.from_blob(file[:content])
+    end
+
+    def _preprocess_css(file)
+      content = file[:content]
+
+      requires = []
+      content = content.gsub(/sc_require\(['"]?(.*?)['"]?\);?/) {|match|
+        requires.push $1
+        ""
+      }
+
+      file[:requires] = requires
+      file[:content] = content
+    end
+    
+  end
+end
+

data/vendor/chance/lib/chance/imager.rb

@@ -0,0 +1,13 @@
+module Chance
+  class Imager
+    attr_reader :css
+    def initialize(slices, instance)
+      @slices = slices
+      @instance = instance
+    end
+    
+    def css
+      ""
+    end
+  end
+end