ccp 0.2.4 → 0.2.5

data/README.rdoc

@@ -265,3 +265,13 @@ Static options(hard code) are also available.
     Cmd.execute(:a=>1)
 
 This generates "tmp/stub.json", "tmp/mock.json".
+
+=== Test
+
+Once you got fixtures, call "test" method to test it.
+
+    Cmd.test
+
+This automatically searchs fixtures when no fixture files are explicitly given.
+The search algorithm is as same as 'fixture_save'.
+

data/lib/ccp.rb

@@ -5,6 +5,8 @@ require "active_support/core_ext"
 require "ccp/version"
 
 module Ccp
+  Failed = Class.new(RuntimeError)
+
   autoload :Utils,             'ccp/utils'
   autoload :Fixtures,          'ccp/fixtures'
   autoload :Commands,          'ccp/commands'

data/lib/ccp/commands/fixturable.rb

@@ -5,6 +5,18 @@ module Ccp
         base.class_eval do
           include Ccp::Utils::Options
           dsl_accessor :fixture, options(:stub, :mock, :fail, :save, :keys, :dir, :kvs, :ext)
+
+          extend Testable
+        end
+      end
+
+      module Testable
+        def test(options = {})
+          c = new
+          c.receiver = options.delete(:receiver)
+          c.receiver.parse!(options)
+          c.receiver.test(c)
+          return c
         end
       end
     end

data/lib/ccp/fixtures.rb

@@ -1,5 +1,6 @@
 module Ccp
   module Fixtures
+    NotFound = Class.new(RuntimeError)
     autoload :Observer       , 'ccp/fixtures/observer'
     autoload :Writers        , 'ccp/fixtures/writers'
   end

data/lib/ccp/persistent/versioned.rb

@@ -48,11 +48,14 @@ class Ccp::Persistent::Versioned
     extend self
   end
 
+  attr_reader :kvs
+  attr_reader :ext
+
   def initialize(dir, options = {})
-    @path        = Pathname(dir)
-    @default_kvs = options[:kvs] || :dir
-    @default_ext = options[:ext] || :json
-    @storages    = {}
+    @path     = Pathname(dir)
+    @kvs      = options[:kvs] || :dir
+    @ext      = options[:ext] || :json
+    @storages = {}
 
     @path.mkpath
   end
@@ -80,11 +83,11 @@ class Ccp::Persistent::Versioned
 
   # 指定したストレージを返す。存在しなければ作成して返す
   def [](key)
-    storage = Storage.complete(key, path, @default_kvs, @default_ext)
+    storage = Storage.complete(key, path, @kvs, @ext)
     @storages[storage.to_s] ||= storage.create
   end
 
   def inspect
-    "<Kvs::Versioned dir=#{path} kvs=#{@default_kvs} ext=#{@default_ext}>"
+    "<Kvs::Versioned dir=#{path} kvs=#{@kvs} ext=#{@ext}>"
   end
 end

data/lib/ccp/receivers/fixtures.rb

@@ -39,19 +39,34 @@ module Ccp
         super
       end
 
+      def test(cmd)
+        # set stub if exist
+        stub = fixture_versioned_for(cmd)["stub"].path
+        runtime_stubs[cmd] = stub if stub.exist?
+
+        # set mock
+        runtime_mocks[cmd] = fixture_versioned_for(cmd)["mock"].path
+
+        execute(cmd)
+      end
+
       def fixture_stub(cmd)
-        path = cmd.class.stub or return
+        path = cmd.class.stub || runtime_stubs[cmd] or return
         hash = Ccp::Persistent.load(path).read!
         data.merge!(hash)
+      rescue Ccp::Persistent::NotFound => e
+        raise Ccp::Fixtures::NotFound, e.to_s
       end
 
       def fixture_mock(cmd)
-        path = cmd.class.mock or return
+        path = cmd.class.mock || runtime_mocks[cmd] or return
         hash = Ccp::Persistent.load(path).read!
 
         hash.keys.each do |key|
           fixture_validate(cmd, key, data, hash)
         end
+      rescue Ccp::Persistent::NotFound => e
+        raise Ccp::Fixtures::NotFound, e.to_s
       end
 
       def fixture_validate(cmd, key, data, hash)
@@ -71,12 +86,12 @@ module Ccp
 
       def default_fixture_fail(cmd, key, exp, got)
         if exp == nil and got == nil
-          raise "#{cmd.class} should write #{key} but not found"
+          raise Failed, "#{cmd.class} should write #{key} but not found"
         end
 
         exp_info = "%s(%s)" % [exp.inspect.truncate(200), Must::StructInfo.new(exp).compact.inspect]
         got_info = "%s(%s)" % [got.inspect.truncate(200), Must::StructInfo.new(got).compact.inspect]
-        raise "%s should create %s for %s, but got %s" % [cmd.class, exp_info, key, got_info]
+        raise Failed, "%s should create %s for %s, but got %s" % [cmd.class, exp_info, key, got_info]
       end
 
       def fixture_save?(cmd)
@@ -98,21 +113,16 @@ module Ccp
       end
 
       def fixture_save(cmd, stub, mock)
-        path = self[:fixture_path_for].call(cmd)
-        path = Pathname(cmd.class.dir) + cmd.class.name.underscore if cmd.class.dir
-
+        versioned = fixture_versioned_for(cmd)
         keys = cmd.class.keys || self[:fixture_keys]
-        kvs  = cmd.class.kvs  || self[:fixture_kvs]
-        ext  = cmd.class.ext  || self[:fixture_ext]
-
-        versioned = Ccp::Persistent::Versioned.new(path, :kvs=>kvs, :ext=>ext)
+        kvs  = Ccp::Persistent.lookup(versioned.kvs)
 
         # stub
-        storage = cmd.class.stub ? Ccp::Persistent.lookup(kvs).new(cmd.class.stub, ext) : versioned["stub"]
+        storage = cmd.class.stub ? kvs.new(cmd.class.stub, versioned.ext) : versioned["stub"]
         storage.save(stub, fixture_keys_filter(keys, stub.keys))
 
         # mock
-        storage = cmd.class.mock ? Ccp::Persistent.lookup(kvs).new(cmd.class.mock, ext) : versioned["mock"]
+        storage = cmd.class.mock ? kvs.new(cmd.class.mock, versioned.ext) : versioned["mock"]
         storage.save(mock, fixture_keys_filter(keys, mock.keys))
       end
 
@@ -136,6 +146,26 @@ module Ccp
       def default_fixture_path_for
         proc{|cmd| settings.path(:fixture_dir) + cmd.class.name.underscore}
       end
+
+      private
+        def runtime_stubs
+          @runtime_stubs ||= {} # key:cmd object, val:filename
+        end
+
+        def runtime_mocks
+          @runtime_mocks ||= {} # key:cmd object, val:filename
+        end
+
+        def fixture_versioned_for(cmd)
+          dir  = cmd.class.dir
+          path = dir ? (Pathname(dir) + cmd.class.name.underscore) : self[:fixture_path_for].call(cmd)
+
+          kvs  = cmd.class.kvs || self[:fixture_kvs]
+          ext  = cmd.class.ext || self[:fixture_ext]
+
+          versioned = Ccp::Persistent::Versioned.new(path, :kvs=>kvs, :ext=>ext)
+          return versioned
+        end
     end
   end
 end

data/lib/ccp/version.rb

@@ -1,3 +1,3 @@
 module Ccp
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/commands/fixturable_spec.rb

@@ -19,6 +19,8 @@ describe Ccp::Commands::Fixturable do
     it { should respond_to("ext") }
     it { should respond_to("fixture") }
     its(:fixture) { should respond_to("options") }
+
+    it { should respond_to("test") }
   end
 
   context "Ccp::Commands::Composite" do
@@ -33,6 +35,8 @@ describe Ccp::Commands::Fixturable do
     it { should respond_to("ext") }
     it { should respond_to("fixture") }
     its(:fixture) { should respond_to("options") }
+
+    it { should respond_to("test") }
   end
 
   context "Ccp::Invokers::Base" do
@@ -47,6 +51,8 @@ describe Ccp::Commands::Fixturable do
     it { should respond_to("ext") }
     it { should respond_to("fixture") }
     its(:fixture) { should respond_to("options") }
+
+    it { should respond_to("test") }
   end
 
   context "included class" do
@@ -61,6 +67,8 @@ describe Ccp::Commands::Fixturable do
     it { should respond_to("ext") }
     it { should respond_to("fixture") }
     its(:fixture) { should respond_to("options") }
+
+    it { should respond_to("test") }
   end
 end
 

data/spec/commands/fixturable_test_spec.rb

@@ -0,0 +1,92 @@
+require "spec_helper"
+
+describe Ccp::Commands::Fixturable do
+  before do
+    @stub = Pathname("tmp/fixtures/square_cmd/stub.json")
+    @mock = Pathname("tmp/fixtures/square_cmd/mock.json")
+    @stub.parent.mkpath
+    save_fixture(@stub, "x"=>10)
+    save_fixture(@mock, "x"=>100)
+  end
+
+  after do
+    FileUtils.rm_rf("tmp/fixtures")
+  end
+
+  class SquareCmd
+    include Ccp::Commands::Core
+    def execute
+      data[:x] = data[:x] * data[:x]
+    end
+  end
+
+  class SquareCmdPass < SquareCmd
+    stub "tmp/fixtures/square_cmd/stub.json"
+    mock "tmp/fixtures/square_cmd/mock.json"
+  end
+
+  class SquareCmdFail < SquareCmd
+    stub "tmp/fixtures/square_cmd/stub.json"
+    mock "tmp/fixtures/square_cmd/mock.json"
+
+    def execute
+      data[:x] = data[:x] + 1
+    end
+  end
+
+  describe ".test" do
+    it "should use stub automatically if exists" do
+      cmd = SquareCmd.test
+      cmd.data[:x].should == 100
+    end
+
+    it "should use mock automatically" do
+      save_fixture(@mock, "x"=>1)
+
+      lambda {
+        SquareCmd.test
+      }.should raise_error(Ccp::Failed)
+    end
+
+    it "should raise Fixtures::NotFound if mock doesn't exist" do
+      @mock.unlink
+
+      lambda {
+        SquareCmd.test
+      }.should raise_error(Ccp::Fixtures::NotFound)
+    end
+
+    context "(pass case)" do
+      it "should raise nothing" do
+        cmd = SquareCmdPass.test
+        cmd.data[:x].should == 100
+      end
+    end
+
+    context "(fail case)" do
+      it "should raise RuntimeError" do
+        failed = nil
+        SquareCmdFail.stub @stub
+        SquareCmdFail.mock @mock
+
+        lambda {
+          SquareCmdFail.test
+        }.should raise_error(Ccp::Failed)
+      end
+
+      it "should call fail handler if given" do
+        failed = nil
+        SquareCmdFail.stub @stub
+        SquareCmdFail.mock @mock
+        SquareCmdFail.fail {|cmd, key, expected, got|
+          failed = key
+        }
+        
+        lambda {
+          SquareCmdFail.test
+        }.should_not raise_error
+        failed.should == "x"
+      end
+    end
+  end
+end

data/spec/persistent/versioned_spec.rb

@@ -10,6 +10,12 @@ describe Ccp::Persistent::Versioned do
     root.mkpath
   end
 
+  describe "(accessors)" do
+    subject { Ccp::Persistent::Versioned.new(root, :kvs=>"dir", :ext=>"yaml") }
+    its(:kvs) { should == "dir" }
+    its(:ext) { should == "yaml" }
+  end
+
   describe "#latest" do
     it "should return a kvs with the latest dated file" do
       # create directories

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ccp
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - maiha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-11 00:00:00 +09:00
+date: 2012-05-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,6 +145,7 @@ files:
 - spec/commands/core_spec.rb
 - spec/commands/executable_spec.rb
 - spec/commands/fixturable_spec.rb
+- spec/commands/fixturable_test_spec.rb
 - spec/fixtures/cmd1stub_mock/mock.json
 - spec/fixtures/stub/breadcrumbs.json
 - spec/invokers/base_spec.rb