libcdb-ruby 0.1.1 → 0.2.0

data/spec/libcdb/reader_spec.rb

@@ -1,42 +1,27 @@
-describe LibCDB::CDB::Reader do
-
-  before :all do
-    @temp = tempfile
+#encoding: utf-8
 
-    db = LibCDB::CDB::Writer.new(@temp.to_io)
-    TEST_DATA.each { |k, v| v.each { |w| db.store(k, w) } }
-    db.close
-  end
-
-  after :all do
-    @temp.unlink
-  end
+describe LibCDB::CDB::Reader do
 
-  describe "#initialize" do
+  describe '#initialize' do
 
-    it "should not accept integers" do
+    it 'should not accept integers' do
       lambda { LibCDB::CDB::Reader.new(12345) }.should raise_error(TypeError)
     end
 
-    it "should not accept pipes" do
+    it 'should not accept pipes' do
       lambda { LibCDB::CDB::Reader.new(STDIN) }.should raise_error(SystemCallError)
     end
 
-  end
-
-  describe "empty" do
-
-    before :all do
-      @empt = tempfile
-      LibCDB::CDB::Writer.new(@empt.to_io).close
+    it 'should not accept empty files' do
+      lambda { reader('empty.dump') }.should raise_error(SystemCallError)
     end
 
-    after :all do
-      @empt.unlink
-    end
+  end
+
+  describe 'empty' do
 
     before :each do
-      @db = LibCDB::CDB::Reader.new(File.open(@empt.path))
+      @db = reader(:empty)
     end
 
     after :each do
@@ -51,19 +36,19 @@ describe LibCDB::CDB::Reader do
       @db.should be_empty
     end
 
-    it "should know its size" do
+    it 'should know its size' do
       @db.size.should == 0
     end
 
-    it "should know its total" do
+    it 'should know its total' do
       @db.total.should == 0
     end
 
-    it "should know its keys" do
+    it 'should know its keys' do
       @db.keys.should == []
     end
 
-    it "should know its values" do
+    it 'should know its values' do
       @db.values.should == []
     end
 
@@ -75,29 +60,21 @@ describe LibCDB::CDB::Reader do
       @db.should_not have_value('v3.2')
     end
 
-    it "should dump itself" do
+    it 'should dump itself' do
       @db.dump.should == ''
     end
 
-    it "should convert itself into a hash" do
+    it 'should convert itself into a hash' do
       @db.to_h.should == {}
     end
 
-    it "should convert itself into an array" do
+    it 'should convert itself into an array' do
       @db.to_a.should == []
     end
 
   end
 
-  describe "non-empty" do
-
-    before :each do
-      @db = LibCDB::CDB::Reader.new(File.open(@temp.path))
-    end
-
-    after :each do
-      @db.close
-    end
+  shared_examples 'non-empty' do
 
     it "should know that it's not closed" do
       @db.should_not be_closed
@@ -107,47 +84,59 @@ describe LibCDB::CDB::Reader do
       @db.should_not be_empty
     end
 
-    it "should know its size" do
+    it 'should know its size' do
       @db.size.should == TEST_DATA.size
     end
 
-    it "should know its total" do
+    it 'should know its total' do
       @db.total.should == TEST_DATA.values.flatten.size
     end
 
-    it "should know its keys" do
+    it 'should know its keys' do
       @db.keys.should == TEST_DATA.map { |k, _| k }.uniq
     end
 
-    it "should know its values" do
+    it 'should know its values' do
       @db.values.should == TEST_DATA.map { |_, v| v }.flatten
     end
 
-    it "should know if it has a key" do
+    it 'should know if it has a key' do
       @db.should have_key('k3')
     end
 
+    it 'should know if it has a wide-char key' do
+      @db.should have_key('€ürö')
+    end
+
     it "should know if it doesn't have a key" do
       @db.should_not have_key('none')
     end
 
-    it "should know if it has a value" do
+    it 'should know if it has a value' do
       @db.should have_value('v3.2')
     end
 
+    it 'should know if it has a wide-char value' do
+      @db.should have_value('½a×¾b')
+    end
+
     it "should know if it doesn't have a value" do
       @db.should_not have_value('none')
     end
 
-    it "should get a single value" do
+    it 'should get a single value' do
       @db['k1'].should == 'v1.1'
     end
 
-    it "should not get non-existent value" do
+    it 'should get a single wide-char value' do
+      @db['€ürö'].should == '½a×¾b'
+    end
+
+    it 'should not get non-existent value' do
       @db['none'].should be_nil
     end
 
-    it "should get each value" do
+    it 'should get each value' do
       TEST_DATA.each { |k, o|
         r = []
         @db.each(k) { |v| r << v }
@@ -155,42 +144,104 @@ describe LibCDB::CDB::Reader do
       }
     end
 
-    it "should get all values" do
-      TEST_DATA.each { |k, o|
-        @db.fetch(k).should == o
-      }
+    it 'should get all values' do
+      TEST_DATA.each { |k, o| @db.fetch(k).should == o }
     end
 
-    it "should get last value" do
-      @db.fetch_last('k10').should == 'v10.10'
+    it 'should get first values' do
+      TEST_DATA.each { |k, o| @db.fetch_first(k).should == Array(o).first }
     end
 
-    it "should find the key for a value" do
+    it 'should get last values' do
+      TEST_DATA.each { |k, o| @db.fetch_last(k).should == Array(o).last }
+    end
+
+    it 'should find the key for a value' do
       @db.key('v3.2').should == 'k3'
     end
 
-    it "should not find the key for a non-existent value" do
+    it 'should find the key for a wide-char value' do
+      @db.key('½a×¾b').should == '€ürö'
+    end
+
+    it 'should not find the key for a non-existent value' do
       @db.key('none').should be_nil
     end
 
-    it "should dump records for key" do
+    it 'should dump itself' do
+      @db.dump.should == File.read(data('test.dump'))
+    end
+
+    it 'should dump records for key' do
       d = []
       @db.each_dump('k3') { |e| d << e }
       d.should == %w[+2,4:k3->v3.1 +2,4:k3->v3.2 +2,4:k3->v3.3]
     end
 
-    it "should convert itself into a hash" do
+    it 'should dump records for wide-char key' do
+      d = []
+      @db.each_dump('€ürö') { |e| d << e }
+      d.should == %w[+8,8:€ürö->½a×¾b]
+    end
+
+    it 'should convert itself into a hash' do
       h = {}
       TEST_DATA.each { |k, v| h[k] = v.size > 1 ? v : v.first }
       @db.to_h.should == h
     end
 
-    it "should convert itself into an array" do
+    it 'should convert itself into an array' do
       a = []
       TEST_DATA.each { |k, v| v.each { |w| a << [k, w] } }
       @db.to_a.should == a
     end
 
+    it 'should yield keys' do
+      @db.each_key { |k| break k }.should == 'k1'
+    end
+
+    it 'should return an enumerator for #each_key without block' do
+      @db.each_key.should be_a(Enumerator)
+    end
+
+    it 'should yield values' do
+      @db.each_value { |v| break v }.should == 'v1.1'
+    end
+
+    it 'should return an enumerator for #each_value without block' do
+      @db.each_value.should be_a(Enumerator)
+    end
+
+  end
+
+  describe 'reader' do
+
+    before do
+      @db = reader
+    end
+
+    after do
+      @db.close
+    end
+
+    include_examples 'non-empty'
+
+  end
+
+  describe '#load_file' do
+
+    before :all do
+      @temp = tempfile
+      @db = LibCDB::CDB.load_file(@temp.path, data('test.dump'))
+    end
+
+    after :all do
+      @db.close
+      @temp.unlink
+    end
+
+    include_examples 'non-empty'
+
   end
 
 end

data/spec/libcdb/writer_spec.rb

@@ -1,33 +1,38 @@
+require 'tempfile'
+
 describe LibCDB::CDB::Writer do
 
-  describe "#initialize" do
+  describe '#initialize' do
 
-    it "should not accept strings" do
+    it 'should not accept strings' do
       lambda { LibCDB::CDB::Writer.new('test') }.should raise_error(TypeError)
     end
 
-    it "should not accept pipes" do
+    it 'should not accept pipes' do
       lambda { LibCDB::CDB::Writer.new(STDOUT) }.should raise_error(SystemCallError)
     end
 
   end
 
-  describe "#add" do
+  describe 'when writing' do
 
-    before :each do
+    before do
       @temp = tempfile
       @db = LibCDB::CDB::Writer.new(@temp.to_io)
     end
 
-    after :each do
+    after do
       @temp.unlink
     end
 
-    it "should add data" do
-      TEST_DATA.each { |k, v| v.each { |w| @db.add(k, w) } }
-      @db.close
-      @db.should be_closed
-    end
+    %w[insert replace store].each { |m|
+      it "should #{m} data" do
+        TEST_DATA.each { |k, v| v.each { |w| @db.send(m, k, w) } }
+
+        @db.close
+        @db.should be_closed
+      end
+    }
 
   end
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 $:.unshift('lib') unless $:.first == 'lib'
 
 require 'libcdb'
@@ -14,10 +16,26 @@ RSpec.configure { |config|
       1.upto(i) { |j| v << "v#{i}.#{j}" }
     }
 
-    TEST_DATA['a' * 1024] = Array('b' * 1024 ** 2)
+    TEST_DATA['€ürö'] = ['½a×¾b']
+
+    TEST_DATA['a' * 1024] = ['b' * 1024 ** 2]
 
     def tempfile
       Tempfile.open("libcdb_spec_#{object_id}_temp")
     end
+
+    def data(file)
+      File.join(File.dirname(__FILE__), 'data', file)
+    end
+
+    def reader(cdb = :test)
+      cdb = "#{cdb}.cdb" if cdb.is_a?(Symbol)
+      LibCDB::CDB::Reader.new(File.open(data(cdb)))
+    end
   })
 }
+
+class String
+  alias_method :_original_inspect, :inspect
+  def inspect; size > 100 ? "#{self.class}(#{size})" : _original_inspect; end
+end

metadata

@@ -1,17 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: libcdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -85,6 +105,10 @@ files:
 - lib/libcdb-ruby.rb
 - lib/libcdb.rb
 - lib/libcdb/version.rb
+- spec/data/empty.cdb
+- spec/data/empty.dump
+- spec/data/test.cdb
+- spec/data/test.dump
 - spec/libcdb/reader_spec.rb
 - spec/libcdb/writer_spec.rb
 - spec/spec_helper.rb
@@ -94,14 +118,19 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  libcdb-ruby-0.1.1 [2014-04-25]:
+  libcdb-ruby-0.2.0 [2014-12-05]:
 
-  * <b>Dropped support for Ruby 1.9.2.</b>
-  * Housekeeping.
+  * Added encoding support to LibCDB::CDB::Reader.
+  * Added LibCDB::CDB.load and LibCDB::CDB.load_file to create a database from a
+    dump.
+  * Added LibCDB::CDB.stats and LibCDB::CDB.print_stats to collect stats from a
+    database.
+  * Fixed that LibCDB::CDB::Reader#each_key and LibCDB::CDB::Reader#each_value
+    would not return an enumerator when no block was given.
 
 rdoc_options:
 - "--title"
-- libcdb-ruby Application documentation (v0.1.1)
+- libcdb-ruby Application documentation (v0.2.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -122,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2.x
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for CDB Constant Databases.