peto 0.2.6 → 0.2.7

data/README.rdoc

@@ -14,8 +14,8 @@ Contract file is simple YAML format.
       errors: [human not found, invalid id]
 
 peto generates some codes.
-* human.rb : human's structure class
-* foo.rb : procedure class. this has find_human, find_human_response, find_human_error_human_not_found, find_human_error_invalid_id
+* human.rb(or human.as) : human's structure class
+* foo.rb(or foo.as) : procedure class. this has find_human, find_human_response, find_human_error_human_not_found, find_human_error_invalid_id
 
 Use Foo class methods to create hash and send it as JSON string for RPC.
 
@@ -41,8 +41,7 @@ contract file (foo.yml):
       args: [user:user]
 
 invoke command:
-  % mkdir generated
-  % peto foo.yml -o generated/
+  % peto foo.yml rb -o generated/
 
 use foo.rb:
   $: << "generated/"

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/peto/generator.rb

@@ -8,7 +8,7 @@ class String
   def to_method_name
     underscore.split(" ").join("_")
   end
-  def to_class_type
+  def to_rb_class_type
     case self
     when "integer"
       "Fixnum"
@@ -16,6 +16,25 @@ class String
       classify
     end
   end
+  def to_as_class_type
+    case self
+    when "integer"
+      "int"
+    when "Number"
+      "int"
+    when "Boolean"
+      "Boolean"
+    when "string"
+      "String"
+    when "array"
+      "Array"
+    else
+      self.capitalize
+    end
+  end
+  def to_class_type(language)
+    send(:"to_#{language}_class_type")
+  end
 end
 
 def rb_primitive_types
@@ -24,11 +43,20 @@ end
 def as_primitive_types
   ["int", "String", "Number", "uint", "Boolean"]
 end
+def as_default_value(type)
+  case type
+  when "int"
+    "0"
+  else
+    "null"
+  end
+end
 
 module Peto
   class Generator
-    def initialize(contract)
+    def initialize(contract, language)
       @contract = contract
+      @language = language
     end
     attr_reader :contract
 
@@ -44,7 +72,7 @@ module Peto
     end
 
     def class_name
-      @contract["name"].to_class_type
+      @contract["name"].to_class_type(@language)
     end
 
     def args(string_args)
@@ -58,14 +86,14 @@ module Peto
       array_type = options.delete(:array_type)
       {
         :name => name,
-        :type => type.to_class_type,
-        :array_type => array_type.nil? ? nil : array_type.to_class_type,
+        :type => type.to_class_type(@language),
+        :array_type => array_type.nil? ? nil : array_type.to_class_type(@language),
       }
     end
 
     def each_types
       @contract["types"].each do |name, args|
-        yield name.to_class_type, args(args)
+        yield name.to_class_type(@language), args(args)
       end
     end
 

data/lib/peto/master.rb

@@ -19,14 +19,25 @@ module Peto
 
     def parse(language)
       (@contract["types"]||{}).inject({}) {|result, type|
-        result.merge!(Generator.new(@contract).generate_class(TEMPLATE_DIR + "/#{language}_classes.erb", type))
-      }.merge!(Generator.new(@contract).generate_procedure(TEMPLATE_DIR + "/#{language}_procedures.erb"))
+        result.merge!(Generator.new(@contract, language).generate_class(TEMPLATE_DIR + "/#{language}_classes.erb", type))
+      }.merge!(Generator.new(@contract, language).generate_procedure(TEMPLATE_DIR + "/#{language}_procedures.erb"))
+    end
+
+    def class_filename(name, language)
+      case language
+      when "rb"
+        "#{name}.#{language}"
+      when "as"
+        "peto/#{name.capitalize}.#{language}"
+      else
+        raise "invalid language #{language.inspect}"
+      end
     end
 
     def generate(language, output_dir=nil)
       raise "language is nil" if language.nil?
       parse(language).each do |name, content|
-        filepath = File.join(output_dir||File::dirname(@filename), language, "#{name}.#{language}")
+        filepath = File.join(output_dir||File::dirname(@filename), language, class_filename(name, language))
         write(filepath, content)
       end
     end

data/lib/templates/as_classes.erb

@@ -1,16 +1,16 @@
 <%- name = @target[:name].camelize -%>
 <%- args = @target[:args] -%>
-import peto.*;
-
 package peto
 {
-	class <%= name %>
+	import peto.*;
+
+	public class <%= name %>
 	{
-		public static function create(hash_args):<%=name%>
+		public static function create(hash_args:Object):<%=name%>
 		{
 			var instance:<%= name %> = new <%= name %>;
 			<%- args.each do |arg| -%>
-				<%- if rb_primitive_types.include?(arg[:type].constantize) -%>
+				<%- if as_primitive_types.include?(arg[:type]) -%>
 			instance.<%=arg[:name]%> = hash_args.<%= arg[:name]%>;
 				<%- elsif arg[:array_type] -%>
 			for each ( var arg:Object in hash_args.<%= arg[:name]%>)
@@ -22,7 +22,7 @@ package peto
 			return instance;
 		}
 
-		public function <%=name%>(<%= args.map{|arg| "#{arg[:name]}:#{arg[:type]}"}.join(",") %>)
+		public function <%=name%>(<%= args.map{|arg| "#{arg[:name]}:#{arg[:type]}=#{as_default_value(arg[:type])}"}.join(",") %>)
 		{
 		<%- args.each do |arg| -%>
 			this.<%= arg[:name] %> = <%= arg[:name] %>;
@@ -30,14 +30,14 @@ package peto
 		}
 
 		<%- args.each do |arg| -%>
-		private var <%= arg[:name] %>:<%= arg[:type] %>;
+		private var m_<%= arg[:name] %>:<%= arg[:type] %>;
 		public function get <%= arg[:name] %>():<%= arg[:type] %>
 		{
-			return <%= arg[:name] %>;
+			return m_<%= arg[:name] %>;
 		}
-		public function set <%= arg[:name] %>(value:<%= arg[:type] %>)
+		public function set <%= arg[:name] %>(value:<%= arg[:type] %>):void
 		{
-			<%= arg[:name] %> = value;
+			m_<%= arg[:name] %> = value;
 		}
 		<%- end -%>
 
@@ -45,13 +45,13 @@ package peto
 		{
 			var hash:Object = new Object;
 			<%- args.each do |arg| -%>
-				<%- if rb_primitive_types.include?(arg[:type].constantize) -%>
-			hash_args["<%= arg[:name]%>"] = <%=arg[:name]%>;
+				<%- if as_primitive_types.include?(arg[:type]) -%>
+			hash["<%= arg[:name]%>"] = <%=arg[:name]%>;
 				<%- elsif arg[:array_type] -%>
 			for each ( var arg:<%= arg[:array_type]%> in <%= arg[:name]%>)
-				hash_args["<%= arg[:name]%>"] = <%=arg[:name]%>.toHash():
+				hash["<%= arg[:name]%>"] = <%=arg[:name]%>.toHash();
 				<%- else -%>
-			hash_args["<%= arg[:name]%>"] = <%=arg[:name]%>.toHash():
+			hash["<%= arg[:name]%>"] = <%=arg[:name]%>.toHash();
 				<%- end -%>
 			<%- end -%>
 			return hash;

data/lib/templates/as_procedures.erb

@@ -6,12 +6,11 @@
     args.map{|arg| "#{arg[:name]}:#{arg[:type]}"}.join(",")
   end
 -%>
-
-import peto.*;
-
 package peto
 {
-	class <%= class_name %>
+	import peto.*;
+
+	public class <%= class_name %>
 	{
 		<%- each_procedures do |name, args| -%>
 		// <%=name%> methods
@@ -21,9 +20,11 @@ package peto
 			return {
 				procedure : "<%=name%>",
 				args : {
-				<%- args.each do |arg| -%>
-					<%=arg[:name]%> : hashize(<%=arg[:name]%>),
-				<%- end -%>
+					<%= args.map {|arg|
+						as_primitive_types.include?(arg[:type]) ?
+						"#{arg[:name]} : #{arg[:name]}" :
+						"#{arg[:name]} : #{arg[:name]}.toHash()"
+					}.join(",")%>
 				}
 			}
 		}
@@ -32,24 +33,15 @@ package peto
 		{
 			var args:Array = new Array();
 			<%- args.each do |arg| -%>
+			<%- if as_primitive_types.include?(arg[:type])-%>
+			args.push(hash_args.<%=arg[:name]%>);
+			<%- else -%>
 			args.push(<%=arg[:type]%>.create(hash_args.<%=arg[:name]%>));
 			<%- end -%>
+			<%- end -%>
 			return args;
 		}
 
 		<%- end -%>
-
-		public static function hashize(var:Object):Object
-		{
-			if ( isPrimitiveType(typeof(var)) )
-				return var;
-			else
-				return var.toHash();
-		}
-
-		public static function isPrimitiveType(type):Boolean
-		{
-			[<%=as_primitive_types.join(",")%>].indexOf?(type) != -1;
-		}
 	}
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Toshiyuki Hirooka
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +09:00
+date: 2010-11-04 00:00:00 +09:00
 default_executable: peto
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,14 +111,9 @@ files:
 - examples/rails_app/test/unit/helpers/foo_helper_test.rb
 - examples/rails_app/test/test_helper.rb
 - examples/rails_app/test/functional/foo_controller_test.rb
-- examples/rails_app/contracts/generated/animal.rb
-- examples/rails_app/contracts/generated/aho.rb
-- examples/rails_app/contracts/generated/user.rb
 - examples/rails_app/contracts/generated/rb/animal.rb
 - examples/rails_app/contracts/generated/rb/user.rb
 - examples/rails_app/contracts/generated/rb/foo.rb
-- examples/rails_app/contracts/generated/foo.rb
-- examples/rails_app/contracts/generated/iasdaho.rb
 has_rdoc: true
 homepage: http://github.com/tosik/peto
 licenses: []
@@ -176,11 +171,6 @@ test_files:
 - examples/rails_app/test/unit/helpers/foo_helper_test.rb
 - examples/rails_app/test/test_helper.rb
 - examples/rails_app/test/functional/foo_controller_test.rb
-- examples/rails_app/contracts/generated/animal.rb
-- examples/rails_app/contracts/generated/aho.rb
-- examples/rails_app/contracts/generated/user.rb
 - examples/rails_app/contracts/generated/rb/animal.rb
 - examples/rails_app/contracts/generated/rb/user.rb
 - examples/rails_app/contracts/generated/rb/foo.rb
-- examples/rails_app/contracts/generated/foo.rb
-- examples/rails_app/contracts/generated/iasdaho.rb

data/examples/rails_app/contracts/generated/aho.rb

@@ -1,27 +0,0 @@
-require "peto/mixin/peto_class"
-
-module Peto
-  class Aho
-    include PetoClass
-    def initialize(args={})
-      @name = nil
-
-      set_by_hash(args)
-      raise_errors unless valid?
-    end
-
-    attr_reader :name
-
-    def members
-      [:name]
-    end
-
-    def types
-      {:name => String}
-    end
-
-    def arrays
-      {}
-    end
-  end
-end

data/examples/rails_app/contracts/generated/animal.rb

@@ -1,39 +0,0 @@
-require "peto/mixin/peto_class"
-
-module Peto
-  class Animal
-    include PetoClass
-
-    def self.create(hash_args)
-      instance = new
-      instance.name = hash_args["name"]
-      return instance
-    end
-
-    def initialize(args={})
-      @name = nil
-
-      set_args(args)
-      raise_errors unless valid?
-    end
-
-    attr_reader :name
-
-    def name=(value)
-      @name = value
-      raise_errors unless valid?
-    end
-
-    def members
-      [:name]
-    end
-
-    def types
-      {:name => String}
-    end
-
-    def arrays
-      {}
-    end
-  end
-end

data/examples/rails_app/contracts/generated/foo.rb

@@ -1,93 +0,0 @@
-require "peto/mixin/peto_errorable"
-
-
-module Peto
-  class Foo
-    extend PetoErrorable
-
-    # set_user methods
-
-    def self.set_user(user)
-      set_user_valid?(user)
-      return {
-        :procedure => "set_user",
-        :args => {
-          :user => hashize(user),
-        }
-      }
-    end
-
-    def self.set_user_valid?(user)
-      invalid_type("user", User, user) unless user.class == User
-      raise_errors unless errors.empty?
-    end
-
-    def self.set_user_hash_to_args(hash_args)
-      args = []
-      args.push(User.create(hash_args["user"]))
-      return args
-    end
-
-
-    # set_user_response methods
-
-    def self.set_user_response(a,b)
-      set_user_response_valid?(a,b)
-      return {
-        :procedure => "set_user_response",
-        :args => {
-          :a => hashize(a),
-          :b => hashize(b),
-        }
-      }
-    end
-
-    def self.set_user_response_valid?(a,b)
-      invalid_type("a", Fixnum, a) unless a.class == Fixnum
-      invalid_type("b", String, b) unless b.class == String
-      raise_errors unless errors.empty?
-    end
-
-    def self.set_user_response_hash_to_args(hash_args)
-      args = []
-      args.push(Fixnum.create(hash_args["a"]))
-      args.push(String.create(hash_args["b"]))
-      return args
-    end
-
-
-    # set_user_error_invalid_user methods
-
-    def self.set_user_error_invalid_user(message)
-      set_user_error_invalid_user_valid?(message)
-      return {
-        :procedure => "set_user_error_invalid_user",
-        :args => {
-          :message => hashize(message),
-        }
-      }
-    end
-
-    def self.set_user_error_invalid_user_valid?(message)
-      invalid_type("message", String, message) unless message.class == String
-      raise_errors unless errors.empty?
-    end
-
-    def self.set_user_error_invalid_user_hash_to_args(hash_args)
-      args = []
-      args.push(String.create(hash_args["message"]))
-      return args
-    end
-
-
-
-    def self.hashize(var)
-      return var if atomic_type?(var.class)
-      var.to_hash
-    end
-
-    def self.atomic_type?(type)
-      [Fixnum,String].include?(type)
-    end
-  end
-end

data/examples/rails_app/contracts/generated/iasdaho.rb

@@ -1,27 +0,0 @@
-require "peto/mixin/peto_class"
-
-module Peto
-  class Iasdaho
-    include PetoClass
-    def initialize(args={})
-      @name = nil
-
-      set_by_hash(args)
-      raise_errors unless valid?
-    end
-
-    attr_reader :name
-
-    def members
-      [:name]
-    end
-
-    def types
-      {:name => String}
-    end
-
-    def arrays
-      {}
-    end
-  end
-end

data/examples/rails_app/contracts/generated/user.rb

@@ -1,53 +0,0 @@
-require "peto/mixin/peto_class"
-
-module Peto
-  class User
-    include PetoClass
-
-    def self.create(hash_args)
-      instance = new
-      instance.name = hash_args["name"]
-      instance.age = hash_args["age"]
-      instance.animals = hash_args["animals"].map {|arg| Animal.create(arg) }
-      return instance
-    end
-
-    def initialize(args={})
-      @name = nil
-      @age = nil
-      @animals = [] # for Animal
-
-      set_args(args)
-      raise_errors unless valid?
-    end
-
-    attr_reader :name
-    attr_reader :age
-    attr_reader :animals
-
-    def name=(value)
-      @name = value
-      raise_errors unless valid?
-    end
-    def age=(value)
-      @age = value
-      raise_errors unless valid?
-    end
-    def animals=(value)
-      @animals = value
-      raise_errors unless valid?
-    end
-
-    def members
-      [:name,:age,:animals]
-    end
-
-    def types
-      {:name => String,:age => Fixnum,:animals => Array}
-    end
-
-    def arrays
-      {:animals => Animal}
-    end
-  end
-end