peto 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/examples/rails_app/config/application.rb

@@ -17,7 +17,7 @@ module RailsApp
 
     # generated files by peto
     config.autoload_paths += %W(#{config.root}/contracts/generated)
-    #config.autoload_paths += %W(#{config.root}/../../lib)
+    config.autoload_paths += %W(#{config.root}/../../lib)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.

data/examples/rails_app/config/environment.rb

@@ -3,3 +3,7 @@ require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
 RailsApp::Application.initialize!
+
+#ActionController::Base.param_parsers[Mime::Type::lookup("application/json")] = Proc.new {
+#  ActiveSupport::JSON.decode(data)
+#}

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

@@ -3,15 +3,27 @@ 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_by_hash(args)
+      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

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

@@ -1,8 +1,12 @@
 require "peto/mixin/peto_errorable"
 
+
 module Peto
   class Foo
     extend PetoErrorable
+
+    # set_user methods
+
     def self.set_user(user)
       set_user_valid?(user)
       return {
@@ -18,6 +22,15 @@ module Peto
       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 {
@@ -35,6 +48,16 @@ module Peto
       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 {
@@ -50,10 +73,21 @@ module Peto
       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 [Fixnum, String].include?(var.class)
+      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/user.rb

@@ -3,12 +3,21 @@ 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_by_hash(args)
+      set_args(args)
       raise_errors unless valid?
     end
 
@@ -16,6 +25,19 @@ module Peto
     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

data/lib/peto/generator.rb

@@ -18,6 +18,10 @@ class String
   end
 end
 
+def atomic_types
+  [Fixnum, String]
+end
+
 module Peto
   class Generator
     def initialize(contract)

data/lib/peto/mixin/peto_class.rb

@@ -3,8 +3,8 @@ require "peto/mixin/peto_errorable"
 module PetoClass
   include PetoErrorable
 
-  def set_by_hash(hash)
-    hash.each do |key, value|
+  def set_args(args)
+    args.each do |key, value|
       var = instance_variable_get("@#{key}")
       invalid_type(key, types[key], value) unless value.class == types[key] || value.nil?
       raise_errors unless errors.empty?

data/lib/peto/rails/rails_controller_helper.rb

@@ -50,9 +50,14 @@ module Peto
       peto_class.send(:"#{procedure}_valid?", args)
     end
 
-    def call_subaction(procedure, args)
-      valid_args?(procedure, args)
-      send(procedure, args)
+    def hash_to_args(procedure, hash_args)
+      peto_class.send(:"#{procedure}_hash_to_args", hash_args)
+    end
+
+    def call_subaction(procedure, hash_args)
+      args = hash_to_args(procedure, hash_args)
+      valid_args?(procedure, *args) # raise error
+      send(procedure, *args)
     end
   end
 end

data/lib/templates/rb_classes.erb

@@ -5,6 +5,21 @@ require "peto/mixin/peto_class"
 module Peto
   class <%= name %>
     include PetoClass
+
+    def self.create(hash_args)
+      instance = new
+      <%- args.each do |arg| -%>
+        <%- if atomic_types.include?(arg[:type].constantize) -%>
+      instance.<%=arg[:name]%> = hash_args["<%= arg[:name]%>"]
+      <%- elsif arg[:array_type] -%>
+      instance.<%=arg[:name]%> = hash_args["<%= arg[:name]%>"].map {|arg| <%=arg[:array_type]%>.create(arg) }
+        <%- else -%>
+      instance.<%=arg[:name]%> = <%=arg[:type]%>.create(hash_args["<%= arg[:name]%>"])
+        <%- end -%>
+      <%- end -%>
+      return instance
+    end
+
     def initialize(args={})
       <%- args.each do |arg| -%>
         <%- if arg[:array_type] -%>
@@ -14,7 +29,7 @@ module Peto
         <%- end -%>
       <%- end -%>
 
-      set_by_hash(args)
+      set_args(args)
       raise_errors unless valid?
     end
 
@@ -22,6 +37,13 @@ module Peto
     attr_reader :<%= arg[:name] %>
     <%- end -%>
 
+    <%- args.each do |arg| -%>
+    def <%= arg[:name] %>=(value)
+      @<%=arg[:name]%> = value
+      raise_errors unless valid?
+    end
+    <%- end -%>
+
     def members
       [<%= args.map{|arg| ":#{arg[:name]}"}.join(",") %>]
     end

data/lib/templates/rb_procedures.erb

@@ -1,11 +1,20 @@
 require "peto/mixin/peto_errorable"
 
+<%-
+  def comma_args(args)
+    args.map{|arg| arg[:name]}.join(",")
+  end
+-%>
+
 module Peto
   class <%= class_name %>
     extend PetoErrorable
+
     <%- each_procedures do |name, args| -%>
-    def self.<%= name %>(<%= args.map{|arg| arg[:name]}.join(",") %>)
-      <%=name%>_valid?(<%= args.map{|arg| arg[:name]}.join(",") %>)
+    # <%=name%> methods
+
+    def self.<%= name %>(<%= comma_args(args) %>)
+      <%=name%>_valid?(<%= comma_args(args) %>)
       return {
         :procedure => "<%=name%>",
         :args => {
@@ -16,18 +25,31 @@ module Peto
       }
     end
 
-    def self.<%=name%>_valid?(<%= args.map{|arg| arg[:name]}.join(",") %>)
+    def self.<%=name%>_valid?(<%= comma_args(args) %>)
       <%- args.each do |arg| -%>
       invalid_type("<%= arg[:name] %>", <%= arg[:type] %>, <%= arg[:name] %>) unless <%= arg[:name] %>.class == <%= arg[:type] %>
       <%- end -%>
       raise_errors unless errors.empty?
     end
 
+    def self.<%=name%>_hash_to_args(hash_args)
+      args = []
+      <%- args.each do |arg| -%>
+      args.push(<%=arg[:type]%>.create(hash_args["<%=arg[:name]%>"]))
+      <%- end -%>
+      return args
+    end
+
+
     <%- end -%>
 
     def self.hashize(var)
-      return var if [Fixnum, String].include?(var.class)
+      return var if atomic_type?(var.class)
       var.to_hash
     end
+
+    def self.atomic_type?(type)
+      [<%=atomic_types.join(",")%>].include?(type)
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Toshiyuki Hirooka