sproutcore 0.9.3 → 0.9.4

data/generators/client/README

@@ -1,3 +1,3 @@
-Your new SproutCore client application has been created.  To access your application, just start sc_sever and visit your client name in the web browser.
+Your new SproutCore client application has been created.  To access your application, just start sc-sever and visit your client name in the web browser.
 
-If you want to change the deployment settings for the application, add a section for your client in your environment.yaml.
+If you want to change the deployment settings for your application edit the sc-config.rb file to get started.

data/generators/client/USAGE

@@ -2,11 +2,11 @@ client - Generates a new SproutCore client
 
 USAGE: 
 
-  ./script/generate sc_client client_name
+  sc-gen client client_name
 
 DISCUSSION:
 
 This generator will create a new SproutCore-based JavaScript application.  After the generator completes, you will be able to begin work immediately.
 
-The code created by this generator will appear in a /clients directory.  To add models, views, and controllers, you can use the additional generators sc_model, sc_controller, sc_object_controller, sc_collection_controller, and sc_view.
+The code created by this generator will appear in a /clients directory.  To add models, views, and controllers, you can use the additional generators model, controller, and view.
 

data/lib/sproutcore/build_tools/html_builder.rb

@@ -45,8 +45,8 @@ module SproutCore
         end
         
         # Clean out any composites we might have collected.  They have already 
-        # been expanded.
-        @entries.reject! { |entry| entry.composite? }
+        # been expanded.  Also clean out any non-localized rhtml files.
+        @entries.reject! { |entry| entry.composite? || (entry.type == :html && !entry.localized?) }
         
         # Load any helpers before we continue
         puts "*************REQUIRE"

data/lib/sproutcore/bundle_manifest.rb

@@ -51,17 +51,19 @@ module SproutCore
     # Builds a manifest for the bundle and the specified language
     def build!
       
-      # STEP 1: Catalog all of the files in the project, including the target language
-      # and the default language.  This will filter out resources not used in this language.
+      # STEP 1: Catalog all of the files in the project, including the target 
+      # language and the default language.  This will filter out resources not 
+      # used in this language.
       entries = catalog_entries
       
-      # STEP 2: Combine the HTML file paths into a single entry, unless this is a framework
-      if (working = entries[:html]) && working.size > 0
-        if bundle.can_have_html?
-          working << build_entry_for('index.html', :html, working)
-        else
-          working.each { |x| x.hidden = true }
-        end
+      # STEP 2: Combine the HTML file paths into a single entry, unless this 
+      # is a framework
+      working = entries[:html] ||= []
+        
+      if bundle.can_have_html?
+        working << build_entry_for('index.html', :html, working)
+      else
+        working.each { |x| x.hidden = true }
       end
       
       # STEP 3: If in development build mode:
@@ -148,7 +150,7 @@ module SproutCore
         if current_lproj = src_path.match(/^([^\/]+\.lproj)\//).to_a[1]
           next if (current_lproj != default_lproj) && (current_lproj != target_lproj)
         end
-
+ 
         # OK, pass all of our validations.  Go ahead and build an entry for this
         # Add entry to list of entries for appropriate lproj if localized
         entry = build_entry_for(src_path, src_type)
@@ -158,6 +160,8 @@ module SproutCore
         when target_lproj
           target_lproj_entries[entry.filename] = entry
         else
+          
+          # Be sure to mark any 
           entries[entry.filename] = entry
         end
       end
@@ -198,17 +202,17 @@ module SproutCore
       case src_path
       when /^tests\/.+/
         :test
-      when /^fixtures\/.+/
+      when /^fixtures\/.+\.js$/
         :fixture
-      when /.html$/
+      when /\.html$/
         :html
-      when /.rhtml$/
+      when /\.rhtml$/
         :html
-      when /.html.erb$/
+      when /\.html.erb$/
         :html
-      when /.css$/
+      when /\.css$/
         :stylesheet
-      when /.js$/
+      when /\.js$/
         :javascript
       when /\.lproj\/.+/
         :resource
@@ -234,9 +238,10 @@ module SproutCore
       # the source path is just the combine source root + the path
       ret.source_path = (composite.nil?) ? File.join(bundle.source_root, src_path) : nil
       
-      # set the composite property.  The passed in array should contain other entries
-      # if hide_composite is true, then hide the composite items as well
-      unless composite.nil? || composite.size == 0
+      # set the composite property.  The passed in array should contain other 
+      # entries if hide_composite is true, then hide the composite items as 
+      # well
+      unless composite.nil?
         composite.each { |x| x.hidden = true } if hide_composite
         ret.composite = composite.map { |x| x.filename }
       end
@@ -295,8 +300,7 @@ module SproutCore
   # hidden::       if true, this entry is needed internally, but otherwise should not be used
   # use_symlink::  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.  
+  # composite::    If set, this will contain the filenames of other resources that should be combined to form this resource.  
   #
   class ManifestEntry < Struct.new(:filename, :ext, :source_path, :url, :build_path, :type, :original_path, :hidden, :use_symlink, :language, :composite)
     def to_hash
@@ -309,7 +313,9 @@ module SproutCore
     def use_symlink?; !!use_symlink; end
     def composite?; !!composite; end
     
-    # Returns true if this entry can be cached even in development mode.  Composite resources
+    def localized?; !!source_path.match(/\.lproj/); end
+      
+      # Returns true if this entry can be cached even in development mode.  Composite resources
     # and tests need to be regenerated whenever you get this.
     def cacheable?
       !composite? && (type != :test)

data/lib/sproutcore/merb/bundle_controller.rb

@@ -21,9 +21,10 @@ module SproutCore
       # the request path to determine which bundle should handle the request.
       def main
 
-        # 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.
+        # 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.
+        #
         if ::Merb.environment.to_sym == :production
           Bundle.build_mode = :production
         else

data/lib/sproutcore/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Charles Jolley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-25 00:00:00 -07:00
+date: 2008-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,10 +106,24 @@ files:
 - 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/mixins/design_mode.js
+- clients/view_builder/tests/controllers/document.rhtml
+- clients/view_builder/tests/views/builder.rhtml
+- clients/view_builder/tests/views/palette.rhtml
+- clients/view_builder/views/builder.js
+- clients/view_builder/views/palette.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

data/frameworks/sproutcore/animation/animation.js

@@ -1,411 +0,0 @@
-// ========================================================================
-// SproutCore
-// copyright 2006-2008 Sprout Systems, Inc.
-// ========================================================================
-
-require('Core') ;
-require('foundation/timer') ;
-
-/**
-  @class
-  
-  An animator is a special timer that will transition its value property from
-  0 to 1 according to a transform function you define.  You can also specify
-  one or more "subjects" that will be invoked whenever the animation value
-  changes, which can apply the animation to any target you like.
-
-  This class and its related classes are based on Bernie's Better Animator
-  class.
-  
-  Use Cases:
-  
-  1. I just want to transition from x=0 -> x=20.
-    v.transitionTo('styleLeft', 20) ;
-     -> creates an animation for styleLeft.  If you add a new animation for
-        the same effect, it will cancel the old one automatically.
-        
-  2. I want to have an 'animation behavior' attached to some property.  
-     whenever I change it, it should automatically transition the property
-     instead of just updating it.  i.e. a "Tracker".
-     
-     -> I may want the tracker to update several things at once.  But that
-        could be done through changing one property which will in turn 
-        update everything else.  Better idea.
-        
-      Tracker simply stores some animation properties and calls transitionTo
-      whenever your target value changes.
-        
-  3. I want to have some property animating on its own.  For example a 
-     throbbing button
-     
-     a = v.addAnimation('opacity', { 
-       repeatCount: , 
-       autoreverses: YES, 
-       end: 1.0, 
-       start: 0.0,
-       property: 'opacity' 
-      }) ;
-      
-    a.set('isPaused', YES) ;
-    v.removeAnimation('opacity');
-    
-  --
-  We will need an animation builder.  It would be nice if I could have a 
-  complete timeline for an animation setup and you just tell it to run.  Set
-  the timecode to anytime that you want, tell it to start or stop.
-  
-  @extends SC.Timer
-  @author Charles Jolley
-  @since SproutCore 1.0
-*/
-SC.Animation = SC.Timer.extend(
-/** @scope SC.Animation.prototype */ {
-
-  /**
-    The target frame rate.  This is used to determine the interval of the
-    timer.
-    
-    @type {Number}
-    @field
-  */
-  frameRate: 60,
-  
-  /**
-    The interval between frames.  Calculated automatically from the frameRate.
-    This property is read only.
-    
-    @type {Number}
-    @field
-  */
-  interval: function() {
-    return 1000 / this.get('frameRate') ;
-  }.property('frameRate'),
-  
-  /**
-    The total amount of time in msec you want to take for the animation to
-    go from 0-1.
-  */
-  duration: 0,
-  
-  /**
-    The speed at which the timecode for the animation will progress.  1.0
-    means it will progress in real time, 2.0 means twice as fast, etc.
-  */
-  speed: 1.0,
-  
-  /**
-    The total number of times you want the animation to repeat.
-    
-    This can be any number, including partial numbers.  If you set this 
-    value you must not set repeatDuration as well.  This will be ignored 
-    if the value is 0, which is the default.
-    
-    If you set this property to -1, then the animation will repeat
-    indefinitely.
-    
-    Setting this property will update the targetTimecode.
-    
-    @type {Number}
-    @field
-  */
-  repeatCount: 0,
-  
-  /**
-    The total amount of time the animation should run, repeating itself, in
-    msec.
-    
-    If you set this value you must not set repeatCount as well.  This will
-    be ignored if the value is 0, which is the default.
-    
-    Setting this property will update the targetTimecode.
-    
-    @type {Number}
-    @field
-  */
-  repeatDuration: 0,
-  
-  /**
-    If YES, then the animation will automatically reverse itself on each
-    repeat.
-  
-    @type {Boolean}
-    @field
-  */
-  autoreverses: NO,
-  
-  /**
-    A transition function.  This is used to convert the progress into a 
-    state value.  You can supply your own transition function to provide
-    varied behaviors such as ease in, ease out, etc.
-  
-    The function must have a signature like:
-    
-    transition: function(value, animator)
-    
-    It must accept a value from 0-1 indicating the current animation progress
-    and return a value from 0-1 indication the current transition progress.
-    
-    @type {Function}
-    @field
-  */
-  transition: null,
-  
-  /**
-    This is the current timecode for the animation, in msec.  You can set
-    this to any value that you want and the animation to compute the current
-    transition value from it.  
-    
-    To move instantly to any part of your animation, you can simply set this
-    timecode or use jumpTo().
-    
-    @type {Number}
-    @field
-  */
-  currentTimecode: 0,
-
-  /**
-    This is the target timecode.  Whenever the target timecode and the
-    current timecode do not match, the animation will animate until it
-    reaches the target timecode.
-    
-    To transition the animation to a new state, set the timecode to any 
-    value that you want.  
-    
-    @type {Number}
-  */
-  targetTimecode: 0,
-
-  /**
-    The current animation progress.  
-    
-    This value will loop from 0-1 based on the current timecode and the 
-    setting of autoreverses.  You generally do not want to use this value. 
-    Instead use the value property to compute the current transition.
-    
-    @type {Number}
-    @field
-  */
-  progress: function() {
-
-    // current progress is calculated from the currentTimecode by dividing
-    // it by the animation duration and autoreverses.
-    var currentTimecode = this.get('currentTimecode') ;
-    var duration = this.get('duration') ;
-    var reverses = this.get('autoreverses') ;
-    
-    // find the progress through the current cycle.
-    var cycle = Math.floor(currentTimecode / duration) ;
-    var progress = (currentTimecode - (duration * cycle)) / duration;
-    
-    // if we autoreverse and the cycle is odd numbered, invert.
-    if (reverses && (cycle % 2) > 0) progress = 1 - progress ;
-    return progress ;
-  }.property('currentTimecode', 'duration', 'autoreverses'),
-  
-  /**
-    The current animation value.  Transform functions can observe this 
-    property and update the target object accordingly.
-  
-    @type {Number}
-    @field
-  */
-  value: function() {
-    var value = this.get('progress');
-    if (this.transition) value = this.transition(value, this) ;
-    return value ;
-  }.property('progress'),
-  
-  /**
-    The target object of the animation.  This is often used by transform
-    functions as the target of their change.  It is not strictly required.
-    
-    @type {Object}
-    @field
-  */
-  target: null,
-  
-
-  /**
-    This method must be called once when the animation is created to schedule
-    it with the run loop.  Once animation has been started, you should can
-    pause it to remove it from the runloop temporarily.
-    
-    @returns {void}
-  */
-  play: function() {
-    this.beginPropertyChanges() ;
-    if (!this.get('isScheduled')) {
-      this.schedule() ;
-      this._lastActionTime = SC.runLoop.get('startTime') ;
-    }
-    
-    if (this.get('isPaused')) this.set('isPaused', NO) ;
-    this.endPropertyChanges() ;
-  },
-  
-  /**
-    Once an animation has been started, you can pause it anytime with this
-    method.  Call start() to restart it or set isPaused to NO.
-    
-    @returns {void}
-  */
-  pause: function() {
-    this.set('isPaused', YES) ;
-  },
-  
-  /**
-    Immediately changes the currentTimecode to reflect the requested amount
-    of progress through a single cycle of the animation.
-    
-    @param progress {Number} a progress value from 0 to 1.
-    @returns {void}
-  */
-  jumpTo: function(progress) {
-    // get the current progress.
-    var cur = this.get('progress') ;
-    var diff = progress - cur ;
-    var duration = this.get('duration') ;
-    diff *= duration ;
-
-    var timecode = this.get('currentTimecode') ;
-    if (diff !== 0) this.set('currentTimecode', timecode + diff) ;
-  },
-  
-  /**
-    Changes the targetTimecode to reflect the request amount of progress
-    through the current cycle of the animation.  If the animation is in 
-    reverse, this could move the timecode in the opposite direction.
-    
-    @param progress {Number} a progress value from 0 to 1.
-    @returns {void}
-  */
-  seekTo: function(progress) {
-    // get the current progress.
-    var cur = this.get('progress') ;
-    var diff = progress - cur ;
-    var duration = this.get('duration') ;
-    diff *= duration ;
-
-    var timecode = this.get('currentTimecode') ;
-    if (diff !== 0) this.set('targetTimecode', timecode + diff) ;
-  },
-  
-  /**
-    Changes the currentTimecode and targetTimecode to reflect the requested
-    amount of progress through the current cycle of the animation.  If the
-    animation is in reverse, this could move the timecode in the opposite
-    direction.
-    
-    @param fromProgress {Number} a progress value from 0 to 1
-    @param toProgress {Number} a progress value from 0 to 1
-    @returns {void} 
-  */
-  seekFromTo: function(fromProgress, toProgress) {
-    // get the current progress.
-    var timecode = this.get('currentTimecode') ;
-    var cur = this.get('progress') ;
-    var duration = this.get('duration') ;
-
-    this.beginPropertyChanges() ;
-    
-    var diff = fromProgress - cur ;
-    diff *= duration ;
-    if (diff !== 0) this.set('currentTimecode', timecode + diff) ;
-    
-    diff = toProgress - cur ;
-    diff *= duration ;
-    if (diff !== 0) this.set('targetTimecode', timecode + diff) ;
-    
-    this.endPropertyChanges() ;
-  },
-  
-  /**
-    Changes the targetTimecode to invert the direction of the animation.
-    If the progress value is currently headed towards 1.0, it will be instead
-    headed to 0.
-    
-    @returns {Number} the new progress
-  */
-  toggle: function() {
-    throw "toggle not yet implemented" ;
-  },
-  
-  /**
-    The core action executed by the timer.
-  */
-  performAction: function() {
-    
-    // if timecodes match, then we suspend the animation and return, there
-    // is nothing more to do.
-    var cur = this.get('currentTimecode') ;
-    var target = this.get('targetTimecode') ;
-    if (cur == target) {
-      this.set('isPaused', YES) ;
-      return ;
-    }
-    
-    // determine the amount of time that has elapsed since the last time
-    // we were called.
-    var curTime = SC.runLoop.get('startTime') ;
-    var lapsed = (curTime - this._lastActionTime) * this.get('speed') ;
-    this._lastActionTime = curTime ;
-    
-    // update the current timecode.  Moving in the direction of the target
-    // timecode.  If timecodes match, there is nothing to do.
-    if (target > cur) {
-      cur += lapsed ;
-      if (cur > target) cur = target ;
-    } else {
-      cur -= lapsed ;
-      if (cur < target) cur = target ;
-    }
-    
-    // now set the new timecode, this should trigger other observers to
-    // update.
-    this.set('currentTimecode', cur) ;
-  },
-  
-  // ......................................
-  // INTERNAL METHODS
-  //
-  
-  /** @private
-    Observes changes to repeatCount; updates the targetTimecode.
-  */
-  _repeatCountObserver: function() {
-    var repeatCount = this.get('repeatCount') ;
-    var target ;
-    if (repeatCount < 0) {
-      target = Date.now() * 2 ;
-    } else if (repeatCount > 0) {
-      target = this.get('duration') * repeatCount ;
-    } else return ; // nothing to do.
-    this.set('targetTimecode', target) ;
-  }.observes('repeatCount'),
-  
-  /** @private
-    Observes changes to the repeatDuration; updates the targetTimecode.
-  */
-  _repeatDurationObserver: function() {
-    var dur = this.get('repeatDuration') ;
-    if (dur < 0) {
-      dur = Date.now() * 2 ;
-    } else if (dur == 0) return; // nothing to do
-    this.set('targetTimecode', dur) ;
-  }.observes('repeatDuration'),
-
-  init: function() {
-    arguments.callee.base.call(this) ;
-
-    this.targetTimecode = this.get('duration') ;
-    this._repeatDurationObserver() ;
-    this._repeatCountObserver() ;
-  },
-  
-  repeats: YES, // for timer
-  
-  _logValueObserver: function() {
-    console.log('value did change to: %@'.fmt(this.get('value')));
-  }.observes('value') 
-  
-});