peto 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

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

@@ -5,5 +5,6 @@ require "animal"
 class FooController < ApplicationController
   def set_user(args)
     respond(123, "foo bar baz")
+    #error(:invalid_user, "aho #{args}")
   end
 end

data/examples/rails_app/config/application.rb

@@ -15,11 +15,9 @@ module RailsApp
     # 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)
+    #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/contracts/generated/animal.rb

@@ -4,20 +4,20 @@ module Peto
   class Animal
     include PetoClass
     def initialize(args={})
-      @nme = nil
+      @name = nil
 
       set_by_hash(args)
       raise_errors unless valid?
     end
 
-    attr_reader :nme
+    attr_reader :name
 
     def members
-      [:nme]
+      [:name]
     end
 
     def types
-      {:nme => String}
+      {:name => String}
     end
 
     def arrays

data/lib/peto/master.rb

@@ -35,10 +35,10 @@ module Peto
         if File.read(filepath) == content
           print "identical".blue.bold
         else
-          print "update   ".white.bold
+          print "   update".white.bold
         end
       else
-        print "create   ".green.bold
+        print "   create".green.bold
       end
       print " "
 

data/lib/peto/rails/rails_controller_helper.rb

@@ -36,7 +36,7 @@ module Peto
     end
 
     def error(error_name, *messages)
-      call_procedure_response(:"error_#{error_name}", messages.join(","))
+      render(:json => call_procedure_response(:"error_#{error_name}", messages.join(",")))
     end
 
 

data/lib/peto/rake_task.rb

@@ -0,0 +1,45 @@
+require "peto"
+require "rake"
+require "rake/tasklib"
+
+module Peto
+  class RakeTask < ::Rake::TaskLib
+    attr_accessor :contracts
+    attr_accessor :output_dir
+    attr_accessor :name
+    attr_accessor :fail_on_error
+    attr_accessor :failure_message
+
+    def initialize(*args)
+      @contracts ||= []
+      @output_dir ||= "./"
+      @name ||= :peto
+      @fail_on_error ||= true
+
+      yield self if block_given?
+
+      desc("Generate codes by contracts") unless ::Rake.application.last_comment
+
+      task name do
+        RakeFileUtils.send(:verbose, verbose) do
+          if contracts.empty?
+            puts "No contracts"
+          else
+            begin
+              self.contracts = [contracts] if contracts.class == String
+              contracts.each do |contract|
+                peto = Peto::Master.new
+                peto.load(contract)
+                peto.generate(output_dir)
+              end
+            rescue
+              puts failure_message if failure_message
+              raise "peto failed" if fail_on_error
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Toshiyuki Hirooka
@@ -80,6 +80,7 @@ files:
 - lib/peto/mixin/peto_errorable.rb
 - lib/peto/rails/rails_controller_helper.rb
 - lib/peto/rails/rails_controller_test_helper.rb
+- lib/peto/rake_task.rb
 - lib/templates/rb_classes.erb
 - lib/templates/rb_procedures.erb
 - test/contracts/generating.yml
@@ -108,14 +109,11 @@ 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/animal.rb
-- examples/rails_app/contracts/user.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/foo.rb
 - examples/rails_app/contracts/generated/iasdaho.rb
-- examples/rails_app/contracts/foo.rb
 has_rdoc: true
 homepage: http://github.com/tosik/peto
 licenses: []
@@ -173,11 +171,8 @@ 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/animal.rb
-- examples/rails_app/contracts/user.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/foo.rb
 - examples/rails_app/contracts/generated/iasdaho.rb
-- examples/rails_app/contracts/foo.rb

data/examples/rails_app/contracts/animal.rb

@@ -1,27 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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/user.rb

@@ -1,31 +0,0 @@
-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