ccp 0.3.0 → 0.3.2

data/ccp.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency "typed", ">= 0.2.2"
-  s.add_dependency "must", ">= 0.2.9"
+  s.add_dependency "must", ">= 0.3.0"
   s.add_dependency "dsl_accessor", ">= 0.4.1"
   s.add_dependency "json"
   s.add_dependency "yajl-ruby"

data/lib/ccp/commands/fixturable.rb

@@ -7,7 +7,7 @@ module Ccp
           dsl_accessor :fixture, options(:stub, :mock, :fail, :save, :keys, :dir, :kvs, :ext)
 
           def self.test(options = {})
-            execute({:fixture_test=>true}.merge(options))
+            execute({:fixture_test=>true,:logger=>Logger.new(STDOUT)}.merge(options))
           end
         end
       end

data/lib/ccp/kvs/core.rb

@@ -18,6 +18,7 @@ module Ccp
       def put(k,v) ; set(k,v) ; end
       def out(k)   ; del(k)   ; end
 
+      def codec    ; @codec                               ; end
       def codec!(c); @codec = Ccp::Serializers[c] ; self  ; end
       def encode(v); @codec ? @codec.encode(v)        : v ; end
       def decode(v); (v && @codec) ? @codec.decode(v) : v ; end

data/lib/ccp/kvs/tokyo/state_machine.rb

@@ -64,6 +64,7 @@ module Ccp
           case state
           when CLOSED   ; begin; W!(); yield; ensure; close; end
           when READABLE ; raise "reopen from read to write is not permitted"
+            # TODO: close -> W -> close -> R ???
           when WRITABLE ; yield
           else          ; raise "unknown state: #{state}"
           end

data/lib/ccp/storage.rb

@@ -3,7 +3,7 @@ module Ccp
     NotFound = Class.new(RuntimeError)
 
     def self.load(path)
-      array = path.split(".")
+      array = path.to_s.split(".")
       kvs   = Ccp::Kvs[array.pop]
       codec = Ccp::Serializers[array.pop]
       return new(path, kvs, codec)
@@ -39,7 +39,7 @@ module Ccp
     def table(name, file = nil)
       @tables[name.to_s] ||= (
         file ||= "%s.%s.%s" % [name, @codec.ext, @kvs.ext]
-        Storage.new((@path + file).to_s, @kvs.class, @codec)
+        @kvs.class.new((@path + file).to_s).codec!(@codec)
       )
     end
 

data/lib/ccp/utils/colorize.rb

@@ -1,15 +1,67 @@
 module Ccp
   module Utils
     module Colorize
-      def colorize(text, ansi); "#{ansi}#{text}\e[0m"; end
-      def red   (text); colorize(text, "\e[31m"); end
-      def green (text); colorize(text, "\e[32m"); end
-      def yellow(text); colorize(text, "\e[33m"); end
-      def blue  (text); colorize(text, "\e[34m"); end
-      def pink  (text); colorize(text, "\e[35m"); end
-      def aqua  (text); colorize(text, "\e[36m"); end
-
-      extend self
+      # [examples]
+      # Ccp::Utils::Colorize::Fore.red("hello")
+      # Ccp::Utils::Colorize::Back.red("hello")
+      # Ccp::Utils::Colorize.red("hello")        # same as Fore
+
+      module Fore
+        CLEAR   = "\e[0m"
+        BLACK   = "\e[30m"
+        RED     = "\e[31m"
+        GREEN   = "\e[32m"
+        YELLOW  = "\e[33m"
+        BLUE    = "\e[34m"
+        MAGENTA = "\e[35m"
+        CYAN    = "\e[36m"
+        WHITE   = "\e[37m"
+
+        def colorize(text, code); code + text.to_s + CLEAR; end
+
+        def black  (text) BLACK   + text.to_s + CLEAR; end
+        def red    (text) RED     + text.to_s + CLEAR; end
+        def green  (text) GREEN   + text.to_s + CLEAR; end
+        def yellow (text) YELLOW  + text.to_s + CLEAR; end
+        def blue   (text) BLUE    + text.to_s + CLEAR; end
+        def magenta(text) MAGENTA + text.to_s + CLEAR; end
+        def purple (text) MAGENTA + text.to_s + CLEAR; end # alias
+        def pink   (text) MAGENTA + text.to_s + CLEAR; end # alias
+        def cyan   (text) CYAN    + text.to_s + CLEAR; end
+        def aqua   (text) CYAN    + text.to_s + CLEAR; end # alias
+        def white  (text) WHITE   + text.to_s + CLEAR; end
+        extend self
+      end
+
+      module Back
+        CLEAR   = "\e[0m"
+        BLACK   = "\e[40m"
+        RED     = "\e[41m"
+        GREEN   = "\e[42m"
+        YELLOW  = "\e[43m"
+        BLUE    = "\e[44m"
+        MAGENTA = "\e[45m"
+        CYAN    = "\e[46m"
+        WHITE   = "\e[47m"
+
+        def colorize(text, code); code + text.to_s + CLEAR; end
+
+        def black  (text) BLACK   + text.to_s + CLEAR; end
+        def red    (text) RED     + text.to_s + CLEAR; end
+        def green  (text) GREEN   + text.to_s + CLEAR; end
+        def yellow (text) YELLOW  + text.to_s + CLEAR; end
+        def blue   (text) BLUE    + text.to_s + CLEAR; end
+        def magenta(text) MAGENTA + text.to_s + CLEAR; end
+        def purple (text) MAGENTA + text.to_s + CLEAR; end # alias
+        def pink   (text) MAGENTA + text.to_s + CLEAR; end # alias
+        def cyan   (text) CYAN    + text.to_s + CLEAR; end
+        def aqua   (text) CYAN    + text.to_s + CLEAR; end # alias
+        def white  (text) WHITE   + text.to_s + CLEAR; end
+        extend self
+      end
+
+      include Fore
+      extend  Fore
     end
   end
 end

data/lib/ccp/version.rb

@@ -1,3 +1,3 @@
 module Ccp
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/spec/storage/loadable_spec.rb

@@ -9,14 +9,15 @@ describe Ccp::Storage do
   describe ".load" do
     context "('tmp/foo.json.tch')" do
       subject { Ccp::Storage.load('tmp/foo.json.tch') }
+      it { should be_kind_of(Ccp::Storage) }
       its(:source) { should == 'tmp/foo.json.tch' }
       its(:kvs)    { should be_kind_of(Ccp::Kvs::Tch) }
       its(:codec)  { should == Ccp::Serializers::Json }
 
       describe "table(:foo)" do
         subject { Ccp::Storage.load('tmp/foo.json.tch').table(:bar) }
+        it { should be_kind_of(Ccp::Kvs::Tch) }
         its(:source) { should == 'tmp/foo.json.tch/bar.json.tch' }
-        its(:kvs)    { should be_kind_of(Ccp::Kvs::Tch) }
         its(:codec)  { should == Ccp::Serializers::Json }
       end
     end
@@ -27,6 +28,13 @@ describe Ccp::Storage do
       its(:kvs)    { should be_kind_of(Ccp::Kvs::Tch) }
       its(:codec)  { should == Ccp::Serializers::Msgpack }
     end
+
+    context "(pathname)" do
+      subject { Ccp::Storage.load(Pathname('tmp/foo.msgpack.tch')) }
+      its(:source) { should == Pathname('tmp/foo.msgpack.tch') }
+      its(:kvs)    { should be_kind_of(Ccp::Kvs::Tch) }
+      its(:codec)  { should == Ccp::Serializers::Msgpack }
+    end
   end
 
   describe "#read!" do

data/spec/utils/colorize_spec.rb

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Ccp::Utils::Colorize do
+  let(:text) { "hello" }
+
+  subject {
+    # methods
+    object.black(text)  .should be_kind_of(String)
+    object.red(text)    .should be_kind_of(String)
+    object.green(text)  .should be_kind_of(String)
+    object.yellow(text) .should be_kind_of(String)
+    object.blue(text)   .should be_kind_of(String)
+    object.magenta(text).should be_kind_of(String)
+    object.purple(text) .should be_kind_of(String)
+    object.pink(text)   .should be_kind_of(String)
+    object.cyan(text)   .should be_kind_of(String)
+    object.aqua(text)   .should be_kind_of(String)
+    object.white(text)  .should be_kind_of(String)
+
+    # alias
+    object.purple(text).should == object.magenta(text)
+    object.pink(text)  .should == object.magenta(text)
+    object.aqua(text)  .should == object.cyan(text)
+  }
+
+  context "(static)" do
+    subject { Ccp::Utils::Colorize }
+    it { should be }
+  end
+
+  context "(include)" do
+    subject { Object.new.extend(Ccp::Utils::Colorize) }
+    it { should be }
+  end
+
+  context "(fore)" do
+    subject { Ccp::Utils::Colorize::Fore }
+    it { should be }
+  end
+
+  context "(fore include)" do
+    subject { Object.new.extend(Ccp::Utils::Colorize::Fore) }
+    it { should be }
+  end
+
+  context "(back)" do
+    subject { Ccp::Utils::Colorize::Back }
+    it { should be }
+  end
+
+  context "(back include)" do
+    subject { Object.new.extend(Ccp::Utils::Colorize::Back) }
+    it { should be }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ccp
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - maiha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-23 00:00:00 Z
+date: 2013-08-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 19
         segments: 
         - 0
-        - 2
-        - 9
-        version: 0.2.9
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -265,6 +265,7 @@ files:
 - spec/serializers/serializer_spec.rb
 - spec/spec_helper.rb
 - spec/storage/loadable_spec.rb
+- spec/utils/colorize_spec.rb
 homepage: http://github.com/maiha/ccp
 licenses: 
 - MIT