sproutcore 1.4.2-java → 1.4.3-java

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: java
 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 
@@ -215,7 +215,6 @@ extra_rdoc_files:
   - README.txt
 files: 
   - CHANGELOG
-  - DISTRIBUTION.yml
   - Gemfile
   - History.txt
   - README.txt
@@ -1537,6 +1536,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"
-  
-