bitescript 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.0.2 / 2009-05-14
+
+* Improve use support for packages, make it more API-friendly
+* Disable instance_eval when a block argument is requested
+* Allow defining non-public classes
+
 === 0.0.1 / 2009-03-28
 
 * 1 major enhancement

data/Rakefile

@@ -15,8 +15,3 @@ Hoe.new('bitescript', BiteScript::VERSION) do |p|
 end
 
 task :default => :test
-
-Rake::TestTask.new do |t|
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*.rb"]
-end

data/lib/bitescript/builder.rb

@@ -91,19 +91,41 @@ module BiteScript
       end
       fb
     end
-    
-    def public_class(class_name, superclass = java.lang.Object, *interfaces, &block)
-      class_name = @package.empty? ? class_name : "#{@package.join('/')}/#{class_name}"
-      class_builder = ClassBuilder.new(self, class_name, @file_name, superclass, *interfaces)
-      @class_builders[class_name] ||= class_builder
+
+    def define_class(class_name, opts, &block)
+      pkg = opts[:package] || @package.dup || []
+
+      class_name = pkg.empty? ? class_name : "#{pkg.join('/')}/#{class_name}"
+      class_builder = ClassBuilder.new(self, class_name, @file_name, opts)
+      @class_builders[class_name] ||= class_builder # TODO Is this really what we want?
       
       if block_given?
-        class_builder.instance_eval(&block)
+        if block.arity == 1
+          block.call(class_builder)
+        else
+          class_builder.instance_eval(&block)
+        end
       else
         return class_builder
       end
     end
     
+    def public_class(class_name, superclass = java.lang.Object, *interfaces, &block)
+      define_class(class_name, :visibility => :public, :superclass => superclass, :interfaces => interfaces, &block)
+    end
+    
+    def protected_class(class_name, superclass = java.lang.Object, *interfaces, &block)
+      define_class(class_name, :visibility => :protected, :superclass => superclass, :interfaces => interfaces, &block)
+    end
+    
+    def private_class(class_name, superclass = java.lang.Object, *interfaces, &block)
+      define_class(class_name, :visibility => :private, :superclass => superclass, :interfaces => interfaces, &block)
+    end
+    
+    def default_class(class_name, superclass = java.lang.Object, *interfaces, &block)
+      define_class(class_name, :visibility => :default, :superclass => superclass, :interfaces => interfaces, &block)
+    end
+    
     def generate
       @class_builders.each do |class_name, class_builder|
         class_file = "#{class_name.gsub('.', '/')}.class"
@@ -117,15 +139,26 @@ module BiteScript
     end
     
     def package(*names)
-      elements = 0
+      return @package unless names.size > 0
+      
+      packages = unpack_packages(*names)
+      @package.concat(packages)
+      yield
+      @package = @package[0..(packages.size - 1)]
+    end
+
+    def package=(name)
+      @package = unpack_packages(name)
+    end
+
+    def unpack_packages(*names)
+      package = []
       names.each do |name_maybe_dotted|
         name_maybe_dotted.split(/\./).each do |name|
-          elements += 1
-          @package.push name
+          package.push name
         end
       end
-      yield
-      elements.times {@package.pop}
+      package
     end
     
     def method?
@@ -156,16 +189,32 @@ module BiteScript
     attr_accessor :imports
     attr_accessor :fields
 
-    def initialize(file_builder, class_name, file_name, superclass = Object, *interfaces)
+    def initialize(file_builder, class_name, file_name, opts) 
       @parent = file_builder
       @class_name = class_name
-      @superclass = superclass 
+      @superclass = opts[:superclass] || Object
       
       @class_writer = ClassWriter.new(ClassWriter::COMPUTE_MAXS)
       
       interface_paths = []
-      interfaces.each {|interface| interface_paths << path(interface)}
-      @class_writer.visit(BiteScript.bytecode_version, Opcodes::ACC_PUBLIC | Opcodes::ACC_SUPER, class_name, nil, path(superclass), interface_paths.to_java(:string))
+      (opts[:interfaces] || []).each {|interface| interface_paths << path(interface)}
+
+      visibility = case (opts[:visibility] && opts[:visibility].to_sym)
+        when nil
+          Opcodes::ACC_PUBLIC  # NOTE Not specified means public -- must explicitly ask for default
+        when :default
+          0
+        when :public
+          Opcodes::ACC_PUBLIC
+        when :private
+          Opcodes::ACC_PRIVATE
+        when :protected
+          Opcodes::ACC_PROTECTED
+        else
+          raise "Unknown visibility: #{opts[:visibility]}"
+      end
+
+      @class_writer.visit(BiteScript.bytecode_version, visibility | Opcodes::ACC_SUPER, class_name, nil, path(superclass), interface_paths.to_java(:string))
       @class_writer.visit_source(file_name, nil)
 
       @constructor = nil
@@ -254,7 +303,11 @@ module BiteScript
       
       if block_given?
         mb.start
-        mb.instance_eval(&block)
+        if block.arity == 1
+          block.call(mb)
+        else
+          mb.instance_eval(&block)
+        end
         mb.stop
       end
 
@@ -360,7 +413,11 @@ module BiteScript
     def self.build(class_builder, modifiers, name, signature, &block)
       mb = MethodBuilder.new(class_builder, modifiers, name, signature)
       mb.start
-      mb.instance_eval(&block)
+      if block.arity == 1
+        block.call(mb)
+      else
+        mb.instance_eval(&block)
+      end
       mb.stop
     end
     

data/lib/bitescript.rb

@@ -5,7 +5,7 @@ require 'bitescript/bytecode'
 require 'bitescript/builder'
 
 module BiteScript
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   include BiteScript::ASM
   JAVA1_4 = Opcodes::V1_4

data/test/test_builder.rb

@@ -29,7 +29,6 @@ class TestBuilder < Test::Unit::TestCase
 
   def load_and_construct(name, class_builder)
     class_bytes = class_builder.generate
-    File.open(name + ".class", 'w') {|f| f.write(class_bytes)}
     cls = JRuby.runtime.jruby_class_loader.define_class(name, class_bytes.to_java_bytes)
 
     cls.new_instance
@@ -426,4 +425,35 @@ class TestBuilder < Test::Unit::TestCase
     anno = method.annotation(JRubyMethod.java_class)
     assert anno
   end
+
+  def test_package_equals
+    @builder.package = "org.jruby"
+    cb = @builder.public_class(@class_name, @builder.object);
+    dummy_constructor(cb)
+    obj = load_and_construct("org.jruby.#{@class_name}", cb);
+
+    assert_equal "org.jruby.#{@class_name}", obj.class.java_class.to_s
+  end
+
+  def test_package_builder_list
+    obj = nil
+    @builder.package "org", "jruby" do
+      cb = @builder.public_class(@class_name, @builder.object);
+      dummy_constructor(cb)
+      obj = load_and_construct("org.jruby.#{@class_name}", cb);
+    end
+
+    assert_equal "org.jruby.#{@class_name}", obj.class.java_class.to_s
+  end
+
+  def test_package_builder_string
+    obj = nil
+    @builder.package "org.jruby" do
+      cb = @builder.public_class(@class_name, @builder.object);
+      dummy_constructor(cb)
+      obj = load_and_construct("org.jruby.#{@class_name}", cb);
+    end
+
+    assert_equal "org.jruby.#{@class_name}", obj.class.java_class.to_s
+  end
 end

data/test/test_java_class.rb

@@ -4,55 +4,62 @@ require 'test/unit'
 require 'bitescript'
 
 class TestJavaClass < Test::Unit::TestCase
-  def test_constructor
-    cls = java.lang.String.java_class
+  ['public', 'protected', 'private', 'default'].each do |visibility|
 
-    cons1 = cls.constructor()
-    cons2 = cls.constructor(java.lang.String.java_class)
+    line = __LINE__; eval "
+      def test_constructor_on_#{visibility}_class
+        cls = java.lang.String.java_class
 
-    assert_not_nil cons1
-    assert_not_nil cons2
-    assert_equal [], cons1.parameter_types
-    assert_equal [java.lang.String.java_class], cons2.parameter_types
+        cons1 = cls.constructor()
+        cons2 = cls.constructor(java.lang.String.java_class)
 
-    cls = BiteScript::FileBuilder.new('x').public_class('y')
-    cls.public_constructor()
-    cls.public_constructor(java.lang.String.java_class)
+        assert_not_nil cons1
+        assert_not_nil cons2
+        assert_equal [], cons1.parameter_types
+        assert_equal [java.lang.String.java_class], cons2.parameter_types
 
-    cons1 = cls.constructor()
-    cons2 = cls.constructor(java.lang.String.java_class)
+        cls = BiteScript::FileBuilder.new('x').#{visibility}_class('y')
+        cls.public_constructor()
+        cls.public_constructor(java.lang.String.java_class)
 
-    assert_not_nil cons1
-    assert_not_nil cons2
-    assert_equal [], cons1.parameter_types
-    assert_equal [java.lang.String.java_class], cons2.parameter_types
-  end
+        cons1 = cls.constructor()
+        cons2 = cls.constructor(java.lang.String.java_class)
+
+        assert_not_nil cons1
+        assert_not_nil cons2
+        assert_equal [], cons1.parameter_types
+        assert_equal [java.lang.String.java_class], cons2.parameter_types
+      end
+    ", binding, __FILE__, line
+
+    line = __LINE__; eval "
+      def test_java_method_on_#{visibility}_class
+        cls = java.lang.String.java_class
+        
+        m1 = cls.java_method('toString')
+        m2 = cls.java_method('equals', java.lang.Object.java_class)
+
+        assert_not_nil m1
+        assert_not_nil m2
+        assert_equal java.lang.String.java_class, m1.return_type
+        assert_equal Java::boolean.java_class, m2.return_type
+        assert_equal [], m1.parameter_types
+        assert_equal [java.lang.Object.java_class], m2.parameter_types
+
+        cls = BiteScript::FileBuilder.new('x').#{visibility}_class('y')
+        cls.public_method('toString', java.lang.String.java_class)
+        cls.public_method('equals', Java::boolean.java_class, java.lang.Object.java_class)
 
-  def test_java_method
-    cls = java.lang.String.java_class
-    
-    m1 = cls.java_method("toString")
-    m2 = cls.java_method("equals", java.lang.Object.java_class)
-
-    assert_not_nil m1
-    assert_not_nil m2
-    assert_equal java.lang.String.java_class, m1.return_type
-    assert_equal Java::boolean.java_class, m2.return_type
-    assert_equal [], m1.parameter_types
-    assert_equal [java.lang.Object.java_class], m2.parameter_types
-
-    cls = BiteScript::FileBuilder.new('x').public_class('y')
-    cls.public_method('toString', java.lang.String.java_class)
-    cls.public_method('equals', Java::boolean.java_class, java.lang.Object.java_class)
-
-    m1 = cls.java_method('toString')
-    m2 = cls.java_method('equals', java.lang.Object.java_class)
-    
-    assert_not_nil m1
-    assert_not_nil m2
-    assert_equal java.lang.String.java_class, m1.return_type
-    assert_equal Java::boolean.java_class, m2.return_type
-    assert_equal [], m1.parameter_types
-    assert_equal [java.lang.Object.java_class], m2.parameter_types
+        m1 = cls.java_method('toString')
+        m2 = cls.java_method('equals', java.lang.Object.java_class)
+        
+        assert_not_nil m1
+        assert_not_nil m2
+        assert_equal java.lang.String.java_class, m1.return_type
+        assert_equal Java::boolean.java_class, m2.return_type
+        assert_equal [], m1.parameter_types
+        assert_equal [java.lang.Object.java_class], m2.parameter_types
+      end
+    ", binding, __FILE__, line
   end
 end

metadata

@@ -22,13 +22,15 @@ name: bitescript
 rdoc_options: 
 - --main
 - README.txt
-autorequire: 
 rubyforge_project: jruby-extras
+autorequire: 
+licenses: []
+
 executables: 
 - bite
 - bitec
 description: BiteScript is a Ruby DSL for generating Java bytecode and classes.
-specification_version: 2
+specification_version: 3
 default_executable: 
 files: 
 - History.txt
@@ -59,12 +61,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 extensions: []
 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 requirements: []
 
 authors: 
 - charles.nutter@sun.comCharles Oliver Nutter
-date: 2009-03-28 05:00:00 +00:00
+date: 2009-05-14 05:00:00 +00:00
 platform: ruby
 test_files: 
 - test/test_bitescript.rb
@@ -73,7 +75,7 @@ test_files:
 - test/test_java_class.rb
 - test/test_signature.rb
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 require_paths: 
 - lib
 dependencies: 
@@ -82,7 +84,7 @@ dependencies:
     requirements: 
     - - '>='
       - !ruby/object:Gem::Version 
-        version: 1.11.0
+        version: 1.12.1
     version: 
   type: :development
   version_requirement: