calavera-tomcat-rails 0.1.1 → 0.1.2

data/HelloTomcat.java

@@ -0,0 +1 @@
+class HelloTomcat {}

data/Rakefile

@@ -16,28 +16,21 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_opts = ['--options', "spec/spec.opts"]
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_opts = ['--options', "spec/spec.opts"]
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/TODO.txt

@@ -3,5 +3,4 @@
 * Add tests!!!!!!!
 * Add rdocs
 * configure it from warbler
-* configure it from a config file
-* autoload of java libraries and classes
+* configure it from a config file

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/tomcat-rails/command_line_parser.rb

@@ -6,7 +6,9 @@ module TomcatRails
       default_options = {
         :port => '3000',
         :environment => 'development',
-        :context_path => '/', 
+        :context_path => '/',
+        :libs_dir => 'lib',
+        :classes_dir => 'classes'
       }
       
       parser = OptionParser.new do |opts|
@@ -28,6 +30,16 @@ module TomcatRails
           default_options[:context_path] = v
         end
         
+        opts.on('--lib', '--jars LIBS_DIR', 'Directory containing jars used by the application', 
+            "default: #{default_options[:libs_dir]}") do |v| 
+          default_options[:libs_dir] = v
+        end
+        
+        opts.on('--classes', '--classes CLASSES_DIR', 'Directory containing classes used by the application', 
+            "default: #{default_options[:classes_dir]}") do |v| 
+          default_options[:classes_dir] = v
+        end
+        
         opts.on('-v', '--version', 'display the current version') do
           puts File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
           exit

data/lib/tomcat-rails/server.rb

@@ -4,7 +4,7 @@ module TomcatRails
     @@defaults = {
       :environment => 'development',
       :context_path => '/',
-      :lib_dir => 'lib',
+      :libs_dir => 'lib',
       :classes_dir => 'classes',
       :port => 3000,
       :jruby_min_runtimes => 1,
@@ -12,63 +12,29 @@ module TomcatRails
     }
     
     def initialize(config = {})
-      @config = config.merge!(@@defaults)
+      @config = @@defaults.merge!(config)
+      @config[:web_app_dir] = Dir.pwd
       
       @tomcat = TomcatRails::Tomcat::Tomcat.new
-      @tomcat.setPort(@config[:port])
+      @tomcat.setPort(@config[:port].to_i)
       
-      web_app = @tomcat.addWebapp(@config[:context_path], Dir.pwd)
+      create_web_app      
+    end
+    
+    def create_web_app
+      web_app = WebApp.new(@tomcat.addWebapp(@config[:context_path].to_s, @config[:web_app_dir]), @config)
       
-      add_rack_filter(web_app, @config[:context_path])      
-      add_context_loader(web_app)
-      add_init_params(web_app)
-      add_web_dir_resources(web_app)
+      web_app.add_rack_filter
+      web_app.add_context_loader
+      web_app.add_init_params
+      web_app.add_web_dir_resources
       
-      web_app.addApplicationListener('org.jruby.rack.rails.RailsServletContextListener')
+      web_app.add_rack_context_listener
     end
 
     def start
       @tomcat.start
       @tomcat.getServer().await
     end
-   
-    private 
-    def add_rack_filter(web_app, context_path)
-      filter_def = TomcatRails::Tomcat::FilterDef.new
-      filter_def.setFilterName('RackFilter')
-      filter_def.setFilterClass('org.jruby.rack.RackFilter')
-      
-      pattern = context_path[-1..-1] != '/' ? context_path : context_path[0..-2]
-      filter_map = TomcatRails::Tomcat::FilterMap.new
-      filter_map.setFilterName('RackFilter')
-      filter_map.addURLPattern("#{pattern}/*")
-      
-      web_app.addFilterDef(filter_def)
-      web_app.addFilterMap(filter_map)
-    end
-    
-    def add_context_loader(web_app)
-      class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
-      loader = TomcatRails::Tomcat::WebappLoader.new(class_loader)
-
-      loader.container = web_app
-      web_app.loader = loader
-    end
-    
-    def add_init_params(web_app)
-      [:jruby_min_runtimes, :jruby_max_runtimes].each do |param|
-        web_app.addParameter(param.to_s.gsub(/_/, '.'), @config[param].to_s)
-      end
-      
-      web_app.addParameter('jruby.initial.runtimes', @config[:jruby_min_runtimes].to_s)
-      web_app.addParameter('rails.env', @config[:environment].to_s)
-      web_app.addParameter('rails.root', '/')
-      web_app.addParameter('public.root', '/public')
-      
-    end
-    
-    def add_web_dir_resources(web_app)
-      web_app.setDocBase(File.join(Dir.pwd, "public/"))
-    end
   end
 end

data/lib/tomcat-rails/web_app.rb

@@ -0,0 +1,68 @@
+module TomcatRails
+  class WebApp
+    attr_reader :web_app, :config
+    
+    def initialize(web_app, config)
+      @web_app = web_app
+      @config = config
+    end
+    
+    def add_rack_filter
+      filter_def = TomcatRails::Tomcat::FilterDef.new
+      filter_def.setFilterName('RackFilter')
+      filter_def.setFilterClass('org.jruby.rack.RackFilter')
+      
+      pattern = @config[:context_path][-1..-1] != '/' ? @config[:context_path] : @config[:context_path][0..-2]
+      filter_map = TomcatRails::Tomcat::FilterMap.new
+      filter_map.setFilterName('RackFilter')
+      filter_map.addURLPattern("#{pattern}/*")
+      
+      @web_app.addFilterDef(filter_def)
+      @web_app.addFilterMap(filter_map)
+    end
+    
+    def add_context_loader
+      class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
+      add_application_libs(class_loader)
+      add_application_classes(class_loader)
+      
+      loader = TomcatRails::Tomcat::WebappLoader.new(class_loader)
+
+      loader.container = @web_app
+      @web_app.loader = loader
+    end
+    
+    def add_init_params
+      [:jruby_min_runtimes, :jruby_max_runtimes].each do |param|
+        @web_app.addParameter(param.to_s.gsub(/_/, '.'), @config[param].to_s)
+      end
+      
+      @web_app.addParameter('jruby.initial.runtimes', @config[:jruby_min_runtimes].to_s)
+      @web_app.addParameter('rails.env', @config[:environment].to_s)
+      @web_app.addParameter('rails.root', '/')
+      @web_app.addParameter('public.root', '/public')
+      
+    end
+    
+    def add_web_dir_resources
+      @web_app.setDocBase(File.join(Dir.pwd, "public/"))
+    end
+    
+    def add_rack_context_listener
+      @web_app.addApplicationListener('org.jruby.rack.rails.RailsServletContextListener')
+    end
+    
+    def add_application_libs(class_loader)
+      resources_dir = File.join(@config[:web_app_dir], @config[:libs_dir], '**', '*.jar')
+      
+      Dir[resources_dir].each do |resource|
+        class_loader.addURL(java.io.File.new(resource).to_url)
+      end
+    end
+    
+    def add_application_classes(class_loader)
+      resources_dir = File.join(@config[:web_app_dir], @config[:classes_dir])
+      class_loader.addURL(java.io.File.new(resources_dir).to_url)
+    end
+  end
+end

data/lib/tomcat-rails.rb

@@ -7,6 +7,7 @@ require 'rubygems'
 require 'tomcat-rails/command_line_parser'
 require 'tomcat-rails/jars'
 require 'tomcat-rails/server'
+require 'tomcat-rails/web_app'
 
 module TomcatRails
   TOMCAT_LIBS = File.dirname(__FILE__) + "/../tomcat-libs" unless defined?(TOMCAT_LIBS)

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--colour
+--format specdoc

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+begin
+  require 'spec'
+rescue LoadError
+  require 'rubygems'
+  gem 'rspec'
+  require 'spec'
+end
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__) + '/../tomcat-libs')
+
+require 'java'
+require 'tomcat-rails'

data/spec/tomcat-rails/command_line_parser_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe TomcatRails::CommandLineParser do
+  it "should override classes option" do
+    ARGV = "--classes my_classes".split
+    
+    options = TomcatRails::CommandLineParser.parse
+    options[:classes_dir].should == 'my_classes'
+  end
+  
+  it "should override libs option with lib option" do
+    ARGV = "--lib my_libs".split
+    
+    options = TomcatRails::CommandLineParser.parse
+    options[:libs_dir].should == 'my_libs'
+  end
+  
+  it "should override libs option with jar option" do
+    ARGV = "--jars my_jars".split
+    
+    options = TomcatRails::CommandLineParser.parse
+    options[:libs_dir].should == 'my_jars'
+  end
+end

data/spec/tomcat-rails/web_app_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe TomcatRails::WebApp do
+  before do
+    tomcat = TomcatRails::Tomcat::Tomcat.new
+    tomcat_web_app = tomcat.addWebapp('/', File.dirname(__FILE__) + '/../../')
+    config = { 
+      :libs_dir => 'lib',
+      :classes_dir => 'classes',
+      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock') 
+    }
+    @web_app = TomcatRails::WebApp.new(tomcat_web_app, config)
+  end
+  
+  it "should load custom jars" do 
+    class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
+    @web_app.add_application_libs(class_loader)
+    
+    resource = class_loader.find_class('org.ho.yaml.Yaml')
+    resource.should_not == nil
+  end
+
+  it "should load custom classes" do
+    class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
+    @web_app.add_application_classes(class_loader)
+    
+    resource = class_loader.find_class('HelloTomcat')
+    resource.should_not == nil    
+  end
+  
+end

data/tomcat-rails.gemspec

@@ -0,0 +1,73 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{tomcat-rails}
+  s.version = "0.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["David Calavera"]
+  s.date = %q{2009-06-13}
+  s.default_executable = %q{tomcat_rails}
+  s.email = %q{david.calavera@gmail.com}
+  s.executables = ["tomcat_rails"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "HelloTomcat.java",
+     "History.txt",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "TODO.txt",
+     "VERSION",
+     "bin/tomcat_rails",
+     "lib/tomcat-rails.rb",
+     "lib/tomcat-rails/command_line_parser.rb",
+     "lib/tomcat-rails/jars.rb",
+     "lib/tomcat-rails/server.rb",
+     "lib/tomcat-rails/web_app.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/tomcat-rails/web_app_spec.rb",
+     "spec/web_app_mock/classes/HelloTomcat.class",
+     "spec/web_app_mock/lib/jyaml-1.3.jar",
+     "tomcat-libs/core-3.1.1.jar",
+     "tomcat-libs/jasper-el.jar",
+     "tomcat-libs/jasper-jdt.jar",
+     "tomcat-libs/jasper.jar",
+     "tomcat-libs/jetty-util-6.1.14.jar",
+     "tomcat-libs/jruby-rack-0.9.4.jar",
+     "tomcat-libs/jsp-2.1.jar",
+     "tomcat-libs/jsp-api-2.1.jar",
+     "tomcat-libs/servlet-api-2.5-6.1.14.jar",
+     "tomcat-libs/tomcat-core.jar",
+     "tomcat-libs/tomcat-dbcp.jar",
+     "tomcat-libs/tomcat-jasper.jar",
+     "tomcat-rails.gemspec"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/calavera/tomcat-rails}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.2}
+  s.summary = %q{Simple library to run a rails application into an embed Tomcat}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/tomcat-rails/command_line_parser_spec.rb",
+     "spec/tomcat-rails/web_app_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: calavera-tomcat-rails
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Calavera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-11 00:00:00 -07:00
+date: 2009-06-13 00:00:00 -07:00
 default_executable: tomcat_rails
 dependencies: []
 
@@ -25,6 +25,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- HelloTomcat.java
 - History.txt
 - LICENSE
 - README.rdoc
@@ -36,8 +37,12 @@ files:
 - lib/tomcat-rails/command_line_parser.rb
 - lib/tomcat-rails/jars.rb
 - lib/tomcat-rails/server.rb
-- test/test_helper.rb
-- test/tomcat-rails_test.rb
+- lib/tomcat-rails/web_app.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/tomcat-rails/web_app_spec.rb
+- spec/web_app_mock/classes/HelloTomcat.class
+- spec/web_app_mock/lib/jyaml-1.3.jar
 - tomcat-libs/core-3.1.1.jar
 - tomcat-libs/jasper-el.jar
 - tomcat-libs/jasper-jdt.jar
@@ -50,6 +55,7 @@ files:
 - tomcat-libs/tomcat-core.jar
 - tomcat-libs/tomcat-dbcp.jar
 - tomcat-libs/tomcat-jasper.jar
+- tomcat-rails.gemspec
 has_rdoc: true
 homepage: http://github.com/calavera/tomcat-rails
 post_install_message: 
@@ -77,5 +83,6 @@ signing_key:
 specification_version: 3
 summary: Simple library to run a rails application into an embed Tomcat
 test_files: 
-- test/test_helper.rb
-- test/tomcat-rails_test.rb
+- spec/spec_helper.rb
+- spec/tomcat-rails/command_line_parser_spec.rb
+- spec/tomcat-rails/web_app_spec.rb

data/test/test_helper.rb

@@ -1,11 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__) + '/../jetty-libs')
-
-require 'tomcat-rails'
-
-class Test::Unit::TestCase
-end

data/test/tomcat-rails_test.rb

@@ -1,5 +0,0 @@
-require 'test_helper'
-
-class TomcatRailsTest < Test::Unit::TestCase
-  
-end