sproutcore 0.9.1 → 0.9.2

data/lib/sproutcore/build_tools/resource_builder.rb

@@ -132,7 +132,7 @@ module SproutCore
       # Final processing of file.  Remove comments & minify
       def join(lines)
 
-        if BuildTools.minify?
+        if bundle.minify?
           # first suck out any comments that should be retained
           comments = []
           include_line = false 

data/lib/sproutcore/bundle.rb

@@ -3,46 +3,49 @@ require 'sproutcore/build_tools'
 module SproutCore
     
   # A bundle can map a directory of source files to an output format optimized
-  # for delivery on the web.  It can also return the URLs to use for a particular client.
-  # A Bundle cannot actually build resources for you, but it works in concert with the 
-  # ResourceBuilder to help you with that.
+  # for delivery on the web.  It can also return the URLs to use for a 
+  # particular client. A Bundle cannot actually build resources for you, but 
+  # it works in concert with the ResourceBuilder to help you with that.
   #
-  # When you create a bundle, you must pass the name of the client and the library the bundle
-  # belongs to.  The library is used to generate default paths for most resources and to find
-  # other bundles.
+  # When you create a bundle, you must pass the name of the client and the 
+  # library the bundle belongs to.  The library is used to generate default 
+  # paths for most resources and to find other bundles.
   #
   # You must provide the following properties to every build:
   # 
-  #  bundle_name::       A name used to identify the client for required URLs, etc.
-  #  library::          The root URL of the library holding the client
+  #  bundle_name::  A name used to identify the client for required URLs, etc.
+  #  library::      The root URL of the library holding the client
   #
-  # The following properties are also required, but have defaults you can rely use:
+  # The following properties are also required, but have defaults you can rely 
+  # use:
   #
   #  bundle_type::       :framework|:client (default :client)
   #  required_bundles::  Names of required frameworks. (default: none)
-  #  stylesheet_libs::  URLs to requires CSS not managed by the build system. (default: none)
-  #  javascript_libs::   URLS to requires JavaScript notn managed by the build system (def:non)
+  #  stylesheet_libs::   URLs to requires CSS not managed by the build system. 
+  #      (default: none)
+  #  javascript_libs::   URLS to requires JavaScript notn managed by the build 
+  #      system (def:non)
   #
-  # The following properties are required for the build process but can be generated
-  # automatically using other properties you specify:
+  # The following properties are required for the build process but can be 
+  # generated automatically using other properties you specify:
   #
   #  source_root::       The directory containing the source files
-  #    default: :library_root/pluralize(:build_type)/:bundle_name
+  #    default: :library_root/pluralize(:bundle_type)/:bundle_name
   #
   #  build_root::        The directory that should contain the built files.
   #    default: :public_root/:url_prefix/:bundle_name
   #
   #  url_root::          The url that can be used to reach the built resources
-  #    default: /:url_prefix/:bundle_name
+  #  default: /:url_prefix/:bundle_name
   #
-  #  index_root::        The root url that can be used to reach retrieve the index.html.
-  #    default: /:index_prefix/:bundle_name
+  #  index_root::        The root url that can be used to reach retrieve the 
+  #  index.html. default: /:index_prefix/:bundle_name
   #
-  # If you do not want to specify all of these options, you can provide the following defaults
-  # and the rest will be inferred:
+  # If you do not want to specify all of these options, you can provide the 
+  # following defaults and the rest will be inferred:
   # 
-  #  library_root::      The root URL for the library.  This is computed from the library if
-  #    you pass one.
+  #  library_root::      The root URL for the library.  This is computed from 
+  #   the library if you pass one.
   #
   #  public_root::       The root directory accessible to the web browser.
   #    default: :library_root/public
@@ -53,13 +56,15 @@ module SproutCore
   #  index_prefix::      The prefix to put in front of all index.html request.
   #    default: ''
   #
-  #  preferred_language::  The default language to use for this bundle.  Defaults to :en
+  #  preferred_language::  The default language to use for this bundle.  
+  #    Defaults to :en
   #
-  #  build_mode::        Determines whether the JS & CSS resources should be combined or 
-  #                       linked directly
+  #  build_mode::        Determines whether the JS & CSS resources should be 
+  #    combined or linked directly
   #
   #  layout:        Path to the layout resource.  This should be of the form
-  #    bundle_name:relative_path/to/client.  Default: sproutcore:lib/index.html 
+  #    bundle_name:relative_path/to/client.  Default: 
+  #    sproutcore:lib/index.html 
   # 
   class Bundle 
 
@@ -104,6 +109,12 @@ module SproutCore
       return ret
     end
       
+    # ==== Returns 
+    # True if the build_mode is not development to minify the JS.
+    def minify?
+      build_mode != :development
+    end
+    
     # ==== Returns
     # The computed path to the layout rhtml.
     def layout_path
@@ -452,6 +463,56 @@ module SproutCore
       end
     end
     
+    ######################################################
+    ## RUBY HELPERS
+    ##
+
+    # ==== Returns
+    # Array of path to helper files that need to be loaded into memory 
+    # before any HTML from the bundle can be rendered.
+    #
+    def helper_paths
+      File.exists?(File.join(source_root,'lib')) ? Dir.glob(File.join(source_root, 'lib', '**', '*.rb')) : []
+    end
+
+    # ==== Returns
+    # The helper path ending in the specified name (sans extension)
+    #
+    def helper_for(helper_name)
+      paths = helper_paths
+
+      ret = nil
+      paths.each do |path|
+        if path =~ /#{helper_name}(\.rb)?$/
+          ret = path
+          break
+        end
+      end
+      
+      return ret 
+    end
+
+    # ==== Returns
+    # The contents of the helper file at the specified path.  For performance
+    # reasons, the contents are only loaded once and reused unless the file's
+    # mtime has changed.
+    def helper_contents_for(path)
+
+      # Oops...file has been deleted!
+      return '' if !File.exists?(path)
+      
+      @_cached_helper_contents ||= {}
+      cached = @_cached_helper_contents[path] 
+      
+      return cached[:contents] if cached && (cached[:mtime] == File.mtime(path))
+  
+      # Not cached, build it.
+      cached = { :mtime => File.mtime(path), :contents => File.read(path) }
+      @_cached_helper_contents[path] = cached
+      
+      return cached[:contents] 
+    end
+    
     ######################################################
     ## MANIFESTS
     ##

data/lib/sproutcore/jsdoc.rb

@@ -32,6 +32,8 @@ module SproutCore
       jar_path = File.join(jsdoc_root, 'app', 'js.jar')
       runjs_path = File.join(jsdoc_root, 'app', 'run.js')
       template_path = File.join(jsdoc_root, 'templates', 'sproutcore')
+
+      puts "GENERATING: java -Djsdoc.dir=#{jsdoc_root} -jar #{jar_path} #{runjs_path} -t=#{template_path} -d=#{build_path} #{files * ' '} -v"
       
       SC.logger.debug `java -Djsdoc.dir=#{jsdoc_root} -jar #{jar_path} #{runjs_path} -t=#{template_path} -d=#{build_path} #{files * ' '} -v`
     

data/lib/sproutcore/version.rb

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

data/lib/sproutcore/view_helpers.rb

@@ -600,7 +600,7 @@ module SproutCore
 
   module ViewHelpers
 
-    def self.view_helper(helper_name,opts={},&prepare_block)
+    def view_helper(helper_name,opts={},&prepare_block)
       hs = SproutCore::ViewHelperSupport::HelperState.new(helper_name,opts,&prepare_block)
       SproutCore::ViewHelperSupport.set_helper(helper_name, hs)
 
@@ -623,8 +623,41 @@ module SproutCore
       return ret 
     end
 
+    # Call this method to load a helper.  This will get the file contents
+    # and eval it.
+    def require_helpers(helper_name, bundle=nil)
+      
+      # save bundle for future use
+      unless bundle.nil?
+        old_helper_bundle = @helper_bundle
+        @helper_bundle = bundle
+      end
+
+      # Get all the helper paths we want to load
+      if helper_name.nil?
+        paths = @helper_bundle.helper_paths
+      else
+        paths = [@helper_bundle.helper_for(helper_name)]
+      end
+      paths.compact!
+      
+      # Create list of loaded helper paths
+      @loaded_helpers = [] if @loaded_helpers.nil?
+      
+      # If a helper path was found, load it.  May require other helpers
+      paths.each do |path|
+        next if @loaded_helpers.include?(path)
+        @loaded_helpers << path
+        
+        eval(@helper_bundle.helper_contents_for(path))
+      end
+      
+      # restore old bundle helper.
+      unless bundle.nil?
+        @helper_bundler = old_helper_bundle
+      end
+    end
+    
   end
   
 end
-
-Dir.glob(File.join(File.dirname(__FILE__),'view_helpers','**','*.rb')).each { |x| require x }

data/tasks/deployment.rake

@@ -37,7 +37,7 @@ namespace :manifest do
     files.reject! do |x| 
       path_parts = x.split('/')
       
-      File.directory?(x) || IGNORE_DIRS.include?(path_parts.first)
+      (path_parts.last[0..0] == '.') || File.directory?(x) || IGNORE_DIRS.include?(path_parts.first)
     end
     
     f = File.open(File.join(APP_ROOT, 'Manifest.txt'), 'w')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Charles Jolley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-18 00:00:00 -07:00
+date: 2008-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,15 +77,9 @@ files:
 - clients/sc_docs/core.js
 - clients/sc_docs/english.lproj/body.css
 - clients/sc_docs/english.lproj/body.rhtml
-- clients/sc_docs/english.lproj/controls.css
-- clients/sc_docs/english.lproj/icons/small/next.png
-- clients/sc_docs/english.lproj/icons/small/reset.png
-- clients/sc_docs/english.lproj/images/gradients.png
-- clients/sc_docs/english.lproj/images/indicator.gif
-- clients/sc_docs/english.lproj/images/toolbar.png
 - clients/sc_docs/english.lproj/no_docs.rhtml
 - clients/sc_docs/english.lproj/strings.js
-- clients/sc_docs/english.lproj/warning.rhtml
+- clients/sc_docs/english.lproj/tabs.rhtml
 - clients/sc_docs/fixtures/doc.js
 - clients/sc_docs/main.js
 - clients/sc_docs/models/doc.js
@@ -107,15 +101,27 @@ files:
 - clients/sc_test_runner/english.lproj/images/toolbar.png
 - clients/sc_test_runner/english.lproj/no_tests.rhtml
 - clients/sc_test_runner/english.lproj/strings.js
-- clients/sc_test_runner/english.lproj/warning.rhtml
 - clients/sc_test_runner/fixtures/test.js
 - clients/sc_test_runner/main.js
 - clients/sc_test_runner/models/test.js
 - clients/sc_test_runner/views/runner_frame.js
 - clients/sc_test_runner/views/test_label.js
+- clients/view_builder/builders/builder.js
+- clients/view_builder/builders/button.js
+- clients/view_builder/controllers/document.js
+- clients/view_builder/core.js
+- clients/view_builder/english.lproj/body.css
+- clients/view_builder/english.lproj/body.rhtml
+- clients/view_builder/english.lproj/controls.css
+- clients/view_builder/english.lproj/strings.js
+- clients/view_builder/main.js
+- clients/view_builder/tests/controllers/document.rhtml
+- clients/view_builder/tests/views/builder.rhtml
+- clients/view_builder/views/builder.js
 - config/hoe.rb
 - config/requirements.rb
 - frameworks/prototype/prototype.js
+- frameworks/sproutcore/animation/animation.js
 - frameworks/sproutcore/controllers/array.js
 - frameworks/sproutcore/controllers/collection.js
 - frameworks/sproutcore/controllers/controller.js
@@ -127,9 +133,12 @@ files:
 - frameworks/sproutcore/drag/drop_target.js
 - frameworks/sproutcore/english.lproj/blank.gif
 - frameworks/sproutcore/english.lproj/buttons.css
-- frameworks/sproutcore/english.lproj/buttons.png
-- frameworks/sproutcore/english.lproj/collections.css
-- frameworks/sproutcore/english.lproj/images/buttons-sprite.png
+- frameworks/sproutcore/english.lproj/core.css
+- frameworks/sproutcore/english.lproj/icons.css
+- frameworks/sproutcore/english.lproj/images/indicator.gif
+- frameworks/sproutcore/english.lproj/images/sc-theme-sprite.png
+- frameworks/sproutcore/english.lproj/images/sc-theme-ysprite.png
+- frameworks/sproutcore/english.lproj/images/shared-icons.png
 - frameworks/sproutcore/english.lproj/images/sproutcore-logo.png
 - frameworks/sproutcore/english.lproj/images/sticky-note.png
 - frameworks/sproutcore/english.lproj/inline_text_editor.css
@@ -153,7 +162,6 @@ files:
 - frameworks/sproutcore/english.lproj/theme.css
 - frameworks/sproutcore/foundation/animator.js
 - frameworks/sproutcore/foundation/application.js
-- frameworks/sproutcore/foundation/array.js
 - frameworks/sproutcore/foundation/benchmark.js
 - frameworks/sproutcore/foundation/binding.js
 - frameworks/sproutcore/foundation/date.js
@@ -163,7 +171,6 @@ files:
 - frameworks/sproutcore/foundation/mock.js
 - frameworks/sproutcore/foundation/node_descriptor.js
 - frameworks/sproutcore/foundation/object.js
-- frameworks/sproutcore/foundation/observable.js
 - frameworks/sproutcore/foundation/page.js
 - frameworks/sproutcore/foundation/path_module.js
 - frameworks/sproutcore/foundation/responder.js
@@ -172,13 +179,26 @@ files:
 - 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
 - frameworks/sproutcore/globals/window.js
+- frameworks/sproutcore/lib/button_views.rb
+- frameworks/sproutcore/lib/collection_view.rb
+- frameworks/sproutcore/lib/core_views.rb
+- frameworks/sproutcore/lib/form_views.rb
 - frameworks/sproutcore/lib/index.rhtml
+- frameworks/sproutcore/lib/menu_views.rb
+- frameworks/sproutcore/mixins/array.js
+- frameworks/sproutcore/mixins/control.js
+- frameworks/sproutcore/mixins/delegate_support.js
+- frameworks/sproutcore/mixins/observable.js
+- frameworks/sproutcore/mixins/scrollable.js
+- frameworks/sproutcore/mixins/selection_support.js
+- frameworks/sproutcore/mixins/validatable.js
 - frameworks/sproutcore/models/collection.js
 - frameworks/sproutcore/models/record.js
 - frameworks/sproutcore/models/store.js
@@ -196,14 +216,28 @@ files:
 - frameworks/sproutcore/tests/foundation/application.rhtml
 - frameworks/sproutcore/tests/foundation/array.rhtml
 - frameworks/sproutcore/tests/foundation/object.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/panes/pane.rhtml
-- frameworks/sproutcore/tests/views/collection.rhtml
+- frameworks/sproutcore/tests/views/checkbox.rhtml
+- frameworks/sproutcore/tests/views/collection/base.rhtml
+- frameworks/sproutcore/tests/views/collection/incremental_rendering.rhtml
+- frameworks/sproutcore/tests/views/image_cell.rhtml
 - frameworks/sproutcore/tests/views/label_item.rhtml
 - frameworks/sproutcore/tests/views/list.rhtml
+- frameworks/sproutcore/tests/views/list_item.rhtml
 - frameworks/sproutcore/tests/views/popup_button.rhtml
-- frameworks/sproutcore/tests/views/scroll.rhtml
+- frameworks/sproutcore/tests/views/slider.rhtml
+- frameworks/sproutcore/tests/views/text_cell.rhtml
 - frameworks/sproutcore/tests/views/text_field.rhtml
+- frameworks/sproutcore/tests/views/view/clippingFrame.rhtml
+- frameworks/sproutcore/tests/views/view/frame.rhtml
+- frameworks/sproutcore/tests/views/view/innerFrame.rhtml
+- frameworks/sproutcore/tests/views/view/isVisibleInWindow.rhtml
+- frameworks/sproutcore/tests/views/view/scrollFrame.rhtml
 - frameworks/sproutcore/validators/credit_card.js
 - frameworks/sproutcore/validators/date.js
 - frameworks/sproutcore/validators/email.js
@@ -211,45 +245,51 @@ files:
 - frameworks/sproutcore/validators/number.js
 - frameworks/sproutcore/validators/password.js
 - frameworks/sproutcore/validators/validator.js
-- frameworks/sproutcore/views/button.js
-- frameworks/sproutcore/views/checkbox_field.js
-- frameworks/sproutcore/views/collection/collection_item.js
+- frameworks/sproutcore/views/button/button.js
+- frameworks/sproutcore/views/button/checkbox.js
+- frameworks/sproutcore/views/button/disclosure.js
+- frameworks/sproutcore/views/button/radio.js
+- frameworks/sproutcore/views/collection/collection.js
 - frameworks/sproutcore/views/collection/grid.js
 - frameworks/sproutcore/views/collection/image_cell.js
 - frameworks/sproutcore/views/collection/list.js
-- frameworks/sproutcore/views/collection/text_cell.js
-- frameworks/sproutcore/views/collection.js
+- frameworks/sproutcore/views/collection/source_list.js
+- frameworks/sproutcore/views/collection/table.js
 - frameworks/sproutcore/views/container.js
 - frameworks/sproutcore/views/error_explanation.js
-- frameworks/sproutcore/views/field.js
+- frameworks/sproutcore/views/field/checkbox_field.js
+- frameworks/sproutcore/views/field/field.js
+- frameworks/sproutcore/views/field/radio_field.js
+- frameworks/sproutcore/views/field/select_field.js
+- frameworks/sproutcore/views/field/text_field.js
+- frameworks/sproutcore/views/field/textarea_field.js
 - frameworks/sproutcore/views/filter_button.js
 - frameworks/sproutcore/views/form.js
 - frameworks/sproutcore/views/image.js
 - frameworks/sproutcore/views/inline_text_editor.js
 - frameworks/sproutcore/views/label.js
+- frameworks/sproutcore/views/list_item.js
 - frameworks/sproutcore/views/menu_item.js
 - frameworks/sproutcore/views/pagination.js
 - frameworks/sproutcore/views/popup_button.js
 - frameworks/sproutcore/views/popup_menu.js
 - frameworks/sproutcore/views/progress.js
-- frameworks/sproutcore/views/radio_field.js
 - frameworks/sproutcore/views/radio_group.js
 - frameworks/sproutcore/views/scroll.js
 - frameworks/sproutcore/views/segmented.js
-- frameworks/sproutcore/views/select_field.js
+- frameworks/sproutcore/views/slider.js
+- frameworks/sproutcore/views/source_list_group.js
 - frameworks/sproutcore/views/spinner.js
+- frameworks/sproutcore/views/split.js
+- frameworks/sproutcore/views/split_divider.js
 - frameworks/sproutcore/views/tab.js
-- frameworks/sproutcore/views/text_field.js
-- frameworks/sproutcore/views/textarea_field.js
 - frameworks/sproutcore/views/toolbar.js
 - frameworks/sproutcore/views/view.js
-- frameworks/sproutcore/views/workspace.js
 - generators/client/client_generator.rb
 - generators/client/README
 - generators/client/templates/core.js
 - generators/client/templates/english.lproj/body.css
 - generators/client/templates/english.lproj/body.rhtml
-- generators/client/templates/english.lproj/controls.css
 - generators/client/templates/english.lproj/strings.js
 - generators/client/templates/main.js
 - generators/client/USAGE
@@ -260,9 +300,6 @@ files:
 - generators/framework/framework_generator.rb
 - generators/framework/README
 - generators/framework/templates/core.js
-- generators/framework/templates/english.lproj/body.css
-- generators/framework/templates/english.lproj/body.rhtml
-- generators/framework/templates/english.lproj/controls.css
 - generators/framework/templates/english.lproj/strings.js
 - generators/framework/USAGE
 - generators/language/language_generator.rb
@@ -325,10 +362,6 @@ files:
 - lib/sproutcore/merb/router.rb
 - lib/sproutcore/merb.rb
 - lib/sproutcore/version.rb
-- lib/sproutcore/view_helpers/button_views.rb
-- lib/sproutcore/view_helpers/core_views.rb
-- lib/sproutcore/view_helpers/form_views.rb
-- lib/sproutcore/view_helpers/menu_views.rb
 - lib/sproutcore/view_helpers.rb
 - lib/sproutcore.rb
 - License.txt