sproutcore 0.9.14 → 0.9.15

data/lib/sproutcore/bundle_manifest.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'digest/md5'
 
 module SproutCore
 
@@ -25,6 +26,8 @@ module SproutCore
       build!
     end
 
+    def bundle_name; bundle.nil? ? nil : bundle.bundle_name; end
+    
     # ==== Returns
     # All entries as an array
     #
@@ -51,19 +54,29 @@ module SproutCore
     # ==== Returns
     # true if javascripts should be combined
     def combine_javascript?
-      bundle.library.combine_javascript_build_modes.include?(build_mode)
+     modes = bundle.library.combine_javascript_build_modes(bundle_name)
+     modes.include?(build_mode)
     end
 
     # ==== Returns
     # true if stylesheets should be combined
     def combine_stylesheets?
-      bundle.library.combine_stylesheets_build_modes.include?(build_mode)
+      modes = bundle.library.combine_stylesheets_build_modes(bundle_name)
+      modes.include?(build_mode)
     end
 
     # ==== Returns
     # true if stylesheets should be combined
     def include_fixtures?
-      bundle.library.include_fixtures_build_modes.include?(build_mode)
+      modes = bundle.library.include_fixtures_build_modes(bundle_name)
+      modes.include?(build_mode)
+    end
+    
+    # ==== Returns
+    # true if debug code should be included in the build
+    def include_debug?
+      modes = bundle.library.include_debug_build_modes(bundle_name)
+      modes.include?(build_mode)
     end
     
     protected
@@ -86,21 +99,24 @@ module SproutCore
         working.each { |x| x.hidden = true }
       end
 
-      # STEP 5: Add entry for javascript.js & stylesheet.js.  If in production 
-      # mode, set these to visible and hide the composite.  If in dev mode, do 
-      # the opposite.
-
       # STEP 3: Handle special build modes...
 
-      #  a. Merge fixture types into JS types & tests
+      #  a. Merge fixture types into JS types if fixtures should be included
       if self.include_fixtures? && !entries[:fixture].nil?
         entries[:javascript] = (entries[:javascript] || []) + entries[:fixture]
       else
         entries.delete(:fixture)
       end
 
-      #  b. Rewrite all of the JS & CSS file paths and URLs to point to
-      # cached versions
+      #  b. Merge debug types into JS types if debug should be included
+      if self.include_debug? && !entries[:debug].nil?
+        entries[:javascript] = (entries[:javascript] || []) + entries[:debug]
+      else
+        entries.delete(:debug)
+      end
+
+      #  c. Rewrite all of the JS & CSS file paths and URLs to point to
+      # cached versions in development mode only.
       # (Cached versions are written to _cache/filename-ctime.ext)
       if self.build_mode == :development
         (entries[:javascript] ||= []).each do | entry |
@@ -117,11 +133,14 @@ module SproutCore
         entries.delete(:test)
       end
 
-      #  c. Rewrite the URLs for all other resources to go through the _src 
+      #  d. Rewrite the URLs for all other resources to go through the _src 
       #     symlink 
       ## -----> Already done build_entry_for()
+      
+      #  STEP 4: Generate entry for combined Javascript and CSS if needed
+      
       #  a. Combine the JS file paths into a single entry for the 
-      #  javascript.js
+      #  javascript.js if required for this build mode
       hide_composite = self.combine_javascript?      
       if (working = entries[:javascript]) && working.size>0
         entry = build_entry_for('javascript.js', :javascript, working, hide_composite)
@@ -131,7 +150,7 @@ module SproutCore
       end
 
       #  b. Combine the CSS file paths into a single entry for the 
-      #  stylesheet.css
+      #  stylesheet.css if required for this build mode
       hide_composite = self.combine_stylesheets?
       if (working = entries[:stylesheet]) && working.size>0
         entry = build_entry_for('stylesheet.css', :stylesheet, working, hide_composite)
@@ -231,10 +250,16 @@ module SproutCore
         :test
       when /^fixtures\/.+\.js$/
         :fixture
+      when /^debug\/.+\.js$/
+        :debug
       when /\.rhtml$/
         :html
       when /\.html.erb$/
         :html
+      when /\.haml$/
+        :html
+      when /\.html.haml$/
+        :html
       when /\.css$/
         :stylesheet
       when /\.js$/
@@ -257,6 +282,7 @@ module SproutCore
       ret.original_path = src_path
       ret.hidden = false
       ret.language = language
+      ret.use_digest_tokens = bundle.use_digest_tokens
 
       # the filename is the src_path less any lproj in the front
       ret.filename = src_path.gsub(/^[^\/]+.lproj\//,'')
@@ -308,7 +334,7 @@ module SproutCore
     # Lookup the timestamp on the source path and interpolate that into the filename URL.
     # also insert the _cache element.
     def setup_timestamp_token(entry)
-      timestamp = entry.timestamp
+      timestamp = bundle.use_digest_tokens ? entry.digest : entry.timestamp
       extname = File.extname(entry.url)
       entry.url = entry.url.gsub(/#{extname}$/,"-#{timestamp}#{extname}") # add timestamp
 
@@ -331,8 +357,9 @@ module SproutCore
   # use_source_directly::  if true, then this entry should be handled via the build symlink
   # language::     the language in use when this entry was created
   # composite::    If set, this will contain the filenames of other resources that should be combined to form this resource.
+  # bundle:: the owner bundle for this entry
   #
-  class ManifestEntry < Struct.new(:filename, :ext, :source_path, :url, :build_path, :type, :original_path, :hidden, :use_source_directly, :language)
+  class ManifestEntry < Struct.new(:filename, :ext, :source_path, :url, :build_path, :type, :original_path, :hidden, :use_source_directly, :language, :use_digest_tokens)
     def to_hash
       ret = {}
       self.members.zip(self.values).each { |p| ret[p[0]] = p[1] }
@@ -369,25 +396,42 @@ module SproutCore
         mtimes = (composite || []).map { |x| x.source_path_mtime }
         ret = mtimes.compact.sort.last
       else
-        ret = (!File.exists?(source_path)) ? nil : File.mtime(source_path)
+        ret = (File.exists?(source_path)) ? File.mtime(source_path) : nil
       end
       return @source_path_mtime = ret 
     end
 
-    # Returns a timestamp based on the source_path_mtime.  If source_path_mtime is nil, always
-    # returns a new timestamp
+    # Returns a timestamp based on the source_path_mtime.  If 
+    # source_path_mtime is nil, always returns a new timestamp
     def timestamp
       (source_path_mtime || Time.now).to_i.to_s
     end
 
-    # Returns the content type for this entry.  Based on a set of MIME_TYPES borrowed from Rack
+    # Returns an MD5::digest of the file.  If the file is composite, returns
+    # the MD5 digest of all the composite files.
+    def digest
+      return @digest unless @digest.nil?
+      
+      if composite?
+        digests = (composite || []).map { |x| x.digest }
+        ret = Digest::SHA1.hexdigest(digests.join)
+      else
+        ret = (File.exists?(source_path)) ? Digest::SHA1.hexdigest(File.read(source_path)) : '0000' 
+      end
+      @digest = ret
+    end
+      
+      
+    # Returns the content type for this entry.  Based on a set of MIME_TYPES 
+    # borrowed from Rack
     def content_type
       MIME_TYPES[File.extname(build_path)[1..-1]] || 'text/plain'
     end
 
     # Returns a URL that takes into account caching requirements.
     def cacheable_url
-      [url, timestamp].compact.join('?')
+      token = (use_digest_tokens) ? digest : timestamp
+      [url, token].compact.join('?')
     end
 
     # :stopdoc:

data/lib/sproutcore/helpers/capture_helper.rb

@@ -11,9 +11,9 @@ module SproutCore
         rescue
           buffer = nil
         end
-
+        
         if buffer.nil?
-          block.call(*args).to_s
+          capture_haml(&block)
         else
           pos = buffer.length
           block.call(*args)

data/lib/sproutcore/library.rb

@@ -170,12 +170,26 @@ module SproutCore
     def bundles
       @cached_all_bundles ||= (client_bundles + framework_bundles)
     end
+    
+    # ==== Returns
+    # All known bundles, except those whose autobuild setting is off.
+    def default_bundles_for_build
+      bundles.reject { |x| !x.autobuild? }
+    end
 
     # Reloads the manifest for all bundles.
     def reload_bundles!
       bundles.each { |b| b.reload! }
     end
 
+    def invalidate_bundle_caches
+      @cached_all_bundles = 
+      @cached_framework_bundles = 
+      @cached_client_bundles = 
+      @bundles = 
+      @cached_bundles_by_url = nil
+    end
+    
     # Build all of the bundles in the library.  This can take awhile but it is the simple
     # way to get all of your code onto disk in a deployable state
     def build(*languages)
@@ -194,8 +208,11 @@ module SproutCore
     # 1. merge together the :all configs.
     # 2. Find the deepest config for the bundle specifically and merge that.
     #
-    def environment_for(bundle_name)
+    def environment_for(bundle_name=nil)
 
+      # If no bundle name is provided, then just return the base environment.
+      return base_environment if bundle_name.nil?
+      
       # Get the bundle location info.  This will return nil if the bundle
       # is not found anywhere.  In that case, return nil to indicate bundle
       # does not exist.
@@ -260,32 +277,39 @@ module SproutCore
     # ==== Returns 
     # The current minification settings.
     #
-    def minify_build_modes
-      env = base_environment || {}
+    def minify_build_modes(bundle_name=nil)
+      env = environment_for(bundle_name) || {}
       [(env[:minify_javascript] || :production)].flatten
     end
     
     # ==== Returns
     # The build modes wherein javascript should be combined.
-    def combine_javascript_build_modes
-      env = base_environment || {}
+    def combine_javascript_build_modes(bundle_name=nil)
+      env = environment_for(bundle_name) || {}
       [(env[:combine_javascript] || :production)].flatten
     end
 
     # ==== Returns
     # The build modes wherein javascript should be combined.
-    def combine_stylesheets_build_modes
-      env = base_environment || {}
+    def combine_stylesheets_build_modes(bundle_name=nil)
+      env = environment_for(bundle_name) || {}
       [(env[:combine_stylesheets] || :production)].flatten
     end
 
     # ==== Returns
     # The build modes where fixtures should be included.
-    def include_fixtures_build_modes
-      env = base_environment || {}
+    def include_fixtures_build_modes(bundle_name=nil)
+      env = environment_for(bundle_name) || {}
       [(env[:include_fixtures] || :development)].flatten
     end
 
+    # ==== Returns
+    # The build modes where debug code should be included.
+    def include_debug_build_modes(bundle_name=nil)
+      env = environment_for(bundle_name) || {}
+      [(env[:include_debug] || :development)].flatten
+    end
+    
     # ==== Returns
     # A BundleInstaller configured for the receiver library.
     #

data/lib/sproutcore/merb/bundle_controller.rb

@@ -26,6 +26,9 @@ module SproutCore
       # request.
       def main
 
+        self.reset_current_bundle
+        puts current_bundle
+        
         # Before we do anything, set the build_mode for the bundles.  This
         # shouldn't change during execution, but if we set this during the
         # router call, the Merb.environment is sometimes not ready yet.
@@ -110,7 +113,8 @@ module SproutCore
           FileUtils.mv(entry.build_path, build_path)
         end
 
-        # And return the file.  Set the content type using a mime-map borroed from Rack.
+        # And return the file.  Set the content type using a mime-map borroed 
+        # from Rack.
         headers['Content-Type'] = entry.content_type
         headers['Content-Length'] = File.size(build_path).to_s
         ret = File.open(build_path, 'rb')
@@ -132,8 +136,8 @@ module SproutCore
       # Proxy the request and return the result...
       def handle_proxy(url, proxy_url, opts ={})
 
-        # collect the method
-        http_method = request.method
+        # collect the method (don't use request.method as that might unmasquerade delete and put requests)
+        http_method = request.env['REQUEST_METHOD'].to_s.downcase
 
         # capture the origin host for cookies.  strip away any port.
         origin_host = request.host.gsub(/:[0-9]+$/,'')
@@ -164,7 +168,7 @@ module SproutCore
         # Handle those that require a body.
         no_body_method = %w(delete get copy head move options trace)
         ::Net::HTTP.start(http_host, http_port) do |http|
-          if no_body_method.include?(http_method.to_s.downcase)
+          if no_body_method.include?(http_method)
             response = http.send(http_method, http_path, headers)
           else
             http_body = request.raw_post
@@ -247,11 +251,18 @@ module SproutCore
 
         # Try root path if nothing found
         ret = bundle_map['/'] if ret.nil?
-
+          
         # Return
         return (@current_bundle = ret)
       end
 
+      # This method is called at the beginning of each request just in case
+      # there as a build error last time around.
+      def reset_current_bundle
+        library.invalidate_bundle_caches
+        @current_bundle = nil
+      end
+      
       # This method is used to redirect certain urls to an alternate bundle.  If the
       # match phrase matches the url, then both the url we use to fetch resources and the
       # current_bundle will be swapped out.

data/lib/sproutcore/version.rb

@@ -2,7 +2,7 @@ module SproutCore #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 14
+    TINY  = 15
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/sproutcore/view_helpers.rb

@@ -570,7 +570,7 @@ module SproutCore
         view_settings = { :id => item_id, :class => view_class, :properties => rc.render_view, :lazy => opts[:lazy], :outlet_path => opts[:outlet_path] }
 
         # if an outlet item is passed, then register this as an outlet.
-        outlet = opts[:outlet] || rc.outlet
+        outlet = opts[:outlet] || !cur_rc.nil?
         define = opts[:define]
         if outlet && cur_rc
           outlet = item_id if outlet == true

data/{sc-config.rb → sc-config}

@@ -6,8 +6,11 @@ config :all, :required => [:sproutcore, :prototype]
 config :sproutcore, :required => [:prototype]
 config :prototype, :required => []
 
-config :sc_test_runner do |c|
-  c[:layout] = "sproutcore:lib/index.rhtml"
+[:sc_test_runner, :sc_docs].each do |bundle_name|
+  config bundle_name, 
+    :layout     => "sproutcore:lib/index.rhtml",
+    :required   => [:sproutcore, :prototype],
+    :autobuild  => false
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors: 
 - Charles Jolley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-20 00:00:00 -07:00
+date: 2008-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: SproutCore - JavaScript Application Framework + Build Tools
 email: 
 - charles@sproutit.com
@@ -145,6 +155,7 @@ files:
 - frameworks/sproutcore/controllers/controller.js
 - frameworks/sproutcore/controllers/object.js
 - frameworks/sproutcore/core.js
+- frameworks/sproutcore/debug/unittest.js
 - frameworks/sproutcore/drag/drag.js
 - frameworks/sproutcore/drag/drag_data_source.js
 - frameworks/sproutcore/drag/drag_source.js
@@ -183,6 +194,7 @@ files:
 - frameworks/sproutcore/foundation/benchmark.js
 - frameworks/sproutcore/foundation/binding.js
 - frameworks/sproutcore/foundation/date.js
+- frameworks/sproutcore/foundation/enumerator.js
 - frameworks/sproutcore/foundation/error.js
 - frameworks/sproutcore/foundation/input_manager.js
 - frameworks/sproutcore/foundation/json.js
@@ -194,12 +206,10 @@ files:
 - frameworks/sproutcore/foundation/responder.js
 - frameworks/sproutcore/foundation/routes.js
 - frameworks/sproutcore/foundation/run_loop.js
-- frameworks/sproutcore/foundation/server.js
 - frameworks/sproutcore/foundation/set.js
 - frameworks/sproutcore/foundation/string.js
 - frameworks/sproutcore/foundation/timer.js
 - frameworks/sproutcore/foundation/undo_manager.js
-- frameworks/sproutcore/foundation/unittest.js
 - frameworks/sproutcore/foundation/utils.js
 - frameworks/sproutcore/globals/panels.js
 - frameworks/sproutcore/globals/popups.js
@@ -211,11 +221,13 @@ files:
 - frameworks/sproutcore/lib/form_views.rb
 - frameworks/sproutcore/lib/index.rhtml
 - frameworks/sproutcore/lib/menu_views.rb
+- frameworks/sproutcore/license.js
 - frameworks/sproutcore/mixins/array.js
 - frameworks/sproutcore/mixins/collection_view_delegate.js
 - frameworks/sproutcore/mixins/control.js
 - frameworks/sproutcore/mixins/delegate_support.js
 - frameworks/sproutcore/mixins/editable.js
+- frameworks/sproutcore/mixins/enumerable.js
 - frameworks/sproutcore/mixins/inline_editor_delegate.js
 - frameworks/sproutcore/mixins/observable.js
 - frameworks/sproutcore/mixins/scrollable.js
@@ -232,17 +244,24 @@ files:
 - frameworks/sproutcore/panes/panel.js
 - frameworks/sproutcore/panes/picker.js
 - frameworks/sproutcore/README
+- frameworks/sproutcore/server/rails_server.js
+- frameworks/sproutcore/server/rest_server.js
+- frameworks/sproutcore/server/server.js
 - frameworks/sproutcore/tests/controllers/array.rhtml
 - frameworks/sproutcore/tests/controllers/controller.rhtml
 - frameworks/sproutcore/tests/controllers/object.rhtml
+- frameworks/sproutcore/tests/core/guidFor.rhtml
 - frameworks/sproutcore/tests/foundation/application.rhtml
 - frameworks/sproutcore/tests/foundation/array.rhtml
 - frameworks/sproutcore/tests/foundation/object.rhtml
+- frameworks/sproutcore/tests/foundation/set.rhtml
 - frameworks/sproutcore/tests/foundation/timer/invalidate.rhtml
 - frameworks/sproutcore/tests/foundation/timer/invokeLater.rhtml
 - frameworks/sproutcore/tests/foundation/timer/isPaused.rhtml
 - frameworks/sproutcore/tests/foundation/timer/schedule.rhtml
 - frameworks/sproutcore/tests/globals/window.rhtml
+- frameworks/sproutcore/tests/mixins/enumerable.rhtml
+- frameworks/sproutcore/tests/mixins/observable.rhtml
 - frameworks/sproutcore/tests/models/model.rhtml
 - frameworks/sproutcore/tests/panes/pane.rhtml
 - frameworks/sproutcore/tests/views/checkbox.rhtml
@@ -436,7 +455,7 @@ files:
 - Manifest.txt
 - Rakefile
 - README.txt
-- sc-config.rb
+- sc-config
 - sc_generators/client/client_generator.rb
 - sc_generators/client/README
 - sc_generators/client/templates/core.js