sproutcore 1.0.1009 → 1.0.1024

data/DISTRIBUTION.yml

@@ -0,0 +1,14 @@
+# This file lists all subprojects that need to be installed in the directory
+# for release.  The Rakefile will track Git hash codes for each project in 
+# the VERSION.yml file
+#
+# Each entry should have the following format:
+#
+# path/to/item:
+#   repo: GIT/SVN URL
+#   scm:  git|svn  <- type of source control system.  defaults to git
+#
+
+frameworks/sproutcore:
+  repo: git://github.com/sproutit/sproutcore.git
+

data/Rakefile

@@ -12,6 +12,13 @@ ROOT_PATH = File.dirname(__FILE__)
 # files to ignore changes in
 IGNORE_CHANGES = %w[.gitignore .gitmodules .DS_Store .gemspec VERSION.yml ^pkg ^tmp ^coverage]
 
+# Get the DISTRIBUTION info
+require 'yaml'
+DIST = YAML.load File.read(File.expand_path(File.join(ROOT_PATH, 'DISTRIBUTION.yml')))
+
+# Make empty to not use sudo
+SUDO = 'sudo'
+
 ################################################
 ## LOAD DEPENDENCIES
 ##
@@ -19,6 +26,7 @@ begin
   require 'rubygems'
   require 'jeweler'
   require 'extlib'
+  require 'fileutils'
   require 'spec/rake/spectask'
 
   $:.unshift(ROOT_PATH / 'lib')
@@ -26,6 +34,7 @@ begin
 
 rescue LoadError => e
   $stderr.puts "WARN: some required gems are not installed (try rake init to setup)"
+  $stderr.puts e
 end
 
 
@@ -45,7 +54,11 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.add_dependency 'extlib', ">= 0.9.9"
   gemspec.add_dependency 'erubis', ">= 2.6.2"
   gemspec.add_dependency 'thor', '>= 0.11.7'
-  gemspec.add_development_dependency 'jeweler', ">= 1.0.1"
+
+  gemspec.add_development_dependency 'gemcutter', ">= 0.1.0"
+  gemspec.add_development_dependency 'jeweler', ">= 1.0.0"
+  gemspec.add_development_dependency 'rspec', ">= 1.2.0"
+
   gemspec.rubyforge_project = "sproutcore"
   gemspec.extra_rdoc_files.include *%w[History.txt README.txt]
     
@@ -59,17 +72,109 @@ Jeweler::RubyforgeTasks.new do |rubyforge|
   rubyforge.doc_task = "rdoc"
 end
 
+Jeweler::GemcutterTasks.new
+
+
+def git(path, cmd, log=true)
+  $stdout.puts("#{path.sub(ROOT_PATH, '')}: git #{cmd}") if log
+  git_path = path / '.git'
+  git_index = git_path / 'index'
+  
+  # The env can become polluted; breaking git.  This will avoid that.
+  %x[GIT_DIR=#{git_path}; GIT_WORK_TREE=#{path}; GIT_INDEX_FILE=#{git_index}; git #{cmd}]
+end
+
 ################################################
 ## CORE TASKS
 ##
   
-desc "performs an initial setup on the tools.  Installs gems, init submodules"
-task :init do
+desc "performs an initial setup on the tools.  Installs gems, checkout"
+task :init => [:install_gems, 'dist:init', 'dist:update'] 
+
+task :install_gems do
   $stdout.puts "Installing gems (may ask for password)"
-  `sudo gem install rack jeweler json_pure extlib erubis thor`
+  system %[#{SUDO} gem install rack json json_pure extlib erubis thor]
+  system %[#{SUDO} gem install jeweler gemcutter rspec] # dev req
+end
+
+namespace :dist do
+  
+  desc "checkout any frameworks in the distribution"
+  task :init do 
+    $stdout.puts "Setup distribution"
+
+    DIST.each do |rel_path, opts|
+      path = ROOT_PATH / rel_path
+      repo_url = opts['repo']
+        
+      if !File.exists?(path / ".git")
+        $stdout.puts "  Creating repo for #{rel_path}"
+        FileUtils.mkdir_p File.dirname(path)
+
+        $stdout.puts "\n> git clone #{repo_url} #{path}"
+        system %[git clone #{repo_url} #{path}]
+      
+      else
+        $stdout.puts "Found #{rel_path}"
+      end
+    end
+  end
+  
+  desc "make the version of each distribution item match the one in VERSION"
+  task :update => 'dist:init' do
+    $stdout.puts "Setup distribution"
+
+    # Use this to get the commit hash
+    version_file = ROOT_PATH / 'VERSION.yml'
+    if File.exist?(version_file)
+      versions = YAML.load File.read(version_file)
+      versions = (versions['dist'] || versions[:dist]) if versions
+      versions ||= {}
+    end
+  
+    DIST.each do |rel_path, opts|
+      path = ROOT_PATH / rel_path
+        
+      if File.exists?(path / ".git") && versions[rel_path]
+        sha = versions[rel_path]
+
+        $stdout.puts "\n> git fetch"
+        $stdout.puts git(path, 'fetch')
+
+        $stdout.puts "\n> git checkout #{sha}"
+        $stdout.puts git(path, 'checkout #{sha}')
+      else
+        $stdout.puts "WARN: cannot fix version for #{rel_path}"
+      end
+      
+    end
+  end
+
+end
+
+namespace :release do
   
-  $stdout.puts "Setup submodules"
-  `git submodule update --init`
+  desc "tags the current repository and any distribution repositories.  if you can push to distribution, then push tag as well"
+  task :tag => :update_version do
+    tag_name = "REL-#{RELEASE_VERSION}"
+    DIST.keys.push('abbot').each do |rel_path|
+      full_path = rel_path=='abbot' ? ROOT_PATH : (ROOT_PATH / rel_path)
+      git(full_path, "tag -f #{tag_name}")
+    end
+  end
+    
+  desc "prepare release.  verify clean, update version, tag"
+  task :prepare => ['git:verify_clean', :update_version, :tag]
+  
+  desc "release to rubyforge for old skool folks"
+  task :rubyforge => [:prepare, 'rubyforge:release']
+  
+  desc "release to gemcutter for new skool kids"
+  task :gemcutter => [:prepare, 'gemcutter:release']
+  
+  desc "one release to rule them all"
+  task :all => [:prepare, 'release:rubyforge', 'release:gemcutter']
+
 end
 
 desc "computes the current hash of the code.  used to autodetect build changes"
@@ -107,7 +212,7 @@ task :hash_content do
   paths.each do |path|
     mtime = File.mtime(path)
     mtime = mtime.nil? ? 0 : mtime.to_i
-    puts "detected file change: #{path.gsub(ROOT_PATH,'')}" if mtime > hash_date
+    $stdout.puts "detected file change: #{path.gsub(ROOT_PATH,'')}" if mtime > hash_date
     cur_date = mtime if mtime > cur_date
   end
   
@@ -127,7 +232,7 @@ task :hash_content do
 
   # finally set the hash
   CONTENT_HASH = hash_digest
-  puts "CONTENT_HASH = #{CONTENT_HASH}"
+  $stdout.puts "CONTENT_HASH = #{CONTENT_HASH}"
 end
   
 desc "updates the VERSION file, bumbing the build rev if the current commit has changed"
@@ -142,6 +247,7 @@ task :update_version => 'hash_content' do
   minor = 0
   build = 99
   rev   = '-0-'
+  dist  = {}
   
   if File.exist?(path)
     yaml = YAML.load_file(path)
@@ -154,12 +260,35 @@ task :update_version => 'hash_content' do
   build += 1 if rev != CONTENT_HASH  #increment if needed
   rev = CONTENT_HASH
   
-  puts "write version #{[major, minor, build].join('.')} => #{path}"
+  # Update distribution versions
+  DIST.each do |rel_path, ignored|
+    dist_path = ROOT_PATH / rel_path
+    if File.exists?(dist_path)
+      dist_rev = git(dist_path, "log HEAD^..HEAD")
+      dist_rev = dist_rev.split("\n").first.scan(/commit ([^\s]+)/)
+      dist_rev = ((dist_rev || []).first || []).first
+
+      if dist_rev.nil?
+        $stdout.puts " WARN: cannot find revision for #{rel_path}"
+      else
+        dist[rel_path] = dist_rev
+      end
+    end
+  end
+  
+  $stdout.puts "write version #{[major, minor, build].join('.')} => #{path}"
   File.open(path, 'w+') do |f|
     YAML.dump({ 
-      :major => major, :minor => minor, :patch => build, :digest => rev 
+      :major => major, 
+      :minor => minor, 
+      :patch => build, 
+      :digest => rev,
+      :dist   => dist 
     }, f)
   end
+  
+  RELEASE_VERSION = "#{major}.#{minor}.#{build}"
+  
 end
 
 def fixup_gemspec
@@ -177,8 +306,6 @@ task :build => 'gemspec:generate' do
   fixup_gemspec
 end
 
-#task "gemspec:generate" => 'git:verify_clean'
-
 # Extend gemspec to rename afterware
 task :gemspec do
   fixup_gemspec
@@ -195,19 +322,19 @@ namespace :git do
   
   desc "verifies there are no pending changes to commit to git"
   task :verify_clean do
-    %w(abbot frameworks/sproutcore lib/thor).each do |repo_name|
-      if repo_name == 'abbot'
-        path = ROOT_PATH
-      else
-        path = File.join(repo_name.split('/').unshift(ROOT_PATH))
-      end
+    DIST.keys.push('abbot').each do |repo_name|
+      full_path = repo_name=='abbot' ? ROOT_PATH : (ROOT_PATH / repo_name)
+
+      result = git(full_path, 'status')
 
-      result = `cd #{path}; git status`
       if !(result =~ /nothing to commit \(working directory clean\)/)
-        $stderr.puts "\nFATAL: Cannot complete task: changes are still pending in the '#{repo_name}' repository."
-        $stderr.puts "       Commit your changes to git to continue.\n\n"
-        exit(1)
-      end
+        if (repo_name != 'abbot') ||
+           (!(result =~ /#\n#\tmodified:   VERSION.yml\n#\n/))
+          $stderr.puts "\nFATAL: Cannot complete task: changes are still pending in the '#{repo_name}' repository."
+          $stderr.puts "       Commit your changes to git to continue.\n\n"
+          exit(1)
+        end
+      end 
     end
   end
   

data/VERSION.yml

@@ -1,5 +1,7 @@
 --- 
+:patch: 1024
+:digest: 94d8bc0e1216dc80ea2be5478115b759e1617e1a
 :major: 1
+:dist: 
+  frameworks/sproutcore: f9f7fe42cbb165a4021eeb616c6990914b83079d
 :minor: 0
-:patch: 1009
-:digest: 88cb568a49aec110427db79f1e1249ca840b2a66

data/frameworks/sproutcore/Buildfile

@@ -20,7 +20,7 @@ config :all,
 # off in your project buildfile by referencing sproutcore specifically
 mode :debug do
   config :all, 
-    :combine_javascript => false,
+    :combine_javascript => true,
     :combine_stylesheet => true
 end
 

data/frameworks/sproutcore/frameworks/bootstrap/system/loader.js

@@ -40,6 +40,7 @@ SC.setupBodyClassNames = function() {
   if(borderRad) classNames.push('border-rad');
   classNames.push(browser) ;
   classNames.push(platform) ;
+  if (SC.browser.msie==7) classNames.push('ie7') ;
   if (SC.browser.mobileSafari) classNames.push('mobile-safari') ;
   el.className = classNames.join(' ') ;
 } ;

data/frameworks/sproutcore/frameworks/datastore/models/record.js

@@ -76,7 +76,18 @@ SC.Record = SC.Object.extend(
   }.property('storeKey').cacheable(),
   
   /**
-    The record's status changes as it is loaded from the server.
+    All records generally have a life cycle as they are created or loaded into 
+    memory, modified, committed and finally destroyed.  This life cycle is 
+    managed by the status property on your record. 
+
+    The status of a record is modelled as a finite state machine.  Based on the 
+    current state of the record, you can determine which operations are 
+    currently allowed on the record and which are not.
+    
+    In general, a record can be in one of five primary states; SC.Record.EMPTY,
+    SC.Record.BUSY, SC.Record.READY, SC.Record.DESTROYED, SC.Record.ERROR. 
+    These are all described in more detail in the class mixin (below) where 
+    they are defined.
     
     @property {Number}
   */
@@ -293,6 +304,7 @@ SC.Record = SC.Object.extend(
         storeKey = this.storeKey,
         status   = store.peekStatus(storeKey),
         recordAttr = this[key],
+        recordType = SC.Store.recordTypeFor(storeKey),
         attrs;
     
     attrs = store.readEditableDataHash(storeKey);
@@ -310,10 +322,59 @@ SC.Record = SC.Object.extend(
       SC.Store.idsByStoreKey[storeKey] = attrs[key] ;
       this.propertyDidChange('id'); // Reset computed value
     }
-
+    
+    // if any aggregates, propagate the state
+    if(!recordType.aggregates || recordType.aggregates.length>0) {
+      this.propagateToAggregates();
+    }
+    
     return this ;  
   },
   
+  /**
+    This will also ensure that any aggregate records are also marked dirty
+    if this record changes.
+    
+    Should not have to be called manually.
+  */
+  propagateToAggregates: function() {
+    var storeKey = this.get('storeKey'),
+        recordType = SC.Store.recordTypeFor(storeKey), 
+        idx, len, key, val, recs;
+    
+    var aggregates = recordType.aggregates;
+    
+    // if recordType aggregates are not set up yet, make sure to 
+    // create the cache first
+    if(!aggregates) {
+      var dataHash = this.get('store').readDataHash(storeKey),
+          aggregates = [];
+      for(k in dataHash) {
+        if(this[k] && this[k].get && this[k].get('aggregate')===YES) {
+          aggregates.push(k);
+        }
+      }
+      recordType.aggregates = aggregates;
+    }
+    
+    // now loop through all aggregate properties and mark their related
+    // record objects as dirty
+    for(idx=0,len=aggregates.length;idx<len;idx++) {
+      key = aggregates[idx];
+      val = this.get(key);
+      
+      recs = SC.kindOf(val, SC.ManyArray) ? val : [val];
+      recs.forEach(function(rec) {
+        // write the dirty status
+        if(rec) { 
+          rec.get('store').writeStatus(rec.get('storeKey'), this.get('status'));
+          rec.storeDidChangeProperties(YES);
+        }
+      }, this);
+    }
+    
+  },
+  
   /**
     Called by the store whenever the underlying data hash has changed.  This
     will notify any observers interested in data hash properties that they
@@ -380,7 +441,9 @@ SC.Record = SC.Object.extend(
 
         if (!isRecord) {
           attrValue = this.get(key);
-          if(attrValue!==undefined || attrValue!==null) dataHash[key] = attrValue;
+          if(attrValue!==undefined || (attrValue===null && includeNull)) {
+            dataHash[key] = attrValue;
+          }
         }
         else if(isRecord) {
           recHash = store.readDataHash(storeKey);
@@ -403,8 +466,6 @@ SC.Record = SC.Object.extend(
             }
           }
         }
-        
-        if (includeNull && dataHash[key]===undefined) dataHash[key] = null;
       }
     }
     

data/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js

@@ -103,6 +103,20 @@ SC.RecordAttribute = SC.Object.extend(
   */
   useIsoDate: YES,
   
+  /**
+    Can only be used for toOne or toMany relationship attributes. If YES,
+    this flag will ensure that any related objects will also be marked
+    dirty when this record dirtied. 
+    
+    Useful when you might have multiple related objects that you want to 
+    consider in an 'aggregated' state. For instance, by changing a child
+    object (image) you might also want to automatically mark the parent 
+    (album) dirty as well.
+    
+    @property {Boolean}
+  */
+  aggregate: NO,
+  
   // ..........................................................
   // HELPER PROPERTIES
   // 

data/frameworks/sproutcore/frameworks/datastore/tests/models/record_attribute.js

@@ -15,6 +15,9 @@ module("SC.RecordAttribute core methods", {
       store: SC.Store.create()
     });
     
+    // stick it to the window object so that objectForPropertyPath works
+    window.MyApp = MyApp;
+    
     MyApp.Foo = SC.Record.extend({
       
       // test simple reading of a pass-through prop
@@ -57,7 +60,10 @@ module("SC.RecordAttribute core methods", {
       
     });
     
-    MyApp.Bar = SC.Record.extend({});
+    MyApp.Bar = SC.Record.extend({
+      parent: SC.Record.toOne('MyApp.Foo', { aggregate: YES }),
+      relatedMany: SC.Record.toMany('MyApp.Foo', { aggregate: YES })
+    });
     
     SC.RunLoop.begin();
     storeKeys = MyApp.store.loadRecords(MyApp.Foo, [
@@ -75,6 +81,7 @@ module("SC.RecordAttribute core methods", {
         firstName: "Jane", 
         lastName: "Doe", 
         relatedTo: 'foo1',
+        relatedToAggregate: 'bar1',
         anArray: 'notAnArray',
         anObject: 'notAnObject',
         nonIsoDate: "2009/06/10 8:55:50 +0000"
@@ -92,7 +99,7 @@ module("SC.RecordAttribute core methods", {
     ]);
     
     MyApp.store.loadRecords(MyApp.Bar, [
-      { guid: 'bar1', city: "Chicago" }
+      { guid: 'bar1', city: "Chicago", parent: 'foo2', relatedMany: ['foo1', 'foo2'] }
     ]);
     
     SC.RunLoop.end();
@@ -165,7 +172,6 @@ test("writing pass-through should simply set value", function() {
 });
 
 test("writing a value should override default value", function() {
-
   equals(rec.get('defaultValue'), 'default', 'precond - returns default');
   rec.set('defaultValue', 'not-default');
   equals(rec.get('defaultValue'), 'not-default', 'newly written value should replace default value');
@@ -176,3 +182,22 @@ test("writing a date should generate an ISO date" ,function() {
   equals(rec.set('date', date), rec, 'returns reciever');
   equals(rec.readAttribute('date'), '2009-04-01T22:28:03-07:00', 'should have new time (%@)'.fmt(date.toString()));
 });
+
+test("writing an attribute should make relationship aggregate dirty" ,function() {
+  equals(bar.get('status'), SC.Record.READY_CLEAN, "precond - bar should be READY_CLEAN");
+  equals(rec2.get('status'), SC.Record.READY_CLEAN, "precond - rec2 should be READY_CLEAN");
+  
+  bar.set('city', 'Oslo');
+  
+  equals(rec2.get('status'), SC.Record.READY_DIRTY, "foo2 should be READY_DIRTY");
+});
+
+test("writing an attribute should make many relationship aggregate dirty" ,function() {
+  equals(bar.get('status'), SC.Record.READY_CLEAN, "precond - bar should be READY_CLEAN");
+  equals(rec2.get('status'), SC.Record.READY_CLEAN, "precond - rec2 should be READY_CLEAN");
+  
+  bar.set('city', 'Oslo');
+  
+  equals(rec.get('status'), SC.Record.READY_DIRTY, "foo1 should be READY_DIRTY");
+  equals(rec2.get('status'), SC.Record.READY_DIRTY, "foo2 should be READY_DIRTY");
+});