peto 0.2.1 → 0.2.2

data/README.rdoc

@@ -17,9 +17,11 @@ contract file (foo.yml):
       args: [user:user]
 
 invoke command:
-  % peto foo.yml
+  % mkdir generated
+  % peto foo.yml -o generated/
 
 use foo.rb:
+  $: << "generated/"
   require "foo"
   require "animal"
   require "user"
@@ -28,6 +30,7 @@ use foo.rb:
   dog = Peto::Animal.new(:name => "dog")
   user = Peto::User.new(:name => "alice", :age => 23, :animals=>[cat, dog])
 
+  # generating procedure hash
   p Peto::Foo.set_user(user) # => { :procedure=>"set_user",
                                     :args=>{ :user=>{ :name=>"alice",
                                                       :age=>23,
@@ -36,6 +39,74 @@ use foo.rb:
                                                         Peto::Animal({:name=>"dog"})
                                                       ]}}}
 
+== in Rails
+
+=== setup
+
+create your new application
+  % rails new myapp
+
+add autoload_paths to config/application.rb
+  config.autoload_paths += %W(#{config.root}/generated)
+
+add including to app/controller/application_controller.rb
+  require "peto/rails/rails_controller_helper"
+
+  class ApplicationController < ActionController::Base
+    include Peto::RailsControllerHelper
+    # ...
+  end
+
+add to test/test_helper.rb
+  require "peto/rails/rails_controller_test_helper"
+
+  class ActionController::TestCase
+    include Peto::RailsControllerTestHelper
+  end
+
+add match to config/routes.rb
+  match ':controller(/:action)'
+
+=== using
+
+  % # on your rails home
+  % create contract/foo.yml
+  % mkdir generated
+  % peto contract/foo.yml -o generated/
+
+add subaction to app/controller/foo_controller.rb
+
+  # this is subaction
+  def set_user(args)
+    respond(123, "foo bar baz")
+  end
+
+subaction is an action method in imitation of rails controller.
+this has args to use likes params.
+
+post procedure name and parameters to application, be called subaction.
+in test/functional/foo_controller_test.rb
+  test "set_user" do
+    peto_post("set_user", Peto::User.new(:name=>"alice"))
+    assert_response :success
+    assert_peto_response("a"=>123, "b"=>"foo bar baz")
+  end
+
+run server
+
+  % rails server
+
+post next json to http://server/foo/
+  {
+    "procedure" : "set_user",
+    "args" : {
+      "user" : {
+        "name" : "alice"
+      }
+    }
+  }
+
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/tosik/peto"
     gem.authors = ["Toshiyuki Hirooka"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.files.exclude "examples"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/examples/rails_app/app/controllers/application_controller.rb

@@ -0,0 +1,9 @@
+$: << "../lib"
+$: << "../works"
+require "peto/rails/rails_controller_helper"
+
+class ApplicationController < ActionController::Base
+  include Peto::RailsControllerHelper
+
+  protect_from_forgery
+end

data/examples/rails_app/app/controllers/foo_controller.rb

@@ -0,0 +1,9 @@
+require "foo"
+require "user"
+require "animal"
+
+class FooController < ApplicationController
+  def set_user(args)
+    respond(123, "foo bar baz")
+  end
+end

data/examples/rails_app/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/examples/rails_app/app/helpers/foo_helper.rb

@@ -0,0 +1,2 @@
+module FooHelper
+end

data/examples/rails_app/config/application.rb

@@ -0,0 +1,48 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module RailsApp
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # local peto lib. you dont need it if you install peto by gem.
+    config.autoload_paths += %W(#{config.root}/../../lib)
+
+    # generated files by peto
+    config.autoload_paths += %W(#{config.root}/contracts/generated)
+
+    # 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.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/examples/rails_app/config/boot.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)

data/examples/rails_app/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+RailsApp::Application.initialize!

data/examples/rails_app/config/environments/development.rb

@@ -0,0 +1,26 @@
+Hoge::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+end
+

data/examples/rails_app/config/environments/production.rb

@@ -0,0 +1,49 @@
+Hoge::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end

data/examples/rails_app/config/environments/test.rb

@@ -0,0 +1,35 @@
+RailsApp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/examples/rails_app/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/examples/rails_app/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/examples/rails_app/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/examples/rails_app/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+RailsApp::Application.config.secret_token = '8e9ae8e11e65624137d5e3a6679648eae8b82c6e46cf4590b0d220d61bd408f73fc6a1566d8841faabcf4b18204d8e30570ead8dacfc3ac20950cd845b62b239'

data/examples/rails_app/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+RailsApp::Application.config.session_store :cookie_store, :key => '_hoge_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# RailsApp::Application.config.session_store :active_record_store

data/examples/rails_app/config/routes.rb

@@ -0,0 +1,60 @@
+RailsApp::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id(.:format)))'
+
+  match ':controller(/:action)'
+end

data/examples/rails_app/contracts/animal.rb

@@ -0,0 +1,27 @@
+require "peto/mixin/peto_class"
+
+module Peto
+  class Animal
+    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/foo.rb

@@ -0,0 +1,36 @@
+require "peto/mixin/peto_errorable"
+
+module Peto
+  class Foo
+    extend PetoErrorable
+    def self.set_user(user)
+      invalid_type("user", User, user) unless user.class == User
+      raise_errors unless errors.empty?
+
+      return {
+        :procedure => "set_user",
+        :args => {
+          :user => hashize(user),
+        }
+      }
+    end
+
+    def self.set_user_error_invalid_user(message)
+      invalid_type("message", String, message) unless message.class == String
+      raise_errors unless errors.empty?
+
+      return {
+        :procedure => "set_user_error_invalid_user",
+        :args => {
+          :message => hashize(message),
+        }
+      }
+    end
+
+
+    def self.hashize(var)
+      return var if [Fixnum, String].include?(var.class)
+      var.to_hash
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require "peto/mixin/peto_class"
+
+module Peto
+  class Animal
+    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/foo.rb

@@ -0,0 +1,59 @@
+require "peto/mixin/peto_errorable"
+
+module Peto
+  class Foo
+    extend PetoErrorable
+    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_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_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.hashize(var)
+      return var if [Fixnum, String].include?(var.class)
+      var.to_hash
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require "peto/mixin/peto_class"
+
+module Peto
+  class User
+    include PetoClass
+    def initialize(args={})
+      @name = nil
+      @age = nil
+      @animals = [] # for Animal
+
+      set_by_hash(args)
+      raise_errors unless valid?
+    end
+
+    attr_reader :name
+    attr_reader :age
+    attr_reader :animals
+
+    def members
+      [:name,:age,:animals]
+    end
+
+    def types
+      {:name => String,:age => Fixnum,:animals => Array}
+    end
+
+    def arrays
+      {:animals => Animal}
+    end
+  end
+end

data/examples/rails_app/contracts/user.rb

@@ -0,0 +1,31 @@
+require "peto/mixin/peto_class"
+
+module Peto
+  class User
+    include PetoClass
+    def initialize(args={})
+      @name = nil
+      @age = nil
+      @animals = [] # for Animal
+
+      set_by_hash(args)
+      raise_errors unless valid?
+    end
+
+    attr_reader :name
+    attr_reader :age
+    attr_reader :animals
+
+    def members
+      [:name,:age,:animals]
+    end
+
+    def types
+      {:name => String,:age => Fixnum,:animals => Array}
+    end
+
+    def arrays
+      {:animals => Animal}
+    end
+  end
+end

data/examples/rails_app/db/schema.rb

@@ -0,0 +1,15 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 0) do
+
+end

data/examples/rails_app/db/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Mayor.create(:name => 'Daley', :city => cities.first)

data/examples/rails_app/test/functional/foo_controller_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class FooControllerTest < ActionController::TestCase
+  test "set_user" do
+    peto_post("set_user", Peto::User.new(:name=>"aho"))
+    assert_response :success
+    assert_peto_response("a"=>123, "b"=>"foo bar baz")
+  end
+end

data/examples/rails_app/test/performance/browsing_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionDispatch::PerformanceTest
+  def test_homepage
+    get '/'
+  end
+end

data/examples/rails_app/test/test_helper.rb

@@ -0,0 +1,18 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end
+
+require "peto/rails/rails_controller_test_helper"
+class ActionController::TestCase
+  include Peto::RailsControllerTestHelper
+end

data/examples/rails_app/test/unit/helpers/foo_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class FooHelperTest < ActionView::TestCase
+end

data/lib/peto/generator.rb

@@ -65,6 +65,7 @@ module Peto
     def each_procedures
       (@contract["procedures"]||[]).each do |name, procedure|
         yield name.to_method_name, args(procedure["args"])
+        yield "#{name} response".to_method_name, args(procedure["returns"])
         (procedure["errors"]||[]).each do |error|
           yield "#{name} error #{error}".to_method_name, [arg("message", "string")]
         end

data/lib/peto/rails/rails_controller_helper.rb

@@ -0,0 +1,58 @@
+
+require "active_support/inflector"
+require "pp"
+
+module Peto
+  module RailsControllerHelper
+    def contract
+      self.class.to_s.sub("Controller", "")
+    end
+
+    def peto_class
+      "Peto::#{contract.to_s.camelize}".constantize
+    end
+
+    def parse_caller(at)
+      if /^(.+?):(\d+)(?::in `(.*)')?/ =~ at
+        {:file => $1, :line => $2.to_i, :method => $3.to_sym}
+      end
+    end
+
+
+    # respond
+
+    def procedure_name
+      parse_caller(caller[(0..caller.length).zip(caller).find {|index,at|
+        parse_caller(at)[:method] == :call_subaction
+      }.first - 1])[:method]
+    end
+
+    def call_procedure_response(response_type, *args)
+      peto_class.send(:"#{procedure_name}_#{response_type}", *args)
+    end
+
+    def respond(*args)
+      render(:json => call_procedure_response(:response, *args).to_json)
+    end
+
+    def error(error_name, *messages)
+      call_procedure_response(:"error_#{error_name}", messages.join(","))
+    end
+
+
+    # subaction
+
+    def index
+      call_subaction(params[:procedure], params[:args])
+    end
+
+    def valid_args?(procedure, args)
+      peto_class.send(:"#{procedure}_valid?", args)
+    end
+
+    def call_subaction(procedure, args)
+      valid_args?(procedure, args)
+      send(procedure, args)
+    end
+  end
+end

data/lib/peto/rails/rails_controller_test_helper.rb

@@ -0,0 +1,18 @@
+
+module Peto
+  module RailsControllerTestHelper
+    def peto_post(procedure, args)
+      post :index, {:procedure=>procedure.to_s, :args=>args}
+    end
+
+    def decoded_response
+      @decoded_response ||= ActiveSupport::JSON.decode(@response.body)
+    end
+
+    def assert_peto_response(except)
+      assert_equal decoded_response["args"], except
+    end
+  end
+end
+
+

data/lib/templates/rb_procedures.erb

@@ -5,11 +5,7 @@ module Peto
     extend PetoErrorable
     <%- each_procedures do |name, args| -%>
     def self.<%= name %>(<%= args.map{|arg| arg[:name]}.join(",") %>)
-      <%- args.each do |arg| -%>
-      invalid_type("<%= arg[:name] %>", <%= arg[:type] %>, <%= arg[:name] %>) unless <%= arg[:name] %>.class == <%= arg[:type] %>
-      <%- end -%>
-      raise_errors unless errors.empty?
-
+      <%=name%>_valid?(<%= args.map{|arg| arg[:name]}.join(",") %>)
       return {
         :procedure => "<%=name%>",
         :args => {
@@ -20,6 +16,13 @@ module Peto
       }
     end
 
+    def self.<%=name%>_valid?(<%= args.map{|arg| arg[:name]}.join(",") %>)
+      <%- 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
+
     <%- end -%>
 
     def self.hashize(var)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: peto
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Toshiyuki Hirooka
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 +09:00
+date: 2010-11-03 00:00:00 +09:00
 default_executable: peto
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,13 +52,42 @@ files:
 - lib/peto/master.rb
 - lib/peto/mixin/peto_class.rb
 - lib/peto/mixin/peto_errorable.rb
-- lib/peto/rails/helper.rb
+- lib/peto/rails/rails_controller_helper.rb
+- lib/peto/rails/rails_controller_test_helper.rb
 - lib/templates/rb_classes.erb
 - lib/templates/rb_procedures.erb
 - test/contracts/generating.yml
 - test/contracts/loading.yml
 - test/helper.rb
 - test/test_peto.rb
+- examples/rails_app/config/environments/development.rb
+- examples/rails_app/config/environments/test.rb
+- examples/rails_app/config/environments/production.rb
+- examples/rails_app/config/application.rb
+- examples/rails_app/config/routes.rb
+- examples/rails_app/config/boot.rb
+- examples/rails_app/config/initializers/secret_token.rb
+- examples/rails_app/config/initializers/session_store.rb
+- examples/rails_app/config/initializers/inflections.rb
+- examples/rails_app/config/initializers/backtrace_silencers.rb
+- examples/rails_app/config/initializers/mime_types.rb
+- examples/rails_app/config/environment.rb
+- examples/rails_app/db/schema.rb
+- examples/rails_app/db/seeds.rb
+- examples/rails_app/app/controllers/application_controller.rb
+- examples/rails_app/app/controllers/foo_controller.rb
+- examples/rails_app/app/helpers/foo_helper.rb
+- examples/rails_app/app/helpers/application_helper.rb
+- examples/rails_app/test/performance/browsing_test.rb
+- 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/animal.rb
+- examples/rails_app/contracts/user.rb
+- examples/rails_app/contracts/generated/animal.rb
+- examples/rails_app/contracts/generated/user.rb
+- examples/rails_app/contracts/generated/foo.rb
+- examples/rails_app/contracts/foo.rb
 has_rdoc: true
 homepage: http://github.com/tosik/peto
 licenses: []
@@ -75,7 +102,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -84,7 +110,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -96,5 +121,33 @@ signing_key:
 specification_version: 3
 summary: contract code generator
 test_files: 
-- test/test_peto.rb
 - test/helper.rb
+- test/test_peto.rb
+- examples/rails_app/config/environments/development.rb
+- examples/rails_app/config/environments/test.rb
+- examples/rails_app/config/environments/production.rb
+- examples/rails_app/config/application.rb
+- examples/rails_app/config/routes.rb
+- examples/rails_app/config/boot.rb
+- examples/rails_app/config/initializers/secret_token.rb
+- examples/rails_app/config/initializers/session_store.rb
+- examples/rails_app/config/initializers/inflections.rb
+- examples/rails_app/config/initializers/backtrace_silencers.rb
+- examples/rails_app/config/initializers/mime_types.rb
+- examples/rails_app/config/environment.rb
+- examples/rails_app/db/schema.rb
+- examples/rails_app/db/seeds.rb
+- examples/rails_app/app/controllers/application_controller.rb
+- examples/rails_app/app/controllers/foo_controller.rb
+- examples/rails_app/app/helpers/foo_helper.rb
+- examples/rails_app/app/helpers/application_helper.rb
+- examples/rails_app/test/performance/browsing_test.rb
+- 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/animal.rb
+- examples/rails_app/contracts/user.rb
+- examples/rails_app/contracts/generated/animal.rb
+- examples/rails_app/contracts/generated/user.rb
+- examples/rails_app/contracts/generated/foo.rb
+- examples/rails_app/contracts/foo.rb

data/lib/peto/rails/helper.rb

@@ -1,22 +0,0 @@
-
-require "active_support/inflector"
-
-module Peto
-  module RailsHelper
-    def contract
-      :procedures
-    end
-
-    def call_procedure_response(procedure_name, *args)
-      "Peto::#{contract.to_s.camelize}".constantize.send("#{procedure_name}", args.join(","))
-    end
-
-    def respond(*args)
-      call_procedure_response(:response, *args)
-    end
-
-    def error(error_name, *messages)
-      call_procedure_response("error_#{error_name}", messages.join(","))
-    end
-  end
-end