rpcoder 0.0.4 → 0.1.0

data/README.rdoc

@@ -22,7 +22,7 @@
   RPCoder.function "getMail" do |f|
     f.path        = "/mails/:id" # => ("/mails/" + id)
     f.method      = "GET"
-    f.set_return_type "Mail"
+    f.add_return_type :mail, "Mail"
     f.add_param  :id, "int"
     f.description = 'メールを取得'
   end
@@ -30,14 +30,13 @@
   RPCoder.function "getMails" do |f|
     f.path        = "/mails"
     f.method      = "GET"
-    f.set_return_type "Array", {:array_type => "Mail"}
+    f.add_return_type :mails, "Mail", {:array? => true}
     f.description = 'メールを送信'
   end
   
   RPCoder.function "sendMail" do |f|
     f.path        = "/mails/create"
     f.method      = "POST"
-    f.set_return_type "void"
     f.add_param  :subject, "String"
     f.add_param  :body,    "String"
     f.description = 'メールを送信'
@@ -50,9 +49,19 @@
 == code for using RPC
 
   var rpc:RPC = new RPC('http://localhost:3000');
+  
   rpc.getMail(1, function(mail:Mail):void {
   	// success
   }, function():void {
   	// failure
   })
+  
+  rpc.getMails(function(mails:Array):void {
+  	// success
+	for each (var mail as Mail in mails)
+	{
+	}
+  }, function():void {
+  	// failure
+  })
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/lib/rpcoder/function.rb

@@ -1,3 +1,5 @@
+require 'rpcoder/param'
+
 module RPCoder
   class Function
     PARAMS_IN_URL_RE = /:[\w\d]+/
@@ -7,6 +9,14 @@ module RPCoder
       @params ||= []
     end
 
+    def return_types
+      @return_types ||= []
+    end
+
+    def has_return_type?
+      !return_types.empty?
+    end
+
     def add_param(name, type, options = {})
       params << Param.new(name, type, options)
     end
@@ -29,28 +39,8 @@ module RPCoder
       params.select { |i| !param_strs.include?(i.name.to_s)  }
     end
 
-    def set_return_type(type, options = {})
-      @return_type = type
-      @return_type_options = options
-    end
-
-    def return_type_instance_creator(elem)
-      type = @return_type
-      type = @return_type_options[:array_type] if @return_type == 'Array'
-      if Type.original_types.include?(type)
-        elem
-      else
-        "new #{type}(#{elem})"
-      end
-    end
-
-    class Param
-      attr_accessor :name, :type, :options
-      def initialize(name, type, options = {})
-        @name = name
-        @type = type
-        @options = options
-      end
+    def add_return_type(name, type, options = {})
+      return_types << Param.new(name, type, options)
     end
   end
 end

data/lib/rpcoder/param.rb

@@ -0,0 +1,45 @@
+module RPCoder
+  class Param
+    def self.original_types
+      [:int, :String, :Boolean, :Array]
+    end
+
+    attr_accessor :name, :type, :options
+    def initialize(name, type, options = {})
+      @name = name
+      @type = type
+      @options = options
+    end
+
+    def array?
+      options[:array?]
+    end
+
+    def original_type?
+      Param.original_types.include?(type.to_sym)
+    end
+
+    def array_param
+      Param.new(name, options[:array_type])
+    end
+
+    def instance_creator(elem = 'elem', options = {})
+      elem = element_accessor(elem, options)
+      if original_type?
+        elem
+      else
+        "new #{type}(#{elem})"
+      end
+    end
+
+    def element_accessor(elem = 'elem', options = {})
+      if options[:object?]
+        "object['#{elem}']"
+      else
+        elem
+      end
+    end
+
+  end
+end
+

data/lib/rpcoder/type.rb

@@ -1,11 +1,9 @@
+require 'rpcoder/param'
+
 module RPCoder
   class Type
     attr_accessor :name, :description
 
-    def self.original_types
-      [:int, :String, :Boolean, :Array]
-    end
-
     def fields
       @fields ||= []
     end
@@ -14,36 +12,7 @@ module RPCoder
       fields << Field.new(name, type, options)
     end
 
-    class Field
-      attr_accessor :name, :type, :options
-      def initialize(name, type, options = {})
-        @name = name
-        @type = type
-        @options = options
-      end
-
-      def original_type?
-        Type.original_types.include?(@type.to_sym)
-      end
-
-      def array?
-        @type.to_sym == :Array
-      end
-
-      def array_field
-        Field.new(name, options[:array_type])
-      end
-
-      def instance_creator(elem = nil, options = {})
-        elem = name if elem.nil?
-        if original_type?
-          "object['#{name}']"
-        elsif options[:direct]
-          "new #{type}(#{elem})"
-        else
-          "new #{type}(object['#{elem}'])"
-        end
-      end
+    class Field < Param
     end
   end
 end

data/lib/templates/API.erb

@@ -105,21 +105,29 @@ package <%= name_space %>
             request("<%= func.method %>", <%= func.path_parts.join(' + ') %>, params,
                 function(e:ResultEvent, t:Object):void {
                     t = t; // FIXME: for removing warning
-                    <%- if func.return_type && func.return_type == 'Array' -%>
                     var hash:Object = JSON.decode(e.result as String);
-                    var array:Array = new Array();
+
+                    <%- func.return_types.each do |param| -%>
+                    <%- if param.array? -%>
+                    var <%= param.name %>_list:Array = new Array();
+                    for each (var <%= param.name %>:Object in hash['<%= param.name %>'])
+                        <%= param.name %>_list.push(<%= param.instance_creator(param.name) %>);
+                    <%- end -%>
+                    <%- end -%>
+
                     <%-
-                      @elem_count ||= 0
-                      @elem_count += 1
+                      args = []
+                      if func.has_return_type?
+                        args = func.return_types.map {|param|
+                          if param.array?
+                            "#{param.name}_list"
+                          else
+                            param.instance_creator("hash['#{param.name}']")
+                          end
+                        }
+                      end
                     -%>
-                    for each (var elem<%= @elem_count %>:Object in hash)
-                        array.push(<%= func.return_type_instance_creator("elem#{@elem_count}") %>);
-                    success(array);
-                    <%- elsif func.return_type != 'void' -%>
-                    success(<%= func.return_type_instance_creator('JSON.decode(e.result as String)') %>);
-                    <%- else -%>
-                    success();
-                    <%- end -%>
+                    success(<%= args.join(', ') %>);
                 },
                 function(e:FaultEvent, t:Object):void {
                     t = t; // FIXME: for removing warning

data/lib/templates/Type.erb

@@ -23,9 +23,9 @@ package <%= name_space %>
                 <%- if field.array? -%>
                 _<%= field.name %> = new Array();
                 for each(var elem:Object in object['<%= field.name %>'])
-                    _<%= field.name %>.push(<%= field.array_field.instance_creator(:elem, {:direct => true}) %>);
+                    _<%= field.name %>.push(<%= field.instance_creator(:elem) %>);
                 <%- else -%>
-                _<%= field.name %> = <%= field.instance_creator %>;
+                _<%= field.name %> = <%= field.instance_creator(field.name, {:object? => true}) %>;
                 <%- end -%>
                 <%- end -%>
             }

data/rpcoder.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rpcoder}
-  s.version = "0.0.4"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo", "Toshiyuki Hirooka"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/rpcoder.rb",
     "lib/rpcoder/function.rb",
+    "lib/rpcoder/param.rb",
     "lib/rpcoder/type.rb",
     "lib/templates/API.erb",
     "lib/templates/Type.erb",
@@ -32,6 +33,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/foo/bar/API.as",
     "spec/fixtures/foo/bar/Mail.as",
     "spec/rpcoder/function_spec.rb",
+    "spec/rpcoder/param_spec.rb",
     "spec/rpcoder_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -42,6 +44,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Simple RPC generator for as3}
   s.test_files = [
     "spec/rpcoder/function_spec.rb",
+    "spec/rpcoder/param_spec.rb",
     "spec/rpcoder_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/fixtures/foo/bar/API.as

@@ -102,7 +102,10 @@ package foo.bar
             request("GET", "/mails/" + id, params,
                 function(e:ResultEvent, t:Object):void {
                     t = t; // FIXME: for removing warning
-                    success(new Mail(JSON.decode(e.result as String)));
+                    var hash:Object = JSON.decode(e.result as String);
+
+
+                    success(new Mail(hash['mail']));
                 },
                 function(e:FaultEvent, t:Object):void {
                     t = t; // FIXME: for removing warning
@@ -124,10 +127,12 @@ package foo.bar
                 function(e:ResultEvent, t:Object):void {
                     t = t; // FIXME: for removing warning
                     var hash:Object = JSON.decode(e.result as String);
-                    var array:Array = new Array();
-                    for each (var elem1:Object in hash)
-                        array.push(new Mail(elem1));
-                    success(array);
+
+                    var mails_list:Array = new Array();
+                    for each (var mails:Object in hash['mails'])
+                        mails_list.push(new Mail(mails));
+
+                    success(mails_list, hash['count']);
                 },
                 function(e:FaultEvent, t:Object):void {
                     t = t; // FIXME: for removing warning

data/spec/rpcoder/param_spec.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+module RPCoder
+  describe "Param" do
+    context do
+      let(:param) { Param.new(:foo, 'int') }
+      subject { param }
+      it { subject.name.should == :foo }
+      it { subject.type.should == 'int' }
+      it { should_not be_array }
+    end
+
+    context do
+      let(:param) { Param.new(:foo, 'int', {:array? => true}) }
+      subject { param }
+      it { should be_array }
+    end
+
+    context do
+      it { Param.new(:foo, 'int').instance_creator.should == 'elem' }
+      it { Param.new(:foo, 'Foo').instance_creator.should == 'new Foo(elem)' }
+      it { Param.new(:foo, 'int').instance_creator('bar').should == 'bar' }
+      it { Param.new(:foo, 'int').instance_creator('bar', {:object? => true}).should == "object['bar']" }
+      it { Param.new(:foo, 'Foo').instance_creator('bar', {:object? => true}).should == "new Foo(object['bar'])" }
+    end
+
+  end
+end
+

data/spec/rpcoder_spec.rb

@@ -12,7 +12,7 @@ describe "RPCoder" do
         f.path        = "/mails/:id" # => ("/mails/" + id)
         f.description = 'get mail'
         f.method      = "GET"
-        f.set_return_type "Mail"
+        f.add_return_type :mail, "Mail"
         f.add_param  :id, :int
         f.add_param  :foo, :String, :expect => ["A","B"]
         f.add_param  :bar, :Array
@@ -23,7 +23,8 @@ describe "RPCoder" do
         f.path        = "/mails/"
         f.description = 'get mails'
         f.method      = "GET"
-        f.set_return_type "Array", {:array_type => "Mail"}
+        f.add_return_type :mails, "Mail", {:array? => true}
+        f.add_return_type :count, "int"
       end
 
       RPCoder.type "Mail" do |t|

metadata

@@ -2,7 +2,7 @@
 name: rpcoder
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - jugyo
@@ -97,6 +97,7 @@ files:
 - VERSION
 - lib/rpcoder.rb
 - lib/rpcoder/function.rb
+- lib/rpcoder/param.rb
 - lib/rpcoder/type.rb
 - lib/templates/API.erb
 - lib/templates/Type.erb
@@ -104,6 +105,7 @@ files:
 - spec/fixtures/foo/bar/API.as
 - spec/fixtures/foo/bar/Mail.as
 - spec/rpcoder/function_spec.rb
+- spec/rpcoder/param_spec.rb
 - spec/rpcoder_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/one-up/rpcoder
@@ -119,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3871653312860039459
+      hash: 26553161876268994
       segments: 
       - 0
       version: "0"
@@ -138,5 +140,6 @@ specification_version: 3
 summary: Simple RPC generator for as3
 test_files: 
 - spec/rpcoder/function_spec.rb
+- spec/rpcoder/param_spec.rb
 - spec/rpcoder_spec.rb
 - spec/spec_helper.rb