ycn 0.0.1 → 0.2.1

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008 FIXME full name
+Copyright (c) 2008 Andrew Koster
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -7,13 +7,22 @@ Rakefile
 bin/ycn-gen
 config/hoe.rb
 config/requirements.rb
-lib/ycn.rb
-lib/ycn/version.rb
-lib/ycn/ycn.rb
+lib/ycn.rb
 lib/ycn/header.rb
-lib/ycn/java_klass.rb
+lib/ycn/java/java_klass.rb
+lib/ycn/java/java_method.rb
+lib/ycn/java/java_property.rb
+lib/ycn/java/java_class.erb
+lib/ycn/ruby/ruby_klass.rb
+lib/ycn/ruby/ruby_method.rb
+lib/ycn/ruby/ruby_property.rb
+lib/ycn/ruby/ruby_class.erb
 lib/ycn/klass.rb
-lib/ycn/string_manip.rb
+lib/ycn/method.rb
+lib/ycn/property.rb
+lib/ycn/string_manip.rb
+lib/ycn/version.rb
+lib/ycn/ycn.rb
 lib/ycn/ycn_functions.rb
 script/console
 script/console.cmd

data/PostInstall.txt

@@ -1,7 +1,5 @@
-
-For more information on ycn, see http://ycn.rubyforge.org
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
-
+For more information on ycn, see :
+
+- http://ycn.rubyforge.org
+- http://naturalcode.wordpress.com
+- http://github.com/naturalcode/ycn/tree

data/README.txt

@@ -1,32 +1,127 @@
 = ycn
 
-* FIX (url)
+http://rubyforge.org/projects/ycn/
+https://github.com/naturalcode/ycn/tree
 
 == DESCRIPTION:
 
-FIX (describe your package)
+Yaml Class Notation is a compact, concise way of defining object
+classes in a beautiful and language-neutral way.
+
+Generate valid, executable code for any language you're forced use
+from YCN files.
+
+No semicolons, curly braces, or verbose keywords.
 
 == FEATURES/PROBLEMS:
 
-* FIX (list of features or problems)
-
-== SYNOPSIS:
-
-  FIX (code sample of usage)
+Features
+- Reads a class definition from a YAML file
+- Transforms a YAML class definition into well-formatted code
+- Currently supports Java as the output language
+
+Problems
+- Currently supports only Java as the output language
+- Not all unusual cases (ex: a class without properties) have necessarily been tested
+- Needs more hooks for custom behavior and plugins
+- Needs easy support for different languages
 
 == REQUIREMENTS:
 
-* FIX (list of requirements)
+- configatron 1.2.1
 
 == INSTALL:
 
-* FIX (sudo gem install, anything else)
+gem install ycn
+
+== SYNOPSIS:
+
+# ycn_example.rb
+# Generates Java classes from a YCN Yaml file.
+
+require 'ycn'
+
+project = {
+  :name    => "JavaExprat4AK - Le polymorphisme, les classes " +
+              "abstraites et les interfaces.",
+  :desc    => "G�re une collection de cowboys, indiens, brigands " +
+              "et dames en d�tresse, ainsi que leurs boissons.",
+  :author  => "Andrew Koster",
+  
+  :package => 'cowboys et indiens'
+}
+
+Ycn.generate project, :java
+
+# pcg/cowboys_et_indiens.yml
+
+humain:
+  new:
+    - nom, texte_parole
+  properties:
+    String:
+      - nom
+      - boisson_favorite = "de l'eau"
+    StringBuilder:
+      - texte_parole
+  methods:
+    void:
+      parler(string): |
+        getTexteParole().append(
+          "(" + getNom() + ") - " + psParoles + "\n")
+      commenter(string): |
+        getTexteParole().append(psCommentaire + "\n")
+      se_presenter: |
+        parler("Bonjour, je suis " + getNom() +
+          " et j'aime " + getBoissonFavorite() + ".")
+      boire: |
+        parler("Ah! Un bon verre avec " +
+          getBoissonFavorite() + "! GLOUPS!")
+
+indien < humain:
+  new:
+    - nom, texte_parole
+    - nom, texte_parole, plumes
+  properties:
+    int:
+      - plumes = 0
+    String:
+      - totem = "Coyote"
+      - boisson_favorite = "du jus de racine"  
+  methods:
+    void:
+      se_presenter: |
+        super.sePresenter()
+        parler("Mon totem est le " + getTotem() +
+          " et j'ai " + getPlumes() + " plume(s).")
+      scalper(cowboy): |
+        pvVisagePale.seFaireScalper(this)
+        setPlumes(getPlumes() + 1)
+          
+cowboy < humain:
+  new:
+    - nom, texte_parole
+    - nom, texte_parole, popularite
+  properties:
+    int:
+      - popularite = 0
+    String:
+      - adjectif = "vaillant"
+  methods:
+    void:
+      se_presenter: |
+        super.sePresenter()
+        parler("Je suis " + getAdjectif() + " et je suis" +
+          " populaire pour la lib�ration de " +
+          getPopularite() + " dame(s).")
+      se_faire_scalper(indien): |
+        parler("A�e! Ma t�te, " + piIndien.getNom() + " !")
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2008 FIXME full name
+Copyright (c) 2008 Andrew Koster
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/bin/ycn-gen

@@ -10,17 +10,17 @@ Dir.mkdir(PCG_DIR)
 example_file_content = <<TEXT
 require 'ycn'
 
-project = {
+Ycn::generate( :java, {
   :name    => "JavaExprat4AK - Le polymorphisme, les classes " +
               "abstraites et les interfaces.",
   :desc    => "Gère une collection de cowboys, indiens, brigands " +
               "et dames en détresse, ainsi que leurs boissons.",
   :author  => "Andrew Koster",
   
-  :package => 'cowboys et indiens'
-}
-
-Ycn.generate project, :java
+  :package => 'cowboys et indiens',
+  
+  :getters => true, :setters => false
+})
 TEXT
 
 example_package_content = <<TEXT

data/config/requirements.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 include FileUtils
 
 require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
+%w[rake hoe newgem rubigen configatron].each do |req_gem|
   begin
     require req_gem
   rescue LoadError

data/lib/ycn.rb

@@ -2,15 +2,27 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'yaml'
+require 'configatron'
+require 'erb'
+require 'pp'
 
-require File.join(File.dirname(__FILE__), 'ycn', 'ycn')
-require File.join(File.dirname(__FILE__), 'ycn', 'header')
-require File.join(File.dirname(__FILE__), 'ycn', 'java_klass')
-require File.join(File.dirname(__FILE__), 'ycn', 'klass')
-require File.join(File.dirname(__FILE__), 'ycn', 'string_manip')
-require File.join(File.dirname(__FILE__), 'ycn', 'ycn_functions')
+y = 'ycn'
+
+require File.join(File.dirname(__FILE__), y, 'java/java_method')
+require File.join(File.dirname(__FILE__), y, 'java/java_property')
+require File.join(File.dirname(__FILE__), y, 'java/java_klass')
+require File.join(File.dirname(__FILE__), y, 'ruby/ruby_method')
+require File.join(File.dirname(__FILE__), y, 'ruby/ruby_property')
+require File.join(File.dirname(__FILE__), y, 'ruby/ruby_klass')
+require File.join(File.dirname(__FILE__), y, 'method')
+require File.join(File.dirname(__FILE__), y, 'property')
+require File.join(File.dirname(__FILE__), y, 'klass')
+require File.join(File.dirname(__FILE__), y, 'ycn')
+require File.join(File.dirname(__FILE__), y, 'header')
+require File.join(File.dirname(__FILE__), y, 'string_manip')
+require File.join(File.dirname(__FILE__), y, 'ycn_functions')
+
+include StringManip
 
 module Ycn
-end
-
-puts "BEHOLD!"
+end

data/lib/ycn/java/java_class.erb

@@ -0,0 +1,17 @@
+<%= klass.java_header %><%=
+klass.java_package
+%>
+<%= klass.java_imports
+%>
+<%= klass.java_class_declaration %>
+{
+  <% for p in klass.properties do
+  %><%=  p.java_property %>
+  <% end %><%=
+  klass.java_constructors %><%
+  klass.methods.each do |m| %>
+  <%= m.java_signature %>
+  {
+    <%= m.java_show_content %>
+  }
+<% end %><%= klass.java_accessors %>}

data/lib/ycn/java/java_klass.rb

@@ -0,0 +1,97 @@
+#coding: utf-8
+
+module JavaKlass
+  def java_header 
+    text = <<HEAD
+Programme :    #{configatron.program_name}
+Auteur(s) :    #{configatron.author_name}
+Date :         #{Time.now.day}/#{Time.now.month}/#{Time.now.year}
+Description :  #{configatron.description}
+HEAD
+
+    '/*' + text.split("\n").map{ |l|
+      "\n *  #{l}"
+    }.join + "\n */\n"
+  end
+  
+  def java_package
+    @package ? "\npackage pcg#{camelize @package};" : ''
+  end
+  
+  def java_imports
+    text = properties.map{ |property|
+      import = case property.type
+        when 'Date'
+          "import java.util.Date;"
+        when 'Time'
+          "import java.util.Time;"
+        else
+          nil
+      end
+      import  
+    }.compact
+    
+    if text.size > 0
+      text = "\n" + text.join("\n")  + "\n"
+    end
+  end
+  
+  def java_class_declaration
+    "public class #{name}#{" extends #{parent.name}" if parent}"
+  end
+  
+  def java_constructors
+    @construct_params.map { |parameter_set|
+      "\n  public #{@name}(" +
+      
+      parameter_set.map { |parameter|
+        type = find_var( parameter ).type
+        "#{type} #{styled_var :riki, parameter, :p, type}"
+        
+      }.join(', ') + ")\n  {\n    " +
+      
+      parameter_set.map { |parameter|
+        type = find_var( parameter ).type
+        "set#{camelize parameter}(#{styled_var :riki, parameter, :p, type});"
+      }.join("\n    ") +
+      
+      java_prop_default_overrides
+    }.join("\n  }\n") + "\n  }\n"
+  end
+  
+  def java_prop_default_overrides
+    prop_default_overrides.map { |property|
+      property = find_var( property )
+      "\n    super.set#{camelize property.name}(#{property.default_value});"
+    }.join("\n")
+  end
+  
+  def java_accessors; java_g_s_etters; end
+  
+  def java_g_s_etters
+    text = properties.map { |property|
+      unless prop_default_overrides.include? property.name
+        type = property.type
+        name = property.name
+        result = ''
+        if configatron.getters; result += <<TEXT
+  public #{type} get#{camelize name}()
+  {
+    return #{styled_var :riki, name, :g, type };
+  }
+TEXT
+        end
+        
+        if configatron.setters; result += <<TEXT
+  public void set#{camelize name}(#{type} #{styled_var :riki, name, :p, type})
+  {
+    #{styled_var :riki, name, :g, type } = #{styled_var :riki, name, :p, type}; 
+  }
+TEXT
+        end
+        result
+      end
+    }.join
+    text
+  end
+end

data/lib/ycn/java/java_method.rb

@@ -0,0 +1,19 @@
+module JavaMethod
+  def java_signature
+    params = @parameters.map{ |p|
+      "#{camelize p} p#{p[0].chr.downcase}#{camelize p}"
+    }.join(', ')
+    
+    "public #{@type} #{low_camelize @name}(#{params})"
+  end
+  
+  def java_show_content
+    @content.split("\n").map { |line|
+      unless line =~ /[\+\(]\s*$/
+        line += ';'
+      end
+      
+      line
+    }.join("\n")
+  end
+end

data/lib/ycn/java/java_property.rb

@@ -0,0 +1,10 @@
+module JavaProperty
+  def java_property
+    t = "#{@type} "
+    t+= styled_var :riki, @name, :g, @type
+    if @default_value && !@klass.prop_default_overrides.include?( @name )
+      t += " = #{@default_value}"
+    end
+    t += ';'    
+  end
+end

data/lib/ycn/klass.rb

@@ -1,95 +1,98 @@
-require "ycn/java_klass"
-require "ycn/string_manip"
-
 class Klass
   attr_accessor :name, :parent, :properties, :methods,
-  :method_params, :construct_params, :prop_defaults,
-  :prop_default_overrides
-  
-  include JavaKlass
-  include StringManip
+  :construct_params, :prop_default_overrides
   
   def initialize name, parent, properties, methods,
   construct_params=nil, package=nil
   
-    @name = camelize(name)
-    @parent = parent ? camelize(parent) : nil
-    @properties = properties
-    @methods = methods
-    _extract_method_params
-    @construct_params = _organize_constructor_params(construct_params)
+    extend JavaKlass if configatron.lang == :java
+    extend RubyKlass if configatron.lang == :ruby
+  
+    @name = camelize( name )
+    @parent = parent ? camelize( parent ) : nil
+    @properties = parse_properties( properties )
+    @methods = parse_methods( methods )
+    @construct_params = organize_constructor_params( construct_params )
     @package = package
   end
   
-  def _extract_method_params
-    return nil unless @methods
-    @method_params = {}
-    
-    @methods.each_pair do |type, meths|
-      meths.each_key do |m|
-        if m =~ /\(.+\)/
-          m_parameters =
-            /\(.*\)/.match(m).
-              to_s[1..-2].split(/ |, /)
-          
-          m_name_only = m.dup.sub!(/\(.*\)/, '')
-          
-          meths.store(m_name_only, meths[m])
-          meths.delete(m)
-          @method_params.store(m_name_only, m_parameters)
-        end
-      end
-    end
+  def print_to template
+    klass = self
+    ERB.new( template ).result( binding )
   end
   
-  def _organize_constructor_params params_array
-    return nil unless params_array
-    params_array.map{ |params| params.split(/ |, /) }
+  def parse_properties properties_hash
+    properties_hash.keys.map { |type|
+      properties_hash[type].map do |property|
+        p = extract_default_values({
+          :name=>property, :type=>type
+        })
+        
+        Property.new self, p[:name], p[:type], p[:default_value]
+      end
+    }.flatten
   end
   
-  def extract_default_values
-    @prop_defaults = {}
-    return nil unless @properties
-    
-    @properties.each_pair do |type, props|
-      props.map! do |p|
-        if /[^(\s*=\s*)]+\s*=\s*/.match(p)
-          default_value = p.sub(/[^(\s*=\s*)]+\s*=\s*/, '')
-          p.sub!(/\s*=\s*.*/, '')
-          @prop_defaults.store(p, default_value)
-        end
-        p
+  def parse_methods methods_hash
+    methods_hash.keys.map { |type|
+      methods_hash[type].keys.map do |method|
+        content = methods_hash[type][method].split("\n").join("\n    ")
+        
+        m = extract_method_params({
+          :name=>method, :type=>type,
+          :content=>content
+        })
+        
+        Methodd.new( m[:name], m[:type], m[:params], m[:content] )
       end
-    end
-  end
+    }.flatten
+  end 
   
-  def fix_default_overrides
-    @prop_default_overrides = {}
-    return nil unless @parent && @prop_defaults
-    
-    @prop_defaults.each_pair do |property, value|
-      type = find_type(property)
+  def extract_method_params method
+    if method[:name] =~ /\(.+\)/
+      m_parameters =
+        /\(.*\)/.match(method[:name]).
+          to_s[1..-2].split(/ |, /)
       
-      if @parent.properties && @parent.properties[type]
-        if @parent.properties[type].include? property
-          @prop_default_overrides[property] =
-            @prop_defaults.delete property
-        end
-      end
+      m_name_only = method[:name].dup.sub!(/\(.*\)/, '')
+      method[:name] = m_name_only
+      method[:params] = m_parameters
     end
+    
+    method
   end
   
-  def find_type property_name
-    prop_hash = {}
-    return nil unless @properties
-    
-    @properties.each_pair do |type, props|
-      props.each { |p| prop_hash.store(p, type) }
+  def extract_default_values property
+    if property[:name] =~ /([^(\s*=\s*)]+)\s*=\s*(.+)/
+      property[:name] = $1
+      property[:default_value] = $2
     end
     
-    type = prop_hash[property_name]
+    property
+  end
+  
+  def organize_constructor_params params_array
+    return [] unless params_array
+    params_array.map{ |params| params.split(/ |, /) }
+  end
+  
+  def fix_default_overrides
+    @prop_default_overrides = []
+    return nil unless @parent
     
-    (!type && parent) ?
-      parent.find_type(property_name) : type
+    @prop_default_overrides = @properties.select { |p|
+      p.default_value && @parent.find_var( p.name )
+    }.map { |p| p.name }
+  end
+  
+  def find_var var_name
+    result = nil
+    if @parent
+      result = @parent.find_var var_name
+    end
+    @properties.each do |property|
+      result = property if property.name == var_name
+    end
+    result
   end
 end

data/lib/ycn/method.rb

@@ -0,0 +1,12 @@
+class Methodd
+  attr_accessor :name, :type, :parameters, :content
+  
+  def initialize name, type, parameters, content
+    eval("extend #{camelize configatron.lang}Method")
+    
+    @name = name
+    @type = type
+    @parameters = parameters || []
+    @content = content
+  end
+end

data/lib/ycn/property.rb

@@ -0,0 +1,12 @@
+class Property
+  attr_accessor :klass, :name, :type, :default_value
+  
+  def initialize klass, name, type, default_value
+    eval("extend #{camelize configatron.lang}Property")
+    
+    @klass = klass
+    @name = name
+    @type = type
+    @default_value = default_value
+  end
+end

data/lib/ycn/ruby/ruby_class.erb

@@ -0,0 +1,11 @@
+<%= klass.ruby_header %><%= klass.ruby_imports %>
+<%= klass.ruby_class_declaration %>
+  <%= klass.ruby_accessors %>
+  <%= klass.ruby_constructors %><% for p in klass.properties do %>
+  <%= p.ruby_property %><% end %>
+  end
+  <% klass.methods.each do |m| %>
+  <%= m.ruby_signature %>
+    <%= m.ruby_show_content %>
+  end
+<% end %>end

data/lib/ycn/ruby/ruby_klass.rb

@@ -0,0 +1,71 @@
+#coding: utf-8
+
+module RubyKlass
+  def ruby_header 
+    text = <<HEAD
+Programme :    #{configatron.program_name}
+Auteur(s) :    #{configatron.author_name}
+Date :         #{Time.now.day}/#{Time.now.month}/#{Time.now.year}
+Description :  #{configatron.description}
+HEAD
+
+    text.split("\n").map{ |l|
+      "# #{l}\n"
+    }.join
+  end
+  
+  def ruby_imports
+    #~ text = properties.map{ |property|
+      #~ import = case property.type
+        #~ when 'Date'
+          #~ "import java.util.Date;"
+        #~ when 'Time'
+          #~ "import java.util.Time;"
+        #~ else
+          #~ nil
+      #~ end
+      #~ import  
+    #~ }.compact
+    
+    #~ if text.size > 0
+      #~ text = "\n" + text.join("\n")  + "\n"
+    #~ end
+  end
+  
+  def ruby_class_declaration
+    "class #{name}#{" < #{parent.name}" if parent}"
+  end
+  
+  def ruby_constructors
+    #~ @construct_params.map { |parameter_set|
+      #~ "\n  public #{@name}(" +
+      
+      #~ parameter_set.map { |parameter|
+        #~ type = find_var( parameter ).type
+        #~ "#{type} #{styled_var :riki, parameter, :p, type}"
+        
+      #~ }.join(', ') + ")\n  {\n    " +
+      
+      #~ parameter_set.map { |parameter|
+        #~ type = find_var( parameter ).type
+        #~ "set#{camelize parameter}(#{styled_var :riki, parameter, :p, type});"
+      #~ }.join("\n    ") +
+      
+      #~ java_prop_default_overrides
+    #~ }.join("\n  }\n") + "\n  }\n"
+    "def initialize " + @construct_params.last.join(', ')
+  end
+  
+  #~ def java_prop_default_overrides
+    #~ prop_default_overrides.map { |property|
+      #~ property = find_var( property )
+      #~ "\n    super.set#{camelize property.name}(#{property.default_value});"
+    #~ }.join("\n")
+  #~ end
+  
+  def ruby_accessors; ruby_g_s_etters; end
+  
+  def ruby_g_s_etters
+    "attr_accessor #{@properties.map{|p| ":#{p.name}"}.join(', ')}\n"
+  end
+end

data/lib/ycn/ruby/ruby_method.rb

@@ -0,0 +1,20 @@
+module RubyMethod
+  def ruby_signature
+    params = @parameters.map{ |p|
+      "#{p} p#{p[0].chr.downcase}_#{p}"
+    }.join(', ')
+    
+    "def #{@name} #{params}"
+  end
+  
+  def ruby_show_content
+    #~ @content.split("\n").map { |line|
+      #~ unless line =~ /[\+\(]\s*$/
+        #~ line += ';'
+      #~ end
+      
+      #~ line
+    #~ }.join("\n")
+    @content
+  end
+end

data/lib/ycn/ruby/ruby_property.rb

@@ -0,0 +1,9 @@
+module RubyProperty
+  def ruby_property
+    t = "  @#{@name} ="
+    if @default_value
+      t += " #{@default_value}"
+    end  
+    t
+  end
+end

data/lib/ycn/string_manip.rb

@@ -10,11 +10,15 @@ module StringManip
   end
   
   def camelize string
-    string.gsub('_', ' ').split(' ').map { |word|
+    string.to_s.gsub('_', ' ').split(' ').map { |word|
       word.capitalize
     }.join
   end
   
+  def camel_case string
+    camelize string
+  end
+  
   def low_camelize string
     w = 0
     string.gsub('_', ' ').split(' ').map { |word|
@@ -22,10 +26,4 @@ module StringManip
       w == 1 ? word.downcase : word.capitalize
     }.join
   end
-  
-  def self.camelize string
-    string.gsub('_', ' ').split(' ').map { |word|
-      word.capitalize
-    }.join
-  end
 end

data/lib/ycn/version.rb

@@ -1,7 +1,7 @@
 module Ycn
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 0
+    MINOR = 2
     TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/ycn/ycn.rb

@@ -1,23 +1,27 @@
+#coding: utf-8
+
 module Ycn
-  def self.generate project_hash, language
-    puts 'moo'
+  def self.generate language, config
     $base_dir = Dir.pwd
 
-    require 'yaml'
-    require 'configatron'
-    require 'ycn/klass'
-    require 'ycn/ycn_functions'
-    require 'ycn/header'
-    require 'ycn/string_manip'
+    Header.configure_from config
+    config[:package] =
+      config[:package].to_s.gsub(' ', '_')
+    
+    config[:getters] = true unless config.has_key? :getters
+    config[:setters] = true unless config.has_key? :setters
+    config[:constructors] = true unless config.has_key? :constructors
+    
+    configatron { |c|
+      c.package = config[:package]
+      c.getters = config[:getters]
+      c.setters = config[:setters]
+      c.lang = language
+    }
     
-    Header.configure_from project_hash
-    project_hash[:package] =
-      project_hash[:package].to_s.gsub(' ', '_')
-    configatron { |c| c.package = project_hash[:package] }
-
     classes_yaml = YAML::load(
       correct_for_blank_last_method( open(
-      "#{$base_dir}/pcg/#{project_hash[:package]}.yml", 'r')))
+        "#{$base_dir}/pcg/#{config[:package]}.yml")))
 
     classes = []
 
@@ -26,21 +30,23 @@ module Ycn
     end
 
     fix_inheritance_and_overrides classes
-
-    generation_dir = "#{$base_dir}/generated_code"
-    package_name = "pcg#{StringManip::camelize configatron.package}"
-    output_dir = "#{generation_dir}/#{package_name}"
     
-    Dir.mkdir generation_dir unless File.exists? generation_dir
-    Dir.mkdir output_dir     unless File.exists? output_dir
+    package_name = "pcg#{camelize configatron.package}"
+    output_dir = "#{$base_dir}/#{package_name}"
     
+    Dir.mkdir output_dir unless File.exists? output_dir
+
     classes.each do |klass|
+      
+      template = open( "#{File.dirname(__FILE__)}/#{language}/#{language}_class.erb" ).read
+      
       file_name = "#{klass.name}.#{extension[language]}"
       
       File.open( "#{output_dir}/#{file_name}", 'w' ) { |f|
-        output = eval("klass.to_#{language.to_s.downcase}")
-        puts output + "\n"
-        f.print output
+        content = klass.print_to( template )
+        f.print content
+        puts content
+        #~ pp klass
       }
     end
   end

data/lib/ycn/ycn_functions.rb

@@ -1,3 +1,5 @@
+#~ require 'property'
+
 def correct_for_blank_last_method file
   # Without this, a blank mapping on the last line of the file
   # is incorrectly interpreted as a String.
@@ -17,8 +19,6 @@ end
 def fix_inheritance_and_overrides classes
   classes.each { |klass|
     klass.parent = (classes.find_all{ |c| c.name == klass.parent })[0]
-  }.each { |klass|
-    klass.extract_default_values
   }.each { |klass|
     klass.fix_default_overrides }
 end

data/website/index.html

@@ -1,11 +1,86 @@
-<html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-		<title>ycn</title>
-		
-	</head>
-	<body id="body">
-		<p>This page has not yet been created for RubyGem <code>ycn</code></p>
-		<p>To the developer: To generate it, update website/index.txt and run the rake task <code>website</code> to generate this <code>index.html</code> file.</p>
-	</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>
+      ycn
+  </title>
+  <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
+<style>
+
+</style>
+  <script type="text/javascript">
+    window.onload = function() {
+      settings = {
+          tl: { radius: 10 },
+          tr: { radius: 10 },
+          bl: { radius: 10 },
+          br: { radius: 10 },
+          antiAlias: true,
+          autoPad: true,
+          validTags: ["div"]
+      }
+      var versionBox = new curvyCorners(settings, document.getElementById("version"));
+      versionBox.applyCornersToAll();
+    }
+  </script>
+</head>
+<body>
+<div id="main">
+
+    <h1>ycn</h1>
+    <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/ycn"; return false'>
+      <p>Get Version</p>
+      <a href="http://rubyforge.org/projects/ycn" class="numbers">0.0.1</a>
+    </div>
+    <h1>&amp;#x2192; &#8216;ycn&#8217;</h1>
+<h2>What</h2>
+<h2>Installing</h2>
+<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">ycn</span></pre></p>
+<h2>The basics</h2>
+<h2>Demonstration of usage</h2>
+<h2>Forum</h2>
+<p><a href="http://groups.google.com/group/ycn">http://groups.google.com/group/ycn</a></p>
+<p><span class="caps">TODO</span> &#8211; create Google Group &#8211; ycn</p>
+<h2>How to submit patches</h2>
+<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
+<p><span class="caps">TODO</span> &#8211; pick <span class="caps">SVN</span> or Git instructions</p>
+<p>The trunk repository is <code>svn://rubyforge.org/var/svn/ycn/trunk</code> for anonymous access.</p>
+<p><span class="caps">OOOORRRR</span></p>
+<p>You can fetch the source from either:</p>
+<ul>
+	<li>rubyforge: <span class="caps">MISSING</span> IN <span class="caps">ACTION</span></li>
+</ul>
+<p><span class="caps">TODO</span> &#8211; You can not created a RubyForge project, OR have not run <code>rubyforge config</code><br />
+yet to refresh your local rubyforge data with this projects&#8217; id information.</p>
+<p>When you do this, this message will magically disappear!</p>
+<p>Or you can hack website/index.txt and make it all go away!!</p>
+<ul>
+	<li>github: <a href="http://github.com/GITHUB_USERNAME/ycn/tree/master">http://github.com/GITHUB_USERNAME/ycn/tree/master</a></li>
+</ul>
+<pre>git clone git://github.com/GITHUB_USERNAME/ycn.git</pre>
+<p><span class="caps">TODO</span> &#8211; add &#8220;github_username: username&#8221; to ~/.rubyforge/user-config.yml and newgem will reuse it for future projects.</p>
+<ul>
+	<li>gitorious: <a href="git://gitorious.org/ycn/mainline.git">git://gitorious.org/ycn/mainline.git</a></li>
+</ul>
+<pre>git clone git://gitorious.org/ycn/mainline.git</pre>
+<h3>Build and test instructions</h3>
+<pre>cd ycn
+rake test
+rake install_gem</pre>
+<h2>License</h2>
+<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
+<h2>Contact</h2>
+<p>Comments are welcome. Send an email to <a href="mailto:FIXME"><span class="caps">FIXME</span> full name</a> email via the <a href="http://groups.google.com/group/ycn">forum</a></p>
+    <p class="coda">
+      <a href="FIXME email">FIXME full name</a>, 22nd September 2008<br>
+      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
+    </p>
+</div>
+
+<!-- insert site tracking codes here, like Google Urchin -->
+
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ycn
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Andrew Koster
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-22 00:00:00 -04:00
+date: 2008-10-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,12 +47,21 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/ycn.rb
-- lib/ycn/version.rb
-- lib/ycn/ycn.rb
 - lib/ycn/header.rb
-- lib/ycn/java_klass.rb
+- lib/ycn/java/java_klass.rb
+- lib/ycn/java/java_method.rb
+- lib/ycn/java/java_property.rb
+- lib/ycn/java/java_class.erb
+- lib/ycn/ruby/ruby_klass.rb
+- lib/ycn/ruby/ruby_method.rb
+- lib/ycn/ruby/ruby_property.rb
+- lib/ycn/ruby/ruby_class.erb
 - lib/ycn/klass.rb
+- lib/ycn/method.rb
+- lib/ycn/property.rb
 - lib/ycn/string_manip.rb
+- lib/ycn/version.rb
+- lib/ycn/ycn.rb
 - lib/ycn/ycn_functions.rb
 - script/console
 - script/console.cmd
@@ -75,14 +84,12 @@ files:
 - website/template.html.erb
 has_rdoc: true
 homepage: http://ycn.rubyforge.org
-post_install_message: |+
-  
-  For more information on ycn, see http://ycn.rubyforge.org
-  
-  NOTE: Change this information in PostInstall.txt 
-  You can also delete it if you don't want it.
-  
+post_install_message: |-
+  For more information on ycn, see :
   
+  - http://ycn.rubyforge.org
+  - http://naturalcode.wordpress.com
+  - http://github.com/naturalcode/ycn/tree
 rdoc_options: 
 - --main
 - README.txt

data/lib/ycn/java_klass.rb

@@ -1,169 +0,0 @@
-module JavaKlass
-  def java_header 
-    text = <<HEAD
-Programme :    #{configatron.program_name}
-Auteur(s) :    #{configatron.author_name}
-Date :         #{Time.now.day}/#{Time.now.month}/#{Time.now.year}
-Description :  #{configatron.description}
-HEAD
-
-    '/*' + text.split("\n").map{ |l|
-      "\n *  #{l}"
-    }.join + "\n */\n"
-  end
-  
-  def to_java
-    java_header+
-    java_package+
-    java_imports+
-    java_class_declaration+
-    java_properties+
-    java_constructors+
-    java_methods+
-    java_g_s_etters+
-    java_bottom
-  end
-  
-  def java_package
-    @package ? "\npackage pcg#{camelize @package};\n" : ''
-  end
-  
-  def java_imports
-    text = ''
-    if properties
-      text += properties.keys.map{ |type|
-        type == 'Date' ? "\nimport java.util.Date;\n" : nil
-      }.join
-    end
-    text
-  end
-  
-  def java_class_declaration
-<<TEXT
-
-public class #{name}#{" extends #{parent.name}" if parent}
-{
-TEXT
-  end
-  
-  def java_properties
-    text = ''
-    
-    if properties
-      properties.each_pair do |type, prop_names|
-        if prop_names.class == Array
-          empty_set = true
-          
-          text += prop_names.map { |name|
-            if prop_default_overrides[name]
-              ''
-            else
-              empty_set = false
-              name_displayed = styled_var :riki, name, :g, type
-              value_assignment = prop_defaults[name] ? " = #{prop_defaults[name]}" : nil
-              
-              "  private #{type} #{name_displayed}#{value_assignment};\n"
-            end
-          }.join# + (empty_set ? '' : "\n")
-          
-        end
-      end
-    end
-    
-    text = (text == '') ? '' : "\n#{text}"
-  end
-  
-  def java_constructors
-    text = <<TEXT
-    
-  // Constructeur par défaut
-  public #{name}()
-  {#{_java_prop_default_overrides}
-TEXT
-    #~ text += 
-    text += "#{"\n" unless prop_default_overrides.keys.size > 0}  }\n"
-    if construct_params
-      #~ pp construct_params
-      text += construct_params.map{ |constructor|
-        "\n  public #{name}(" +
-        constructor.map { |param|
-          type = find_type(param)
-          "#{type} #{styled_var :riki, param, :p, type}"
-        }.join(', ') + ")\n  {\n" +
-        constructor.map { |param|
-          type = find_type(param)
-          "    set#{camelize param}(#{styled_var :riki, param, :p, type});"
-        }.join("\n") +
-        _java_prop_default_overrides + "\n  }\n"
-      }.join
-    end
-    text
-  end
-  
-  def _java_prop_default_overrides
-    p = prop_default_overrides.keys.map { |property|
-      "\n    super.set#{camelize property}(#{prop_default_overrides[property]});"
-    }.join("\n")
-  end
-  
-  def java_methods
-    text = ""
-    #~ puts "#{pp(methods)}"
-    if methods.class == Hash
-      methods.each_pair do |type, meth|
-        #~ puts 't' + type
-        if meth.class == Hash
-          meth.each_pair { |m, contents|
-            
-            if method_params[m]
-              parameters = method_params[m].map{ |item|
-                "#{camelize item} #{styled_var :riki, item, :p, item}"
-              }.join(', ')
-            end
-            
-            text += "\n  public #{type} #{low_camelize m}(" +
-            "#{parameters if parameters})\n" +
-            "  {\n#{contents.split("\n").map{ |l| "    #{l}#{';' if !(l =~ /(\+|\{|\}|\()\z/)}"}.join("\n") if contents}\n  }\n"
-          }
-        else
-          puts "Warning! No method type for #{type}"
-        end
-      end
-      
-    else
-      
-    end
-    text
-  end
-  
-  def java_g_s_etters
-    text = ''
-    if properties
-      properties.each_pair do |type, prop_names|
-        text += prop_names.map { |name|
-          unless prop_default_overrides[name]
-<<TEXT
-
-  public #{type} get#{camelize name}()
-  {
-    return #{styled_var :riki, name, :g, type };
-  }
-  
-  public void set#{camelize name}(#{type} #{styled_var :riki, name, :p, type})
-  {
-    #{styled_var :riki, name, :g, type } = #{styled_var :riki, name, :p, type}; 
-  }
-TEXT
-          else
-            ''
-          end
-        }.join
-      end
-    end
-    text
-  end
-  
-  def java_bottom
-    '}'
-  end
-end