rufus-tokyo 0.1.9 → 0.1.10

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-tokyo CHANGELOG.txt
 
 
+== rufus-tokyo - 0.1.10    released 2009/03/19
+
+- bug   : had to adapt to TC 1.4.10 and TT 1.1.17 new "setlimit"
+
+
 == rufus-tokyo - 0.1.9    released 2009/02/27
 
 - bug   : sudo gem install rufus-tokyo was failing because of

data/README.txt

@@ -24,6 +24,24 @@ Note : Rufus::Tokyo focuses on leveraging Hirabayashi-san's C libraries via ruby
 
 hereafter TC references Tokyo Cabinet, while TT references Tokyo Tyrant.
 
+the rdoc is at http://rufus.rubyforge.org/rufus-tokyo/
+
+
+== version [mis]match
+
+this version of rufus-tokyo works with
+
+  ruby 1.8.6
+  ruby 1.9.1p0
+  jruby 1.1.6
+  jruby 1.2.0
+
+  TC 1.4.9 and TT 1.1.16
+  TC 1.4.10 and TT 1.1.17 (adds the offset arg to query.limit)
+
+  tc-ruby 1.20 and tt-ruby 1.3 (Rufus::Edo)
+  tc-ruby 1.21 and tt-ruby 1.4 (Rufus::Edo)
+
 
 === TC Abstract API
 

data/TODO.txt

@@ -1,6 +1,6 @@
 
-[ ] table : bench find(1) after set_index
-[ ] table : bench insert(1) after set_index
+[x] table : bench find(1) after set_index
+[x] table : bench insert(1) after set_index
 
 [x] align edo#new on tokyo#new
 [ ] horizontal (bdb hdb fdb) tests for tokyo and edo

data/lib/rufus/edo/ntyrant/table.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'tokyotyrant'
 

data/lib/rufus/edo/tabcore.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'rufus/tokyo/query'
 require 'rufus/tokyo/transactions'
@@ -34,6 +29,10 @@ require 'rufus/tokyo/transactions'
 
 module Rufus::Edo
 
+  #
+  # Methods common to the two table classes (cabinet + ntyrant) found in
+  # Rufus::Edo
+  #
   module TableCore
 
     include Rufus::Tokyo::HashMethods
@@ -383,11 +382,14 @@ module Rufus::Edo
     #
     # Sets the max number of records to return for this query.
     #
-    # (sorry no 'offset' as of now)
+    # (If you're using TC >= 1.4.10 the optional 'offset' (skip) parameter
+    # is accepted)
     #
-    def limit (i)
+    def limit (i, offset=-1)
 
-      @query.setmax(i)
+      @query.respond_to?(:setlimit) ?
+        @query.setlimit(i, offset) :
+        @query.setmax(i)
     end
 
     #

data/lib/rufus/edo.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 begin
 

data/lib/rufus/tokyo/cabinet/lib.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus::Tokyo
 
@@ -41,6 +36,7 @@ module Rufus::Tokyo
 
     paths = Array(ENV['TOKYO_CABINET_LIB'] || %w{
       /opt/local/lib/libtokyocabinet.dylib
+      /opt/local/lib/libtokyocabinet.so
       /usr/local/lib/libtokyocabinet.dylib
       /usr/local/lib/libtokyocabinet.so
     })
@@ -156,7 +152,12 @@ module Rufus::Tokyo
 
     attfunc :qry_addcond, :tctdbqryaddcond, [ :pointer, :string, :int, :string ], :void
     attfunc :qry_setorder, :tctdbqrysetorder, [ :pointer, :string, :int ], :void
-    attfunc :qry_setmax, :tctdbqrysetmax, [ :pointer, :int ], :void
+
+    begin
+      attfunc :qry_setmax, :tctdbqrysetmax, [ :pointer, :int ], :void
+    rescue FFI::NotFoundError => nfe
+      attfunc :qry_setlimit, :tctdbqrysetlimit, [ :pointer, :int, :int ], :void
+    end
 
     attfunc :qry_search, :tctdbqrysearch, [ :pointer ], :pointer
 

data/lib/rufus/tokyo/cabinet/table.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'rufus/tokyo/query'
 require 'rufus/tokyo/config'
@@ -505,6 +500,7 @@ module Rufus::Tokyo
     #   :numoreq # number which is equal to at least one token
     #
     def add (colname, operator, val, affirmative=true, no_index=true)
+
       op = operator.is_a?(Fixnum) ? operator : OPERATORS[operator]
       op = op | TDBQCNEGATE unless affirmative
       op = op | TDBQCNOIDX if no_index
@@ -515,10 +511,14 @@ module Rufus::Tokyo
     #
     # Sets the max number of records to return for this query.
     #
-    # (sorry no 'offset' as of now)
+    # (If you're using TC >= 1.4.10 the optional 'offset' (skip) parameter
+    # is accepted)
     #
-    def limit (i)
-      lib.qry_setmax(@query, i)
+    def limit (i, offset=-1)
+
+      lib.respond_to?(:qry_setlimit) ?
+        lib.qry_setlimit(@query, i, offset) :
+        lib.qry_setmax(@query, i)
     end
 
     #

data/lib/rufus/tokyo/tyrant/lib.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus::Tokyo
 
@@ -42,6 +37,7 @@ module Rufus::Tokyo
 
     paths = Array(ENV['TOKYO_TYRANT_LIB'] || %w{
       /opt/local/lib/libtokyotyrant.dylib
+      /opt/local/lib/libtokyotyrant.so
       /usr/local/lib/libtokyotyrant.dylib
       /usr/local/lib/libtokyotyrant.so
     })
@@ -123,7 +119,12 @@ module Rufus::Tokyo
 
     attfunc :qry_addcond, :tcrdbqryaddcond, [ :pointer, :string, :int, :string ], :void
     attfunc :qry_setorder, :tcrdbqrysetorder, [ :pointer, :string, :int ], :void
-    attfunc :qry_setmax, :tcrdbqrysetmax, [ :pointer, :int ], :void
+
+    begin
+      attfunc :qry_setmax, :tcrdbqrysetmax, [ :pointer, :int ], :void
+    rescue FFI::NotFoundError => nfe
+      attfunc :qry_setlimit, :tcrdbqrysetlimit, [ :pointer, :int, :int ], :void
+    end
 
     attfunc :qry_search, :tcrdbqrysearch, [ :pointer ], :pointer
   end

data/lib/rufus/tokyo.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'ffi' # sudo gem install ffi
 
@@ -34,7 +29,7 @@ require 'ffi' # sudo gem install ffi
 module Rufus
 module Tokyo
 
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 
   #
   # A common error class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-tokyo
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 +09:00
+date: 2009-03-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,6 @@ rubyforge_project: rufus
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: ruby-ffi based lib to access Tokyo Cabinet
+summary: ruby-ffi based lib to access Tokyo Cabinet and Tyrant
 test_files: 
 - spec/spec.rb