couchbase 1.2.0.z.beta-x86-mingw32 → 1.2.1-x86-mingw32

data/lib/couchbase/view_row.rb

@@ -115,7 +115,7 @@ module Couchbase
       @value = data['value']
       if data['doc']
         @meta = data['doc']['meta']
-        @doc = data['doc']['json']
+        @doc = data['doc']['value']
       end
       @id = data['id'] || @meta && @meta['id']
       @views = []

data/lib/ext/multi_json_fix.rb

@@ -24,10 +24,23 @@ if MultiJson.respond_to?(:engine)
 else
   multi_json_engine = MultiJson.send(:adapter)
 end
+
+# Patch for MultiJson versions < 1.3.3
+require 'multi_json/version'
+if Gem::Version.new(MultiJson::VERSION) < Gem::Version.new('1.3.3')
+  class << MultiJson
+    alias :dump :encode
+    alias :load :decode
+  end
+end
+
 if multi_json_engine.name =~ /JsonGem$/
   class << multi_json_engine
     alias _load_object load
     def load(string, options = {})
+      if string.is_a?(StringIO)
+        string = string.read
+      end
       if string =~ /\A\s*[{\[]/
         _load_object(string, options)
       else
@@ -36,12 +49,3 @@ if multi_json_engine.name =~ /JsonGem$/
     end
   end
 end
-
-# Patch for MultiJson versions < 1.3.3
-if MultiJson.respond_to?(:decode) && MultiJson.respond_to?(:encode) &&
-  !MultiJson.respond_to?(:load) && !MultiJson.respond_to?(:dump)
-  class << MultiJson
-    alias :dump :encode
-    alias :load :decode
-  end
-end

data/lib/rack/session/couchbase.rb

@@ -33,16 +33,20 @@ module Rack
     #
     #   require 'rack/session/couchbase'
     #   use Rack::Session::Couchbase, :expire_after => 5.minutes,
-    #     :couchbase => {:bucket => "sessions", :default_format => :marshal}
+    #     :couchbase => {:bucket => "sessions", :default_format => :document}
     #
-    # By default sessions will be serialized to JSON, to allow analyse them
-    # using Map/Reduce.
+    # By default sessions will be serialized using Marshal class. But
+    # you can store them as JSON (+:default_format => :document+), to
+    # allow analyse them using Map/Reduce. In this case you should
+    # care about serialization of all custom objects like
+    # ActionDispatch::Flash::FlashHash
     #
     class Couchbase < Abstract::ID
       attr_reader :mutex, :pool
 
       DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge(
-        :couchbase => {:default_format => :document, :key_prefix => 'rack:session:'})
+        :couchbase => {:quiet => true, :default_format => :marshal,
+                       :key_prefix => 'rack:session:'})
 
       def initialize(app, options = {})
         # Support old :expires option
@@ -57,7 +61,7 @@ module Rack
       end
 
       def generate_sid
-        loop do
+        while true
           sid = super
           break sid unless @pool.get(sid)
         end
@@ -75,7 +79,7 @@ module Rack
 
       def set_session(env, session_id, new_session, options)
         with_lock(env, false) do
-          @pool.set session_id, new_session, options
+          @pool.set(session_id, new_session, options)
           session_id
         end
       end
@@ -90,7 +94,7 @@ module Rack
       def with_lock(env, default = nil)
         @mutex.lock if env['rack.multithread']
         yield
-      rescue Couchbase::Error::Connect, Couchbase::Error::Timeout
+      rescue ::Couchbase::Error::Connect, ::Couchbase::Error::Timeout
         if $VERBOSE
           warn "#{self} is unable to find Couchbase server."
           warn $!.inspect

data/tasks/compile.rake

@@ -84,7 +84,7 @@ namespace :ports do
   directory "ports"
 
   task :libcouchbase => ["ports"] do
-    recipe = MiniPortile.new "libcouchbase", "2.0.0beta_5_g970a292"
+    recipe = MiniPortile.new "libcouchbase", "2.0.1"
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
     recipe.configure_options.push("--disable-debug",
                                   "--disable-dependency-tracking",

data/tasks/test.rake

@@ -41,54 +41,60 @@ end
 
 Rake::TestTask.new do |test|
   test.libs << "test" << "."
-  test.ruby_opts << "-rruby-debug" if ENV['DEBUG']
   test.pattern = 'test/test_*.rb'
   test.options = '--verbose'
 end
 
 Rake::Task['test'].prerequisites.unshift('test/CouchbaseMock.jar')
 
-desc "Run the test suite under Valgrind."
+common_flags = %w[
+  --tool=memcheck
+  --error-limit=no
+  --undef-value-errors=no
+  --leak-check=full
+  --show-reachable=yes
+  --num-callers=50
+  --track-fds=yes
+  --workaround-gcc296-bugs=yes
+  --leak-resolution=med
+  --max-stackframe=7304328
+  --partial-loads-ok=yes
+]
+
+desc "Run the test suite under Valgrind memcheck."
 task "test:valgrind" do
-  ENV['RUBY_PREFIX'] = [
-    "valgrind",
-    "--num-callers=50",
-    "--error-limit=no",
-    "--partial-loads-ok=yes",
-    "--undef-value-errors=no",
-    "--track-fds=yes",
-    "--leak-check=full",
-    "--leak-resolution=med",
-  ].join(' ')
+  ENV['RUBY_PREFIX'] = "valgrind #{common_flags.join(' ')}"
   Rake::Task['test'].invoke
 end
 
-desc "Run the test suite under Valgrind with memory-fill."
+desc "Run the test suite under Valgrind memcheck with memory-fill."
 task "test:valgrind:mem_fill" do
-  ENV['RUBY_PREFIX'] = [
-    "valgrind",
-    "--num-callers=50",
-    "--error-limit=no",
-    "--partial-loads-ok=yes",
-    "--undef-value-errors=no",
-    "--freelist-vol=100000000",
-    "--malloc-fill=6D",
-    "--free-fill=66",
-  ].join(' ')
+  local_flags = %w[
+    --malloc-fill=6D
+    --freelist-vol=100000000
+    --free-fill=66
+  ]
+  ENV['RUBY_PREFIX'] = "valgrind #{common_flags.join(' ')} #{local_flags.join(' ')}"
   Rake::Task['test'].invoke
 end
 
-desc "Run the test suite under Valgrind with memory-zero."
+desc "Run the test suite under Valgrind memcheck with memory-zero."
 task "test:valgrind:mem_zero" do
-  ENV['RUBY_PREFIX'] = [
-    "valgrind",
-    "--num-callers=50",
-    "--error-limit=no",
-    "--partial-loads-ok=yes",
-    "--undef-value-errors=no",
-    "--freelist-vol=100000000",
-    "--malloc-fill=00",
-    "--free-fill=00",
-  ].join(' ')
+  local_flags = %w[
+    --freelist-vol=100000000
+    --malloc-fill=00
+    --free-fill=00
+  ]
+  ENV['RUBY_PREFIX'] = "valgrind #{common_flags.join(' ')} #{local_flags.join(' ')}"
+  Rake::Task['test'].invoke
+end
+
+desc "Run the test suite under Valgrind massif."
+task "test:valgrind:massif" do
+  local_flags = %w[
+    --tool=massif
+    --time-unit=B
+  ]
+  ENV['RUBY_PREFIX'] = "valgrind #{local_flags.join(' ')}"
   Rake::Task['test'].invoke
 end

data/tasks/util.rake

@@ -17,5 +17,5 @@
 
 desc 'Start an irb session and load the library.'
 task :console => :compile do
-  exec "irb -I lib -r#{RUBY_VERSION =~ /^1\.9/ ? 'debugger' : 'ruby-debug'} -rcouchbase"
+  exec "irb -I lib -rcouchbase"
 end

data/test/setup.rb

@@ -55,7 +55,7 @@ class CouchbaseServer
       rescue Couchbase::Error::NotSupported
         # on recent server flush is disabled
       end
-    end
+    end if ENV['COUCHBASE_FLUSH_BUCKETS']
   end
   def stop; end
 end
@@ -166,6 +166,13 @@ class MiniTest::Unit::TestCase
   end
 
   def uniq_id(*suffixes)
-    [caller.first[/.*[` ](.*)'/, 1], suffixes].join("_")
+    test_id = [caller.first[/.*[` ](.*)'/, 1], suffixes].compact.join("_")
+    @ids ||= {}
+    @ids[test_id] ||= Time.now.to_f
+    [test_id, @ids[test_id]].join("_")
+  end
+
+  def after_teardown
+    GC.start
   end
 end

data/test/test_arithmetic.rb

@@ -54,6 +54,43 @@ class TestArithmetic < MiniTest::Unit::TestCase
     end
   end
 
+  def test_it_allows_to_make_increments_less_verbose_by_forcing_create_by_default
+    connection = Couchbase.connect(:hostname => @mock.host, :port => @mock.port,
+                                   :default_arithmetic_init => true)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
+    assert_equal 0, connection.incr(uniq_id), "return value"
+    assert_equal 0, connection.get(uniq_id), "via get command"
+  end
+
+  def test_it_allows_to_setup_initial_value_during_connection
+    connection = Couchbase.connect(:hostname => @mock.host, :port => @mock.port,
+                                   :default_arithmetic_init => 10)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
+    assert_equal 10, connection.incr(uniq_id), "return value"
+    assert_equal 10, connection.get(uniq_id), "via get command"
+  end
+
+  def test_it_allows_to_change_default_initial_value_after_connection
+    connection = Couchbase.connect(:hostname => @mock.host, :port => @mock.port)
+
+    assert_equal 0, connection.default_arithmetic_init
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.incr(uniq_id)
+    end
+
+    connection.default_arithmetic_init = 10
+    assert_equal 10, connection.default_arithmetic_init
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
+    assert_equal 10, connection.incr(uniq_id), "return value"
+    assert_equal 10, connection.get(uniq_id), "via get command"
+  end
+
   def test_it_creates_missing_key_when_initial_value_specified
     connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 

data/test/test_async.rb

@@ -124,7 +124,7 @@ class TestAsync < MiniTest::Unit::TestCase
     connection.run do |conn|
       conn.delete(uniq_id, :cas => cas) do |res1|
         success = res1.success?
-        conn.get(uniq_id) do |res2|
+        conn.get(uniq_id, :quiet => true) do |res2|
           val = res2.value
         end
       end
@@ -154,27 +154,31 @@ class TestAsync < MiniTest::Unit::TestCase
   end
 
   def test_nested_async_flush_set
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-    cas = connection.set(uniq_id, "foo")
-    res = {}
+    if @mock.real?
+      connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+      cas = connection.set(uniq_id, "foo")
+      res = {}
 
-    connection.run do |conn|
-      conn.flush do |res1|
-        assert res1.success?
-        id = uniq_id(res1.node)
-        res[id] = false
-        conn.set(id, true) do |res2|
-          res[id] = res2.cas
+      connection.run do |conn|
+        conn.flush do |res1|
+          assert res1.success?, "Expected: successful status code.\nActual: #{res1.error.inspect}"
+          id = uniq_id(res1.node)
+          res[id] = false
+          conn.set(id, true) do |res2|
+            res[id] = res2.cas
+          end
         end
       end
-    end
 
-    assert_raises(Couchbase::Error::NotFound) do
-      connection.get(uniq_id)
-    end
-    res.keys.each do |key|
-      assert res[key].is_a?(Numeric)
-      assert connection.get(key)
+      assert_raises(Couchbase::Error::NotFound) do
+        connection.get(uniq_id)
+      end
+      res.keys.each do |key|
+        assert res[key].is_a?(Numeric)
+        assert connection.get(key)
+      end
+    else
+      skip("REST FLUSH isn't implemented in CouchbaseMock.jar yet")
     end
   end
 

data/test/test_unlock.rb

@@ -71,7 +71,6 @@ class TestTouch < MiniTest::Unit::TestCase
       end
       ret = connection.unlock(uniq_id(1) => info[uniq_id(1)][2],
                               uniq_id(2) => info[uniq_id(2)][2])
-      puts ret.inspect
       assert ret[uniq_id(1)]
       assert ret[uniq_id(2)]
       connection.set(uniq_id(1), "bar")

data/test/test_utils.rb

@@ -19,8 +19,40 @@ require File.join(File.dirname(__FILE__), 'setup')
 
 class TestUtils < MiniTest::Unit::TestCase
 
+  def setup
+    @mock = start_mock
+  end
+
+  def teardown
+    stop_mock(@mock)
+  end
+
   def test_complex_startkey
     assert_equal "all_docs?startkey=%5B%22Deadmau5%22%2C%22%22%5D", Couchbase::Utils.build_query("all_docs", :startkey =>  ["Deadmau5", ""])
   end
 
+  def test_it_provides_enough_info_with_value_error
+    class << MultiJson
+      alias dump_good dump
+      def dump(obj)
+        raise ArgumentError, "cannot accept your object"
+      end
+    end
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    assert_raises(Couchbase::Error::ValueFormat) do
+      connection.set(uniq_id, "foo")
+    end
+    begin
+      connection.set(uniq_id, "foo")
+    rescue Couchbase::Error::ValueFormat => ex
+      assert_match /cannot accept your object/, ex.to_s
+      assert_instance_of ArgumentError, ex.inner_exception
+    end
+  ensure
+    class << MultiJson
+      undef dump
+      alias dump dump_good
+    end
+  end
+
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.2.0.z.beta
-  prerelease: 6
+  version: 1.2.1
+  prerelease: 
 platform: x86-mingw32
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -171,22 +171,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_support
   requirement: !ruby/object:Gem::Requirement
@@ -213,9 +197,10 @@ files:
 - .travis.yml
 - .yardopts
 - Gemfile
-- HISTORY.markdown
 - LICENSE
+- Makefile
 - README.markdown
+- RELEASE_NOTES.markdown
 - Rakefile
 - couchbase.gemspec
 - ext/couchbase_ext/.gitignore
@@ -229,6 +214,7 @@ files:
 - ext/couchbase_ext/get.c
 - ext/couchbase_ext/gethrtime.c
 - ext/couchbase_ext/http.c
+- ext/couchbase_ext/multithread_plugin.c
 - ext/couchbase_ext/observe.c
 - ext/couchbase_ext/result.c
 - ext/couchbase_ext/stats.c
@@ -242,6 +228,7 @@ files:
 - lib/active_support/cache/couchbase_store.rb
 - lib/couchbase.rb
 - lib/couchbase/bucket.rb
+- lib/couchbase/cluster.rb
 - lib/couchbase/result.rb
 - lib/couchbase/utils.rb
 - lib/couchbase/version.rb
@@ -293,13 +280,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2121319828183338938
+      hash: 1784186520908276694
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1784186520908276694
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23