jruby-mapdb 0.9.6-java → 1.0.0-java

data/README.md

@@ -1,6 +1,6 @@
 # Jruby::Mapdb
 
-This is a jruby-only wrapper for MapDB (v0.9.5). MapDB is a fast key-value store java library.
+This is a jruby-only wrapper for MapDB (v0.9.6). MapDB is a fast key-value store java library.
 
 Using this gem, MapDB trees are seen as hashes in jruby, making persistence easy and cheap.
 
@@ -62,6 +62,27 @@ p People[1]
 
 ~~~
 
+## Jruby::Mapdb::DB API
+
+This API has been kept as simple as possible, compatible with Ruby Hash.
+
+It is compatible with most Enumerable methods: each, find_all, select, reject, entries, etc...
+
+~~~
+
+#new                      create a MemoryDB.
+#new(dbname)              create a FileDB named dbname into current directory.
+
+#tree(treename)           create a MapDB treemap, which can be used with Jruby::Mapdb::Tree API.
+
+#close                    close DB instance.
+
+#closed?                  return true if DB instance is closed, false otherwise.
+
+#compact                  compact the DB. To be used in dedicated/isolated script, not in main script.
+
+~~~
+
 ## Jruby::Mapdb::Tree API
 
 This API has been kept as simple as possible, compatible with Ruby Hash.

data/Rakefile

@@ -1,10 +1,8 @@
-require "rubygems"
-require "rake"
-require "rake/testtask"
+%w[rubygems rake rake/testtask].map &method(:require) 
 
-desc "Run tests"
-Rake::TestTask.new "test" do |t|
-  t.libs << "test"
+desc 'Run tests'
+Rake::TestTask.new 'test' do |t|
+  t.libs << 'test'
   t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end

data/jruby-mapdb.gemspec

@@ -3,17 +3,17 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jruby/mapdb/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "jruby-mapdb"
+  spec.name          = 'jruby-mapdb'
   spec.version       = Jruby::Mapdb::VERSION
-  spec.platform      = "java"
-  spec.authors       = ["Christian MICHON"]
-  spec.email         = ["christian.michon@gmail.com"]
+  spec.platform      = 'java'
+  spec.authors       = ['Christian MICHON']
+  spec.email         = ['christian.michon@gmail.com']
   spec.description   = %q{MapDB wrapper for JRuby}
   spec.summary       = %q{MapDB wrapper}
-  spec.homepage      = "http://github.com/cmichon/jruby-mapdb"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://github.com/cmichon/jruby-mapdb'
+  spec.license       = 'MIT'
 
   spec.files         = Dir['{**/*}']
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 end

data/lib/jruby-mapdb.rb

@@ -1,3 +1 @@
-(%w[java] + Dir['**/*.jar']).each { |jar| require jar }
-
-require 'jruby/mapdb'
+(%w[java] + Dir['**/*.jar'] + %w[jruby/mapdb]).map &method(:require)

data/lib/jruby/mapdb.rb

@@ -1,9 +1,10 @@
-require "jruby/mapdb/version"
+%w[jruby/mapdb/version forwardable].map &method(:require)
 
 module Jruby
   module Mapdb
     module ClassMethods
       include Enumerable
+      extend Forwardable
       def encode(key, value)
         @tree.put key, Marshal.dump(value).to_java_bytes
       end
@@ -15,58 +16,53 @@ module Jruby
       def each
         @tree.each_pair { |key,value| yield(key, Marshal.load(String.from_java_bytes(value))) }
       end
-      def key?(key)
-        @tree.has_key? key
-      end
       def keys
         @tree.key_set.to_a
       end
-      def count
-        @tree.size
-      end
       def regexp(pattern)
         re = Regexp.new "#{pattern}", Regexp::EXTENDED | Regexp::IGNORECASE
         @tree.select{ |k,v| "#{k}" =~ re }.map(&:first)
       end
-      def clear
-        @tree.clear
-      end
-      alias :[]=  :encode
-      alias :[]   :decode
-      alias :size :count
-      private
+      def_delegator :@tree, :clear,    :clear
+      def_delegator :@tree, :has_key?, :key?
+      def_delegator :@tree, :count,    :size
+      alias :[]=   :encode
+      alias :[]    :decode
+      alias :count :size
     end
     class Tree
       extend ClassMethods
     end
     class DB
-      attr_reader :mapdb, :trees, :type
+      extend Forwardable
+      attr_reader :mapdb, :type
       def initialize(dbname=nil)
         if dbname.nil?
           @type = :MemoryDB
-          @trees = []
           @mapdb = Java::OrgMapdb::DBMaker.
             newMemoryDB().
             closeOnJvmShutdown().
             make()
         else
           @type = :FileDB
-          @trees = []
           @mapdb = Java::OrgMapdb::DBMaker.
             newFileDB(Java::JavaIo::File.new("#{dbname}")).
             closeOnJvmShutdown().
-            writeAheadLogDisable().
+            transactionDisable().
             make()
         end
       end
       def tree(treename)
-        raise "Tree already defined" if @trees.include?(treename) || Object.const_defined?(treename)
-        trees << treename
+        raise "Tree '#{treename}' already defined" if Object.const_defined?(treename)
         Object.const_set treename, Class.new(Tree)
         Object.const_get(treename).instance_variable_set :@mapdb, @mapdb
         Object.const_get(treename).instance_variable_set :@tree, @mapdb.getTreeMap("#{treename}")
         Object.const_get treename
       end
+      def trees
+        Hash[*(@mapdb.getAll.map(&:first).map(&:to_sym).zip(@mapdb.getAll.map(&:last).map(&:size)).flatten)]
+      end
+      def_delegators :@mapdb, :close, :closed?, :compact
     end
   end
 end

data/lib/jruby/mapdb/version.rb

@@ -1,5 +1,5 @@
 module Jruby
   module Mapdb
-    VERSION = "0.9.6"
+    VERSION = "1.0.0"
   end
 end

data/test/mapdb_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require 'test_helper'
 
 module MyTest
   def runner(type)
@@ -9,7 +9,7 @@ module MyTest
     db.tree :People
     assert People.is_a?(Enumerable)
     assert_equal Jruby::Mapdb::Tree, People.superclass
-    assert_equal [:People], db.trees
+    assert_equal [:People], db.instance_variable_get(:@mapdb).get_all.map(&:first).map(&:to_sym)
     assert_equal [], People.entries
 
     People[0] = 'CM'
@@ -35,6 +35,8 @@ module MyTest
     assert_instance_of Hash, People[1][:features]
     assert People[1][:features][:developer]
 
+    assert_equal ({:People=>2}),db.trees
+
     People.clear
     assert_equal 0, People.count
 
@@ -43,9 +45,8 @@ module MyTest
     end
     Object.send(:remove_const, :People)
 
-    mapdb = db.instance_variable_get(:@mapdb)
-    mapdb.close
-    assert mapdb.closed?
+    db.close
+    assert db.closed?
   end
 end
 

data/test/test_helper.rb

@@ -1,4 +1,2 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-%w[rubygems tempfile jruby-mapdb].map &method(:require)
-require 'test/unit'
+$: << File.expand_path('../lib', __FILE__)
+%w[rubygems test/unit tempfile jruby-mapdb].map &method(:require)

metadata

@@ -1,56 +1,66 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jruby-mapdb
-version: !ruby/object:Gem::Version
-  version: 0.9.6
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 1.0.0
 platform: java
-authors:
-- Christian MICHON
-autorequire:
+authors: 
+  - Christian MICHON
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+
+date: 2013-09-30 00:00:00 Z
 dependencies: []
+
 description: MapDB wrapper for JRuby
-email:
-- christian.michon@gmail.com
+email: 
+  - christian.michon@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- Gemfile
-- jruby-mapdb.gemspec
-- LICENSE-mapdb.txt
-- LICENSE.txt
-- Rakefile
-- README.md
-- lib/jruby-mapdb.rb
-- lib/mapdb-0.9.5.jar
-- lib/jruby/mapdb.rb
-- lib/jruby/mapdb/version.rb
-- test/mapdb_test.rb
-- test/test_helper.rb
+
+files: 
+  - Gemfile
+  - jruby-mapdb.gemspec
+  - LICENSE-mapdb.txt
+  - LICENSE.txt
+  - Rakefile
+  - README.md
+  - lib/jruby-mapdb.rb
+  - lib/mapdb-0.9.6.jar
+  - lib/jruby/mapdb.rb
+  - lib/jruby/mapdb/version.rb
+  - test/mapdb_test.rb
+  - test/test_helper.rb
 homepage: http://github.com/cmichon/jruby-mapdb
-licenses:
-- MIT
-metadata: {}
-post_install_message:
+licenses: 
+  - MIT
+post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
-rubyforge_project:
-rubygems_version: 2.0.3
-signing_key:
-specification_version: 4
+
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
+specification_version: 3
 summary: MapDB wrapper
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: cbd28983814fe1f29640826969cba61f7ae13a81
-  data.tar.gz: 1170604b2d40a0643f813e4898195a86697aba33
-SHA512:
-  metadata.gz: 781523f4f5672147184b3274257b5db87cb4d0f3dfd5d99403481d2650937ac62dcada5cee0034d7ccef5812cb0d2cffac0349c072103bff7c94a6a8292bccfd
-  data.tar.gz: ade71e1c8f299776edfd7d776530cc36b2ed2e78861dd8762b5176e6eecc91560f7e3c5cc13966f573a13f8505a7db109aaba072396cf24553b58a29e9bd7d21