sproutcore 1.0.1037 → 1.0.1042

data/lib/sproutcore/helpers/static_helper.rb

@@ -162,7 +162,7 @@ module SC
           
         return '' if entry.nil?
         
-        ret = File.readlines(entry.build!.build_path)*''
+        ret = entry.stage!.inline_contents*''
         return %(<script type="text/javascript">\n#{ret}\n</script>)
       end
 
@@ -190,7 +190,7 @@ module SC
           
         return '' if entry.nil?
         
-        ret = File.readlines(entry.build!.build_path)
+        ret = entry.stage!.inline_contents
         return %(<style>\n#{ret*"\n"}\n</style>)
       end
         

data/lib/sproutcore/models/manifest_entry.rb

@@ -135,14 +135,29 @@ module SC
     end
     
     # Returns a URL with a possible timestamp token appended to the end of 
-    # the entry if the target's timestamp_url config is set.  Otherwise
+    # the entry if the target's timestamp_url config is set, or with a randomly
+    # assigned domain name prepended if hyper-domaining is turned on.  Otherwise
     # returns the URL itself.
     def cacheable_url
       ret = self.url
       ret = [ret, self.timestamp].join('?') if target.config.timestamp_urls
+      if target.config.hyper_domaining
+        ret = [self.hyperdomain_prefix(ret), ret].join('') 
+      end
       return ret
     end
     
+    # If the hyper_domaining config is an array of strings, this will select
+    # one of them based on the hash of the URL, and provide an absolute URL
+    # to the entry. The hyperdomain includes the protocol. (http://, etc)
+    def hyperdomain_prefix(url)
+      hyperdomains = target.config.hyper_domaining
+      index = url.hash % hyperdomains.length
+      
+      return "#{hyperdomains[index]}"
+    end
+    
+    
     # Scans the source paths (first staging any source entries) for the 
     # passed regex.  Your block will be executed with each line that matched.
     # Returns the results of each block
@@ -243,6 +258,32 @@ module SC
     def inspect_staging_state
       inspect_build_to self.staging_path
     end
+    
+    
+    def inline_contents
+      unless File.exists?(self.staging_path)
+    
+        # stage source entries if needed...
+        (self.source_entries || []).each { |e| e.stage! } if composite?
+    
+        # get build task and build it
+        buildfile = manifest.target.buildfile
+        if !buildfile.task_defined?(self.build_task)
+          raise "Could not build entry #{self.filename} because build task '#{self.build_task}' is not defined"
+        end
+    
+        buildfile.invoke 'build:minify:inline_javascript',
+          :entry => self,
+          :manifest => self.manifest,
+          :target => self.manifest.target,
+          :config => self.manifest.target.config,
+          :project => self.manifest.target.project,
+          :src_path => self.source_path,
+          :src_paths => self.source_paths,
+          :dst_path => self.staging_path
+      end
+      File.readlines(self.staging_path)
+    end
      
     private 
     

data/lib/sproutcore/tools/build.rb

@@ -7,6 +7,8 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'manifest'))
 
+$to_minify=''
+
 module SC
   class Tools
     
@@ -18,7 +20,7 @@ module SC
 
       # Copy some key props to the env
       SC.env.build_prefix   = options.buildroot if options.buildroot
-      SC.env.stating_prefix = options.stageroot if options.stageroot
+      SC.env.staging_prefix = options.stageroot if options.stageroot
       SC.env.use_symlink    = options.symlink 
       SC.env.clean          = options.clean 
       
@@ -73,8 +75,22 @@ module SC
           end
         end
       end
+      yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
+      jar_path = File.join(yui_root, 'SCyuicompressor-2.4.2.jar')
+      filecompress = "java -jar " + jar_path + " --charset utf-8 --line-break 80 " + $to_minify + " 2>&1"
+      SC.logger.info filecompress
+      SC.logger.info  'Compressing with YUI:  '+ $to_minify + "..."
       
+      output = `#{filecompress}`      # It'd be nice to just read STDERR, but
+                                          # I can't find a reasonable, commonly-
+                                          # installed, works-on-all-OSes solution.
+      SC.logger.info output
+        if $?.exitstatus != 0
+        SC.logger.fatal(output)
+        SC.logger.fatal("!!!!YUI compressor failed, please check that your js code is valid")
+        SC.logger.fatal("!!!!Failed compressing ... "+ build_root)
+        exit(1) 
+      end
     end    
-    
   end
 end

data/spec/lib/models/manifest_entry/hyperdomain_prefix.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), %w[.. .. .. spec_helper])
+
+describe SC::ManifestEntry, 'hyperdomain_prefix' do
+  
+  include SC::SpecHelpers
+  
+  before do
+    @project = fixture_project(:real_world)
+    @target = @project.target_for :contacts
+    @manifest = @target.manifest_for(:language => :en)
+    
+    # create entry manually to avoid calling prepare
+    @entry = SC::ManifestEntry.new @manifest, 
+      :filename => "filename", 
+      :url => "/foo.jpg",
+      :source_path => "imaginary" / "path"
+  end
+
+  it "should not alter url by calling hyperdomain_prefix if hyper_domaining array is empty in config" do
+    @target.config.timestamp_urls = false # preconditon for the simplicity of this test
+    
+    @entry.cacheable_url.should == '/foo.jpg'
+  end
+  
+  it "should prepend a fully qualified hyper domain to the url by calling hyperdomain_prefix if hyper_domaining array is NOT empty in config" do
+    @target.config.timestamp_urls = false  # preconditon for the simplicity of this test
+    
+    @target.config.hyper_domaining = ["http://hyper1.sproutcore.com", "http://hyper2.sproutcore.com"]
+    # hashing algorithm should pick 'http://hyper2.sproutcore.com' as the hyper domain
+    @entry.cacheable_url.should == 'http://hyper2.sproutcore.com/foo.jpg'
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 1.0.1037
+  version: 1.0.1042
 platform: ruby
 authors: 
 - Sprout Systems, Inc.  Apple Inc. and contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -08:00
+date: 2009-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
     version: 
-description: |
+description: |-
   sproutcore - abbot
       by Charles Jolley and contributors
       http://www.sproutcore.com
@@ -175,7 +175,7 @@ description: |
   == LICENSE:
   
   Copyright (c) 2009 Apple Inc.  
-  Portions copyright (c) 2006-2009 Sprout Systems, Inc. and contributors
+  Portions copyright (c) 2006-2009 Sprout Systems Inc. and contributors
   
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -195,7 +195,8 @@ description: |
   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+  
+  SproutCore and the SproutCore logo are trademarks of Sprout Systems Inc.
 email: contact@sproutcore.com
 executables: 
 - sc-build
@@ -338,6 +339,11 @@ files:
 - frameworks/sproutcore/design/TestRunner Design.graffle/image31.png
 - frameworks/sproutcore/design/TestRunner Design.graffle/image8.png
 - frameworks/sproutcore/design/TestRunner Design.graffle/image9.png
+- frameworks/sproutcore/frameworks/animation/Buildfile
+- frameworks/sproutcore/frameworks/animation/LICENSE
+- frameworks/sproutcore/frameworks/animation/README.md
+- frameworks/sproutcore/frameworks/animation/core.js
+- frameworks/sproutcore/frameworks/animation/tests/core.js
 - frameworks/sproutcore/frameworks/bootstrap/README
 - frameworks/sproutcore/frameworks/bootstrap/core.js
 - frameworks/sproutcore/frameworks/bootstrap/setup_body_class_names.js
@@ -440,6 +446,7 @@ files:
 - frameworks/sproutcore/frameworks/datejs/time.js
 - frameworks/sproutcore/frameworks/datejs/validators/datejs.js
 - frameworks/sproutcore/frameworks/debug/core.js
+- frameworks/sproutcore/frameworks/debug/invoke_once_last_debugging.js
 - frameworks/sproutcore/frameworks/designer/coders/design.js
 - frameworks/sproutcore/frameworks/designer/coders/localization.js
 - frameworks/sproutcore/frameworks/designer/coders/object.js
@@ -466,13 +473,7 @@ files:
 - frameworks/sproutcore/frameworks/desktop/english.lproj/disclosure.css
 - frameworks/sproutcore/frameworks/desktop/english.lproj/drag.css
 - frameworks/sproutcore/frameworks/desktop/english.lproj/icons.css
-- frameworks/sproutcore/frameworks/desktop/english.lproj/images/icons/mini_222222.png
-- frameworks/sproutcore/frameworks/desktop/english.lproj/images/icons/mini_454545.png
-- frameworks/sproutcore/frameworks/desktop/english.lproj/images/icons/mini_888888.png
-- frameworks/sproutcore/frameworks/desktop/english.lproj/images/icons/mini_ffffff.png
 - frameworks/sproutcore/frameworks/desktop/english.lproj/images/icons/shared.png
-- frameworks/sproutcore/frameworks/desktop/english.lproj/images/panels/sprite-x.png
-- frameworks/sproutcore/frameworks/desktop/english.lproj/images/panels/sprite-y.png
 - frameworks/sproutcore/frameworks/desktop/english.lproj/list_item.css
 - frameworks/sproutcore/frameworks/desktop/english.lproj/menu.css
 - frameworks/sproutcore/frameworks/desktop/english.lproj/menu_item_view.css
@@ -520,6 +521,7 @@ files:
 - frameworks/sproutcore/frameworks/desktop/tests/panes/menu/ui.js
 - frameworks/sproutcore/frameworks/desktop/tests/panes/palette/methods.js
 - frameworks/sproutcore/frameworks/desktop/tests/panes/palette/ui.js
+- frameworks/sproutcore/frameworks/desktop/tests/panes/pane_page.js
 - frameworks/sproutcore/frameworks/desktop/tests/panes/panel/methods.js
 - frameworks/sproutcore/frameworks/desktop/tests/panes/panel/ui.js
 - frameworks/sproutcore/frameworks/desktop/tests/panes/picker/methods.js
@@ -756,9 +758,11 @@ files:
 - frameworks/sproutcore/frameworks/foundation/tests/views/text_field/ui.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/clippingFrame.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/convertFrames.js
+- frameworks/sproutcore/frameworks/foundation/tests/views/view/convertLayouts.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/createChildViews.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/createLayer.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/destroyLayer.js
+- frameworks/sproutcore/frameworks/foundation/tests/views/view/didAppendToDocument.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/findLayerInParentLayer.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/init.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/insertBefore.js
@@ -768,6 +772,7 @@ files:
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/layoutChildViews.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/layoutDidChange.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/layoutStyle.js
+- frameworks/sproutcore/frameworks/foundation/tests/views/view/nextValidKeyView.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/parentViewDidChange.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/prepareContext.js
 - frameworks/sproutcore/frameworks/foundation/tests/views/view/removeChild.js
@@ -1013,6 +1018,12 @@ files:
 - frameworks/sproutcore/themes/standard_theme/english.lproj/collection.css
 - frameworks/sproutcore/themes/standard_theme/english.lproj/core.css
 - frameworks/sproutcore/themes/standard_theme/english.lproj/disclosure.css
+- frameworks/sproutcore/themes/standard_theme/english.lproj/images/icons/mini_222222.png
+- frameworks/sproutcore/themes/standard_theme/english.lproj/images/icons/mini_454545.png
+- frameworks/sproutcore/themes/standard_theme/english.lproj/images/icons/mini_888888.png
+- frameworks/sproutcore/themes/standard_theme/english.lproj/images/icons/mini_ffffff.png
+- frameworks/sproutcore/themes/standard_theme/english.lproj/images/panels/sprite-x.png
+- frameworks/sproutcore/themes/standard_theme/english.lproj/images/panels/sprite-y.png
 - frameworks/sproutcore/themes/standard_theme/english.lproj/images/sc-theme-repeat-x.png
 - frameworks/sproutcore/themes/standard_theme/english.lproj/images/sc-theme-ysprite.png
 - frameworks/sproutcore/themes/standard_theme/english.lproj/images/sc-toolbar-view.png
@@ -1021,17 +1032,8 @@ files:
 - frameworks/sproutcore/themes/standard_theme/english.lproj/menu.css
 - frameworks/sproutcore/themes/standard_theme/english.lproj/menu_item_view.css
 - frameworks/sproutcore/themes/standard_theme/english.lproj/pane.css
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/background-fat.jpg
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/background-thin.jpg
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/bottom-edge.png
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/bottom-left-corner.png
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/bottom-right-corner.png
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/left-edge.png
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/overlay.png
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/right-edge.png
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/top-edge.png
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/top-left-corner.png
-- frameworks/sproutcore/themes/standard_theme/english.lproj/panels/top-right-corner.png
+- frameworks/sproutcore/themes/standard_theme/english.lproj/panel.css
+- frameworks/sproutcore/themes/standard_theme/english.lproj/picker.css
 - frameworks/sproutcore/themes/standard_theme/english.lproj/progress.css
 - frameworks/sproutcore/themes/standard_theme/english.lproj/radio.css
 - frameworks/sproutcore/themes/standard_theme/english.lproj/segmented.css
@@ -1040,6 +1042,7 @@ files:
 - frameworks/sproutcore/themes/standard_theme/english.lproj/tab.css
 - frameworks/sproutcore/themes/standard_theme/english.lproj/text_field.css
 - frameworks/sproutcore/themes/standard_theme/english.lproj/toolbar.css
+- frameworks/sproutcore/themes/standard_theme/english.lproj/well.css
 - gen/Buildfile
 - gen/app/Buildfile
 - gen/app/README
@@ -1407,6 +1410,7 @@ files:
 - spec/lib/models/manifest/find_entry.rb
 - spec/lib/models/manifest/prepare_spec.rb
 - spec/lib/models/manifest_entry/cacheable_url_spec.rb
+- spec/lib/models/manifest_entry/hyperdomain_prefix.rb
 - spec/lib/models/manifest_entry/prepare_spec.rb
 - spec/lib/models/project/add_target_spec.rb
 - spec/lib/models/project/buildfile_spec.rb
@@ -1565,6 +1569,7 @@ files:
 - vendor/jsdoc/test/synonyms.js
 - vendor/jsdoc/test/tosource.js
 - vendor/jsdoc/test/variable_redefine.js
+- vendor/yui-compressor/SCyuicompressor-2.4.2.jar
 - vendor/yui-compressor/yuicompressor-2.4.2.jar
 has_rdoc: true
 homepage: http://www.sproutcore.com
@@ -1650,6 +1655,7 @@ test_files:
 - spec/lib/models/manifest/find_entry.rb
 - spec/lib/models/manifest/prepare_spec.rb
 - spec/lib/models/manifest_entry/cacheable_url_spec.rb
+- spec/lib/models/manifest_entry/hyperdomain_prefix.rb
 - spec/lib/models/manifest_entry/prepare_spec.rb
 - spec/lib/models/project/add_target_spec.rb
 - spec/lib/models/project/buildfile_spec.rb