embed config inheritance (no longer) supported (... for now)

Author: kares

src/main/java/org/jruby/rack/embed/Config.java

@@ -1,6 +1,25 @@
 /*
- * This source code is available under the MIT license.
- * See the file LICENSE.txt for details.
+ * The MIT License
+ *
+ * Copyright (c) 2013-2014 Karol Bucek LTD.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 package org.jruby.rack.embed;
 

src/main/java/org/jruby/rack/embed/Dispatcher.java

@@ -1,10 +1,10 @@
 /*
+ * Copyright (c) 2013-2014 Karol Bucek LTD.
  * Copyright (c) 2010-2012 Engine Yard, Inc.
  * Copyright (c) 2007-2009 Sun Microsystems, Inc.
  * This source code is available under the MIT license.
  * See the file LICENSE.txt for details.
  */
-
 package org.jruby.rack.embed;
 
 import java.io.IOException;
@@ -27,7 +27,7 @@ public class Dispatcher extends AbstractRackDispatcher {
 
     protected final IRubyObject application;
     private RackApplication rackApplication;
-    
+
     public Dispatcher(RackContext rackContext, IRubyObject application) {
         super(rackContext);
         this.application = application;
@@ -48,7 +48,7 @@ private void initialize() {
         // user code should use JRuby::Rack.context instead of $servlet_context
         runtime.getGlobalVariables().set("$servlet_context", rubyContext);
     }
-    
+
     @Override
     protected RackApplication getApplication() throws RackInitializationException {
         if (rackApplication == null) {
@@ -57,13 +57,13 @@ protected RackApplication getApplication() throws RackInitializationException {
         }
         return rackApplication;
     }
-    
+
     @Override
     public void destroy() {
         if (rackApplication != null) rackApplication.destroy();
         rackApplication = null;
     }
-    
+
     @Override
     protected void afterException(
             RackEnvironment env, Exception re,
@@ -77,5 +77,5 @@ protected void afterException(
     protected void afterProcess(RackApplication app) throws IOException {
         // NOOP
     }
-    
+
 }

src/main/java/org/jruby/rack/embed/Filter.java

@@ -1,10 +1,10 @@
 /*
+ * Copyright (c) 2013-2014 Karol Bucek LTD.
  * Copyright (c) 2010-2012 Engine Yard, Inc.
  * Copyright (c) 2007-2009 Sun Microsystems, Inc.
  * This source code is available under the MIT license.
  * See the file LICENSE.txt for details.
  */
-
 package org.jruby.rack.embed;
 
 import javax.servlet.FilterConfig;
@@ -17,7 +17,7 @@
 /**
  * There isn't anything particularly embedded about this filter
  * FIXME perhaps make this one the base implementation?
- * 
+ *
  * @author nick
  */
 public class Filter extends AbstractFilter {
@@ -44,5 +44,5 @@ protected RackDispatcher getDispatcher() {
     public void init(FilterConfig config) throws ServletException {
         // NOOP
     }
-    
+
 }

src/main/java/org/jruby/rack/embed/Servlet.java

@@ -1,10 +1,10 @@
 /*
+ * Copyright (c) 2013-2014 Karol Bucek LTD.
  * Copyright (c) 2010-2012 Engine Yard, Inc.
  * Copyright (c) 2007-2009 Sun Microsystems, Inc.
  * This source code is available under the MIT license.
  * See the file LICENSE.txt for details.
  */
-
 package org.jruby.rack.embed;
 
 import javax.servlet.ServletConfig;
@@ -38,5 +38,5 @@ protected RackDispatcher getDispatcher() {
     public void init(ServletConfig config) {
         // NOOP
     }
-    
+
 }

src/spec/ruby/rack/embed/config_spec.rb

@@ -1,6 +1,4 @@
-
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../..')
-require 'jruby'
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
 
 describe org.jruby.rack.embed.Config do
 
@@ -9,10 +7,10 @@
       java.lang.System.set_property "foo", "bar"
       java.lang.System.set_property "truish", "true"
       java.lang.System.set_property "falsish", "false"
-      
+
       subject.get_property('foo').should == 'bar'
       subject.get_property('foo', 'BAR').should == 'bar'
-      
+
       subject.get_boolean_property('truish').should == true
       subject.get_boolean_property('falsish', true).should == false
     ensure
@@ -22,47 +20,47 @@
     end
   end
 
-  it "honors properties from provided config if available" do
-    foo_config = org.jruby.rack.RackConfig.impl {}
-    def foo_config.getProperty(name, default = nil)
-      name == 'foo' ? 'bar' : default
-    end
-    
-    constructor = org.jruby.rack.embed.Config.java_class.to_java.
-      getDeclaredConstructor([ org.jruby.rack.RackConfig.java_class ].to_java :'java.lang.Class')
-    constructor.setAccessible(true)
-    config = constructor.newInstance(foo_config) # org.jruby.rack.embed.Config.new(foo_config)
-    
-    begin
-      java.lang.System.set_property "foo", "BAR"
-      java.lang.System.set_property "bar", "FOO"
-      
-      config.getProperty('some').should be nil
-      
-      config.getProperty('foo').should == 'bar'
-      config.getProperty('bar').should == 'FOO'
-    ensure
-      java.lang.System.clear_property "foo"
-      java.lang.System.clear_property "bar"
-    end
-  end
-  
+#  it "honors properties from provided config if available" do
+#    foo_config = org.jruby.rack.RackConfig.impl {}
+#    def foo_config.getProperty(name, default = nil)
+#      name == 'foo' ? 'bar' : default
+#    end
+#
+#    constructor = org.jruby.rack.embed.Config.java_class.to_java.
+#      getDeclaredConstructor([ org.jruby.rack.RackConfig.java_class ].to_java :'java.lang.Class')
+#    constructor.setAccessible(true)
+#    config = constructor.newInstance(foo_config) # org.jruby.rack.embed.Config.new(foo_config)
+#
+#    begin
+#      java.lang.System.set_property "foo", "BAR"
+#      java.lang.System.set_property "bar", "FOO"
+#
+#      config.getProperty('some').should be nil
+#
+#      config.getProperty('foo').should == 'bar'
+#      config.getProperty('bar').should == 'FOO'
+#    ensure
+#      java.lang.System.clear_property "foo"
+#      java.lang.System.clear_property "bar"
+#    end
+#  end
+
   context "initialized" do
-    
+
     before(:each) do
       @config = org.jruby.rack.embed.Config.new
       @config.doInitialize JRuby.runtime
     end
-    
+
     it "resolves properties from ENV" do
       begin
         ENV['env_foo'] = 'env_bar'
         ENV['env_true'] = 'true'
         ENV['env_false'] = 'false'
-        
+
         @config.get_property('env_foo').should == 'env_bar'
         @config.get_property('env_true').should == 'true'
-        
+
         @config.get_boolean_property('env_true').should == true
         @config.get_boolean_property('env_false').should == false
       ensure
@@ -76,38 +74,36 @@ def foo_config.getProperty(name, default = nil)
       begin
         ENV["jruby.rack.request.size.initial.bytes"] = '1024'
         ENV["jruby.rack.request.size.maximum.bytes"] = '4096'
-        
+
         @config.getInitialMemoryBufferSize.should == 1024
         @config.getMaximumMemoryBufferSize.should == 4096
       ensure
         ENV.delete("jruby.rack.request.size.initial.bytes")
         ENV.delete("jruby.rack.request.size.treshold.bytes")
       end
     end
-    
+
     it "sets compat version from runtime" do
-      if JRuby.runtime.is1_9
-        @config.compat_version.should == org.jruby.CompatVersion::RUBY1_9
-      else
-        @config.compat_version.should == org.jruby.CompatVersion::RUBY1_8
-      end
+      require 'jruby'
+      compat_version = JRuby.runtime.instance_config.compat_version
+      expect( @config.compat_version ).to eql compat_version
     end
-    
+
     it "sets out/err streams from runtime" do
       out = java.io.ByteArrayOutputStream.new
       err = java.io.ByteArrayOutputStream.new
       config = org.jruby.RubyInstanceConfig.new
       config.output = java.io.PrintStream.new(out)
       config.error  = java.io.PrintStream.new(err)
       @config.doInitialize org.jruby.Ruby.newInstance(config)
-      
+
       @config.getOut.println "hello out!"
       @config.getErr.println "hello err!"
-      
+
       out.toString.should == "hello out!\n"
       err.toString.should == "hello err!\n"
     end
 
   end
-  
+
 end

src/spec/ruby/rack/embed/context_spec.rb

@@ -1,11 +1,4 @@
-#--
-# Copyright (c) 2010-2012 Engine Yard, Inc.
-# Copyright (c) 2007-2009 Sun Microsystems, Inc.
-# This source code is available under the MIT license.
-# See the file LICENSE.txt for details.
-#++
-
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../..')
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
 
 describe org.jruby.rack.embed.Context do
   let(:stream) { java.io.ByteArrayOutputStream.new }
@@ -28,7 +21,7 @@
     context.log info, "this is logging at its best"
     captured.should == "INFO: this is logging at its best\n"
   end
-  
+
   it "outputs error log messages to stderr" do
     my_error = begin
       raise java.lang.RuntimeException.new "shizzle sticks"

src/spec/ruby/rack/embed/dispatcher_spec.rb

@@ -1,6 +1,4 @@
-
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../..')
-require 'jruby'
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
 
 describe org.jruby.rack.embed.Dispatcher do
 

src/spec/ruby/rack/embed/filter_spec.rb

@@ -1,11 +1,4 @@
-#--
-# Copyright (c) 2010-2012 Engine Yard, Inc.
-# Copyright (c) 2007-2009 Sun Microsystems, Inc.
-# This source code is available under the MIT license.
-# See the file LICENSE.txt for details.
-#++
-
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../..')
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
 
 describe org.jruby.rack.embed.Filter do