sproutcore 1.0.1031 → 1.0.1035

data/History.txt

@@ -1,3 +1,15 @@
+== 1.0.1034
+
+- Fixed bug with the new proxy.  HTTP method names were not capitalized, causing some servers to throw an exception
+
+== 1.0.1033
+
+- Updated SproutCore JS
+- Build tools now work as a distribution.  We can include resources from other projects as well
+
+== 1.0.1009
+
+First release of SproutCore 1.0 RC1
 
 == 1.0.0.a1 / 2009-04-04
 

data/VERSION.yml

@@ -1,7 +1,7 @@
 --- 
-:patch: 1031
-:digest: a4a6ad7402d09a2424b632097d189cbe5249461e
+:patch: 1035
+:digest: 6adcb96d3bfd9d5a101f0ff1ae272a5044854a84
 :dist: 
-  frameworks/sproutcore: 8c54dc5a319e402e86319e5a98c21d16744200d8
+  frameworks/sproutcore: edcf66df94134f479ddad658d95b27e94b685c2a
 :major: 1
 :minor: 0

data/buildtasks/manifest.rake

@@ -275,6 +275,8 @@ namespace :manifest do
           :build_task  => 'build:bundle_loaded',
           :resource    => 'javascript',
           :entry_type  => :javascript,
+          :composite   => true, # does not have a source
+          :source_entries => [],
           :target      => TARGET
       end
       

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

@@ -210,6 +210,7 @@ SC.Record = SC.Object.extend(
   */
   destroy: function() { 
     this.get('store').destroyRecord(null, null, this.get('storeKey'));
+    this.propertyDidChange('status');
     return this ;
   },
 

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

@@ -79,3 +79,14 @@ test("should return receiver", function() {
   equals(MyApp.foo.destroy(), MyApp.foo, 'should return receiver');
 });
 
+test("destroy should update status cache", function() {
+  var st = MyApp.foo.get('status');
+  ok(st !== SC.Record.DESTROYED_CLEAN, 'precond - foo should not be destroyed');
+
+  SC.RunLoop.begin();
+  MyApp.foo.destroy();
+  equals(MyApp.foo.get('status'), SC.Record.DESTROYED_CLEAN, 'status should be DESTROYED_CLEAN immediately when destroyed directly by record');
+  SC.RunLoop.end();
+});
+
+

data/frameworks/sproutcore/frameworks/desktop/views/stacked.js

@@ -39,6 +39,15 @@ SC.StackedView = SC.CollectionView.extend(
     adjust the height of the view.
   */
   layout: { top: 0, left: 0, right: 0, height: 1 },
+  
+  /**
+    Return full range of its indexes for nowShowing
+    
+    @returns {SC.IndexSet} full range of indexes
+  */
+  computeNowShowing: function(rect) {
+    return this.get('allContentIndexes');
+  },  
 
   /**
     Updates the height of the stacked view to reflect the current content of 
@@ -98,4 +107,4 @@ SC.StackedView = SC.CollectionView.extend(
   */
   didCreateLayer: function() { return this.updateHeight(); }
   
-});
+});

data/lib/sproutcore/buildfile/task.rb

@@ -148,6 +148,18 @@ module SC
       invoke_with_call_chain(task_args, InvocationChain::EMPTY)
     end
 
+    def self.log_indent
+      @task_indent ||= ''
+    end
+    
+    def self.indent_logs
+      @task_indent = (@task_indent || '') + '  '
+    end
+    
+    def self.outdent_logs
+      @task_indent = (@task_indent || '')[0..-3]
+    end
+    
     # Same as invoke, but explicitly pass a call chain to detect
     # circular dependencies.
     def invoke_with_call_chain(task_args, invocation_chain) # :nodoc:
@@ -155,23 +167,37 @@ module SC
         invocation_chain = InvocationChain.append(self, invocation_chain)
         @lock.synchronize do
           
+          indent = self.class.indent_logs
+          
           # Use logging options to decide what to output
           # one of :env, :name, :none
-          log_opt = task_options[:log] || :env
+          log_opt = task_options[:log] || :none
           if [:name, :env].include?(log_opt)
-            SC.logger.debug "invoke ~ #{name} #{format_trace_flags}"
+            SC.logger.debug "#{indent}invoke ~ #{name} #{format_trace_flags}"
           end
           
           if log_opt == :env
             TASK_ENV.each do |key, value|
               next if %w(config task_env).include?(key.to_s.downcase)
-              SC.logger.debug "  #{key} = #{value.inspect}"
+              SC.logger.debug "#{indent}  #{key} = #{value.inspect}"
             end
           end
           
+          t_start = Time.now.to_f * 1000
+          
           invocation_chain = invoke_prerequisites(task_args, invocation_chain)
           @invoke_count += 1
           execute(task_args) if needed?
+          
+          t_end = Time.now.to_f * 1000
+          t_diff = t_end - t_start
+          
+          # ignore short tasks
+          if t_diff > 10
+            SC.logger.debug "#{indent}long task ~ #{name}: #{t_diff.to_i} msec"
+          end
+          self.class.outdent_logs
+          
         end
       end
       return invocation_chain
@@ -199,6 +225,7 @@ module SC
 
     # Execute the actions associated with this task.
     def execute(args=nil)
+      
       @execute_count += 1
       args ||= EMPTY_TASK_ARGS
       return if SC.env.dryrun
@@ -211,6 +238,7 @@ module SC
           act.call(self, args)
         end
       end
+      
     end
 
     # Is this task needed?

data/lib/sproutcore/models/manifest_entry.rb

@@ -127,7 +127,8 @@ module SC
         end
         timestamps.max
       elsif composite?
-        source_entries.map { |e| e.timestamp }.max
+
+        source_entries.map { |e| e.timestamp || 0 }.max || Time.now.to_i
       else
         File.exist?(source_path) ? File.mtime(source_path).to_i : 0
       end
@@ -158,11 +159,21 @@ module SC
       if paths = self.source_paths
         paths.each do |path|
           next unless File.exist?(path)
-          File.readlines(path).each do |line|
-            if (line.valid_encoding?)
-              line.scan(regexp) { |result| yield(result) }
-            end
-          end 
+          
+          # fine all directives in the source.  use file cache to make this 
+          # fast later on.
+          results = target.file_attr('scan_source', path) do
+            ret = []
+            File.readlines(path).each do |line|
+              if (line.valid_encoding?)
+                line.scan(regexp) { |result| ret << result }
+              end
+            end 
+            ret
+          end
+          
+          results.each { |result| yield(result) }
+          
         end
       end
     end
@@ -175,6 +186,9 @@ module SC
     # results on all other file types.
     #
     def discover_build_directives!
+      
+      target.begin_attr_changes
+      
       self.required = []
       entry = self.transform? ? self.source_entry : self
       entry.scan_source(BUILD_DIRECTIVES_REGEX) do |matches|
@@ -189,6 +203,9 @@ module SC
           self.resource = filename
         end
       end
+      
+      target.end_attr_changes
+      
     end
     
     ######################################################
@@ -218,8 +235,34 @@ module SC
       return self 
     end
         
+    # Diagnostic function.  Indicates what will happen if you called build
+    def inspect_build_state
+      inspect_build_to self.build_path
+    end
+    
+    def inspect_staging_state
+      inspect_build_to self.staging_path
+    end
+     
     private 
     
+    def inspect_build_to(dst_path)
+      return "#{filename}: dst #{dst_path} not found" if !File.exist?(dst_path)
+      dst_mtime = File.mtime(dst_path).to_i
+      self.source_paths.each do |path|
+        if path.nil?
+          puts "WARN: nil path in #{filename}"
+          next
+        end
+        
+        return "#{filename}: src #{path} not found" if !File.exist?(path)
+        
+        src_mtime = File.mtime(path).to_i
+        return "#{filename}: src #{path} is newer [#{dst_mtime} < #{src_mtime}]" if dst_mtime < src_mtime
+      end
+      return "#{filename}: will not build"
+    end
+    
     def build_to(dst_path)
       if self.build_task.nil?
         raise "no build task defined for #{self.filename}" 
@@ -245,7 +288,8 @@ module SC
         :dst_path => dst_path
         
       return self
-    end  
+    end
+    
 
   end
   

data/lib/sproutcore/models/target.rb

@@ -5,6 +5,9 @@
 #            and contributors
 # ===========================================================================
 
+require 'yaml'
+require 'fileutils'
+
 module SC
   
   # Defines a build target in a project.  A build target is a component that
@@ -286,6 +289,76 @@ module SC
       return false
     end
     
+    # path to attr_cache file
+    def file_attr_cache_path
+      @file_attr_cache_path ||= (self.cache_root / '__file_attr_cache.yml')
+    end
+    
+    # suspend writing the file cache out if needed
+    def begin_attr_changes
+      @attr_change_level = (@attr_change_level || 0)+1
+    end
+    
+    # resume writing file cache out if needed
+    def end_attr_changes
+      @attr_change_level = (@attr_change_level || 0) - 1
+      if @attr_change_level <= 0
+        @attr_change_level = 0 
+        _write_file_attr_cache if @attr_cache_has_changes
+      end
+    end
+    
+    def _write_file_attr_cache
+      if (@attr_change_level||0) > 0
+        @attr_cache_has_changes = true
+
+      else
+        @attr_cache_has_changes = false
+        if @file_attr_cache
+          FileUtils.mkdir_p(File.dirname(file_attr_cache_path))
+          fp = File.open(file_attr_cache_path, 'w+')
+          fp.write @file_attr_cache.to_yaml
+          fp.close
+        end
+      end
+      
+    end
+      
+          
+    # returns or computes an attribute on a given file.  this will keep the
+    # named attribute in a cache keyed against the mtime of the named path.
+    # if the mtime matches, the cached value is returned.  otherwise, yields
+    # to the passed block to compute again.
+    def file_attr(attr_name, path, &block)
+      
+      # read cache from disk if needed
+      if @file_attr_cache.nil?
+        if File.exists?(file_attr_cache_path)
+          require 'yaml'
+          @file_attr_cache = YAML.load File.read(file_attr_cache_path)
+        else
+          @file_attr_cache = {}
+        end
+      end
+
+      path_root = (@file_attr_cache[path] ||= {})
+      attr_info = (path_root[attr_name.to_s] ||= {})
+      attr_mtime = attr_info['mtime'].to_i
+      path_mtime = File.exists?(path) ? File.mtime(path).to_i : 0
+      if attr_mtime.nil? || (path_mtime != attr_mtime)
+        SC.logger.debug "MISS file_attr_cache:#{attr_name}: #{File.basename(path)} path_mtime=#{path_mtime} attr_mtime=#{attr_mtime}"
+        
+        value = attr_info['value'] = yield
+        attr_info['mtime'] = path_mtime
+        _write_file_attr_cache
+        
+      else
+        value = attr_info['value']
+      end
+      
+      return value
+    end
+    
     # Computes a unique build number for this target.  The build number is
     # gauranteed to change anytime the contents of any source file changes 
     # or anytime the build number of a required target changes.  Although 
@@ -321,11 +394,16 @@ module SC
         # files.  It is not as fast as using an mtime, but it will remain
         # constant from one machine to the next so it can be used when
         # deploying across multiple build machines, etc.
+        begin_attr_changes
         digests = Dir.glob(File.join(source_root, '**', '*')).map do |path|
-          allowed = File.exists?(path) && !File.directory?(path)
-          allowed = allowed && !target_directory?(path)
-          allowed ? Digest::SHA1.hexdigest(File.read(path)) : nil
+          file_attr(:digest, path) do
+            allowed = File.exists?(path) && !File.directory?(path)
+            allowed = allowed && !target_directory?(path)
+            allowed ? Digest::SHA1.hexdigest(File.read(path)) : nil
+          end
         end
+        end_attr_changes
+        
         digests.compact!
 
         # Get all required targets and add in their build number.

data/lib/sproutcore/rack/proxy.rb

@@ -69,7 +69,9 @@ module SC
             response = http.send(http_method, http_path, headers)
           else
             http_body = env['rack.input']
-            some_request = Net::HTTPGenericRequest.new(http_method, '', '', http_path, headers)
+            some_request = Net::HTTPGenericRequest.new http_method.upcase, 
+                            true, true, http_path, headers
+                            
             some_request.body_stream = http_body
             response = http.request(some_request)
           end

data/lib/sproutcore/tools.rb

@@ -138,6 +138,11 @@ module SC
         @project = a_project
       end
     
+      def set_test_project(a_project)
+        @project = a_project
+        @discovered_project = true
+      end
+      
       # The current project.  This is discovered based on the passed --project
       # option or based on the current working directory.  If no project can 
       # be found, this method will always return null.

data/spec/lib/models/target/compute_build_number_spec.rb

@@ -50,7 +50,7 @@ describe SC::Target, 'compute_build_number' do
   describe "accurate method to compute build number" do
     
     before do
-      @target = @project.target_for(:sproutcore)
+      @target = @project.target_for(:sproutcore).prepare!
       @target.config.build_numbers = nil #precondition
       @target.config.build_number = nil  #precondition
     end
@@ -72,10 +72,10 @@ describe SC::Target, 'compute_build_number' do
   end
 
   it "changes generated build number if build number for a required target changes" do
-    target = @project.target_for(:sproutcore)
+    target = @project.target_for(:sproutcore).prepare!
     target.should_not be_nil
 
-    required = target.target_for(:desktop)
+    required = target.target_for(:desktop).prepare!
     required.should_not be_nil
     required.config.build_numbers = nil #precondition
     required.config.build_number = nil  #precondition
@@ -95,10 +95,10 @@ describe SC::Target, 'compute_build_number' do
   end
 
   it "does not change generated build number if a nested target that is not required by target changes" do
-    target = @project.target_for(:sproutcore)
+    target = @project.target_for(:sproutcore).prepare!
     target.should_not be_nil
 
-    not_required = target.target_for(:mobile)
+    not_required = target.target_for(:mobile).prepare!
     not_required.should_not be_nil
 
     #precondition

data/spec/lib/models/target/required_targets_spec.rb

@@ -5,8 +5,15 @@ describe SC::Target, 'required_targets' do
   include SC::SpecHelpers
 
   before do
+    @env = SC.build_mode # force debug mode
+    SC.build_mode = :debug
+
     @project = fixture_project(:real_world)
   end
+  
+  after do
+    SC.build_mode = @env
+  end
     
   it "should resolve references to child targets" do
     target = @project.target_for :sproutcore
@@ -66,15 +73,18 @@ describe SC::Target, 'required_targets' do
   end
   
   it "should log a warning if a required test or debug target could not be found" do
+    
     target = @project.target_for :sproutcore
     target.config.test_required = 'imaginary_foo'
     target.config.debug_required = 'imaginary_bar'
     
     capture('stderr') { target.required_targets(:test => true) }.size.should_not == 0
     capture('stderr') { target.required_targets(:debug => true) }.size.should_not == 0
+    
   end
   
   it "should include any CONFIG.theme if passed :theme => true && target_type == :app" do
+    
     expected = @project.target_for 'sproutcore/standard_theme'
     
     target = @project.target_for :contacts

data/spec/lib/tools/build_number_spec.rb

@@ -5,9 +5,15 @@ describe SC::Tools, 'build-number' do
   include SC::SpecHelpers
   
   before do 
+    save_env
+    SC.build_mode = :production
     @tool = SC::Tools.new('build_number')
   end
   
+  after do
+    restore_env
+  end
+  
   it "should raise error if no target is passed" do
     lambda { @tool.build_number }.should raise_error
   end
@@ -17,11 +23,12 @@ describe SC::Tools, 'build-number' do
   end
   
   it "should write build number when passed target" do
-    @tool.project = fixture_project(:real_world) # req...
-    bn = capture('stdout') { @tool.build_number('sproutcore') }
-    
     expected_target = fixture_project(:real_world).target_for(:sproutcore)
     expected = expected_target.prepare!.compute_build_number
+
+    @tool.set_test_project fixture_project(:real_world) # req...
+    bn = capture('stdout') { @tool.build_number('sproutcore') }
+
     bn.should eql(expected)
   end
   

data/spec/lib/tools/tools_spec.rb

@@ -13,6 +13,14 @@ describe SC::Tools do
 
   describe "logger options" do
 
+    before do
+      save_env
+    end
+    
+    after do 
+      restore_env
+    end
+    
     it "should default to warn log level" do
       SC::Tools.start %w(dummy)
       SC.env.log_level.should == :warn
@@ -54,6 +62,14 @@ describe SC::Tools do
       
   describe "build mode options" do
     
+    before do
+      save_env
+    end
+    
+    after do
+      restore_env
+    end
+    
     it "should default to :production build mode" do
       SC::Tools.start %w(dummy)
       SC.build_mode.should eql(:production)

data/spec/spec_helper.rb

@@ -48,6 +48,18 @@ module SC
   
   module SpecHelpers
     
+    # env doesn't automatically reset
+    def save_env
+      @env ||= []
+      @env << { :env => SC.env.dup, :build_mode => SC.build_mode }
+    end
+    
+    def restore_env
+      e = (@env || []).pop
+      SC.env = e[:env]
+      SC.build_mode = e[:build_mode]
+    end
+    
     def fixture_path(*path_items)
       (path_items = path_items.flatten).unshift 'fixtures'
       path_items.map! { |pi| pi.to_s }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 1.0.1031
+  version: 1.0.1035
 platform: ruby
 authors: 
 - Sprout Systems, Inc.  Apple Inc. and contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -08:00
+date: 2009-11-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency