ropenlaszlo 0.3.0 → 0.4.0

data/doc/CHANGES

@@ -1,17 +1,23 @@
 = Change Log
 
+== Version 0.4.0 (2006/01/19)
+* new feature: command-line compiler detects compilation warnings
+* bug fix: command-line compilation in qualified directory places object in same directory
+* improve rdoc
+* refactored unit tests
+
 == Version 0.3.0 (2006/01/16)
-* compilation errors and warnings
+* New feature: compilation errors and warnings
+* Bug fix: --output doesn't exist; --dir does
 * refactored test case setup
 * fixed test case directory
-* added rdoc task
-* --output doesn't exist; --dir does
+* Rakefile: added rdoc task
 * Updated installation instructions
 * Fixed rdoc formatting errors
 
 == Version 0.2.0 (2006/01/11)
 * Released as gem
-* Published to rubyforge
+* Moved to rubyforge
 * Added doc directory
 * Added test directory
 * Added examples directory

data/doc/README

@@ -1,8 +1,10 @@
-= ROpenLaszlo Interface to the OpenLaszlo Platform
+= ROpenLaszlo: Interface to the OpenLaszlo compiler
 
-ROpenLaszo is a Ruby interface to the OpenLaszlo[http://openlaszlo.org] platform for creating rich internet applicatons.  It allows you to compile OpenLaszlo[http://openlaszlo.org] programs from within Ruby, in order to integrate OpenLaszlo[http://openlaszlo.org] development into Rake or Rails applications.
+ROpenLaszo is a Ruby interface to the OpenLaszlo[openlaszlo.org] compiler.  It allows you to compile Open<tt></tt>Laszlo programs from within Ruby, in order to integrate Open<tt></tt>Laszlo development into Rake or Rails applications.
 
-OpenLaszlo[http://openlaszlo.org] programs are written in XML with embedded JavaScript, and compiled into Flash (swf) binary files, or DHTML.  (As of this writing, the DHTML target is in pre-beta form.)  The APIs in this library make it easy for Ruby code to invoke the OpenLaszlo[http://openlaszlo.org] compiler.  For example, if hello.lzx contains the following text:
+If you are using Open<tt></tt>Laszlo with Ruby on Rails, you probably want the {OpenLaszlo Rails plugin}[laszlo-plugin.rubyforge.org] instead.
+
+OpenLaszlo[openlaszlo.org] programs are written in XML with embedded JavaScript, and compiled into Flash (swf) binary files, or DHTML.  (As of this writing, the DHTML target is in pre-beta form.)  The APIs in this library make it easy for Ruby code to invoke the Open<tt></tt>Laszlo compiler.  For example, if hello.lzx contains the following text:
   <canvas>
     <window>
       <button>Hello, World!</button>
@@ -13,28 +15,42 @@ then the following Ruby code can be used to create a file 'hello.swf' which can
   require 'ropenlaszlo'
   OpenLaszlo::compile 'hello.lzx'
 
+You can turn this into a Rake task that will compile any Open<tt></tt>Laszlo source file:
+  rule '.swf' => '.lzx' do |t|
+    puts "Compiling #{t.source} => #{t.name}" if verbose
+    OpenLaszlo::compile t.source, :output => t.name
+  end
+
 == Requirements
 
-* {OpenLaszlo 3.1 or later}[http://openlaszlo.org]
+* {OpenLaszlo 3.1 or later}[openlaszlo.org]
 * Ruby -v 1.8.2 or later (untested in earlier versions)
-* RubyGems[http://rubygems.rubyforge.org]
+* RubyGems[rubygems.rubyforge.org]
 
 == Installation
 
-0:: Download and install {OpenLaszlo}[http://openlaszlo.org]
+0:: Download and install the {OpenLaszlo SDK}[openlaszlo.org]
 
 1: Install this gem
   > gem install ropenlaszlo
 
-2:: Set your +OPENLASZLO_HOME+ environment variable to the directory that contains the {OpenLaszlo SDK}[http://openlaszlo.org].  If the following prints something, you've got it right:
+2:: Set your +OPENLASZLO_HOME+ environment variable to the directory that contains the {OpenLaszlo SDK}[openlaszlo.org].  If the following prints something, you've got it right:
   > grep Laszlo "$OPENLASZLO_HOME/README.txt"
 
-== Documentation
+3:: (Optional)  Set your +OPENLASZLO_URL+ environment variable to the web location of the Open<tt></tt>Laszlo server; for example, <tt>http</tt><tt>://localhost:8080/lps-3.1</tt>.  If you omit this step, the module will use the command line compiler, which is slower but is not limited to compiling files inside of +OPENLASZLO_HOME+.
+
+== Additional Resources
+
+* The {OpenLaszlo web site}[openlaszlo.org] is a rich source of information about the Open<tt></tt>Laszlo platform.  It includes links to the wiki, mailing lists, and forums.
+
+* The {Laszlo on Rails}[groups.google.com/group/laszlo-on-rails] news group discusses the integration of Open<tt></tt>Laszlo with Ruby on Rails.
+
+* The {OpenLaszlo Rails plugin}[laszlo-plugin.rubyforge.org] provides generators and scaffolding for using Open<tt></tt>Laszlo with Ruby on Rails.
 
-{This OpenLaszlo Blog entry}[http://weblog.openlaszlo.org/archives/2006/01/deploying-openlaszlo-applications-with-rake/] has additional information and some examples of using ROpenLaszlo in a Rakefile.
+* {This OpenLaszlo Blog entry}[weblog.openlaszlo.org/archives/2006/01/deploying-openlaszlo-applications-with-rake/] has additional information and some examples of using ROpenLaszlo in a Rakefile.
 
 == License
 
 ROpenLaszlo is copyright (c) 2006 Oliver Steele.  It is open-source software, and may be redistributed
-under the terms of the MIT license. The text of this licences is included in the
+under the terms of the MIT license. The text of this licence is included in the
 ROpenLaszlo distribution, under the +doc+ subdirectory.

data/doc/TODO

@@ -1,10 +1,12 @@
 = ROpenLaszlo Project -- To Do List
 
-== Compiler
-* Dependency tracking
-* Compile server: allow use of proxy
+== Features
+* Add rake task file
+* Compile server: allow use of proxy?
 * Compile server: temporarily copy files into webapp directory
-* Command line: detect compilation warnings
+* compile_string
+* Dependency tracking
+* query compiler version
 
 == Unit Tests
 * Compiler parameters
@@ -12,6 +14,8 @@
 * Unreachable server
 * Invalid OPENLASZLO_HOME
 
-== Packaging
-* Add rake task file
-* Add unit testing, doc generation to rakefile
+== Corners
+* invalid parameters
+* server isn't running
+* thinks lps-dev/foo is in lps/ directory
+

data/lib/compiler.rb

@@ -1,33 +1,11 @@
 # Author:: Oliver Steele
 # Copyright:: Copyright (c) 2005-2006 Oliver Steele.  All rights reserved.
 # License:: Ruby License.
-#
-# This module contains utility methods for compiling OpenLaszlo[http://openlaszlo.org] programs.  See the OpenLaszlo module documentation for usage information.
-# 
-#--
-# Bugs:
-# - syntax error compiles swf anyway
-#
-# Todo:
-# - unit tests
-# - doc :profile
-#
-# Wishlist:
-# - compile_string
-# - detect compiler version
-# - select compiler based on file location; or, copy files
-# - retrieve dependencies
-# - retrieve compiler warnings
-#
-# Corners:
-# - detect invalid parameters
-# - server isn't running
-# - lps-dev/foo isn't inside lps
-
  
 # == module OpenLaszlo
 # 
-# This module contains utility methods for compiling OpenLaszlo[http://openlaszlo.org] programs.
+# This module contains utility methods for compiling
+# OpenLaszlo[openlaszlo.org] programs.
 #
 # Example:
 #   # Set up the environment to use the compile server.  The OpenLaszlo server
@@ -49,28 +27,29 @@ module OpenLaszlo
   # If you don't need multiple compilers, you can use the methods in
   # the OpenLaszlo module instead.
   #
-  # The compile server is faster than CommandLineCompiler, but can only compile
-  # files in the same directory as the {OpenLaszlo SDK}[http://openlaszlo.org].
+  # CompileServer is faster than CommandLineCompiler, but can only compile
+  # files in the same directory as the Open<tt></tt>Laszlo SDK.
   class CompileServer
     # Options:
-    # * <tt>:openlaszlo_home</tt> - filesystem location of the OpenLaszlo SDK.  Defaults to EVN['OPENLASZLO_HOME']
+    # * <tt>:openlaszlo_home</tt> - filesystem location of the Open<tt></tt>Laszlo SDK.  Defaults to EVN['OPENLASZLO_HOME']
     # * <tt>:server_uri</tt> - the URI of the server.  Defaults to ENV['OPENLASZLO_URL'] if this is specified, otherwise to 'http://localhost:8080/lps-dev'.
-    def initialize params={}
-      @home = params[:home] || ENV['OPENLASZLO_HOME']
-      @base_url = params[:server_uri] || ENV['OPENLASZLO_URL'] || 'http://localhost:8080/lps-dev'
+    def initialize options={}
+      @home = options[:home] || ENV['OPENLASZLO_HOME']
+      @base_url = options[:server_uri] || ENV['OPENLASZLO_URL'] || 'http://localhost:8080/lps-dev'
     end
     
-    # Invokes the OpenLaszlo server-based compiler on +source_file+.
-    # +source_file+ must be inside the home directory of the server.
-    # See OpenLaszlo.compile for a description of the +params+.
+    # Invokes the Open<tt></tt>Laszlo server-based compiler on
+    # +source_file+.  +source_file+ must be inside the home directory
+    # of the server.
     #
-    # Additional options:
+    # Options:
     # * <tt>:format</tt> - request type (default 'swf')
-    def compile source_file, params={}
+    # See OpenLaszlo.compile for a description of +options+.
+    def compile source_file, options={}
       mtime = File.mtime source_file
-      output = params[:output] || "#{File.basename source_file, '.lzx'}.swf"
-      compile_object source_file, output, params
-      results = request_metadata_for source_file, params
+      output = options[:output] || "#{File.expand_path(File.join(File.dirname(source_file), File.basename(source_file, '.lzx')))}.swf"
+      compile_object source_file, output, options
+      results = request_metadata_for source_file, options
       raise "Race condition: #{source_file} was modified during compilation" if mtime != File.mtime(source_file)
       results[:output] = output
       raise CompilationError.new(results[:error]) if results[:error]
@@ -78,15 +57,15 @@ module OpenLaszlo
     end
     
     private
-    def compile_object source_file, object, params={}
-      params = {}.update(params).update(:output => object)
-      request source_file, params
+    def compile_object source_file, object, options={}
+      options = {}.update(options).update(:output => object)
+      request source_file, options
     end
     
-    def request_metadata_for source_file, params={}
+    def request_metadata_for source_file, options={}
       results = {}
-      params = {}.update(params).update(:format => 'canvas-xml', :output => nil)
-      text = request source_file, params
+      options = {}.update(options).update(:format => 'canvas-xml', :output => nil)
+      text = request source_file, options
       if text =~ %r{<warnings>(.*?)</warnings>}m
         results[:warnings] = $1.scan(%r{<error>\s*(.*?)\s*</error>}m).map{|w|w.first}
       elsif text !~ %r{<canvas>} && text =~ %r{<pre>Error:\s*(.*?)\s*</pre>}m
@@ -95,7 +74,8 @@ module OpenLaszlo
       return results
     end
     
-    def request source_file, params={}
+    def request source_file, options={}
+      output = options[:output]
       require 'net/http'
       require 'uri'
       # assert that pathname is relative to LPS home:
@@ -105,12 +85,11 @@ module OpenLaszlo
       # FIXME: this doesn't handle quoting; use recursive File.split instead
       # FIXME: should encode the url, for filenames that include '/'
       server_relative_path.gsub(File::Separator, '/')
-      output = params[:output]
       options = {
-        :lzr => params[:runtime],
-        :debug => params[:debug],
-        :lzproxied => params[:proxied] == nil ? params[:proxied] : false,
-        :lzt => params[:format] || 'swf'}
+        :lzr => options[:runtime],
+        :debug => options[:debug],
+        :lzproxied => options.fetch(:proxied, false),
+        :lzt => options[:format] || 'swf'}
       query = options.map{|k,v|"#{k}=#{v}" unless v.nil?}.compact.join('&')
       url = "#{@base_url}#{server_relative_path}"
       url += "?#{query}" unless query.empty?
@@ -127,7 +106,7 @@ module OpenLaszlo
             return response.body
           end
         else
-          response.value # raises error
+          response.value # for effect: raises error
         end
       end
     end
@@ -138,7 +117,7 @@ module OpenLaszlo
   # If you don't need multiple compilers, you can use the methods in
   # the OpenLaszlo module instead.
   #
-  # The command-line compiler is slower than CompileServer, but,
+  # CommandLineCompiler is slower than CompileServer, but,
   # unlike the server, it can compile files in any location.
   class CommandLineCompiler
     # Creates a new compiler.
@@ -147,45 +126,48 @@ module OpenLaszlo
     # * <tt>:compiler_script</tt> - the path to the shell script that
     # invokes the compiler.  This defaults to a standard location inside
     # the value specified by :home.
-    # * <tt>:openlaszlo_home</tt> - the home directory of the OpenLaszlo SDK.
+    # * <tt>:openlaszlo_home</tt> - the home directory of the Open<tt></tt>Laszlo SDK.
     # This defaults to ENV['OPENLASZLO_HOME'].
-    def initialize params={}
-      @lzc = params[:compiler_script]
+    def initialize options={}
+      @lzc = options[:compiler_script]
       unless @lzc
-        home = params[:openlaszlo_home] || ENV['OPENLASZLO_HOME']
+        home = options[:openlaszlo_home] || ENV['OPENLASZLO_HOME']
         raise ":compiler_script or :openlaszlo_home must be specified" unless home
         search = lzc_directories.map{|f| File.join(home, f, 'lzc')}
         found = search.select{|f| File.exists? f}
         raise "couldn't find bin/lzc in #{search.join(' or ')}" if found.empty?
         @lzc = found.first
-        # Adjust the name for Windows
+        # Adjust the name for Windows:
         @lzc += '.bat' if windows?
       end
     end
     
     # Invokes the OpenLaszlo command-line compiler on +source_file+.
     #
-    # See OpenLaszlo.compile for a description of the +params+.
-    def compile source_file, params={}
-      default_output = File.basename(source_file, '.lzx') + '.swf'
-      output = params[:output] || default_output
+    # See OpenLaszlo.compile for a description of +options+.
+    def compile source_file, options={}
+      default_output = File.join(File.dirname(source_file),
+                                 File.basename(source_file, '.lzx') + '.swf')
+      output = options[:output] || default_output
       # TODO: could handle this case by compiling to a temporary directory and
       # renaming from there
       raise "#{source_file} and #{output} do not have the same basename." unless File.basename(source_file, '.lzx') == File.basename(output, '.swf')
       args = []
-      args << '--runtime=#{params[:runtime]}' if params[:runtime]
-      args << '--debug' if params[:debug]
-      args << '--profile' if params[:profile]
+      args << '--runtime=#{options[:runtime]}' if options[:runtime]
+      args << '--debug' if options[:debug]
+      args << '--profile' if options[:profile]
       args << "--dir '#{File.dirname output}'" unless File.dirname(source_file) == File.dirname(output)
       args << source_file
-      text = `#{@lzc} #{args.join(' ')}`
+      # The compiler writes errors to stdout, warnings to stderr
+      require "open3"
+      stdin, stdout, stderr = Open3.popen3("#{@lzc} #{args.join(' ')}")
+      text = stdout.read
       text.gsub!(/^\d+\s+/, '') # work around a bug in OpenLaszlo 3.1
       results = {:output => output}
       if text =~ /^Compilation errors occurred:\n/
         raise CompilationError.new($'.strip)
       else
-        # FIXME: doesn't work because lzc prints errors to stderr
-        results[:warnings] = text.split("\n")
+        results[:warnings] = stderr.readlines
       end
       return results
     end
@@ -226,7 +208,7 @@ EOF
     @compiler = compiler
   end
   
-  # Compile an OpenLaszlo[http://openlaszlo.org] source file.
+  # Compile an OpenLaszlo source file.
   #
   # Examples:
   #   require 'openlaszlo'
@@ -234,27 +216,28 @@ EOF
   #   OpenLaszlo::compile 'hello.lzx', :debug => true
   #   OpenLaszlo::compile 'hello.lzx', :runtime => 'swf8'
   #   OpenLaszlo::compile 'hello.lzx', {:runtime => 'swf8', :debug => true}
-  #   OpenLaszlo::compile 'hello.lzx', :output => 'hello-world.swf' # server only
+  #   OpenLaszlo::compile 'hello.lzx', :output => 'hello-world.swf'
   #
   # Options are:
   # * <tt>:debug</tt> - debug mode (default false)
-  # * <tt>:output</tt> - specify the name and location for the output file (default = input_file.sub(/\.lzx$/, '.swf'))
+  # * <tt>:output</tt> - specify the name and location for the output file (default = <tt>input_file.sub(/\.lzx$/, '.swf')</tt>)
   # * <tt>:proxied</tt> - is application proxied (default true)
   # * <tt>:runtime</tt> - runtime (default swf7)
   #
-  # See CompileServer.compile and CommandLineCompiler.compile for additional options
-  # that are specific to these compilers.
-  def self.compile source_file, params={}
-    compiler.compile source_file, params
+  # See CompileServer.compile and CommandLineCompiler.compile for
+  # additional options that are specific to the compilation methods in
+  # those classes.
+  def self.compile source_file, options={}
+    compiler.compile source_file, options
   end
   
-  def self.make_html source_file, params={} #:nodoc:
+  def self.make_html source_file, options={} #:nodoc:
     raise 'not really supported, for now'
-    params = {
+    options = {
       :format => 'html-object',
-      :output => File.basename(source_file, '.lzx')+'.html'}.update(params)
-    compiler.compile source_file, params
-    source_file = params[:output]
+      :output => File.basename(source_file, '.lzx')+'.html'}.update(options)
+    compiler.compile source_file, options
+    source_file = options[:output]
     s = open(source_file).read
     open(source_file, 'w') {|f| f.write s.gsub!(/\.lzx\?lzt=swf&amp;/, '.lzx.swf?')}
   end

data/test/compiler_test.rb

@@ -1,12 +1,9 @@
-# Author:: Oliver Steele
-# Copyright:: Copyright (c) 2005-2006 Oliver Steele.  All rights reserved.
-# License:: Ruby License.
-
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
 require 'test/unit'
 require 'ropenlaszlo'
 require 'fileutils'
+require File.join(File.dirname(__FILE__), 'test_utils.rb')
 
 include FileUtils
 
@@ -15,33 +12,9 @@ unless REQUIRED_ENV_VALUES.reject {|w| ENV[w]}.empty?
   raise "These environment variables must be set: #{REQUIRED_ENV_VALUES}.join(', ')"
 end
 
-class << ENV
-  # Execute a block, restoring the bindings for +keys+ at the end.
-  # NOT thread-safe!
-  def with_saved_bindings keys, &block
-    saved_bindings = Hash[*keys.map {|k| [k, ENV[k]]}.flatten]
-    begin
-      block.call
-    ensure
-      ENV.update saved_bindings
-    end
-  end
-  
-  # Execute a block with the temporary bindings in +bindings+.
-  # Doesn't remove keys; simply sets them to nil.
-  def with_bindings bindings, &block
-    with_saved_bindings bindings.keys do
-      ENV.update bindings
-      return block.call
-    end
-  end
-end
-
-# FIXME: should be able to put the test methods in here too
 module CompilerTestHelper
-  def super_setup
-    OpenLaszlo::compiler = nil
-    #cd File.expand_path(File.dirname(__FILE__))
+  def self.included(base)
+    base.send(:include, InstanceMethods)
   end
   
   private
@@ -49,57 +22,66 @@ module CompilerTestHelper
     File.expand_path file, File.dirname(__FILE__)
   end
   
+  def assert_same_file a, b
+    assert_equal File.expand_path(a), File.expand_path(b)
+  end
+  
   def compile file, output=nil, options={}
     file = testfile_pathname file
-    output = File.basename(file, '.lzx')+'.swf'
+    output ||= File.join(File.dirname(file), File.basename(file, '.lzx')+'.swf')
     rm_f output
+    raise "Unable to remove output file: #{output}" if File.exists?(output)
     begin
       result = OpenLaszlo::compile file, *options
+      assert_same_file output, result[:output]
       assert File.exists?(output), "#{output} does not exist"
       return result
     ensure
       rm_f output
     end
   end
+  
+  # Tests that are shared between CompilerServerTest and
+  # CommandLineCompilerTest.
+  module InstanceMethods
+    def test_compilation
+      result = compile 'test.lzx'
+    end
+    
+    def test_compilation_warning
+      result = compile 'compilation-warning.lzx'
+      assert_instance_of Array, result[:warnings]
+      assert_equal 2, result[:warnings].length
+      assert_match /^compilation-warning.lzx:1:36/, result[:warnings].first
+    end
+    
+    def test_compilation_error
+      ex = (compile 'compilation-error.lzx' rescue $!)
+      assert_instance_of OpenLaszlo::CompilationError, ex
+      assert_match /^compilation-error.lzx:3:1: XML document structures must start and end within the same entity./, ex.message
+    end
+  end
 end
 
 class CompileServerTest < Test::Unit::TestCase
   include CompilerTestHelper
   
   def setup
-    @test_dir = File.join(ENV['OPENLASZLO_HOME'], 'ropenlaszlo-tests')
+    OpenLaszlo::compiler = nil
+    @test_dir = File.join(ENV['OPENLASZLO_HOME'], 'tmp/ropenlaszlo-tests')
     mkdir @test_dir
-    super_setup
   end
   
   def teardown
+    OpenLaszlo::compiler = nil
     rm_rf @test_dir
   end
-    
-  def test_compilation
-    result = compile 'test.lzx'
-    assert_equal 'test.swf', result[:output]
-  end
-  
-  def test_compilation_error
-    #assert_raise(OpenLaszlo::CompilationError) {compile 'compilation-error.lzx'}
-    ex = (compile 'compilation-error.lzx' rescue $!)
-    assert_instance_of OpenLaszlo::CompilationError, ex
-    assert_match /^compilation-error.lzx:3:1: XML document structures must start and end within the same entity./, ex.message
-  end
-  
-  def test_compilation_warning
-    result = compile 'compilation-warning.lzx'
-    assert_equal 'compilation-warning.swf', result[:output]
-    assert_instance_of Array, result[:warnings]
-    assert_equal 2, result[:warnings].length
-    assert_match /^compilation-warning.lzx:1:36/, result[:warnings].first
-  end
   
   private
   alias :saved_compile :compile
   
   def compile file, output=nil, options={}
+    raise "unimplemented" if output
     file = testfile_pathname file
     server_local_file = File.join @test_dir, File.basename(file)
     cp file, server_local_file
@@ -115,7 +97,7 @@ class CommandLineCompilerTest < Test::Unit::TestCase
   include CompilerTestHelper
   
   def setup
-    super_setup
+    OpenLaszlo::compiler = nil
     callcc do |exit|
       resume = nil
       ENV.with_bindings 'OPENLASZLO_URL' => nil do
@@ -129,19 +111,9 @@ class CommandLineCompilerTest < Test::Unit::TestCase
   end
   
   def teardown
+    OpenLaszlo::compiler = nil
     callcc do |continue| @teardown.call(continue) end
   end
-  
-  def test_compilation
-    result = compile 'test.lzx'
-    assert_equal 'test.swf', result[:output]
-  end
-  
-  def test_compilation_error
-    ex = (compile 'compilation-error.lzx' rescue $!)
-    assert_instance_of OpenLaszlo::CompilationError, ex
-    assert_match /^compilation-error.lzx:3:1: XML document structures must start and end within the same entity./, ex.message
-  end
 end
 
 class CompilerFacadeTest < Test::Unit::TestCase

data/test/{utils.rb → test_utils.rb}

@@ -1,3 +1,7 @@
+# Author:: Oliver Steele
+# Copyright:: Copyright (c) 2005-2006 Oliver Steele.  All rights reserved.
+# License:: Ruby License.
+
 class << ENV
   # Execute a block, restoring the bindings for +keys+ at the end.
   # NOT thread-safe!
@@ -19,4 +23,3 @@ class << ENV
     end
   end
 end
-

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ropenlaszlo
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2006-01-16 00:00:00 -05:00
+  version: 0.4.0
+date: 2006-01-19 00:00:00 -05:00
 summary: Ruby interface to OpenLaszlo.
 require_paths: 
 - lib
@@ -38,14 +38,14 @@ files:
 - test/compilation-warning.lzx
 - test/compiler_test.rb
 - test/test.lzx
-- test/utils.rb
+- test/test_utils.rb
 test_files: []
 
 rdoc_options: 
 - --title
-- "ROpenLaszlo: Ruby interface to OpenLaszlo."
-- --main
-- doc/README
+- "ROpenLaszlo: Ruby interface to OpenLaszlo"
+- --exclude
+- test/.*
 extra_rdoc_files: 
 - doc/CHANGES
 - doc/MIT-LICENSE