ccp 0.4.0 → 0.4.1

data/ccp.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "ccp/version"
+require File.expand_path('../lib/ccp/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "ccp"
@@ -29,10 +28,24 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "must", ">= 0.3.0"
   s.add_runtime_dependency "dsl_accessor", ">= 0.4.1"
   s.add_runtime_dependency "json"
-  s.add_runtime_dependency "yajl-ruby"
-  s.add_runtime_dependency "msgpack", "> 0.4"
+
+
+  if RUBY_PLATFORM == 'java'
+    s.platform = RUBY_PLATFORM
+    s.add_runtime_dependency "msgpack-jruby", "~> 1.3.2"
+  else
+    s.add_runtime_dependency "yajl-ruby"
+    s.add_runtime_dependency 'msgpack', '> 0.4'
+    s.add_runtime_dependency "tokyocabinet", "~> 1.29.1"
+  end
+
+  ### test
 
   s.add_development_dependency "rspec"
-  s.add_development_dependency "tokyocabinet", "~> 1.29.1"
-  s.add_development_dependency "kyotocabinet-ruby", "~> 1.27.1"
+  if defined?(JRUBY_VERSION)
+    s.add_runtime_dependency 'kyotocabinet-java'
+  else
+    s.add_development_dependency "tokyocabinet", "~> 1.29.1"
+    s.add_development_dependency "kyotocabinet-ruby", "~> 1.27.1"
+  end
 end

data/lib/ccp/kvs/kyoto/cabinet.rb

@@ -18,18 +18,16 @@ module Ccp
           if v
             return decode(v)
           else
-            if @db.error.is_a?(KyotoCabinet::Error::XNOREC)
-              return nil
-            else
-              kyoto_error!("get(%s): " % k)
-            end
+            # tc, kc is not safe for file deletion or unexpected stuffs
+            # if @db.error.is_a?(KyotoCabinet::Error::XNOREC)
+            return nil
           end
         end
 
         def set(k,v)
           tryW("set")
           val = encode(v)
-          @db[k.to_s] = val or
+          @db.set(k.to_s, val) or
             kyoto_error!("set(%s): " % k)
         end
 

data/lib/ccp/version.rb

@@ -1,3 +1,3 @@
 module Ccp
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/kvs/enum_spec.rb

@@ -2,7 +2,8 @@
 require 'spec_helper'
 
 codecs = %w( json msgpack )
-exts   = %w( tch kch )
+exts   = %w( kch )
+exts << "tch" if defined?(TokyoCabinet)
 
 codecs.product(exts).each do |codec, ext|
   klass = Ccp::Kvs[ext]

data/spec/kvs/kvs_spec.rb

@@ -2,7 +2,8 @@
 require 'spec_helper'
 
 kvs_args = {}
-kvs_args["tch"] = "#{tmp_path}/kvs/foo.tch"
+
+kvs_args["tch"] = "#{tmp_path}/kvs/foo.tch" if defined?(TokyoCabinet)
 kvs_args["kch"] = "#{tmp_path}/kvs/foo.kch"
 
 Ccp::Kvs.each do |klass|

data/spec/kvs/kyoto/cabinet_spec.rb

@@ -99,6 +99,17 @@ describe Ccp::Kvs::Kyoto::Cabinet do
       before  { put(:foo, 1); kvs.W! }
       specify { kvs.W { kvs.get("foo").should == "1" } }
     end
+
+    ### error: rare case
+
+    pending "TODO: tc,kc is not safe about file deletion" do
+      # ruby: + open(read) -----------------+ kvs.get ---
+      # file:                + delete kch ---------------
+      context "(for read with file deletion)" do
+        before  { put(:foo, 1); kvs.W!; kch.unlink }
+        specify { kvs.set("xxx", "_").should == false }
+      end
+    end
   end
 
   ######################################################################

data/spec/kvs/load_spec.rb

@@ -12,7 +12,7 @@ describe Ccp::Kvs do
 
   context "(unknown codec)" do
     specify do
-      expect{ Ccp::Kvs.load("foo.xxx.tch") }.to raise_error(/xxx/)
+      expect{ Ccp::Kvs.load("foo.xxx.kch") }.to raise_error(/xxx/)
     end
   end
 
@@ -26,7 +26,8 @@ describe Ccp::Kvs do
   ### Usally case
 
   codecs = %w( json msgpack )
-  exts   = %w( tch kch )
+  exts   = %w( kch )
+  exts << "tch" if defined?(TokyoCabinet)
 
   codecs.product(exts).each do |codec, ext|
     file = "foo.#{codec}.#{ext}"

data/spec/kvs/tokyo/cabinet_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe Ccp::Kvs::Tokyo::Cabinet do
+describe "Ccp::Kvs::Tokyo::Cabinet", :tch do
   let(:tmp) { tmp_path + "kvs/tokyo/cabinet" }
   let(:tch) { tmp + "foo.tch" }
   let(:kvs) { subject }

data/spec/kvs/tokyo/info_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe Ccp::Kvs::Tokyo::Info do
+describe "Ccp::Kvs::Tokyo::Info", :tch do
   let(:tmp) { tmp_path + "kvs/tokyo/info" }
   before { FileUtils.rm_rf(tmp) if tmp.directory? }
 

data/spec/kvs/usecase_spec.rb

@@ -2,7 +2,8 @@
 require 'spec_helper'
 
 codecs = %w( json msgpack )
-exts   = %w( tch kch )
+exts   = %w( kch )
+exts << "tch" if defined?(TokyoCabinet)
 
 codecs.product(exts).each do |codec, ext|
   klass = Ccp::Kvs[ext]

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ require 'rspec'
 require 'ccp'
 require 'fileutils'
 
+Ccp::Kvs                        # force to autoload for tokyocabinet, kyotocabinet
+
 require File.join(File.dirname(__FILE__), "models")
 
 
@@ -17,7 +19,9 @@ RSpec.configure do |config|
   # config.mock_with :rr
   config.mock_with :rspec
 
+  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus => true
+  config.filter_run_excluding :tch unless defined?(TokyoCabinet)
   config.run_all_when_everything_filtered = true
 end
 

data/spec/storage/loadable_spec.rb

@@ -6,7 +6,7 @@ describe Ccp::Storage do
     Ccp::Storage.should respond_to(:load)
   end
 
-  describe ".load" do
+  describe ".load", :tch do
     context "('tmp/foo.json.tch')" do
       subject { Ccp::Storage.load('tmp/foo.json.tch') }
       it { should be_kind_of(Ccp::Storage) }
@@ -29,13 +29,6 @@ describe Ccp::Storage do
       its(:codec)  { should == Ccp::Serializers::Msgpack }
     end
 
-    context "('tmp/foo.msgpack.kch')" do
-      subject { Ccp::Storage.load('tmp/foo.msgpack.kch') }
-      its(:source) { should == 'tmp/foo.msgpack.kch' }
-      its(:kvs)    { should be_kind_of(Ccp::Kvs::Kch) }
-      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') }
@@ -44,7 +37,16 @@ describe Ccp::Storage do
     end
   end
 
-  describe "#read" do
+  describe ".load", :kch do
+    context "('tmp/foo.msgpack.kch')" do
+      subject { Ccp::Storage.load('tmp/foo.msgpack.kch') }
+      its(:source) { should == 'tmp/foo.msgpack.kch' }
+      its(:kvs)    { should be_kind_of(Ccp::Kvs::Kch) }
+      its(:codec)  { should == Ccp::Serializers::Msgpack }
+    end
+  end
+
+  describe "#read", :tch do
     before { FileUtils.rm_rf(tmp_path) if tmp_path.directory? }
 
     context "(file)" do
@@ -81,7 +83,7 @@ describe Ccp::Storage do
     end
   end
 
-  describe "#close" do
+  describe "#close", :tch do
     before { FileUtils.rm_rf(tmp_path) if tmp_path.directory? }
 
     let(:tch) { tmp_path + "foo.json.tch" }

data/spec/storage/usecase_spec.rb

@@ -2,7 +2,8 @@
 require 'spec_helper'
 
 codecs = %w( json msgpack )
-exts   = %w( tch kch )
+exts   = %w( kch )
+exts << "tch" if defined?(TokyoCabinet)
 
 codecs.product(exts).each do |codec, ext|
   dir = "foo.#{codec}.#{ext}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ccp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: tokyocabinet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.29.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.29.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement