sproutcore 1.4.2 → 1.4.3

data/lib/frameworks/sproutcore/frameworks/foundation/validators/not_empty.js

@@ -20,9 +20,13 @@ SC.Validator.NotEmpty = SC.Validator.extend(
   
   validate: function(form, field) {
     var value = field.get('fieldValue'); 
-    var ret = !!value ;
-    if (ret && value.length) ret = value.length > 0 ;
-    return ret ;
+    if (SC.none(value))
+      return NO;
+
+    if (! SC.none(value.length))
+      return value.length > 0;
+
+    return YES;
   },
   
   validateError: function(form, field) {

data/lib/frameworks/sproutcore/frameworks/foundation/views/label.js

@@ -208,7 +208,7 @@ SC.LabelView = SC.View.extend(SC.Control,
     if (!this.get('isEditable')) return NO ;
 
     var el = this.$(),
-        value = this.get('value') || '',
+        value = this.get('value'),
         f = SC.viewportOffset(el[0]),
         frameTemp = this.convertFrameFromView(this.get('frame'), null) ;
     f.width=frameTemp.width;

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('views/controls');

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals SC */
 

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals SC */
 

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals SC */
 

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals SC */
 

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 

data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_set.js

@@ -51,7 +51,7 @@ SC.ObserverSet = {
     // context is really useful sometimes but not used that often so this
     // implementation is intentionally lazy.
     if (context !== undefined) {
-      if (!methods.contexts) context = methods.contexts = {} ;
+      if (!methods.contexts) methods.contexts = {} ;
       methods.contexts[SC.guidFor(method)] = context ;
     }
 

data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js

@@ -782,6 +782,7 @@ function findClassNames() {
   SC._object_foundObjectClassNames = true ;
 
   var seen = [] ;
+  var detectedSC = false;
   var searchObject = function(root, object, levels) {
     levels-- ;
 
@@ -792,7 +793,12 @@ function findClassNames() {
     for(var key in object) {
       if (key == '__scope__') continue ;
       if (key == 'superclass') continue ;
+      if (key == '__SC__') key = 'SC' ;
       if (!key.match(/^[A-Z0-9]/)) continue ;
+      if (key == 'SC') {
+        if (detectedSC) continue;
+        detectedSC = true;
+      }
 
       var path = (root) ? [root,key].join('.') : key ;
       var value = object[key] ;
@@ -818,29 +824,18 @@ function findClassNames() {
     }
   } ;
 
+  // Fix for IE 7 and 8 in order to detect the SC global variable. When you create
+  // a global variable in IE, it is not added to the window object like in other
+  // browsers. Therefore the searchObject method will not pick it up. So we have to
+  // update the window object to have a reference to the global variable. And
+  // doing window['SC'] does not work since the global variable already exists. For
+  // any object that you create that is used act as a namespace, be sure to create it
+  // like so:
+  //
+  //   window.MyApp = window.MyApp || SC.Object.create({ ... })
+  //
+  window['__SC__'] = SC;
   searchObject(null, window, 2) ;
-
-  // Internet Explorer doesn't loop over global variables...
-  /*if ( SC.browser.isIE ) {
-    searchObject('SC', SC, 2) ; // get names for the SC classes
-
-    // get names for the model classes, including nested namespaces (untested)
-    for ( var i = 0; i < SC.Server.servers.length; i++ ) {
-      var server = SC.Server.servers[i];
-      if (server.prefix) {
-        for (var prefixLoc = 0; prefixLoc < server.prefix.length; prefixLoc++) {
-          var prefixParts = server.prefix[prefixLoc].split('.');
-          var namespace = window;
-          var namespaceName;
-          for (var prefixPartsLoc = 0; prefixPartsLoc < prefixParts.length; prefixPartsLoc++) {
-            namespace = namespace[prefixParts[prefixPartsLoc]] ;
-            namespaceName = prefixParts[prefixPartsLoc];
-          }
-          searchObject(namespaceName, namespace, 2) ;
-        }
-      }
-    }
-  }*/
 }
 
 /**  
@@ -875,7 +870,7 @@ SC.kindOf = function(scObject, scClass) {
   This method is used to allow classes to determine their own name.
 */
 SC._object_className = function(obj) {
-  if (!SC.isReady) return ''; // class names are not available until ready
+  if (SC.isReady === NO) return ''; // class names are not available until ready
   if (!obj._object_className) findClassNames() ;
   if (obj._object_className) return obj._object_className ;
 

data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/observable.js

@@ -550,6 +550,19 @@ test("should register an observer for a property - Special case of chained prope
   equals('chainedPropertyObserved',ObjectC.normal2);  
 });
 
+test("passing a context", function() {
+  var target = {
+    callback: function(target, key, nullVariable, context, revision) {
+      target.context = context;
+    }
+  };
+  
+  ObjectC.context = null;
+  ObjectC.addObserver('normal', target, 'callback', 'context');
+  ObjectC.set('normal','newValue');
+  
+  equals(ObjectC.context, 'context');
+});
 
 module("object.removeObserver()", {  
   setup: function() {

data/lib/sproutcore/builders/base.rb

@@ -48,15 +48,15 @@ module SC
       # joins the array of lines.  this is where you can also do any final
       # post-processing on the build
       def joinlines(lines)
-        lines * ""
+        lines.is_a?(Array) ? lines.join : lines
       end
 
       # writes the passed lines to the named file
       def writelines(dst_path, lines)
         FileUtils.mkdir_p(File.dirname(dst_path))
-        f = File.open(dst_path, 'w')
-        f.write joinlines(lines)
-        f.close
+        File.open(dst_path, 'w') do |f|
+          f.write joinlines(lines)
+        end
       end
 
       # Handles occurances of sc_static() or static_url()

data/lib/sproutcore/builders/javascript.rb

@@ -24,13 +24,6 @@ module SC
       end
     end
 
-    def writelines(dst_path, lines)
-      FileUtils.mkdir_p(File.dirname(dst_path))
-      File.open(dst_path, 'w') do |f|
-        f.write lines
-      end
-    end
-
     def build(dst_path)
       lines = ""
       target_name = entry.target[:target_name].to_s.sub(/^\//,'')

data/lib/sproutcore/builders/stylesheet.rb

@@ -26,13 +26,6 @@ module SC
       end
     end
 
-    def writelines(dst_path, lines)
-      FileUtils.mkdir_p(File.dirname(dst_path))
-      File.open(dst_path, 'w') do |f|
-        f.write lines
-      end
-    end
-
     def build(dst_path)
       code = rewrite_inline_code(readlines(entry[:source_path]))
       writelines dst_path, code

data/lib/sproutcore/rack/proxy.rb

@@ -5,7 +5,14 @@
 #            and contributors
 # ===========================================================================
 
-require 'net/https'
+begin
+  require 'net/https'
+  SC::HTTPS_ENABLED = true
+rescue LoadError => e
+  require 'net/http'
+  SC::HTTPS_ENABLED = false
+end
+
 module SC
   module Rack
 
@@ -30,6 +37,12 @@ module SC
       end
 
       def handle_proxy(proxy, proxy_url, env)
+        if proxy[:secure] && !SC::HTTPS_ENABLED
+          SC.logger << "~ WARNING: HTTPS is not supported on your system, using HTTP instead.\n"
+          SC.logger << "    If you are using Ubuntu, you can run `apt-get install libopenssl-ruby`\n"
+          proxy[:secure] = false
+        end
+
         origin_host = env['SERVER_NAME'] # capture the origin host for cookies
         http_method = env['REQUEST_METHOD'].to_s.downcase
         url = env['PATH_INFO']
@@ -50,7 +63,7 @@ module SC
         headers['Content-Length'] = env['CONTENT_LENGTH'] if env['CONTENT_LENGTH']
 
         http_host, http_port = proxy[:to].split(':')
-        http_port = '80' if http_port.nil?
+        http_port = proxy[:secure] ? '443' : '80' if http_port.nil?
 
         # added 4/23/09 per Charles Jolley, corrects problem
         # when making requests to virtual hosts
@@ -70,14 +83,16 @@ module SC
         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
+          http = ::Net::HTTP.new(http_host, http_port)
+
+          if proxy[:secure]
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
 
+          http.start do |web|
             if no_body_method.include?(http_method)
-              response = http.send(http_method, http_path, headers)
+              response = web.send(http_method, http_path, headers)
             else
               http_body = env['rack.input']
               http_body.rewind
@@ -86,13 +101,14 @@ module SC
                               true, true, http_path, headers
 
               some_request.body_stream = http_body
-              response = http.request(some_request)
+              response = web.request(some_request)
             end
           end
 
           status = response.code # http status code
+          protocol = proxy[:secure] ? 'https' : 'http'
 
-          SC.logger << "~ PROXY: #{http_method.upcase} #{status} #{url} -> http://#{http_host}:#{http_port}#{http_path}\n"
+          SC.logger << "~ PROXY: #{http_method.upcase} #{status} #{url} -> #{protocol}://#{http_host}:#{http_port}#{http_path}\n"
 
           # display and construct specific response headers
           response_headers = {}
@@ -120,15 +136,14 @@ module SC
             response_headers[key] = value
           end
 
-          if [301, 307].include?(status.to_i)
-            SC.logger << '~ REDIRECTING: '+response_headers['location']
+          if [301, 302, 303, 307].include?(status.to_i) && proxy[:redirect] != false
+            SC.logger << '~ REDIRECTING: '+response_headers['location']+"\n"
 
             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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Strobe, Inc., Sprout Systems, Inc.  Apple Inc. and contributors
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 -04:00
+date: 2010-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -228,7 +228,6 @@ extra_rdoc_files:
 - README.txt
 files: 
 - CHANGELOG
-- DISTRIBUTION.yml
 - Gemfile
 - History.txt
 - README.txt
@@ -1547,6 +1546,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/rect.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/credit_card.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/date.js
+- lib/frameworks/sproutcore/frameworks/foundation/tests/validators/not_empty.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/number.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/password.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/validator.js

data/DISTRIBUTION.yml

@@ -1,20 +0,0 @@
-# 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
-#
-# Note that if you are maintaining private versions of any of these 
-# frameworks you can also create a file called LOCAL.yml that can contain
-# any overrides to the distirbution info contained here.
-#
-
-frameworks/sproutcore:
-  repo: "git://github.com/sproutit/sproutcore.git"
-  branch: "master"
-  
-