|
From: <luk...@us...> - 2006-09-06 03:45:22
|
Revision: 78
http://svn.sourceforge.net/asunit/?rev=78&view=rev
Author: lukebayes
Date: 2006-09-05 20:45:13 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
working on class creation, basic erb template is being resolved
Modified Paths:
--------------
trunk/ruby/src/create_class.rb
trunk/ruby/src/create_class_test.rb
trunk/ruby/src/settings.rb
trunk/ruby/src/settings_test.rb
trunk/ruby/src/template_resolver.rb
trunk/ruby/src/templates/Class.erb
Modified: trunk/ruby/src/create_class.rb
===================================================================
--- trunk/ruby/src/create_class.rb 2006-09-06 02:40:22 UTC (rev 77)
+++ trunk/ruby/src/create_class.rb 2006-09-06 03:45:13 UTC (rev 78)
@@ -1,9 +1,25 @@
+require 'template_resolver'
+
module AsUnit
- class CreateClass
+ class CreateClass
+ attr_accessor :settings, :classname, :template_name
- def initialize
- puts 'create class instantiated'
+ def initialize(name, settings, template)
+ @classname = name
+ @settings = settings
+ @template_name = template
+ @resolver = AsUnit::TemplateResolver.new @classname
end
+
+ def run
+ src = Dir.pwd + File::SEPARATOR + settings.templates + File::SEPARATOR + template_name
+ puts 'opening: ' + src
+ template = IO.read(src)
+ @resolver.template = template
+
+ puts @resolver.parse
+# file = File.new(src)
+ end
end
end
\ No newline at end of file
Modified: trunk/ruby/src/create_class_test.rb
===================================================================
--- trunk/ruby/src/create_class_test.rb 2006-09-06 02:40:22 UTC (rev 77)
+++ trunk/ruby/src/create_class_test.rb 2006-09-06 03:45:13 UTC (rev 78)
@@ -1,11 +1,15 @@
require 'test/unit'
-require 'create_class.rb'
+require 'create_class'
+require 'settings'
class CreateClassTest < Test::Unit::TestCase
- def setup
- @instance = AsUnit::CreateClass.new
+ def setup
+ @classname = 'somepackage.otherpackage.SomeClass'
+ @template_name = 'Class.erb'
+ @settings = AsUnit::Settings.new
+ @instance = AsUnit::CreateClass.new(@classname, @settings, @template_name)
end
def teardown
@@ -15,4 +19,21 @@
def test_instantiated
assert(!@instance.nil?)
end
+
+ def test_templates
+ @instance.settings = AsUnit::Settings.new
+ assert(!@instance.nil?)
+ end
+
+ def test_classname
+ assert_equal(@classname, @instance.classname)
+ end
+
+ def test_template
+ assert_equal(@template_name, @instance.template_name)
+ end
+
+ def test_run
+ @instance.run
+ end
end
\ No newline at end of file
Modified: trunk/ruby/src/settings.rb
===================================================================
--- trunk/ruby/src/settings.rb 2006-09-06 02:40:22 UTC (rev 77)
+++ trunk/ruby/src/settings.rb 2006-09-06 03:45:13 UTC (rev 78)
@@ -1,13 +1,13 @@
module AsUnit
class Settings
- attr_accessor :src, :test, :template, :directories
+ attr_accessor :src, :test, :templates, :directories
- def initialize()
+ def initialize
@directories = ['src', 'test', 'templates', 'css', 'xml']
@src = 'src'
@test = 'test'
- @template = 'template'
+ @templates = 'templates'
end
end
end
\ No newline at end of file
Modified: trunk/ruby/src/settings_test.rb
===================================================================
--- trunk/ruby/src/settings_test.rb 2006-09-06 02:40:22 UTC (rev 77)
+++ trunk/ruby/src/settings_test.rb 2006-09-06 03:45:13 UTC (rev 78)
@@ -10,5 +10,5 @@
def test_instantiated
assert_not_nil(@instance)
- end
+ end
end
\ No newline at end of file
Modified: trunk/ruby/src/template_resolver.rb
===================================================================
--- trunk/ruby/src/template_resolver.rb 2006-09-06 02:40:22 UTC (rev 77)
+++ trunk/ruby/src/template_resolver.rb 2006-09-06 03:45:13 UTC (rev 78)
@@ -4,11 +4,12 @@
module AsUnit
class TemplateResolver
- attr_reader :template, :classname, :interfaces, :test_cases
+ attr_reader :template, :fullclass, :classname, :interfaces, :test_cases
attr_accessor :superclass, :visual
- def initialize(name)
- @classname = name;
+ def initialize(fullclass)
+ @fullclass = fullclass;
+ @classname = fullclass.split('.').pop
@template = template
@package = nil
@parsed = nil
@@ -29,9 +30,12 @@
def package
if(@package.nil?)
- arr = classname.split('.')
- arr.pop
- @package = arr.join('.')
+ segments = fullclass.split('.')
+ segments.pop
+ @package = segments.join('.')
+ if(segments.length > 0)
+ @package += ' '
+ end
end
return @package
end
Modified: trunk/ruby/src/templates/Class.erb
===================================================================
--- trunk/ruby/src/templates/Class.erb 2006-09-06 02:40:22 UTC (rev 77)
+++ trunk/ruby/src/templates/Class.erb 2006-09-06 03:45:13 UTC (rev 78)
@@ -1,10 +1,10 @@
-package <%= package %> {
- import <%= if(extends?) extends %>
+package <%= package %>{
+ <% if(superclass?) %>import superclass <% end %>
- public class ClassName <%= if(extends?) %> extends <% classname end %>{
-
+ public class <%= classname %><% if(superclass?) %> extends <%= superclass %><% end %> {
+
public function <%= classname %>() {
super();
- }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|