sproutcore 0.9.17 → 0.9.18

data/lib/sproutcore/renderers/haml.rb

@@ -0,0 +1,28 @@
+module Sproutcore
+  module Renderers
+
+    class Haml
+      def initialize(html_context)
+        @html_context = html_context
+      end
+
+      def compile(input)
+        require 'haml'
+        ::Haml::Engine.new(input).send(:precompiled_with_ambles, [])
+      end
+      
+      def concat(string, binding)
+        eval("_hamlout", binding).push_text string
+      end
+      
+      def capture(*args, &block)
+        if @html_context.respond_to?(:is_haml?) && @html_context.is_haml?
+          @html_context.capture_haml(nil, &block)
+        else
+          block.call(*args).to_s
+        end
+      end
+    end
+
+  end
+end

data/lib/sproutcore/renderers/sass.rb

@@ -0,0 +1,42 @@
+module SproutCore
+  module Renderers
+
+    class Sass
+
+      def self.compile(entry, content)
+        require 'sass'
+        begin
+          ::Sass::Engine.new(content).render
+        rescue Exception => e
+          e_string = "#{e.class}: #{e.message}"
+          if e.is_a? Sass::SyntaxError
+            e_string << "\non line #{e.sass_line}"
+            e_string << " of #{entry.source_path}"
+            if File.exists?(entry.source_path)
+              e_string << "\n\n"
+              min = [e.sass_line - 5, 0].max
+              File.read(entry.source_path).rstrip.split("\n")[
+                min .. e.sass_line + 5
+              ].each_with_index do |line, i|
+                e_string << "#{min + i + 1}: #{line}\n"
+              end
+            end
+          end
+<<END
+/*
+#{e_string}
+
+Backtrace:\n#{e.backtrace.join("\n")}
+*/
+body:before {
+  white-space: pre;
+  font-family: monospace;
+  content: "#{e_string.gsub('"', '\"').gsub("\n", '\\A ')}"; }
+END
+        end
+      end
+
+    end
+
+  end
+end

data/lib/sproutcore/version.rb

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

data/lib/sproutcore/view_helpers.rb

@@ -4,12 +4,10 @@ module SproutCore
   # The PageHelper is a singleton object that can render the Page javascript
   # object.
   module PageHelper
-
     @@render_contexts = []
-    @@outlets = {}
-    @@outlet_names = []
+    @@outlets = []
     @@styles = []
-    @@defines = {}
+    @@defines = []
 
     # This is the current helper state used when rendering the HTML.  When
     # a view helper is rendered, it may add itself as an outlet to the current
@@ -29,19 +27,17 @@ module SproutCore
     # reset the page helper.
     def self.reset!
       @@render_contexts = []
-      @@outlets = {}
-      @@outlet_names = []
+      @@outlets = []
       @@styles = []
-      @@defines = {}
+      @@defines = []
     end
 
     def self.set_define(key, opts = {})
-      @@defines[key] = opts
+      @@defines << [key, opts]
     end
 
     def self.set_outlet(key,opts = {})
-      @@outlet_names << key
-      @@outlets[key] = opts
+      @@outlets << [key, opts]
     end
 
     def self.add_styles(styles)
@@ -50,25 +46,23 @@ module SproutCore
 
     # renders the page object for the current page.  If you include a prefix
     # that will be used to create a separate page object.  Otherwise, the
-    # object will live in the SC namespace.
+    # object will live in the SC namespace. If you provide a bundle that
+    # is configured to minify sources the output will be compressed.
     #
     # returns the text to insert into the HTML.
-    def self.render_js(prefix = 'SC')
-
+    def self.render_js(prefix = 'SC', bundle = nil)
       outlets = []
-      @@outlet_names.each do | key |
-        opts = @@outlets[key]
+      @@outlets.each do | key, opts |
         outlet_path = opts[:outlet_path] || "##{opts[:id] || key}"
         outlets << %{  #{key}: #{opts[:class] || 'SC.View'}.extend({\n  #{ opts[:properties].gsub("\n","\n  ") }\n  }).outletFor("#{outlet_path}") }
       end
 
       # defines let you define classes to include in your UI.
-      ret = @@defines.map do | key, opts |
+      ret = @@defines.each do | key, opts |
         %{#{key} = #{opts[:class] || 'SC.View'}.extend({\n  #{ opts[:properties] }\n});}
       end
       ret << %{#{prefix}.page = SC.Page.create({\n#{ outlets * ",\n\n" }\n}); }
-      return ret * "\n"
-
+      bundle ? SproutCore::BuildTools::JavaScriptResourceBuilder.new(nil, nil, bundle).join(ret) : ret*"\n"
     end
 
     def self.render_css
@@ -95,24 +89,30 @@ module SproutCore
     class RenderContext
 
       # options passed in from the view helper
+      attr_reader :view_helper_id
       attr_reader :item_id
       attr_accessor :outlet
       attr_accessor :define
       attr_accessor :current_helper
       attr_accessor :client_builder
       attr_reader :render_source
+      attr_reader :parent_context
+      attr_reader :child_contexts
 
-      def initialize(item_id, opts={}, client_builder = nil, render_source=nil)
+      def initialize(view_helper_id, item_id, opts={}, client_builder = nil, render_source=nil)
         @_options = opts.dup
         @bindings = (@_options[:bind] || {}).dup
-        @outlets = {}
+        @outlets = []
         @prototypes = {}
+        @view_helper_id = view_helper_id
         @item_id = item_id
         @outlet = opts[:outlet]
         @define = opts[:define]
         @client_builder = client_builder
-        @outlet_names = []
         @render_source = render_source
+        @parent_context = SproutCore::PageHelper.current_render_context
+        @parent_context.child_contexts << self if @parent_context
+        @child_contexts = []
 
         @attributes = (@_options[:attributes] || {}).dup
 
@@ -123,14 +123,17 @@ module SproutCore
           end
         end
       end
+      
+      def to_s
+        "RenderContext #{view_helper_id}[#{item_id}]"
+      end
 
       def options
         @_options
       end
 
       def set_outlet(key,opts = {})
-        @outlet_names << key
-        @outlets[key] = opts
+        @outlets << [key, opts]
       end
 
       def prepare_bindings
@@ -143,8 +146,7 @@ module SproutCore
       def prepare_outlets
         return if @outlets.size == 0
         outlets = []
-        @outlet_names.each do | key |
-          opts = @outlets[key]
+        @outlets.each do | key, opts |
           outlet_key = key.to_s.camelize(:lower)
           outlets << outlet_key unless opts[:lazy]
 
@@ -431,10 +433,6 @@ module SproutCore
       def prepare_for_javascript(value)
         return 'null' if value.nil?
         case value
-        when String:
-          %("#{ value.gsub('"','\"').gsub("\n",'\n') }")
-        when Symbol:
-          %("#{ value.to_s.gsub('"','\"').gsub("\n",'\n') }")
         when Array:
           "[#{value.map { |v| prepare_for_javascript(v) } * ','}]"
         when Hash:
@@ -447,7 +445,7 @@ module SproutCore
         when TrueClass:
           "true"
         else
-          value.to_s
+          %("#{ value.to_s.gsub('"','\"').gsub("\n",'\n') }")
         end
       end
 
@@ -506,7 +504,9 @@ module SproutCore
       def initialize(helper_name, opts={}, &block)
         @name = helper_name
         @prepare_block = block
-        @parent_helper = SproutCore::ViewHelperSupport.find_helper(opts[:wraps] || opts[:extends] || :view)
+        unless helper_name == :view
+          @parent_helper = SproutCore::ViewHelperSupport.find_helper(opts[:wraps] || opts[:extends] || :view)
+        end
         @extends = opts[:wraps].nil?
       end
 
@@ -524,12 +524,6 @@ module SproutCore
 
     end
 
-    @@tick = 0
-    def self._gen_id(type="id")
-      @@tick += 1
-      return "#{type}_#{(Time.now.to_i + @@tick)}"
-    end
-
     extend SproutCore::Helpers::CaptureHelper
     extend SproutCore::Helpers::TextHelper
 
@@ -542,29 +536,29 @@ module SproutCore
       if item_id.instance_of?(Hash)
         opts = item_id; item_id = nil
       end
-      item_id = _gen_id if item_id.nil?
+      item_id = render_source.dom_id! if item_id.nil?
 
       # create the new render context and set it.
       client_builder = opts[:client] if opts[:client]
-      rc = RenderContext.new(item_id, opts, client_builder, render_source)
+      rc = RenderContext.new(view_helper_id, item_id, opts, client_builder, render_source)
       hs = find_helper(view_helper_id)
 
       # render the inner_html using the block, if one is given.
       SproutCore::PageHelper.push_render_context(rc)
-      rc.options[:inner_html] = capture(&block) if block_given?
+      rc.options[:inner_html] = render_source.capture(&block) if block_given?
 
       # now, use the helper state to prepare the render context.  This will
       # extract the properties from the options and setup the render procs.
       hs.prepare_context(rc) unless hs.nil?
 
-      # how have the render context render the HTML content.  This may also
+      # now have the render context render the HTML content.  This may also
       # make changes to the other items to render.
       ret = rc.render_content
 
       SproutCore::PageHelper.pop_render_context
 
       # get the JS.  Save as an outlet or in the page.
-      cur_rc = SproutCore::PageHelper.current_render_context
+      cur_rc = opts[:current_context] || SproutCore::PageHelper.current_render_context
       view_class = opts[:view] || rc.view_class
 
       unless view_class.nil?
@@ -596,7 +590,7 @@ module SproutCore
       SproutCore::PageHelper.add_styles(styles) if styles && styles.size > 0
 
       # done. return the generated HTML
-      concat(ret,block) if block_given?
+      render_source.concat(ret,block) if block_given?
       return ret
     end
 
@@ -616,8 +610,8 @@ module SproutCore
 
     end
 
-    def render_page_views
-      ret = %(<script type="text/javascript">\n#{SproutCore::PageHelper.render_js}\n</script>)
+    def render_page_views(prefix = 'SC')
+      ret = %(<script type="text/javascript">\n#{SproutCore::PageHelper.render_js(prefix, self.bundle)}\n</script>)
       SproutCore::PageHelper.reset!
       return ret
     end
@@ -641,7 +635,7 @@ module SproutCore
       paths.compact!
 
       # Create list of loaded helper paths
-      @loaded_helpers = [] if @loaded_helpers.nil?
+      @loaded_helpers ||= []
 
       # If a helper path was found, load it.  May require other helpers
       paths.each do |path|

data/sc_generators/controller/controller_generator.rb

@@ -10,7 +10,7 @@ class ControllerGenerator < RubiGen::Base
 
   def initialize(runtime_args, runtime_options = {})
     super
-    usage if args.empty?
+    usage if args.empty? || !file_structure_exists? 
     @name = args.shift
     extract_options
     assign_names!(@name)

data/sc_generators/language/USAGE

@@ -1,15 +1,13 @@
-sc_view - Create a new view class in your SproutCore client.
+sc_language - Create a new langauge.lproj bundle
 
 USAGE:
 
-  ./script/generate view client_name/view_name [CLASS]
+  ./script/generate language client_name/languge_name [CLASS]
 
 DISCUSSION:
 
-This generator will create a new SproutCore view class in your client.  You should pass as the first parameter your client directory name/the view you want to create.  For example:
+This generator will create a new SproutCore language bundle.  You should pass as the first parameter your client directory name/the view you want to create.  For example:
 
-./script/generate view todos/task
+./script/generate language todos/esperanto
 
-defines a new class called Todos.TaskView in the file clients/todos/views/task.js.
-
-This generator creates view that inherit from SC.View but you can override this by passing the name of the view class you want as the second argument.
+creates a new lproj bundle esperanto.lproj in the client clients/todos.  This bundle will contain a strings.js that extends String. You should place your localized language translations here.

data/sc_generators/language/language_generator.rb

@@ -18,7 +18,7 @@ class LanguageGenerator < RubiGen::Base
 
   def manifest
     record do |m|
-      fp = client_file_path("#{file_path}.lproj",'js', nil, "#{file_path}/strings")
+      fp = client_file_path(nil,'js', nil, "#{file_path}.lproj/strings")
       build_client_directories(m, fp)
       m.template 'strings.js', fp
     end

data/sc_generators/language/templates/strings.js

@@ -1,7 +1,11 @@
 // ==========================================================================
 // <%= client_namespace %> <%= file_name.capitalize %> Strings
 // ==========================================================================
-
+// Place strings you want to localize here.  In your app, use the key and
+// localize it using "key string".loc().  HINT: For your key names, use the
+// <%= file_name %> string with an underscore in front.  This way you can still see
+// how your UI will look and you'll notice right away when something needs a
+// localized string added to this file!
 // HINT: For your key names, use the english string with an underscore in
 // front.
 Object.extend(String.<%= file_name.capitalize %>,{

data/sc_generators/model/model_generator.rb

@@ -10,7 +10,7 @@ class ModelGenerator < RubiGen::Base
 
   def initialize(runtime_args, runtime_options = {})
     super
-    usage if args.empty?
+    usage if args.empty? || !file_structure_exists?
     @name = args.shift
     extract_options
     assign_names!(@name)

data/sc_generators/test/test_generator.rb

@@ -10,7 +10,7 @@ class TestGenerator < RubiGen::Base
 
   def initialize(runtime_args, runtime_options = {})
     super
-    usage if args.empty?
+    usage if args.empty? || !file_structure_exists? 
     @name = args.shift
     extract_options
     assign_names!(@name)

data/sc_generators/view/view_generator.rb

@@ -10,7 +10,7 @@ class ViewGenerator < RubiGen::Base
 
   def initialize(runtime_args, runtime_options = {})
     super
-    usage if args.empty?
+    usage if args.empty? || !file_structure_exists? 
     @name = args.shift
     extract_options
     assign_names!(@name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors: 
 - Charles Jolley, Erich Ocean
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-30 00:00:00 -07:00
+date: 2008-09-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.9.1
-    - - <
-      - !ruby/object:Gem::Version 
-        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -119,6 +116,7 @@ files:
 - clients/sc_docs/english.lproj/strings.js
 - clients/sc_docs/english.lproj/tabs.rhtml
 - clients/sc_docs/fixtures/doc.js
+- clients/sc_docs/french.lproj/strings.js
 - clients/sc_docs/HISTORY
 - clients/sc_docs/main.js
 - clients/sc_docs/models/doc.js
@@ -158,6 +156,7 @@ files:
 - frameworks/sproutcore/controllers/controller.js
 - frameworks/sproutcore/controllers/object.js
 - frameworks/sproutcore/core.js
+- frameworks/sproutcore/debug/trace.js
 - frameworks/sproutcore/debug/unittest.js
 - frameworks/sproutcore/drag/drag.js
 - frameworks/sproutcore/drag/drag_data_source.js
@@ -188,6 +187,7 @@ files:
 - frameworks/sproutcore/english.lproj/panels/top-right-corner.png
 - frameworks/sproutcore/english.lproj/panes.css
 - frameworks/sproutcore/english.lproj/picker.css
+- frameworks/sproutcore/english.lproj/splitview.css
 - frameworks/sproutcore/english.lproj/strings.js
 - frameworks/sproutcore/english.lproj/tab.css
 - frameworks/sproutcore/english.lproj/tests.css
@@ -265,11 +265,13 @@ files:
 - frameworks/sproutcore/tests/globals/window.rhtml
 - frameworks/sproutcore/tests/mixins/enumerable.rhtml
 - frameworks/sproutcore/tests/mixins/observable.rhtml
+- frameworks/sproutcore/tests/models/collection.rhtml
 - frameworks/sproutcore/tests/models/model.rhtml
 - frameworks/sproutcore/tests/panes/pane.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/collection/source_list_rendering.rhtml
 - frameworks/sproutcore/tests/views/image_cell.rhtml
 - frameworks/sproutcore/tests/views/label_item.rhtml
 - frameworks/sproutcore/tests/views/list.rhtml
@@ -439,8 +441,10 @@ files:
 - lib/sproutcore/bundle.rb
 - lib/sproutcore/bundle_installer.rb
 - lib/sproutcore/bundle_manifest.rb
+- lib/sproutcore/cssmin.rb
 - lib/sproutcore/generator_helper.rb
 - lib/sproutcore/helpers/capture_helper.rb
+- lib/sproutcore/helpers/dom_id_helper.rb
 - lib/sproutcore/helpers/static_helper.rb
 - lib/sproutcore/helpers/tag_helper.rb
 - lib/sproutcore/helpers/text_helper.rb
@@ -451,6 +455,9 @@ files:
 - lib/sproutcore/merb/bundle_controller.rb
 - lib/sproutcore/merb/router.rb
 - lib/sproutcore/merb.rb
+- lib/sproutcore/renderers/erubis.rb
+- lib/sproutcore/renderers/haml.rb
+- lib/sproutcore/renderers/sass.rb
 - lib/sproutcore/version.rb
 - lib/sproutcore/view_helpers.rb
 - lib/sproutcore.rb