sproutcore 0.9.16 → 0.9.17

data/History.txt

@@ -1,3 +1,8 @@
+== 0.9.17
+
+* Fix for Ticket [158]: Fix requirements to load correct version of merb (Paul Barry)
+* Fix for Ticket [124]: Proxy doesn't forward GET params with merb 0.9.4 (Lawrence Pit)
+
 == 0.9.16
 
 * Added requirement for hoe when installing.

data/clients/sc_test_runner/english.lproj/no_tests.rhtml

@@ -2,4 +2,5 @@
   <h1>Client Has No Tests</h1>
   <p style="font-size: 15px;">This client does not currently have any unit tests.  To add a unit test, open a terminal to the root directly and type:</p>
   <p style="font-size: 15px; text-align:center;"><code>./script/generate sc_test <%= label_view :outlet => true, :tag => 'span', :bind => { :content => 'TestRunner.runnerController.clientName' } %>/<b>test_name</b></code></p>
+  </div>
 <% end %>

data/config/hoe.rb

@@ -1,7 +1,7 @@
 require 'sproutcore/version'
 
-AUTHOR = 'Charles Jolley'  # can also be an array of Authors
-EMAIL = "charles@sproutit.com"
+AUTHOR = "Charles Jolley, Erich Ocean"  # can also be an array of Authors
+EMAIL = 'charles@sproutit.com, erich@atlasocean.com'
 DESCRIPTION = "SproutCore - JavaScript Application Framework + Build Tools"
 GEM_NAME = 'sproutcore' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'sproutcore' # The unix name for your project
@@ -60,7 +60,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
 
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [['activesupport', '>= 2.0.2'], ['merb-core', '>= 0.9.1'], ['erubis'], ['rubigen'], ['mongrel'], ['hoe']]
+  p.extra_deps = [['activesupport', '>= 2.0.2'], ['merb-core', '>= 0.9.1', '< 0.9.5'], ['erubis'], ['rubigen'], ['mongrel'], ['hoe']]
 
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 

data/frameworks/sproutcore/HISTORY

@@ -1,3 +1,7 @@
+== sproutcore 0.9.17
+
+* Fix require()'s for server/rest_server.js and server/rails_server.js
+
 == sproutcore 0.9.15
 
 - Added titleize() helper for Strings.  Also imported various other helpers

data/frameworks/sproutcore/server/rails_server.js

@@ -3,7 +3,7 @@
 // copyright 2006-2008 Sprout Systems, Inc.
 // ========================================================================
 
-require('core') ;
+require('server/rest_server') ;
 
 /**
   @class

data/frameworks/sproutcore/server/rest_server.js

@@ -3,8 +3,7 @@
 // copyright 2006-2008 Sprout Systems, Inc.
 // ========================================================================
 
-require('core') ;
-require('server') ;
+require('server/server') ;
 
 /** 
   @class

data/lib/sproutcore/merb/bundle_controller.rb

@@ -46,6 +46,9 @@ module SproutCore
           url = request.uri
           proxy_url, proxy_opts = library.proxy_url_for(url)
           if proxy_url
+            unless request.query_string.length == 0
+              proxy_url = proxy_url + "?" + request.query_string
+            end
             return handle_proxy(url, proxy_url, proxy_opts)
           else
             raise(NotFound, "No SproutCore Bundle registered at this location.")

data/lib/sproutcore/merb.rb

@@ -15,13 +15,8 @@
 
 # Load Merb if it is available
 begin
-  require('merb-core')
-rescue LoadError
-end
-
-# Load SproutCore Merb support if Merb meets minimum criteria
-if defined?(Merb) && defined?(Merb::VERSION) && (Merb::VERSION.to_f >= 0.9)
+  gem('merb-core', '>= 0.9.1', '< 0.9.5')
   Dir.glob(File.join(File.dirname(__FILE__),'merb','**','*.rb')).each { |x| require(x) }
-else
-  puts "WARNING: sproutcore/merb required Merb 0.9.1 or later.  Module was not loaded."
-end
+rescue LoadError
+  puts "WARNING: sproutcore/merb requires Merb 0.9.1 through 0.9.4. Earlier and later releases are not supported. Module was not loaded."
+end

data/lib/sproutcore/version.rb

@@ -2,7 +2,7 @@ module SproutCore #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 16
+    TINY  = 17
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors: 
-- Charles Jolley
+- Charles Jolley, Erich Ocean
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.9.1
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -74,7 +77,7 @@ dependencies:
     version: 
 description: SproutCore - JavaScript Application Framework + Build Tools
 email: 
-- charles@sproutit.com
+- charles@sproutit.com, erich@atlasocean.com
 executables: 
 - sc-build
 - sc-gen