sproutcore 0.9.0 → 0.9.1

data/lib/sproutcore/build_tools/resource_builder.rb

@@ -74,7 +74,7 @@ module SproutCore
         end
         
         file_lines = []
-        io = entry.source_path.nil? ? [] : File.new(entry.source_path)
+        io = (entry.source_path.nil? || !File.exists?(entry.source_path)) ? [] : File.new(entry.source_path)
         io.each do | line |
           
           # check for requires.  Only follow a require if the require is in the list

data/lib/sproutcore/bundle.rb

@@ -319,7 +319,7 @@ module SproutCore
     # Does a deep search of the entries, looking for a resource that is a close
     # match of the specified resource.  This does not need to match the filename
     # exactly and it can omit the extension
-    def find_resource_entry(filename, opts={})
+    def find_resource_entry(filename, opts={}, seen=nil)
       extname = File.extname(filename)
       rootname = filename.gsub(/#{extname}$/,'')
       entry_extname = entry_rootname = nil
@@ -332,14 +332,25 @@ module SproutCore
         !(ext_match && (/#{rootname}$/ =~ entry_rootname))
       end
       
-      ret.first
+      ret = ret.first
+      
+      if ret.nil?
+        seen = Set.new if seen.nil?
+        seen << self
+        all_required_bundles.each do |bundle|
+          next if seen.include?(bundle) # avoid recursion
+          ret = bundle.find_resource_entry(filename, opts, seen)
+          return ret unless ret.nil?
+        end
+      end
+      return ret 
     end
     
-    # Builds the passed array of entries.  If the entry is already built, then this 
-    # method does nothing unless force => true
+    # Builds the passed array of entries.  If the entry is already built, then 
+    # this method does nothing unless force => true
     #
-    # The exact action taken by this method varies by resource type.  Some resources
-    # will simply be copied.  Others will actually be compiled.
+    # The exact action taken by this method varies by resource type.  Some 
+    # resources will simply be copied.  Others will actually be compiled.
     #
     # ==== Params
     #
@@ -347,7 +358,8 @@ module SproutCore
     # 
     # ==== Options
     # 
-    # force:: If true then the entry will be built again, even if it already exists.
+    # force:: If true then the entry will be built again, even if it already 
+    #   exists.
     # hidden:: Set to :none, :include, or :only
     #
     def build_entries(entries, opts={})

data/lib/sproutcore/library.rb

@@ -45,7 +45,7 @@ module SproutCore
     
     # Heuristically determine if a particular location is a library.
     def self.is_library?(path)
-      has_it = %w(clients frameworks environment.yml).map do |x|
+      has_it = %w(clients frameworks sc-config.rb).map do |x|
         File.exists?(File.join(path, x))
       end
       return false unless has_it.pop
@@ -150,6 +150,11 @@ module SproutCore
     def bundles
       @cached_all_bundles ||= (client_bundles + framework_bundles)
     end
+
+    # Reloads the manifest for all bundles.
+    def reload_bundles!
+      bundles.each { |b| b.reload! }  
+    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
@@ -217,11 +222,13 @@ module SproutCore
 
     protected
     
-    # Load the library at the specified path.  Loads the environment.yml if it exists
-    # and then detects all clients and frameworks in the library.  If you pass any options,
-    # those will overlay any :all options you specify in your environment.yml file.
+    # Load the library at the specified path.  Loads the sc-config.rb if it 
+    # exists and then detects all clients and frameworks in the library.  If 
+    # you pass any options, those will overlay any :all options you specify in 
+    # your sc-config file.
     # 
-    # You cannot create a library directly using this method.  Instead is library_in()
+    # You cannot create a library directly using this method.  Instead is 
+    # library_in()
     #
     def initialize(rp, opts = {}, next_lib = nil)
       @root_path = rp
@@ -230,27 +237,38 @@ module SproutCore
       load_environment!(opts)
     end
     
-    # Internal method loads the actual environment
+    # Internal method loads the actual environment.  Get the ruby file and
+    # eval it in the context of the library object.
     def load_environment!(opts=nil)
-      env_path = File.join(root_path, 'environment.yml')
-      env = {}
-      if File.exists?(env_path)
-        f = File.open(env_path)
-        env = YAML::load(f) rescue nil
-        f.close
-      end
-      env = {} if env.nil?
-
-      # symbolize
+      env_path = File.join(root_path, 'sc-config.rb')
       @environment = {}
-      env.each do |k,v|
-        @environment[k.to_sym] = v.respond_to?(:symbolize_keys) ? v.symbolize_keys : v 
+      if File.exists?(env_path)
+        f = File.read(env_path)
+        eval(f) # execute the config file as if it belongs.
       end
       
-      # Overlay :all opts, if passed
-      @environment[:all] = (@environment[:all] || {}).merge(opts) unless opts.nil?
+      # Override any all options with load_opts
+      (@environment[:all] ||= {}).merge!(@load_opts)
+      
     end
-    
+
+    # This can be called from within a configuration file to actually setup
+    # the environment.  Passes the relative environment hash to the block.
+    #
+    # ==== Params
+    # bundle_name: the bundle these settings are for or :all for every bundle.
+    # opts: optional set of parameters to merge into this bundle environment
+    # 
+    # ==== Yields
+    # If block is given, yield to the block, passing an options hash the block
+    # can work on.
+    #
+    def config(bundle_name, opts=nil)
+      env = @environment[bundle_name.to_sym] ||= {}
+      env.merge!(opts) unless opts.nil?
+      yield(env) if block_given?
+    end
+      
   end
   
 end

data/lib/sproutcore/merb/bundle_controller.rb

@@ -35,29 +35,25 @@ module SproutCore
 
         # Check for a few special urls that need to be rewritten
         url = request.path
-        puts "BEFORE URL: #{url} current_bundle: #{current_bundle.bundle_name}"
         if request.method == :get 
           url = rewrite_bundle_if(url, /^#{current_bundle.index_root}\/-tests/, :sc_test_runner)
           url = rewrite_bundle_if(url, /^#{current_bundle.index_root}\/-docs/, :sc_docs)
         end
 
         # If we are in development mode, reload bundle first
-        current_bundle.reload! if current_bundle.build_mode == :development
-
-        puts "AFTER URL: #{url} current_bundle: #{current_bundle.bundle_name}"
+        library.reload_bundles! if current_bundle.build_mode == :development
 
         # Get the normalized URL for the requested resource
         url = current_bundle.normalize_url(url)
 
-        
         # Check for a few special urls for built-in services and route them off
         case url
         when "#{current_bundle.url_root}/-tests/index.js"
           ret = handle_test(url)
-        when "#{current_bundle.index_root}/-docs"
+        when "#{current_bundle.index_root}/-docs/index.html"
           ret = (request.method == :post) ? handle_doc(url) : handle_resource(url)
 
-        when "#{current_bundle.url_root}/-docs"
+        when "#{current_bundle.url_root}/-docs/index.html"
           ret = (request.method == :post) ? handle_doc(url) : handle_resource(url)
 
         else
@@ -81,7 +77,6 @@ module SproutCore
         # Found an entry, build the resource.  If the resource has already been built, this
         # will not do much.  If this the resource is an index.html file, force the build.
         is_index = /\/index\.html$/ =~ url
-        puts "building: #{url} - is_index: #{is_index}"
         
         current_bundle.build_entry(entry, :force => is_index, :hidden => :include)
 

data/lib/sproutcore/version.rb

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

data/lib/sproutcore/view_helpers.rb

@@ -100,8 +100,9 @@ module SproutCore
       attr_accessor :define
       attr_accessor :current_helper
       attr_accessor :client_builder
+      attr_reader :render_source
       
-      def initialize(item_id, opts={}, client_builder = nil)
+      def initialize(item_id, opts={}, client_builder = nil, render_source=nil)
         @_options = opts.dup
         @bindings = (@_options[:bind] || {}).dup
         @outlets = {}
@@ -111,6 +112,7 @@ module SproutCore
         @define = opts[:define]
         @client_builder = client_builder 
         @outlet_names = []
+        @render_source = render_source
         
         @attributes = (@_options[:attributes] || {}).dup
         
@@ -533,7 +535,7 @@ module SproutCore
     
     # :outlet => define if you want this to be used as an outlet.
     # :prototype => define if you want this to be used as a prototype.
-    def self.render_view(view_helper_id, item_id, opts={}, client_builder=nil, &block)
+    def self.render_view(view_helper_id, item_id, opts={}, client_builder=nil, render_source=nil, &block)
       
       # item_id is optional.  If it is not a symbol or string, then generate
       # an item_id
@@ -544,7 +546,7 @@ module SproutCore
 
       # create the new render context and set it.
       client_builder = opts[:client] if opts[:client]
-      rc = RenderContext.new(item_id, opts, client_builder)
+      rc = RenderContext.new(item_id, opts, client_builder, render_source)
       hs = find_helper(view_helper_id)
       
       # render the inner_html using the block, if one is given.
@@ -605,12 +607,12 @@ module SproutCore
       ## install the helper method
       SproutCore::ViewHelpers.class_eval %{
         def #{helper_name}(item_id=nil, opts={}, &block)
-          SproutCore::ViewHelperSupport.render_view(:#{helper_name}, item_id, opts, bundle, &block)
+          SproutCore::ViewHelperSupport.render_view(:#{helper_name}, item_id, opts, bundle, self, &block)
         end }
 
       SproutCore::ViewHelpers.class_eval %{
           def self.#{helper_name}(item_id=nil, opts={}, &block)
-            SproutCore::ViewHelperSupport.render_view(:#{helper_name}, item_id, opts, bundle, &block)
+            SproutCore::ViewHelperSupport.render_view(:#{helper_name}, item_id, opts, bundle, self, &block)
           end }
 
     end

data/lib/sproutcore/view_helpers/core_views.rb

@@ -201,6 +201,11 @@ EOF
       property :content
     end
     
+    view_helper :scroll_view do
+      view 'SC.ScrollView'
+      css_class_names << 'sc-scroll-view'
+    end
+    
     view_helper :segmented_view do
       property :value
       property :selection, :key => 'value'
@@ -225,7 +230,7 @@ EOF
           key = seg.first || ''
           label = seg.size > 1 ? seg.last : key.to_s.humanize.split.map { |x| x.capitalize }.join(' ')
           
-          result << ViewHelpers::button_view(:outlet => "#{key}_button", :label => label, :tag => 'a', :class => class_names )
+          result << render_source.button_view(:outlet => "#{key}_button", :label => label, :tag => 'a', :class => class_names )
         end
         @inner_html = result * ''
       end
@@ -252,8 +257,8 @@ EOF
         # name.
         css_class_names << 'segmented' 
         result = []
-        result << ViewHelpers::segmented_view(:outlet => :segmented_view, :segments => @segments, :bind => { :value => '*owner.nowShowing' })
-        result << ViewHelpers::view({:outlet => :root_view, :class => 'root'})
+        result << render_source.segmented_view(:outlet => :segmented_view, :segments => @segments, :bind => { :value => '*owner.nowShowing' })
+        result << render_source.view({:outlet => :root_view, :class => 'root'})
         @inner_html = [(result * ""), %(<div style="display:none;">), (@inner_html || ''), %(</div>)] * ""
       end
         
@@ -271,6 +276,7 @@ EOF
       property :act_on_select
       property(:example_view) { |v| v }
       property(:example_group_view) { |v| v }
+      property :display_property
       
       property(:group, :key => 'groupBy') do |v|
         "['#{Array(v) * "','" }']"
@@ -278,6 +284,8 @@ EOF
       
       property(:action) { |v| "function(ev) { return #{v}(this, ev); }" }
       view 'SC.CollectionView'
+      
+      css_class_names << 'sc-collection-view'
     end
     
   end

data/sc-config.rb

@@ -0,0 +1,7 @@
+# This is the default configuration file for SproutCore.  By default, all
+# frameworks in this library will pick up these settings.  Override them in
+# your own projects as needed
+
+config :all, :required => [:sproutcore, :prototype]
+config :sproutcore, :required => [:prototype]
+config :prototype, :required => []

data/tasks/deployment.rake

@@ -26,9 +26,22 @@ task :install_gem_no_doc => [:clean, :package] do
   sh "#{'sudo ' unless Hoe::WINDOZE }gem install pkg/*.gem --no-rdoc --no-ri"
 end
 
+IGNORE_DIRS = [] unless defined?(IGNORE_DIRS)
+
 namespace :manifest do
-  desc 'Recreate Manifest.txt to include ALL files'
+  desc 'Recreate Manifest.txt to include ALL files from specified locations'
   task :refresh do
-    `rake check_manifest | patch -p0 > Manifest.txt`
+    Dir.chdir(APP_ROOT)
+    files = Dir.glob(File.join('**','*'))
+    puts "IGNORE_DIRS = #{IGNORE_DIRS.join(',')}"
+    files.reject! do |x| 
+      path_parts = x.split('/')
+      
+      File.directory?(x) || IGNORE_DIRS.include?(path_parts.first)
+    end
+    
+    f = File.open(File.join(APP_ROOT, 'Manifest.txt'), 'w')
+    f.write(files.join("\n"))
+    f.close
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Charles Jolley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-11 00:00:00 -07:00
+date: 2008-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,20 +60,15 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- License.txt
-- Manifest.txt
-- README.txt
 - jsdoc/README.txt
-files: 
-- History.txt
 - License.txt
 - Manifest.txt
 - README.txt
-- Rakefile
-- app_generators/sproutcore/USAGE
+files: 
 - app_generators/sproutcore/sproutcore_generator.rb
 - app_generators/sproutcore/templates/README
-- app_generators/sproutcore/templates/environment.yml
+- app_generators/sproutcore/templates/sc-config.rb
+- app_generators/sproutcore/USAGE
 - bin/sc-build
 - bin/sc-gen
 - bin/sc-server
@@ -120,14 +115,12 @@ files:
 - clients/sc_test_runner/views/test_label.js
 - config/hoe.rb
 - config/requirements.rb
-- environment.yml
 - frameworks/prototype/prototype.js
-- frameworks/sproutcore/Core.js
-- frameworks/sproutcore/README
 - frameworks/sproutcore/controllers/array.js
 - frameworks/sproutcore/controllers/collection.js
 - frameworks/sproutcore/controllers/controller.js
 - frameworks/sproutcore/controllers/object.js
+- frameworks/sproutcore/Core.js
 - frameworks/sproutcore/drag/drag.js
 - frameworks/sproutcore/drag/drag_data_source.js
 - frameworks/sproutcore/drag/drag_source.js
@@ -135,6 +128,10 @@ files:
 - 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/images/sproutcore-logo.png
+- frameworks/sproutcore/english.lproj/images/sticky-note.png
 - frameworks/sproutcore/english.lproj/inline_text_editor.css
 - frameworks/sproutcore/english.lproj/menu.css
 - frameworks/sproutcore/english.lproj/panels/background-fat.jpg
@@ -192,6 +189,7 @@ files:
 - frameworks/sproutcore/panes/pane.js
 - frameworks/sproutcore/panes/panel.js
 - frameworks/sproutcore/panes/picker.js
+- frameworks/sproutcore/README
 - frameworks/sproutcore/tests/controllers/array.rhtml
 - frameworks/sproutcore/tests/controllers/controller.rhtml
 - frameworks/sproutcore/tests/controllers/object.rhtml
@@ -201,7 +199,10 @@ files:
 - frameworks/sproutcore/tests/globals/window.rhtml
 - frameworks/sproutcore/tests/panes/pane.rhtml
 - frameworks/sproutcore/tests/views/collection.rhtml
+- frameworks/sproutcore/tests/views/label_item.rhtml
+- frameworks/sproutcore/tests/views/list.rhtml
 - frameworks/sproutcore/tests/views/popup_button.rhtml
+- frameworks/sproutcore/tests/views/scroll.rhtml
 - frameworks/sproutcore/tests/views/text_field.rhtml
 - frameworks/sproutcore/validators/credit_card.js
 - frameworks/sproutcore/validators/date.js
@@ -212,6 +213,11 @@ files:
 - 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/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/container.js
 - frameworks/sproutcore/views/error_explanation.js
@@ -228,6 +234,7 @@ files:
 - 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/spinner.js
@@ -237,47 +244,48 @@ files:
 - frameworks/sproutcore/views/toolbar.js
 - frameworks/sproutcore/views/view.js
 - frameworks/sproutcore/views/workspace.js
-- generators/client/README
-- generators/client/USAGE
 - 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/controller/USAGE
+- generators/client/USAGE
 - generators/controller/controller_generator.rb
 - generators/controller/templates/controller.js
 - generators/controller/templates/test.rhtml
-- generators/framework/README
-- generators/framework/USAGE
+- generators/controller/USAGE
 - 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/language/USAGE
+- generators/framework/USAGE
 - generators/language/language_generator.rb
 - generators/language/templates/strings.js
-- generators/model/USAGE
+- generators/language/USAGE
 - generators/model/model_generator.rb
 - generators/model/templates/fixture.js
 - generators/model/templates/model.js
 - generators/model/templates/test.rhtml
-- generators/test/USAGE
+- generators/model/USAGE
 - generators/test/templates/test.rhtml
 - generators/test/test_generator.rb
-- generators/view/USAGE
+- generators/test/USAGE
 - generators/view/templates/test.rhtml
 - generators/view/templates/view.js
+- generators/view/USAGE
 - generators/view/view_generator.rb
-- jsdoc/README.txt
+- History.txt
 - jsdoc/app/DocFile.js
-- jsdoc/app/DocTag.js
 - jsdoc/app/Doclet.js
+- jsdoc/app/DocTag.js
 - jsdoc/app/Dumper.js
+- jsdoc/app/js.jar
 - jsdoc/app/JsDoc.js
 - jsdoc/app/JsHilite.js
 - jsdoc/app/JsIO.js
@@ -285,13 +293,13 @@ files:
 - jsdoc/app/JsPlate.js
 - jsdoc/app/JsTestrun.js
 - jsdoc/app/JsToke.js
+- jsdoc/app/run.js
 - jsdoc/app/Symbol.js
 - jsdoc/app/Transformer.js
 - jsdoc/app/Util.js
-- jsdoc/app/js.jar
-- jsdoc/app/run.js
 - jsdoc/plugins/min.js
 - jsdoc/plugins/strip.js
+- jsdoc/README.txt
 - jsdoc/templates/sproutcore/class.tmpl
 - jsdoc/templates/sproutcore/default.css
 - jsdoc/templates/sproutcore/index.html
@@ -299,30 +307,35 @@ files:
 - jsdoc/templates/sproutcore/prototype.js
 - jsdoc/templates/sproutcore/publish.js
 - jsdoc/templates/sproutcore/splash.html
-- lib/sproutcore.rb
-- lib/sproutcore/build_tools.rb
 - lib/sproutcore/build_tools/html_builder.rb
 - lib/sproutcore/build_tools/resource_builder.rb
+- lib/sproutcore/build_tools.rb
 - lib/sproutcore/bundle.rb
 - lib/sproutcore/bundle_manifest.rb
 - lib/sproutcore/generator_helper.rb
-- lib/sproutcore/helpers.rb
 - lib/sproutcore/helpers/capture_helper.rb
 - lib/sproutcore/helpers/static_helper.rb
 - lib/sproutcore/helpers/tag_helper.rb
 - lib/sproutcore/helpers/text_helper.rb
+- lib/sproutcore/helpers.rb
 - lib/sproutcore/jsdoc.rb
 - lib/sproutcore/jsmin.rb
 - lib/sproutcore/library.rb
-- lib/sproutcore/merb.rb
 - lib/sproutcore/merb/bundle_controller.rb
 - lib/sproutcore/merb/router.rb
+- lib/sproutcore/merb.rb
 - lib/sproutcore/version.rb
-- lib/sproutcore/view_helpers.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
+- Manifest.txt
+- Rakefile
+- README.txt
+- sc-config.rb
 - script/destroy
 - script/generate
 - script/txt2html