couchbase-jruby-client 0.1.0-java → 0.1.5-java

data/lib/couchbase.rb

@@ -1,3 +1,19 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 unless RUBY_PLATFORM =~ /java/
   error "This gem is only compatible with a java-based ruby environment like JRuby."
@@ -14,7 +30,7 @@ require 'jars/spymemcached-2.10.0.jar'
 require 'jars/httpcore-nio-4.1.1.jar'
 require 'couchbase/version'
 require 'uri'
-require 'atomic'
+require 'thread_safe'
 require 'couchbase/transcoder'
 require 'couchbase/async'
 require 'couchbase/operations'
@@ -26,10 +42,13 @@ require 'couchbase/view_row'
 require 'couchbase/view'
 require 'couchbase/result'
 require 'couchbase/cluster'
+require 'couchbase/design_doc'
+require 'couchbase/view'
+require 'couchbase/query'
 
 include Java
 
-import Java::com.couchbase.client.CouchbaseClient;
+java_import Java::com.couchbase.client.CouchbaseClient
 
 at_exit do
   Couchbase.disconnect
@@ -38,7 +57,7 @@ end
 # Couchbase jruby client
 module Couchbase
 
-  @@bucket = Atomic.new(nil)
+  @@buckets = ThreadSafe::Cache.new
 
   class << self
 
@@ -65,9 +84,7 @@ module Couchbase
     #
     # @return [Bucket] connection instance
     def connect(*options)
-      disconnect
-      @@bucket.update { |bucket| bucket ||= Bucket.new(*(options.flatten)) }
-      @@bucket.value
+      Bucket.new(*(options.flatten))
     end
     alias :new :connect
 
@@ -80,67 +97,16 @@ module Couchbase
     #   Couchbase.bucket.name     #=> "blog"
     #
     # @return [Hash, String]
-    attr_accessor :connection_options
-
-    # The connection instance for current thread
-    #
-    # @since 1.1.0
-    #
-    # @see Couchbase.connection_options
-    #
-    # @example
-    #   Couchbase.bucket.set("foo", "bar")
-    #
-    # @return [Bucket]
-    def bucket
-      if !connected?
-        connect(connection_options)
-      end
-      @@bucket.value
-    end
-
-    # Set a connection instance for current thread
-    #
-    # @since 1.1.0
-    #
-    # @return [Bucket]
-    def bucket=(connection)
-      @@bucket.update { |bucket| bucket = connection }
-    end
-
-    def connected?
-      !!@@bucket.value
-    end
+    attr_reader :connection_options
 
-    def disconnect
-      @@bucket.value.disconnect if connected?
-      @@bucket = Atomic.new(nil)
+    def connection_options=(options)
+      @connection_options = normalize_connection_options(options)
     end
-  end
-end
 
-__END__
-
-    def self.connect(*options)
-      disconnect
-      Bucket.new(*(options.flatten))
+    def normalize_connection_options(options)
+      Hash[ options.map { |k, v| [k.to_sym, v] } ]
     end
 
-    def self.new(*options)
-      connect(options)
-    end
-
-    # Default connection options
-    #
-    # @since 1.1.0
-    #
-    # @example Using {Couchbase#connection_options} to change the bucket
-    #   Couchbase.connection_options = {:bucket => 'blog'}
-    #   Couchbase.bucket.name     #=> "blog"
-    #
-    # @return [Hash, String]
-    attr_accessor :connection_options
-
     # The connection instance for current thread
     #
     # @since 1.1.0
@@ -150,9 +116,42 @@ __END__
     # @example
     #   Couchbase.bucket.set("foo", "bar")
     #
+    # @example Set connection options using Hash
+    #   Couchbase.connection_options = {:node_list => ["example.com:8091"]}
+    #   Couchbase.bucket("slot1").set("foo", "bar")
+    #   Couchbase.bucket("slot1").bucket #=> "default"
+    #   Couchbase.connection_options[:bucket] = "test"
+    #   Couchbase.bucket("slot2").bucket #=> "test"
+    #
+    # @example Set connection options using URI
+    #   Couchbase.connection_options = "http://example.com:8091/pools"
+    #   Couchbase.bucket("slot1").set("foo", "bar")
+    #   Couchbase.bucket("slot1").bucket #=> "default"
+    #   Couchbase.connection_options = "http://example.com:8091/pools/buckets/test"
+    #   Couchbase.bucket("slot2").bucket #=> "test"
+    #
+    # @example Use named slots to keep a connection
+    #   Couchbase.connection_options = {
+    #     :node_list => ["example.com", "example.org"],
+    #     :bucket => "users"
+    #   }
+    #   Couchbase.bucket("users").set("john", {"balance" => 0})
+    #   Couchbase.connection_options[:bucket] = "orders"
+    #   Couchbase.bucket("other").set("john:1", {"products" => [42, 66]})
+    #
     # @return [Bucket]
-    def self.bucket
-      @bucket ||= connect(connection_options)
+    def bucket(name = nil)
+      name ||= case @connection_options
+               when Hash
+                 @connection_options[:bucket]
+               when String
+                 path = URI.parse(@connection_options).path
+                 path[%r(^(/pools/([A-Za-z0-9_.-]+)(/buckets/([A-Za-z0-9_.-]+))?)?), 3] || "default"
+               else
+                 'default'
+               end
+
+      @@buckets[name] ||= connect(connection_options)
     end
 
     # Set a connection instance for current thread
@@ -160,18 +159,21 @@ __END__
     # @since 1.1.0
     #
     # @return [Bucket]
-    def self.bucket=(connection)
-      @bucket = connection
+    def bucket=(connection)
+      name = @connection_options && @connection_options[:bucket] || "default"
+      @@buckets[name] = connection
     end
 
-    def self.connected?
-      !!@bucket
+    def connected?
+      !!@@buckets.empty?
     end
 
-    def self.disconnect
-      bucket.disconnect if connected?
-      @bucket = nil
+    def disconnect
+      @@buckets.each_key do |name|
+        bucket = @@buckets.delete(name)
+        bucket.disconnect if connected?
+      end
     end
-
+  end
 end