ccp 0.1.3 → 0.1.4

data/README.rdoc

@@ -64,8 +64,8 @@ It is too hard to see data dependencies especially about instance variables.
   class FetchData                                # 1. SRP 
     include Ccp::Commands::Core
 
-    # {pre,post} methods can be used like Design By Contract
-    def post
+    # {before,after} methods can be used like Design By Contract
+    def after
       data.check(:fetched, {Symbol => [Float]})  # 2. Typed Variables
     end
 
@@ -84,7 +84,7 @@ in each scopes, and can share variables only via data object.
 
 So you can easily refactor or replace FetchData unit
 because there are no implicit instance variable dependencies
-and futhermore all depencenies would be explicitly declared in "pre","post" method.
+and futhermore all depencenies would be explicitly declared in "before","after" method.
 
 === execute
 

data/lib/ccp/invokers/base.rb

@@ -57,13 +57,6 @@ module Ccp
         end
       end
 
-      def benchmark
-        before
-        super
-        after
-        return true
-      end
-
       def receiver
         @receiver.must(Receivers::Base)
       end
@@ -72,14 +65,10 @@ module Ccp
         @receiver = value.must(Receivers::Base)
       end
 
-      private
-        def before
-        end
-
-        def after
-          show_profiles if data?(:profile)
-          show_comments if data?(:comment)
-        end
+      def after
+        show_profiles if data?(:profile)
+        show_comments if data?(:comment)
+      end
     end
   end
 end

data/lib/ccp/receivers/profileable.rb

@@ -16,9 +16,9 @@ module Ccp
 
       def profile(target, method)
         start = Time.new
-        target.__send__(:pre) if target.respond_to?(:pre)
+        target.__send__(:before) if target.respond_to?(:before)
         target.__send__(method)
-        target.__send__(:post) if target.respond_to?(:post)
+        target.__send__(:after) if target.respond_to?(:after)
 
         case target
         when Ccp::Commands::Composite

data/lib/ccp/version.rb

@@ -1,3 +1,3 @@
 module Ccp
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/commands_composite_spec.rb

@@ -2,66 +2,66 @@ require "spec_helper"
 
 describe Ccp::Commands::Composite do
   describe "#execute" do
-    it "should call its execute and sub commands's {pre,execute,post} in declared order" do
+    it "should call its execute and sub commands's {before,execute,after} in declared order" do
       c = Program.new
       c.data[:breadcrumbs] = []
       c.execute
       c.data[:breadcrumbs].should ==
-        ["Cmd1#pre", "Cmd1#execute", "Cmd1#post",
-         "Cmd2#pre", "Cmd2#execute", "Cmd2#post",
-         "Cmd3#pre", "Cmd3#execute", "Cmd3#post"]
+        ["Cmd1#before", "Cmd1#execute", "Cmd1#after",
+         "Cmd2#before", "Cmd2#execute", "Cmd2#after",
+         "Cmd3#before", "Cmd3#execute", "Cmd3#after"]
     end
   end
 
   describe "#benchmark" do
-    it "should call its and sub commands's {pre,execute,post} in declared order" do
+    it "should call its and sub commands's {before,execute,after} in declared order" do
       c = Program.new
       c.data[:breadcrumbs] = []
       c.benchmark
       c.data[:breadcrumbs].should ==
-        ["Program#pre",
-         "Cmd1#pre", "Cmd1#execute", "Cmd1#post",
-         "Cmd2#pre", "Cmd2#execute", "Cmd2#post",
-         "Cmd3#pre", "Cmd3#execute", "Cmd3#post",
-         "Program#post"]
+        ["Program#before",
+         "Cmd1#before", "Cmd1#execute", "Cmd1#after",
+         "Cmd2#before", "Cmd2#execute", "Cmd2#after",
+         "Cmd3#before", "Cmd3#execute", "Cmd3#after",
+         "Program#after"]
     end
   end
 end
 
 describe "Ccp::Commands::Composite(nested)" do
   describe "#execute" do
-    it "should call its execute and sub commands's {pre,execute,post} in declared order" do
+    it "should call its execute and sub commands's {before,execute,after} in declared order" do
       c = CompositeProgram.new
       c.data[:breadcrumbs] = []
       c.execute
       c.data[:breadcrumbs].should ==
-        ["Cmd1#pre", "Cmd1#execute", "Cmd1#post",
-         "Cmd23#pre",
+        ["Cmd1#before", "Cmd1#execute", "Cmd1#after",
+         "Cmd23#before",
          "Cmd23#execute:start",
-         "Cmd2#pre", "Cmd2#execute", "Cmd2#post",
-         "Cmd3#pre", "Cmd3#execute", "Cmd3#post",
+         "Cmd2#before", "Cmd2#execute", "Cmd2#after",
+         "Cmd3#before", "Cmd3#execute", "Cmd3#after",
          "Cmd23#execute:end",
-         "Cmd23#post",
-         "Cmd4#pre", "Cmd4#execute", "Cmd4#post"]
+         "Cmd23#after",
+         "Cmd4#before", "Cmd4#execute", "Cmd4#after"]
     end
   end
 
   describe "#benchmark" do
-    it "should call its and sub commands's {pre,execute,post} in declared order" do
+    it "should call its and sub commands's {before,execute,after} in declared order" do
       c = CompositeProgram.new
       c.data[:breadcrumbs] = []
       c.benchmark
       c.data[:breadcrumbs].should ==
-        ["CompositeProgram#pre",
-         "Cmd1#pre", "Cmd1#execute", "Cmd1#post",
-         "Cmd23#pre",
+        ["CompositeProgram#before",
+         "Cmd1#before", "Cmd1#execute", "Cmd1#after",
+         "Cmd23#before",
          "Cmd23#execute:start",
-         "Cmd2#pre", "Cmd2#execute", "Cmd2#post",
-         "Cmd3#pre", "Cmd3#execute", "Cmd3#post",
+         "Cmd2#before", "Cmd2#execute", "Cmd2#after",
+         "Cmd3#before", "Cmd3#execute", "Cmd3#after",
          "Cmd23#execute:end",
-         "Cmd23#post",
-         "Cmd4#pre", "Cmd4#execute", "Cmd4#post",
-         "CompositeProgram#post"]
+         "Cmd23#after",
+         "Cmd4#before", "Cmd4#execute", "Cmd4#after",
+         "CompositeProgram#after"]
     end
   end
 

data/spec/commands_core_spec.rb

@@ -28,11 +28,11 @@ describe Ccp::Commands::Core do
   end
 
   describe "#benchmark" do
-    it "should call {pre,execute,post}" do
+    it "should call {before,execute,after}" do
       cmd1 = Cmd1.new
       cmd1.data[:breadcrumbs] = []
       cmd1.benchmark
-      cmd1.data[:breadcrumbs].should == ["Cmd1#pre", "Cmd1#execute", "Cmd1#post"]
+      cmd1.data[:breadcrumbs].should == ["Cmd1#before", "Cmd1#execute", "Cmd1#after"]
     end
 
     it "should call receiver.profile" do

data/spec/invokers_spec.rb

@@ -4,55 +4,55 @@ describe Ccp::Invokers::Base do
   def no_logger; Logger.new('/dev/null'); end
 
   describe "#execute" do
-    it "should call its execute and sub commands's {pre,execute,post} in declared order" do
+    it "should call its execute and sub commands's {before,execute,after} in declared order" do
       c = CompositeInvoker.new
       c.data[:breadcrumbs] = []
       c.execute
       c.data[:breadcrumbs].should ==
-        ["Cmd1#pre", "Cmd1#execute", "Cmd1#post",
-         "Cmd23#pre",
+        ["Cmd1#before", "Cmd1#execute", "Cmd1#after",
+         "Cmd23#before",
          "Cmd23#execute:start",
-         "Cmd2#pre", "Cmd2#execute", "Cmd2#post",
-         "Cmd3#pre", "Cmd3#execute", "Cmd3#post",
+         "Cmd2#before", "Cmd2#execute", "Cmd2#after",
+         "Cmd3#before", "Cmd3#execute", "Cmd3#after",
          "Cmd23#execute:end",
-         "Cmd23#post",
-         "Cmd4#pre", "Cmd4#execute", "Cmd4#post"]
+         "Cmd23#after",
+         "Cmd4#before", "Cmd4#execute", "Cmd4#after"]
     end
   end
 
   describe "#benchmark" do
-    it "should call its and sub commands's {pre,execute,post} in declared order" do
+    it "should call its and sub commands's {before,execute,after} in declared order" do
       c = CompositeInvoker.new
       c.data[:breadcrumbs] = []
       c.benchmark
       c.data[:breadcrumbs].should ==
-        ["CompositeInvoker#pre",
-         "Cmd1#pre", "Cmd1#execute", "Cmd1#post",
-         "Cmd23#pre",
+        ["CompositeInvoker#before",
+         "Cmd1#before", "Cmd1#execute", "Cmd1#after",
+         "Cmd23#before",
          "Cmd23#execute:start",
-         "Cmd2#pre", "Cmd2#execute", "Cmd2#post",
-         "Cmd3#pre", "Cmd3#execute", "Cmd3#post",
+         "Cmd2#before", "Cmd2#execute", "Cmd2#after",
+         "Cmd3#before", "Cmd3#execute", "Cmd3#after",
          "Cmd23#execute:end",
-         "Cmd23#post",
-         "Cmd4#pre", "Cmd4#execute", "Cmd4#post",
-         "CompositeInvoker#post"]
+         "Cmd23#after",
+         "Cmd4#before", "Cmd4#execute", "Cmd4#after",
+         "CompositeInvoker#after"]
     end
   end
 
   describe ".execute" do
-    it "should call its and sub commands's {pre,execute,post} in declared order" do
+    it "should call its and sub commands's {before,execute,after} in declared order" do
       c = CompositeInvoker.execute(:breadcrumbs => [])
       c.data[:breadcrumbs].should ==
-        ["CompositeInvoker#pre",
-         "Cmd1#pre", "Cmd1#execute", "Cmd1#post",
-         "Cmd23#pre",
+        ["CompositeInvoker#before",
+         "Cmd1#before", "Cmd1#execute", "Cmd1#after",
+         "Cmd23#before",
          "Cmd23#execute:start",
-         "Cmd2#pre", "Cmd2#execute", "Cmd2#post",
-         "Cmd3#pre", "Cmd3#execute", "Cmd3#post",
+         "Cmd2#before", "Cmd2#execute", "Cmd2#after",
+         "Cmd3#before", "Cmd3#execute", "Cmd3#after",
          "Cmd23#execute:end",
-         "Cmd23#post",
-         "Cmd4#pre", "Cmd4#execute", "Cmd4#post",
-         "CompositeInvoker#post"]
+         "Cmd23#after",
+         "Cmd4#before", "Cmd4#execute", "Cmd4#after",
+         "CompositeInvoker#after"]
     end
 
     it "should call only show_comments in default" do
@@ -76,23 +76,23 @@ describe Ccp::Invokers::Base do
   end
 
   describe ".benchmark" do
-    it "should call its and sub commands's {pre,execute,post} in declared order" do
+    it "should call its and sub commands's {before,execute,after} in declared order" do
       r = Ccp::Receivers::Base.new
       r.stub!(:show_comments)   # disable output
       r.stub!(:show_profiles)   # disable output
 
       c = CompositeInvoker.benchmark(:receiver => r, :breadcrumbs => [])
       c.data[:breadcrumbs].should ==
-        ["CompositeInvoker#pre",
-         "Cmd1#pre", "Cmd1#execute", "Cmd1#post",
-         "Cmd23#pre",
+        ["CompositeInvoker#before",
+         "Cmd1#before", "Cmd1#execute", "Cmd1#after",
+         "Cmd23#before",
          "Cmd23#execute:start",
-         "Cmd2#pre", "Cmd2#execute", "Cmd2#post",
-         "Cmd3#pre", "Cmd3#execute", "Cmd3#post",
+         "Cmd2#before", "Cmd2#execute", "Cmd2#after",
+         "Cmd3#before", "Cmd3#execute", "Cmd3#after",
          "Cmd23#execute:end",
-         "Cmd23#post",
-         "Cmd4#pre", "Cmd4#execute", "Cmd4#post",
-         "CompositeInvoker#post"]
+         "Cmd23#after",
+         "Cmd4#before", "Cmd4#execute", "Cmd4#after",
+         "CompositeInvoker#after"]
     end
 
     it "should call only show_comments in default" do

data/spec/models.rb

@@ -8,7 +8,7 @@ class Cmd1
   include Ccp::Commands::Core
   include Breadcrumbing
 
-  def pre
+  def before
     data[:breadcrumbs] << this
   end
 
@@ -16,7 +16,7 @@ class Cmd1
     data[:breadcrumbs] << this
   end
 
-  def post
+  def after
     data[:breadcrumbs] << this
   end
 end
@@ -33,11 +33,11 @@ class Program
   command Cmd2
   command Cmd3
 
-  def pre
+  def before
     data[:breadcrumbs] << this
   end
 
-  def post
+  def after
     data[:breadcrumbs] << this
   end
 end
@@ -49,7 +49,7 @@ class Cmd23
   command Cmd2
   command Cmd3
 
-  def pre
+  def before
     data[:breadcrumbs] << this
   end
 
@@ -59,7 +59,7 @@ class Cmd23
     data[:breadcrumbs] << this + ":end"
   end
 
-  def post
+  def after
     data[:breadcrumbs] << this
   end
 end
@@ -72,11 +72,11 @@ class CompositeProgram
   command Cmd23
   command Cmd4
 
-  def pre
+  def before
     data[:breadcrumbs] << this
   end
 
-  def post
+  def after
     data[:breadcrumbs] << this
   end
 end
@@ -88,11 +88,12 @@ class CompositeInvoker < Ccp::Invokers::Base
   command Cmd23
   command Cmd4
 
-  def pre
+  def before
     data[:breadcrumbs] << this
   end
 
-  def post
+  def after
     data[:breadcrumbs] << this
+    super
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ccp
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - maiha