sproutcore 1.6.0.rc.1-java → 1.6.0.rc.2-java

data/CHANGELOG

@@ -1,3 +1,34 @@
+*SproutCore 1.6.0.rc.2 (May 23, 2011)*
+
+* Allow for absolute build_prefix
+* We don't need to split for windows
+* Fixed language generator - Fixes #44
+* Fixed CLI --target flag
+* Makes code less readable is more like it!
+* We don't need this hack anymore
+* simplified ruby compatibility code in lib/sproutcore.rb
+* Soften dependencies to allow use SproutCore in Rails 3.1
+* Don't hash SCSS paths after all, instead santize
+* Don't need a check, the gem requires haml
+* Compass requires chunky_png
+* cleaned up a few return calls on methods of helpers/text_helper
+* refactored textilize method in helpers/text_helper
+* refactored textilize_without_paragraph method in helpers/text_helper
+* Removed documentation tools, use sc-docs gem instead
+* Fixed issue with default load files that broke modules
+* Fixes to README
+* Fixed the renamed History.txt and README.txt (to *.rdoc) in the Gemspec.
+* Suffix History and Todo with .rdoc
+* Renamed the README so that it displays nice on Github
+* refactored do_misc method on helpers/cssmin
+* Removed Rake release nopush option
+* refactored shorten_colors method on helpers/cssmin
+* refactored remove_spaces method on helpers/cssmin
+* remove #replace_ext
+* When the host or the port has changed, we should really redirect
+* redefine the headers['Host'] every time
+* removing the port from the address breaks any redirect which is not on port 80
+
 *SproutCore 1.6.0.rc.1 (May 16, 2011)*
 
 * More Rakefile improvements
@@ -5,28 +36,22 @@
 * Added get_allowed_keys to DRY up the retrieval of options
 * DRY up the init task
 * Added in sc-build args that were in documentation but not implemented - Fixes #429
-* Merge pull request #47 from drogus/script_name
 * Added copyright_block method to centralize template copyright generation
 * Commited missing fixtures for tests
 * Handle SCRIPT_NAME properly when sproutcore server is mounted
 * Fixed test name typos
 * Try to load APP_NAME.js in addition to core.js - Fixes #413
 * Updated haml and compass dependencies
-* Merge pull request #45 from gmoeck/master
-* Merge remote branch 'public/master'
 * Fixed issue where the javascript building got in a fight with the YUI compressor (I think). See http://i.imgur.com/xbxGO.png.
 * Less noisy RSpec
 * Rakefile release task
 * Add handlebars files to the entries
 * fixed bug in the require of generated models
-* Merged with public/msater
 * Adding touch_enabled flag to avoid having the touch icons included (default is still true)
 * Correct behavior of sc_require in Chance.
 * Made modules SC.Objects instead of just hashes
-* Merge remote-tracking branch 'public/master'
 * Fix to chance to avoid a Windows error
 * Change jQuery.ready() to SC.ready() in HTML template, which allows SC.RootResponder to attach event listeners before the app runs.
-* Merge remote branch 'public/master'
 * Changed the generators so they create more descriptive names. Before, we had lots of files with the same name, which was confusing in editors and in the webkit inspector. This solves that problem.
 * Adding timestamp to sc-build logger, thanks Tony Sung
 

data/{README.txt → README.rdoc}

@@ -1,7 +1,8 @@
-sproutcore - abbot
+= sproutcore - abbot
+
     by Charles Jolley and contributors
     http://www.sproutcore.com
-    http://github.com/sproutit/sproutcore-abbot
+    http://github.com/sproutcore/sproutcore-abbot
 
 == DESCRIPTION:
 

data/Rakefile

@@ -25,14 +25,14 @@ To get the SproutCore framework, run
 To update the gem:
 
   - Update VERSION.yml
-  - Run `rake release:all` on Mac OS X or Linux
+  - Run `rake release:prepare` on Mac OS X or Linux
       This updates the CHANGELOGS for both framework and abbot,
       updates version numbers and tags them. It also builds and
       pushes gems. If you just want to see what it does, pass
       PRETEND=1 to make no actual changes.
       For best results you should have RVM with MRI Ruby and JRuby installed.
-  - Once you have verified your changes, run `rake release:push`.
-  - On Windows, update the repos and run `rake release:gems:all`
+  - Once you have verified your changes, run `rake release:deploy`.
+  - On Windows, update the repos and run `rake release:gems:deploy`
   - To create installer packages, run `rake pkg` on Mac OS X and Windows
 
 END
@@ -79,10 +79,6 @@ namespace :release do
     ENV['PRETEND']
   end
 
-  def nopush?
-    ENV['NOPUSH']
-  end
-
   namespace :framework do
 
     task :chdir do
@@ -147,7 +143,7 @@ namespace :release do
 
     task :push => :chdir do
       puts "Pushing Repo"
-      unless pretend? || nopush?
+      unless pretend?
         print "Are you sure you want to push the framework repo to github? (y/N) "
         res = STDIN.gets.chomp
         if res == 'y'
@@ -159,7 +155,8 @@ namespace :release do
       end
     end
 
-    task :all => [:update, :changelog, :update_references, :commit, :tag]
+    task :prepare => [:update, :changelog, :update_references]
+    task :deploy => [:commit, :tag, :push]
 
   end
 
@@ -188,6 +185,7 @@ namespace :release do
         File.open('CHANGELOG', 'r+') do |file|
           current = file.read
           file.pos = 0;
+          file.puts output
           file.puts current
         end
       else
@@ -211,7 +209,7 @@ namespace :release do
 
     task :push => :chdir do
       puts "Pushing Repo"
-      unless pretend? || nopush?
+      unless pretend?
         print "Are you sure you want to push the abbot repo to github? (y/N) "
         res = STDIN.gets.chomp
         if res == 'y'
@@ -223,7 +221,8 @@ namespace :release do
       end
     end
 
-    task :all => [:update, :changelog, :commit, :tag]
+    task :prepare => [:update, :changelog]
+    task :deploy => [:commit, :tag, :push]
 
   end
 
@@ -243,7 +242,7 @@ namespace :release do
     task :push do
       Dir["sproutcore-#{version}*.gem"].each do |g|
         puts "Pushing #{g}"
-        unless pretend? || nopush?
+        unless pretend?
           print "Are you sure you want to push the gem to RubyGems.org? (y/N) "
           res = STDIN.gets.chomp
           if res == 'y'
@@ -255,11 +254,12 @@ namespace :release do
       end
     end
 
-    task :all => [:build]
+    task :prepare => []
+    task :deploy => [:build, :push]
 
   end
 
-  task :all => ["framework:all", "abbot:all", "gems:all"]
-  task :push => ["framework:push", "abbot:push", "gems:push"]
+  task :prepare => ["framework:prepare", "abbot:prepare", "gems:prepare"]
+  task :deploy => ["framework:deploy", "abbot:deploy", "gems:deploy"]
 
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 6
-:patch: 0.rc.1
+:patch: 0.rc.2

data/lib/buildtasks/manifest.rake

@@ -605,10 +605,17 @@ namespace :manifest do
       # build combined JS entry
       javascript_entries.each do |resource_name, entries|
         resource_name = resource_name.ext('js')
-        target_name = manifest.target.target_name.to_s.split('/')[-1]
-        pf = (resource_name == 'javascript.js') ?
-                ['source/lproj/strings.js', 'source/core.js', "source/#{target_name}.js", 'source/utils.js'] :
-                []
+
+        if resource_name == 'javascript.js'
+          pf = ['source/lproj/strings.js', 'source/core.js', 'source/utils.js']
+          if manifest.target.target_type == :app
+            target_name = manifest.target.target_name.to_s.split('/')[-1]
+            pf.insert(2, "source/#{target_name}.js")
+          end
+        else
+          pf = []
+        end
+
         manifest.add_composite resource_name,
           :build_task      => 'build:combine',
           :source_entries  => entries,

data/lib/buildtasks/target.rake

@@ -33,29 +33,26 @@ namespace :target do
       target[:index_root] = url
     end
 
-    url_prefix = config[:url_prefix]
-    url_prefix = url_prefix.gsub(/^[^\/]+:\/\/[^\/]+\//,'') if url_prefix
-
-    # Split all of these paths in case we are on windows...
-    target[:build_root] = File.expand_path(config[:build_root] ||
-      File.join(project.project_root.to_s,
-        (config[:build_prefix] || '').to_s.split('/'),
-        (url_prefix || '').to_s.split('/'),
-        target[:target_name].to_s.split('/')))
-
-
-    target[:staging_root] = File.expand_path(config[:staging_root] ||
-      File.join(project.project_root.to_s,
-        (config[:staging_prefix] || '').to_s.split('/'),
-        (url_prefix || '').to_s.split('/'),
-        target[:target_name].to_s))
-
-    # cache is used to store intermediate files
-    target[:cache_root] = File.expand_path(config[:cache_root] ||
-      File.join(project.project_root.to_s,
-        (config[:cache_prefix] || '').to_s.split('/'),
-        (url_prefix || '').to_s.split('/'),
-        target[:target_name].to_s))
+    url_prefix = (config[:url_prefix] || '').gsub(/^[^\/]+:\/\/[^\/]+\//,'')
+
+    # Set up root paths
+    %w(build staging cache).each do |type|
+      root_key = "#{type}_root".to_sym
+      root = config[root_key]
+      prefix = config["#{type}_prefix".to_sym]
+
+      path = root
+      unless path
+        base = prefix || ''
+        # Check if it's absolute, if not add project_root
+        unless base[0..0] == '~' || File.absolute_path(base) == base
+          base = File.join((project.project_root || '').to_s, base)
+        end
+        path = File.join(base, url_prefix, (target[:target_name] || '').to_s)
+      end
+
+      target[root_key] = File.expand_path(path)
+    end
 
     target[:build_number] = target.compute_build_number
 

data/lib/frameworks/sproutcore/CHANGELOG.md

@@ -1,6 +1,42 @@
 CHANGE LOG FOR 1.6
 ==================
 
+1.6.0.rc.2
+----------
+* Fixed SC.PickerPane#modalPaneDidClick return values - Fixes #339
+* Fixed SC.Enumerable fallback for SC.RecordArray#find - Fixes #363
+* Added SC.requiredObjectForPropertyPath that throws an error when object can't be found
+* Make it possible for the handlebars helpers to generate tags other than <span>
+* Improved Observer Tests with better location (thx martoche)
+* Fixed disclosure positioning in Ace, fixes #457
+* Added backslash to prevent SASS comment interpolation warning
+* Allow for passing relative paths to #collection helper.
+* Further cleanup to TextField template multiline
+* Added isMultiline property to SC.TextField.
+* jQuery is now smart enough to take booleans for certain attributes
+* Stop using jQuery expando
+* Added unit tests for SC.ContainerView to verify it cleans up views that it instantiates.
+* SC.ContainerView will instantiate it's contentView if nowShowing is set with a string or class, however it was not cleaning up views when it was finished. Now it keeps track and cleans up when necessary.
+* Unit test for previous commit checking that the themeName got passed through to the buttons.
+* Allow you to set themeName on the AlertPane to also set the themeName on the buttons (which were previously stuck as 'capsule')
+* Unit test for previous commit adding controlSize to TabView + removed useless TabView methods test and left a warning unit test instead.
+* Whitespace + allow setting of controlSize
+* Comment typo forEachIndex is not a function in IndexSet
+* fix jQuery/SC conflict for events handeling add tryToPerform on SC.TextField
+* use prop instead of attr in SC.Checkbox replace SC.data with jQuery.data
+* remove more code : passing unit tests but fail in real app
+* upgrade to jquery 1.6 use jQuery.sub()
+* Minor adjustments for docs
+* fixed so that replace on ChildArray only notifies the part of the array that has actually changed
+* remove more code : passing unit tests but fail in real app
+* upgrade to jquery 1.6 use jQuery.sub()
+* Hacky solution to the issue where template collection views render their item views multiple times when they are nested inside another template collection view.
+* Adds support for specifying an inverse template name to template collection view.
+* Adds unit tests for using an inverse template in template collection views.
+* Fixes issue with nested template collection views causing childViews array to get messed up.
+* Adds failing unit test for childView structure of nested collection views.
+* Adds unit tests for checking the number of items rendered in nested collection views with default content.
+
 1.6.0.rc.1
 ----------
 * Added 'Show Progress' checkbox to Test Runner

data/lib/frameworks/sproutcore/frameworks/core_foundation/core.js

@@ -107,23 +107,7 @@ SC.mixin(/** @lends SC */ {
     @param data {Object} Optional data.  If passed, write.
     @returns {Object} the value of the named data
   */
-  data: function(elem, name, data) {
-    elem = (elem === window) ? "@window" : elem ;
-    var hash = SC.hashFor(elem) ; // get the hash key
-    
-    // Generate the data cache if needed
-    var cache = SC._data_cache ;
-    if (!cache) SC._data_cache = cache = {} ;
-    
-    // Now get cache for element
-    var elemCache = cache[hash] ;
-    if (name && !elemCache) cache[hash] = elemCache = {} ;
-    
-    // Write data if provided 
-    if (elemCache && (data !== undefined)) elemCache[name] = data ;
-    
-    return (name) ? elemCache[name] : elemCache ;
-  },
+  data: $.data,
   
   /**
     Removes data from the global cache.  This is used throughout the
@@ -136,31 +120,7 @@ SC.mixin(/** @lends SC */ {
     @param name {String} optional name to remove. 
     @returns {Object} the value or cache that was removed
   */
-  removeData: function(elem, name) {
-    elem = (elem === window) ? "@window" : elem ;
-    var hash = SC.hashFor(elem) ;
-    
-    // return undefined if no cache is defined
-    var cache = SC._data_cache ;
-    if (!cache) return undefined ;
-    
-    // return undefined if the elem cache is undefined
-    var elemCache = cache[hash] ;
-    if (!elemCache) return undefined;
-    
-    // get the return value
-    var ret = (name) ? elemCache[name] : elemCache ;
-    
-    // and delete as appropriate
-    if (name) {
-      delete elemCache[name] ;
-    } else {
-      delete cache[hash] ;
-    }
-    
-    return ret ;
-  },
-
+  removeData: $.removeData,
 
   // ..........................................................
   // LOCALIZATION SUPPORT

data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/handlebars/bind.js

@@ -51,7 +51,8 @@ sc_require('ext/handlebars');
         displayTemplate: fn,
         inverseTemplate: inverse,
         property: property,
-        previousContext: this
+        previousContext: this,
+        tagName: (options.hash.tagName || "span")
       });
 
       var observer, invoker;

data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/handlebars/collection.js

@@ -9,7 +9,9 @@ Handlebars.registerHelper('collection', function(path, options) {
   var hash = options.hash;
   var collectionClass, collectionObject;
 
-  collectionClass = path ? SC.objectForPropertyPath(path) : SC.TemplateCollectionView;
+  collectionClass = path ? SC.getPath(this, path) || SC.getPath(path) :
+    SC.TemplateCollectionView;
+
   // @if (debug)
   if (!collectionClass) {
     throw "%@ #collection: Could not find %@".fmt(data.view, path);

data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/checkbox_support.js

@@ -27,14 +27,14 @@ SC.Checkbox = SC.TemplateView.extend(
   },
 
   domValueDidChange: function(node) {
-    this.set('value', !!$(node).attr('checked'));
+    this.set('value', $(node).prop('checked'));
   },
 
   value: function(key, value) {
     if (value !== undefined) {
-      this.$('input').attr('checked', value);
+      this.$('input').prop('checked', value);
     } else {
-      value = this.$('input').attr('checked');
+      value = this.$('input').prop('checked');
     }
 
     return value;
@@ -52,9 +52,9 @@ SC.CheckboxSupport = /** @scope SC.CheckboxSupport */{
 
   value: function(key, value) {
     if (value !== undefined) {
-      this.$('input').attr('checked', value);
+      this.$('input').prop('checked', value);
     } else {
-      value = this.$('input').attr('checked');
+      value = this.$('input').prop('checked');
     }
 
     return value;

data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/text_field_support.js

@@ -14,6 +14,15 @@ SC.TextField = SC.TemplateView.extend(
 
   classNames: ['sc-text-field'],
 
+  /**
+    If set to `YES` uses textarea tag instead of input to
+    accommodate multi-line strings.
+
+    @type Boolean
+    @default NO
+  */
+  isMultiline: NO,
+
   // we can't use bindAttr because of a race condition:
   //
   // when `value` is set, the bindAttr observer immediately calls
@@ -25,18 +34,25 @@ SC.TextField = SC.TemplateView.extend(
   // In short, because we need to be able to catch changes to the
   // DOM made directly, we cannot also rely on bindAttr to update
   // the property: a chicken-and-egg problem.
-  template: SC.Handlebars.compile('<input type="text">'),
+  template: function(){
+    return SC.Handlebars.compile(this.get('isMultiline') ? '<textarea></textarea>' : '<input type="text">');
+  }.property('isMultiline').cacheable(),
+
+  $input: function() {
+    tagName = this.get('isMultiline') ? 'textarea' : 'input';
+    return this.$(tagName);
+  },
 
   didCreateLayer: function() {
     var self = this;
 
-    var input = this.$('input');
+    var input = this.$input();
     input.val(this._value);
 
     SC.Event.add(input, 'focus', this, this.focusIn);
     SC.Event.add(input, 'blur', this, this.focusOut);
 
-    this.$('input').bind('change', function() {
+    input.bind('change', function() {
       self.domValueDidChange(SC.$(this));
     });
   },
@@ -58,7 +74,7 @@ SC.TextField = SC.TemplateView.extend(
     the underlying DOM element is created.
   */
   value: function(key, value) {
-    var input = this.$('input');
+    var input = this.$input();
 
     if (value !== undefined) {
       this._value = value;
@@ -91,16 +107,17 @@ SC.TextField = SC.TemplateView.extend(
   },
 
   keyUp: function(evt) {
-    this.domValueDidChange(this.$('input'));
+    this.domValueDidChange(this.$input());
 
-    if (evt.keyCode === 13) {
-      return this.insertNewline(evt);
-    } else if (evt.keyCode === 27) {
-      return this.cancel(evt);
+    if (evt.keyCode === SC.Event.KEY_RETURN) {
+      return this.tryToPerform('insertNewline', evt);
+    } else if (evt.keyCode === SC.Event.KEY_ESC) {
+      return this.tryToPerform('cancel', evt);
     }
 
     return true;
   }
+
 });
 
 SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
@@ -109,7 +126,7 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
     Used internally to store value because the layer may not exist
   */
   _value: null,
-  
+
   /**
     @type String
     @default null
@@ -162,9 +179,9 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
   },
 
   keyUp: function(event) {
-    if (event.keyCode === 13) {
+    if (event.keyCode === SC.Event.KEY_RETURN) {
       return this.tryToPerform('insertNewline', event);
-    } else if (event.keyCode === 27) {
+    } else if (event.keyCode === SC.Event.KEY_ESC) {
       return this.tryToPerform('cancel', event);
     }
   }