sproutcore 0.9.19 → 0.9.20

data/Manifest.txt

@@ -19,7 +19,6 @@ clients/sc_docs/english.lproj/no_docs.rhtml
 clients/sc_docs/english.lproj/strings.js
 clients/sc_docs/english.lproj/tabs.rhtml
 clients/sc_docs/fixtures/doc.js
-clients/sc_docs/french.lproj/strings.js
 clients/sc_docs/HISTORY
 clients/sc_docs/main.js
 clients/sc_docs/models/doc.js

data/bin/sc-server

@@ -9,7 +9,7 @@ $:.unshift File.join(APP_ROOT,'lib') ;
 # Require Merb, SproutCore & SproutCore/Merb support
 require 'rubygems'
 require 'rubigen'
-gem('merb-core', '>= 0.9.1')
+gem('merb-core', '>= 0.9.9')
 require 'merb-core'
 require 'sproutcore'
 require 'sproutcore/merb'
@@ -21,23 +21,23 @@ require 'sproutcore/merb'
 ## Setup Default Options
 ##
 
-begin
-  require 'thin'
-  server_kind = 'thin'
-rescue LoadError
-  server_kind = 'mongrel'
-end
+unless ARGV.index('-a') || ARGV.index('--adapter') || ARGV.index('-i') || ARGV.index('--irb-console')
+  begin
+    require 'thin'
+    server_kind = 'thin'
+  rescue LoadError
+    server_kind = 'mongrel'
+  end
 
-unless ARGV.index('-a') || ARGV.index('-i')
-  ARGV.push *['-a', server_kind]
+  ARGV.push *['--adapter', server_kind]
 end
 
 # Make BlueRibbon run on a different port by default
-unless ARGV.index('-p')
-  ARGV.push *%w[-p 4020]
+unless ARGV.index('-p') || ARGV.index('--port')
+  ARGV.push *%w[--port 4020]
 end
 
-unless ARGV.index('--merb-root')
+unless ARGV.index('-m') || ARGV.index('--merb-root')
   ARGV.push "--merb-root=#{SC.library.root_path}"
 end
 
@@ -45,27 +45,36 @@ end
 ## Configure Merb
 ##
 
-Merb::Router.prepare { |r| r.connect_clients('/') }
-Merb::Config.use { |c|
-  c[:framework]           = {},
-  c[:session_store]       = 'none',
-  c[:exception_details]   = true,
-  c[:reload_classes]      = false,
-  c[:use_mutex]           = false,
-  c[:log_auto_flush]      = true
-}
+class Sproutcore::BootLoader < Merb::BootLoader
+  def self.run
+    Merb::Router.prepare { |r| r.connect_clients('/') }
+
+    Merb::Config.use { |c|
+      c[:framework]           = {}
+      c[:session_store]       = 'none'
+      c[:exception_details]   = true
+      c[:reload_classes]      = false
+      c[:use_mutex]           = false
+      c[:log_auto_flush]      = true
+      c[:log_level]           = :warn
+      c[:disabled_components] = [:initfile]
+    }
+  end
+end
+Sproutcore::BootLoader.before(Merb::BootLoader::Dependencies)
 
 ############################################################
 ## Register Exception Handler
 ##
 
-# required in 0.9.5-0.9.7, when defining an exception controller
-class Application < Merb::Controller ; end
-
 class Exceptions < Merb::Controller
   def base
     params[:exception].to_s
   end
+
+  def not_found
+    return "<h1>404</h1>NOT FOUND"
+  end
 end
 
 ############################################################

data/clients/sc_docs/english.lproj/body.css

@@ -16,7 +16,27 @@ body {
 	overflow: hidden ;
 }
 
+.workspace .sidebar {
+	position: absolute;
+	left:  0;
+	top:  0;
+	width: 200px;
+	bottom: 0;
+}
+
+.sc-theme .workspace.horizontal .sc-split-divider-view {
+  position: absolute;
+  left: 200px;
+  top: 0;
+  bottom: 0;
+}
+
 .workspace .document_view {
+	position: absolute;	
+	left: 205px;
+	right: 0;
+	top: 0;
+	bottom: 0;
 	border: none ;
 	background-color: #aaa ;
 }

data/clients/sc_docs/english.lproj/body.rhtml

@@ -15,7 +15,7 @@
 
 
 <% split_view :workspace, :class => 'sc-app-workspace header footer', :direction => :horizontal do %>  
-  <% view :sidebar, :outlet => true, :width => 200 do %>
+  <% view :sidebar, :outlet => true do %>
     <% scroll_view :source_list, :outlet => true do %>
       <%= source_list_view :outlet => true, 
         :content_value_key => :title,
@@ -31,6 +31,8 @@
     <% end %>
   <% end %>
   
+  <%= split_divider_view :outlet => true, :width => 5 %>
+  
   <%= tab_view :document_view, :outlet => true, 
     :bind => { :now_showing => 'Docs.docsController.nowShowingContainer' }, 
     :lazy_tabs => :true %>

data/clients/sc_docs/english.lproj/strings.js

@@ -9,6 +9,6 @@
 // localized string added to this file!
 //
 Object.extend(String.English,{
-  "_English": "English"
+  // "_String Key": "Localized String"
 }) ;
 

data/clients/sc_test_runner/english.lproj/body.css

@@ -16,7 +16,27 @@ body {
 	overflow: hidden ;
 }
 
+.workspace .sidebar {
+	position: absolute;
+	left:  0;
+	top:  0;
+	width: 200px;
+	bottom: 0;
+}
+
+.sc-theme .workspace.horizontal .sc-split-divider-view {
+  position: absolute;
+  left: 200px;
+  top: 0;
+  bottom: 0;
+}
+
 .workspace .document_view {
+	position: absolute;	
+	left: 205px;
+	right: 0;
+	top: 0;
+	bottom: 0;
 	border: none ;
 	background-color: #aaa ;
 }

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

@@ -16,7 +16,7 @@
 
 
 <% split_view :workspace, :class => 'sc-app-workspace header footer', :direction => :horizontal do %>  
-  <% view :sidebar, :outlet => true, :width => 200 do %>
+  <% view :sidebar, :outlet => true do %>
     <% scroll_view :source_list, :outlet => true do %>
       <%= source_list_view :outlet => true, 
         :group => :group,
@@ -30,6 +30,8 @@
         
     <% end %>
   <% end %>
+  
+  <%= split_divider_view :outlet => true, :width => 5 %>
 
   <% view :document_view, :outlet => true do %>
     <%= view :outlet => :runner_frame, :tag => :iframe, 

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

@@ -2,5 +2,4 @@
   <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

@@ -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 = [['merb-core', '>= 0.9.9'], ['erubis'], ['rubigen'], ['mongrel'], ['hoe']]
 
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 

data/lib/sproutcore/merb/bundle_controller.rb

@@ -27,7 +27,6 @@ module SproutCore
       def main
 
         self.reset_current_bundle
-        puts current_bundle
         
         # Before we do anything, set the build_mode for the bundles.  This
         # shouldn't change during execution, but if we set this during the

data/lib/sproutcore/merb.rb

@@ -15,8 +15,8 @@
 
 # Load Merb if it is available
 begin
-  gem('merb-core', '>= 0.9.1')
+  gem('merb-core', '>= 0.9.9')
   Dir.glob(File.join(File.dirname(__FILE__),'merb','**','*.rb')).each { |x| require(x) }
 rescue LoadError
-  puts "WARNING: sproutcore/merb requires Merb 0.9.1 or later. Earlier releases are not supported. Module was not loaded."
+  puts "WARNING: sproutcore/merb requires Merb 0.9.9 or later. Earlier 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  = 19
+    TINY  = 20
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.19
+  version: 0.9.20
 platform: ruby
 authors: 
 - Charles Jolley, Erich Ocean
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-30 00:00:00 -07:00
+date: 2008-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
   type: :runtime
@@ -30,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -116,7 +106,6 @@ files:
 - clients/sc_docs/english.lproj/strings.js
 - clients/sc_docs/english.lproj/tabs.rhtml
 - clients/sc_docs/fixtures/doc.js
-- clients/sc_docs/french.lproj/strings.js
 - clients/sc_docs/HISTORY
 - clients/sc_docs/main.js
 - clients/sc_docs/models/doc.js

data/clients/sc_docs/french.lproj/strings.js

@@ -1,14 +0,0 @@
-// ==========================================================================
-// Docs French Strings
-// ==========================================================================
-
-// Place strings you want to localize here.  In your app, use the key and 
-// localize it using "key string".loc().  HINT: For your key names, use the
-// english string with an underscore in front.  This way you can still see
-// how your UI will look and you'll notice right away when something needs a
-// localized string added to this file!
-//
-Object.extend(String.English,{
-  "_English": "French"
-}) ;
-