sproutcore 1.4.0.rc → 1.4.0.rc.2

data/VERSION.yml

@@ -1,7 +1,7 @@
 --- 
 :major: 1
 :minor: 4
-:patch: 0.rc
+:patch: 0.rc.2
 :digest: e038ba5746bb757cd0ff2391828c5f03496fbb64
 :dist: 
   frameworks/sproutcore: 637dc82942f2fd5c1e9cd57ce7582fca821a3bfa

data/bin/sc-build

@@ -6,7 +6,12 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib sproutcore]))
+if caller.empty?
+  puts "FATAL: You need to invoke sc-build from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  exit
+end
+
+require "sproutcore"
 
 SC::Tools.invoke 'build'
 

data/bin/sc-build-number

@@ -6,7 +6,12 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib sproutcore]))
+if caller.empty?
+  puts "FATAL: You need to invoke sc-build-number from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  exit
+end
+
+require "sproutcore"
 
 SC::Tools.invoke :build_number
 

data/bin/sc-docs

@@ -7,7 +7,12 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib sproutcore]))
+if caller.empty?
+  puts "FATAL: You need to invoke sc-docs from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  exit
+end
+
+require "sproutcore"
 
 SC::Tools.invoke :docs
 

data/bin/sc-gen

@@ -6,7 +6,12 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib sproutcore]))
+if caller.empty?
+  puts "FATAL: You need to invoke sc-gen from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  exit
+end
+
+require "sproutcore"
 
 SC::Tools.invoke 'gen'
 

data/bin/sc-init

@@ -6,7 +6,12 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib sproutcore]))
+if caller.empty?
+  puts "FATAL: You need to invoke sc-init from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  exit
+end
+
+require "sproutcore"
 
 SC::Tools.invoke 'init'
 

data/bin/sc-manifest

@@ -6,7 +6,12 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib sproutcore]))
+if caller.empty?
+  puts "FATAL: You need to invoke sc-manifest from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  exit
+end
+
+require "sproutcore"
 
 SC::Tools.invoke :manifest
 

data/bin/sc-server

@@ -6,7 +6,13 @@
 #            and contributors
 # ===========================================================================
 
+if caller.empty?
+  puts "FATAL: You need to invoke sc-server from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  exit
+end
+
 require "sproutcore"
+
 SC::Tools.invoke 'server'
 
 # EOF

data/bin/sproutcore

@@ -6,8 +6,12 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(
-    File.join(File.dirname(__FILE__), %w[.. lib sproutcore]))
+if caller.empty?
+  puts "FATAL: You need to invoke sproutcore from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  exit
+end
+
+require "sproutcore"
 
 SC::Tools.start
 

data/lib/frameworks/sproutcore/frameworks/bootstrap/setup_body_class_names.js

@@ -7,6 +7,4 @@
 
 // sc_resource('setup_body_class_names'); // publish into inline format
 
-// sc_require("system/loader");
-
 if (SC.setupBodyClassNames) SC.setupBodyClassNames() ;

data/lib/frameworks/sproutcore/frameworks/desktop/panes/select_button.js

@@ -608,7 +608,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
 
     customView = menu.menuItemViewForContentIndex(this.get('itemIdx'));
     menu.set('currentMenuItem', customView) ;
-    customView.becomeFirstResponder();
+    if (customView) customView.becomeFirstResponder();
 
     this.set('isActive', YES);
     return YES ;

data/lib/frameworks/sproutcore/frameworks/foundation/system/response.js

@@ -126,14 +126,6 @@ SC.Response = SC.Object.extend(
   */
   headers: null,
   
-  /**
-    The raw body retrieved from the transport.  This may be further parsed
-    by the body property, which is probably what you want.
-    
-    @property {String}
-  */
-  encodedBody: null,
-  
   /**
     Response body. If isJSON was set, will be parsed automatically.
     
@@ -529,8 +521,14 @@ SC.XHRResponse = SC.Response.extend({
         this.set('status', status);
       
       }, this);
-      // avoid memory leak in MSIE: clean up
-      rawRequest.onreadystatechange = function() {} ;
+
+      // Avoid memory leaks
+      if (!SC.browser.msie) {
+        SC.Event.remove(rawRequest, 'readystatechange', this, this.finishRequest);	  
+      } else {
+        rawRequest.onreadystatechange = null;
+      }
+
       return YES;
     }
     return NO; 

data/lib/frameworks/sproutcore/frameworks/media/views/audio.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 sc_require('views/controls');
-sc_require('views/miniControls');
+sc_require('views/mini_controls');
 /** 
   @class
   
@@ -178,7 +178,10 @@ SC.AudioView = SC.View.extend({
           return;
         case "flash":
           var flashURL= sc_static('videoCanvas.swf');
+
           var movieURL = this.get('value');
+          if (!movieURL) return;
+
           if(movieURL.indexOf('http:')==-1){
             movieURL=location.protocol+'//'+location.host+movieURL;
           }

data/lib/frameworks/sproutcore/frameworks/media/views/controls.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 /*globals SC */
 
-sc_require('views/mediaSlider');
+sc_require('views/media_slider');
 /** @class
 
   (Document Your View Here)
@@ -43,7 +43,7 @@ SC.MediaControlsView = SC.View.extend({
     renderStyle: 'renderImage',
     theme: ''
   }),
-  progressView: SC.mediaSlider.design({
+  progressView: SC.MediaSlider.design({
     layout: { top: 0, left: 20, right: 220, height:20},
     value:0,
     minimum: 0,
@@ -74,7 +74,7 @@ SC.MediaControlsView = SC.View.extend({
     value: '',
     icon: 'minus'
   }),
-  volumeView: SC.mediaSlider.design({
+  volumeView: SC.MediaSlider.design({
     layout: { top: 0, right: 20, width: 100, height:20},
     value:0,
     valueBinding: "*owner.target.volume" ,

data/lib/frameworks/sproutcore/frameworks/media/views/{mediaSlider.js → media_slider.js}

@@ -12,7 +12,7 @@
 
   @extends SC.View
 */
-SC.mediaSlider = SC.SliderView.extend({
+SC.MediaSlider = SC.SliderView.extend({
   
   mediaView: null,
 

data/lib/frameworks/sproutcore/frameworks/media/views/{miniControls.js → mini_controls.js}

@@ -6,7 +6,7 @@
 // ==========================================================================
 /*globals SC */
 
-sc_require('views/mediaSlider');
+sc_require('views/media_slider');
 /** @class
 
   (Document Your View Here)

data/lib/frameworks/sproutcore/frameworks/media/views/{simpleControls.js → simple_controls.js}

@@ -6,7 +6,7 @@
 // ==========================================================================
 /*globals SC */
 
-sc_require('views/mediaSlider');
+sc_require('views/media_slider');
 /** @class
 
   (Document Your View Here)
@@ -43,7 +43,7 @@ SC.SimpleMediaControlsView = SC.View.extend({
     renderStyle: 'renderImage',
     theme: ''
   }),
-  progressView: SC.mediaSlider.design({
+  progressView: SC.MediaSlider.design({
     layout: { top: 0, left: 25, right: 0, height:20 },
     value:0,
     minimum: 0,

data/lib/frameworks/sproutcore/frameworks/media/views/video.js

@@ -7,7 +7,7 @@
 
 
 sc_require('views/controls');
-sc_require('views/miniControls');
+sc_require('views/mini_controls');
 
 /** 
   @class
@@ -203,7 +203,10 @@ SC.VideoView = SC.View.extend({
           return;
         case "flash":
           var flashURL= sc_static('videoCanvas.swf');
+
           var movieURL = this.get('value');
+          if (!movieURL) return;
+
           if(movieURL.indexOf('http:')==-1){
             movieURL=location.protocol+'//'+location.host+movieURL;
           }

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

@@ -204,7 +204,7 @@ SC.mixin(/** @scope SC */ {
       // this is safe.
       } else if (SC.Error && (item instanceof SC.Error)) {
         ret = SC.T_ERROR ;        
-      } else if (item.isObject === true) {
+      } else if (item instanceof SC.Object) {
         ret = SC.T_OBJECT ;
       } else ret = SC.T_HASH ;
     } else if (ret === SC.T_FUNCTION) ret = (item.isClass) ? SC.T_CLASS : SC.T_FUNCTION;

data/lib/frameworks/sproutcore/frameworks/table/views/table.js

@@ -6,6 +6,7 @@
 // ==========================================================================
 
 sc_require('mixins/table_delegate');
+sc_require('views/table_head');
 
 /** @class
   

data/lib/sproutcore/rack/builder.rb

@@ -198,7 +198,6 @@ module SC
       end
 
       def monitor_project!
-        return
         if !@should_monitor
           @should_monitor = true
           @project_root = @project.project_root

data/lib/sproutcore/rack/dev.rb

@@ -6,7 +6,6 @@
 # ===========================================================================
 
 require 'json'
-#require 'ruby-debug'
 module SC
   module Rack
 
@@ -60,7 +59,8 @@ module SC
       def get_greenhouse_configs(env)
         rqust = ::Rack::Request.new(env)
         params = rqust.params
-        app_target = @project.target_for(params['app'].to_sym)
+        app = params['app'] ? params['app'].to_sym : ''
+        app_target = @project.target_for(app) 
         ret = []
         if(app_target)
           path = app_target.source_root + "/design/greenhouse.config"

data/lib/sproutcore/rack/proxy.rb

@@ -5,7 +5,7 @@
 #            and contributors
 # ===========================================================================
 
-require 'net/http'
+require 'net/https'
 module SC
   module Rack
 
@@ -66,7 +66,16 @@ module SC
 
         response = nil
         no_body_method = %w(delete get copy head move options trace)
+
+        done = false
+        tries = 0
+        until done
         ::Net::HTTP.start(http_host, http_port) do |http|
+          if proxy[:secure]
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+
           if no_body_method.include?(http_method)
             response = http.send(http_method, http_path, headers)
           else
@@ -94,11 +103,33 @@ module SC
           value.gsub!(/domain=[^\;]+\;? ?/,'') if key.downcase == 'set-cookie'
           # Location headers should rewrite the hostname if it is included.
           value.gsub!(/^http:\/\/#{http_host}(:[0-9]+)?\//, "http://#{http_host}/") if key.downcase == 'location'
+          # content-length is returning char count not bytesize
+          value = response.body.bytesize.to_s if key.downcase == 'content-length'
+
 
           SC.logger << "   #{key}: #{value}\n"
           response_headers[key] = value
         end
 
+          if [301, 307].include?(status.to_i)
+            SC.logger << '~ REDIRECTING: '+response_headers['location']
+
+            uri = URI.parse(response_headers['location']);
+            http_host = uri.host
+            http_port = uri.port
+            http_path = uri.path
+            http_path += '?'+uri.query if uri.query
+            headers = {}
+
+            tries += 1
+            if tries > 10
+              raise "Too many redirects!"
+            end
+          else
+            done = true
+          end
+        end
+
         return [status, ::Rack::Utils::HeaderHash.new(response_headers), [response.body]]
       end
     end

data/lib/sproutcore/rack/service.rb

@@ -58,8 +58,8 @@ module SC
             end
           end
         end
-
-        opts[:Filesystem] ||= opts[:filesystem] || false # allow either case
+        
+        opts[:Filesystem] ||= opts[:filesystem] || true # enabled by default
         self.filesystem = opts[:Filesystem]
 
         projects = opts.delete(:projects) || [opts.delete(:project)].compact

data/lib/sproutcore/tools/build.rb

@@ -16,9 +16,9 @@ module SC
   class Tools
 
     desc "build [TARGET..]", "Builds one or more targets"
-    method_options(
-      MANIFEST_OPTIONS.merge(:entries => :string, :clean => false))
-
+    method_options(MANIFEST_OPTIONS)
+    method_option :entries, :type => :string
+    method_option :clean,   :type => :boolean, :aliases => "-c"
     def build(*targets)
       # Copy some key props to the env
       SC.env.build_prefix   = options.buildroot if options.buildroot

data/spec/lib/models/hash_struct/hash_spec.rb

@@ -26,37 +26,4 @@ describe SC::HashStruct, 'hash operations' do
     e[:foo].should eql(:bar)
   end
 
-  it "should treat string and hash keys as the same for writing, but not reading" do
-    e = SC::HashStruct.new
-    e['foo'] = :bar
-    e[:foo].should eql(:bar)
-
-    e[:foo2] = :bar
-    e['foo2'].should eql(nil)
-  end
-
-  it "should convert all keys to symbols (i.e. if you get keys, they will always be symbols)" do
-    e = SC::HashStruct.new
-    e['string'] = :foo
-    e[:symbol] = :foo
-
-    expected = [:string, :symbol]
-    idx=0
-    e.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |k|
-      k.should eql(expected[idx])
-      idx += 1
-    end
-  end
-
-  it "should raise error if key cannot be converted to symbol" do
-    a = SC::HashStruct.new
-
-    # numbers respond to to_sym but return nil
-    lambda { a[1] = :foo }.should raise_error
-
-    # Object does not respond to to_sym
-    lambda { a[Object.new] = :foo }.should raise_error
-  end
-
-
 end

data/spec/lib/models/hash_struct/merge_spec.rb

@@ -2,13 +2,6 @@ require "spec_helper"
 
 describe SC::HashStruct, 'merge!' do
 
-  it "should convert all keys to symbols - if symbol and string is passed, they will overrwite" do
-    a = SC::HashStruct.new
-    a.merge! :foo => :bar1, 'foo' => :bar2
-    a.keys.size.should eql(1)
-    a.keys.first.should eql(:foo)
-  end
-
   it "should do nothing if we merge self!" do
     a = SC::HashStruct.new :foo => :bar
     a.merge! a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  hash: 7712042
   prerelease: true
   segments: 
   - 1
   - 4
   - 0
   - rc
-  version: 1.4.0.rc
+  - 2
+  version: 1.4.0.rc.2
 platform: ruby
 authors: 
 - Sprout Systems, Inc.  Apple Inc. and contributors
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -07:00
+date: 2010-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +27,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
         segments: 
         - 0
         - 9
@@ -43,7 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -59,7 +57,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 41
         segments: 
         - 0
         - 9
@@ -75,7 +72,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 2
         - 6
@@ -91,7 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
         segments: 
         - 0
         - 11
@@ -107,7 +102,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 1
         - 2
@@ -123,7 +117,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
         - 1
@@ -139,7 +132,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -155,7 +147,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -320,79 +311,79 @@ files:
 - doc_templates/sproutcore/static/header.html
 - doc_templates/sproutcore/static/index.html
 - doc_templates/sproutcore/symbol.tmpl
-- gen/Buildfile
-- gen/app/Buildfile
-- gen/app/README
-- gen/app/USAGE
-- gen/app/templates/apps/@target_name@/core.js
-- gen/app/templates/apps/@target_name@/main.js
-- gen/app/templates/apps/@target_name@/resources/loading.rhtml
-- gen/app/templates/apps/@target_name@/resources/main_page.js
-- gen/controller/Buildfile
-- gen/controller/README
-- gen/controller/USAGE
-- gen/controller/templates/controllers/@filename@.js
-- gen/controller/templates/tests/controllers/@filename@.js
-- gen/data-source/Buildfile
-- gen/data-source/README
-- gen/data-source/USAGE
-- gen/data-source/templates/data_sources/@filename@.js
-- gen/design/Buildfile
-- gen/design/README
-- gen/design/USAGE
-- gen/design/templates/resources/@filename@.js
-- gen/framework/Buildfile
-- gen/framework/README
-- gen/framework/USAGE
-- gen/framework/templates/frameworks/@target_name@/core.js
-- gen/framework/templates/frameworks/@target_name@/english.lproj/strings.js
-- gen/language/Buildfile
-- gen/language/README
-- gen/language/USAGE
-- gen/language/templates/@filename@/strings.js
-- gen/model/Buildfile
-- gen/model/README
-- gen/model/USAGE
-- gen/model/templates/fixtures/@filename@.js
-- gen/model/templates/models/@filename@.js
-- gen/model/templates/tests/models/@filename@.js
-- gen/page/Buildfile
-- gen/page/README
-- gen/page/USAGE
-- gen/page/templates/pages/@target_name@/Buildfile
-- gen/page/templates/pages/@target_name@/core.js
-- gen/page/templates/pages/@target_name@/en.lproj/strings.js
-- gen/page/templates/pages/@target_name@/resources/body.css
-- gen/page/templates/pages/@target_name@/resources/body.rhtml
-- gen/project/Buildfile
-- gen/project/INIT
-- gen/project/README
-- gen/project/USAGE
-- gen/project/templates/@filename@/Buildfile
-- gen/project/templates/@filename@/README
-- gen/responder/Buildfile
-- gen/responder/README
-- gen/responder/USAGE
-- gen/responder/templates/states/@filename@.js
-- gen/test/Buildfile
-- gen/test/README
-- gen/test/USAGE
-- gen/test/templates/tests/@filename@.js
-- gen/theme/Buildfile
-- gen/theme/README
-- gen/theme/USAGE
-- gen/theme/templates/themes/@target_name@/resources/theme_styles.css
-- gen/view/Buildfile
-- gen/view/README
-- gen/view/USAGE
-- gen/view/templates/tests/views/@filename@.js
-- gen/view/templates/views/@filename@.js
 - lib/Buildfile
 - lib/buildtasks/build.rake
 - lib/buildtasks/entry.rake
 - lib/buildtasks/manifest.rake
 - lib/buildtasks/render.rake
 - lib/buildtasks/target.rake
+- lib/gen/Buildfile
+- lib/gen/app/Buildfile
+- lib/gen/app/README
+- lib/gen/app/USAGE
+- lib/gen/app/templates/apps/@target_name@/core.js
+- lib/gen/app/templates/apps/@target_name@/main.js
+- lib/gen/app/templates/apps/@target_name@/resources/loading.rhtml
+- lib/gen/app/templates/apps/@target_name@/resources/main_page.js
+- lib/gen/controller/Buildfile
+- lib/gen/controller/README
+- lib/gen/controller/USAGE
+- lib/gen/controller/templates/controllers/@filename@.js
+- lib/gen/controller/templates/tests/controllers/@filename@.js
+- lib/gen/data-source/Buildfile
+- lib/gen/data-source/README
+- lib/gen/data-source/USAGE
+- lib/gen/data-source/templates/data_sources/@filename@.js
+- lib/gen/design/Buildfile
+- lib/gen/design/README
+- lib/gen/design/USAGE
+- lib/gen/design/templates/resources/@filename@.js
+- lib/gen/framework/Buildfile
+- lib/gen/framework/README
+- lib/gen/framework/USAGE
+- lib/gen/framework/templates/frameworks/@target_name@/core.js
+- lib/gen/framework/templates/frameworks/@target_name@/english.lproj/strings.js
+- lib/gen/language/Buildfile
+- lib/gen/language/README
+- lib/gen/language/USAGE
+- lib/gen/language/templates/@filename@/strings.js
+- lib/gen/model/Buildfile
+- lib/gen/model/README
+- lib/gen/model/USAGE
+- lib/gen/model/templates/fixtures/@filename@.js
+- lib/gen/model/templates/models/@filename@.js
+- lib/gen/model/templates/tests/models/@filename@.js
+- lib/gen/page/Buildfile
+- lib/gen/page/README
+- lib/gen/page/USAGE
+- lib/gen/page/templates/pages/@target_name@/Buildfile
+- lib/gen/page/templates/pages/@target_name@/core.js
+- lib/gen/page/templates/pages/@target_name@/en.lproj/strings.js
+- lib/gen/page/templates/pages/@target_name@/resources/body.css
+- lib/gen/page/templates/pages/@target_name@/resources/body.rhtml
+- lib/gen/project/Buildfile
+- lib/gen/project/INIT
+- lib/gen/project/README
+- lib/gen/project/USAGE
+- lib/gen/project/templates/@filename@/Buildfile
+- lib/gen/project/templates/@filename@/README
+- lib/gen/responder/Buildfile
+- lib/gen/responder/README
+- lib/gen/responder/USAGE
+- lib/gen/responder/templates/states/@filename@.js
+- lib/gen/test/Buildfile
+- lib/gen/test/README
+- lib/gen/test/USAGE
+- lib/gen/test/templates/tests/@filename@.js
+- lib/gen/theme/Buildfile
+- lib/gen/theme/README
+- lib/gen/theme/USAGE
+- lib/gen/theme/templates/themes/@target_name@/resources/theme_styles.css
+- lib/gen/view/Buildfile
+- lib/gen/view/README
+- lib/gen/view/USAGE
+- lib/gen/view/templates/tests/views/@filename@.js
+- lib/gen/view/templates/views/@filename@.js
 - lib/sproutcore.rb
 - lib/sproutcore/builders.rb
 - lib/sproutcore/builders/base.rb
@@ -760,6 +751,7 @@ files:
 - spec/fixtures/real_world/frameworks/sproutcore/debug/debug-resource.html
 - spec/fixtures/real_world/frameworks/sproutcore/debug/sample_debug.js
 - spec/fixtures/real_world/frameworks/sproutcore/demo2.js
+- spec/fixtures/real_world/frameworks/sproutcore/demo3.scss
 - spec/fixtures/real_world/frameworks/sproutcore/english.lproj/debug/sample_debug-loc.js
 - spec/fixtures/real_world/frameworks/sproutcore/english.lproj/demo.css
 - spec/fixtures/real_world/frameworks/sproutcore/english.lproj/demo.html
@@ -1659,9 +1651,9 @@ files:
 - lib/frameworks/sproutcore/frameworks/media/resources/videoCanvas.swf
 - lib/frameworks/sproutcore/frameworks/media/views/audio.js
 - lib/frameworks/sproutcore/frameworks/media/views/controls.js
-- lib/frameworks/sproutcore/frameworks/media/views/mediaSlider.js
-- lib/frameworks/sproutcore/frameworks/media/views/miniControls.js
-- lib/frameworks/sproutcore/frameworks/media/views/simpleControls.js
+- lib/frameworks/sproutcore/frameworks/media/views/media_slider.js
+- lib/frameworks/sproutcore/frameworks/media/views/mini_controls.js
+- lib/frameworks/sproutcore/frameworks/media/views/simple_controls.js
 - lib/frameworks/sproutcore/frameworks/media/views/video.js
 - lib/frameworks/sproutcore/frameworks/mini/license.js
 - lib/frameworks/sproutcore/frameworks/mobile/english.lproj/core.css
@@ -1948,7 +1940,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -1957,7 +1948,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3