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

data/lib/couchbase/operations.rb

@@ -1,9 +1,28 @@
+# 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.
+#
+
 require 'couchbase/operations/touch'
 require 'couchbase/operations/store'
 require 'couchbase/operations/get'
 require 'couchbase/operations/delete'
+require 'couchbase/operations/unlock'
 require 'couchbase/operations/arithmetic'
 require 'couchbase/operations/stats'
+require 'couchbase/operations/design_docs'
 require 'couchbase/operations/utils'
 
 module Couchbase
@@ -14,8 +33,10 @@ module Couchbase
       klass.send(:include, Get)
       klass.send(:include, Touch)
       klass.send(:include, Delete)
+      klass.send(:include, Unlock)
       klass.send(:include, Arithmetic)
       klass.send(:include, Stats)
+      klass.send(:include, DesignDocs)
       klass.send(:include, Utils)
     end
   end

data/lib/couchbase/query.rb

@@ -0,0 +1,92 @@
+# 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.
+#
+
+
+module Couchbase
+  class Query
+
+    java_import com.couchbase.client.protocol.views.Stale
+
+    METHOD_MAPPING = {
+      :include_docs       => :setIncludeDocs,
+      :descending         => :setDescending,
+      :key                => :setKey,
+      :keys               => :setKeys,
+      :start_key          => :setRangeStart,
+      :startkey           => :setRangeStart,
+      :startkey_docid     => :setStartkeyDocID,
+      :endkey             => :setRangeEnd,
+      :endkey_docid       => :setEndkeyDocID,
+      :inclusive_end      => :setInclusiveEnd,
+      :limit              => :setLimit,
+      :skip               => :setSkip,
+      :reduce             => :setReduce,
+      :group              => :setGroup,
+      :group_level        => :setGroupLevel,
+      :connection_timeout => nil
+    }.freeze
+
+    def initialize(params)
+      @params = params
+    end
+
+    def generate
+      query = Java::ComCouchbaseClientProtocolViews::Query.new
+
+      stale = @params.delete(:stale)
+      if !stale.nil?
+        case stale
+        when :after_update
+          query.setStale(Stale::UPDATE_AFTER)
+        when :ok
+          query.setStale(Stale::OK)
+        when false
+          query.setStale(Stale::FALSE)
+        end
+      end
+
+      @params.each_pair do |meth, val|
+        if METHOD_MAPPING.key?(meth)
+          if java_meth = METHOD_MAPPING[meth]
+            query.send(java_meth, val)
+          end
+        else
+          fail ArgumentError, "Query does not support #{meth}"
+        end
+      end
+
+
+      # @option params [true, false] :quiet (true) Do not raise error if
+      #   associated document not found in the memory. If the parameter +true+
+      #   will use +nil+ value instead.
+      # @option params [String, Symbol] :on_error (:continue) Sets the
+      #   response in the event of an error. Supported values:
+      #   :continue:: Continue to generate view information in the event of an
+      #               error, including the error information in the view
+      #               response stream.
+      #   :stop::     Stop immediately when an error condition occurs. No
+      #               further view information will be returned.
+      # @option params [Fixnum] :connection_timeout (75000) Timeout before the
+      #   view request is dropped (milliseconds)
+
+
+      # @option params [Hash] :body
+      query
+    end
+
+  end
+end

data/lib/couchbase/result.rb

@@ -1,3 +1,20 @@
+# 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.
+#
+
 module Couchbase
   class Result
 
@@ -27,7 +44,7 @@ module Couchbase
     end
 
     def value
-      @bucket.load @future.get
+      @future.get
     rescue MultiJson::LoadError
       nil
     end

data/lib/couchbase/transcoder.rb

@@ -21,60 +21,54 @@ module Couchbase
 
   module Transcoder
 
-    # module Compat
-    #   def self.enable!
-    #     @disabled = false
-    #   end
-
-    #   def self.disable!
-    #     @disabled = true
-    #   end
-
-    #   def self.enabled?
-    #     !@disabled
-    #   end
-
-    #   def self.guess_and_load(blob, flags, options = {})
-    #     case flags & Bucket::FMT_MASK
-    #     when Bucket::FMT_DOCUMENT
-    #       MultiJson.load(blob)
-    #     when Bucket::FMT_MARSHAL
-    #       ::Marshal.load(blob)
-    #     when Bucket::FMT_PLAIN
-    #       blob
-    #     else
-    #       raise ArgumentError, "unexpected flags (0x%02x)" % flags
-    #     end
-    #   end
-    # end
-
-    module Document
-      def self.dump(obj)
-        MultiJson.dump(obj)
+    class Base < Java::NetSpyMemcachedTranscoders::SerializingTranscoder
+    end
+
+    class Document < Base
+
+      def decode(d)
+        decoded = super
+        data = if decoded.respond_to?(:to_str)
+                 decoded
+               else
+                 decoded.getData.to_s
+               end
+
+        MultiJson.load(data)
+      rescue MultiJson::LoadError
+        ::Marshal.load(data)
       end
 
-      def self.load(blob)
-        MultiJson.load(blob)
+      def encode(o)
+        super MultiJson.dump(o)
+      rescue ArgumentError => e
+        ex = Couchbase::Error::ValueFormat.new
+        ex.inner_exception = e
+        fail ex
       end
     end
 
-    module Marshal
-      def self.dump(obj)
-        ::Marshal.dump(obj)
+    class Marshal < Base
+
+      def decode(d)
+        ::Marshal.load super.getData.to_s
       end
 
-      def self.load(blob)
-        ::Marshal.load(blob)
+      def encode(o)
+        super ::Marshal.dump(o)
       end
     end
 
-    module Plain
-      def self.dump(obj)
-        obj
+    class Plain < Base
+
+      def decode(d)
+        super
       end
 
-      def self.load(blob)
-        blob
+      def encode(o)
+        super(o.to_str)
+      rescue NoMethodError
+        raise Couchbase::Error::ValueFormat
       end
     end
 

data/lib/couchbase/version.rb

@@ -1,3 +1,20 @@
+# 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.
+#
+
 module Couchbase
-  VERSION = '0.1.0'
+  VERSION = '0.1.5'
 end

data/lib/couchbase/view.rb

@@ -63,6 +63,7 @@ module Couchbase
   #
   # @see http://www.couchbase.com/docs/couchbase-manual-2.0/couchbase-views.html
   class View
+
     include Enumerable
     include Constants
 
@@ -71,83 +72,7 @@ module Couchbase
       alias total_entries total_rows
     end
 
-    class AsyncHelper # :nodoc:
-      include Constants
-      EMPTY = []
-
-      def initialize(wrapper_class, bucket, include_docs, quiet, block)
-        @wrapper_class = wrapper_class
-        @bucket = bucket
-        @block = block
-        @quiet = quiet
-        @include_docs = include_docs
-        @queue = []
-        @first = @shift = 0
-        @completed = false
-      end
-
-      # Register object in the emitter.
-      def push(obj)
-        if @include_docs
-          @queue << obj
-          @bucket.get(obj[S_ID], :extended => true, :quiet => @quiet) do |res|
-            obj[S_DOC] = {
-              S_VALUE => res.value,
-              S_META => {
-                S_ID => obj[S_ID],
-                S_FLAGS => res.flags,
-                S_CAS => res.cas
-              }
-            }
-            check_for_ready_documents
-          end
-        else
-          old_obj = @queue.shift
-          @queue << obj
-          block_call(old_obj) if old_obj
-        end
-      end
-
-      def complete!
-        if @include_docs
-          @completed = true
-          check_for_ready_documents
-        elsif !@queue.empty?
-          obj = @queue.shift
-          obj[S_IS_LAST] = true
-          block_call obj
-        end
-      end
-
-      private
-
-      def block_call(obj)
-        @block.call @wrapper_class.wrap(@bucket, obj)
-      end
-
-      def check_for_ready_documents
-        shift = @shift
-        queue = @queue
-        save_last = @completed ? 0 : 1
-        while @first < queue.size + shift - save_last
-          obj = queue[@first - shift]
-          break unless obj[S_DOC]
-          queue[@first - shift] = nil
-          @first += 1
-          if @completed && @first == queue.size + shift
-            obj[S_IS_LAST] = true
-          end
-          block_call obj
-        end
-        if @first - shift > queue.size / 2
-          queue[0, @first - shift] = EMPTY
-          @shift = @first
-        end
-      end
-
-    end
-
-    attr_reader :params
+    attr_reader :params, :design_doc, :name
 
     # Set up view endpoint and optional params
     #
@@ -160,10 +85,11 @@ module Couchbase
     #   {View#fetch}
     #
     def initialize(bucket, endpoint, params = {})
-      @bucket = bucket
+      @bucket   = bucket
       @endpoint = endpoint
-      @params = {:connection_timeout => 75_000}.merge(params)
+      @design_doc, @name = parse_endpoint(endpoint)
       @wrapper_class = params.delete(:wrapper_class) || ViewRow
+      @params   = { connection_timeout: 75_000 }.merge(params)
       unless @wrapper_class.respond_to?(:wrap)
         raise ArgumentError, "wrapper class should reposond to :wrap, check the options"
       end
@@ -197,7 +123,7 @@ module Couchbase
     #
     def each(params = {})
       return enum_for(:each, params) unless block_given?
-      fetch(params) {|doc| yield(doc)}
+      fetch(params) { |doc| yield(doc) }
     end
 
     def first(params = {})
@@ -357,25 +283,30 @@ module Couchbase
     #   doc.recent_posts_with_comments(:start_key => [post_id, 0],
     #                                  :end_key => [post_id, 1],
     #                                  :include_docs => true)
-    def fetch(params = {}, &block)
+    def fetch(params = {})
       params = @params.merge(params)
-      include_docs = params.delete(:include_docs)
-      quiet = params.delete(:quiet){ true }
+      # quiet = params.fetch(:quiet, true)
 
-      options = {:chunked => true, :extended => true, :type => :view}
-      if body = params.delete(:body)
-        body = MultiJson.dump(body) unless body.is_a?(String)
-        options.update(:body => body, :method => params.delete(:method) || :post)
-      end
-      path = Utils.build_query(@endpoint, params)
-      request = @bucket.make_http_request(path, options)
+      view = @bucket.client.getView(@design_doc, @name)
+
+      query = Query.new(params)
 
-      if @bucket.async?
-        if block
-          fetch_async(request, include_docs, quiet, block)
+      request = @bucket.client.query(view, query.generate)
+
+      if block_given?
+        block = Proc.new
+        request.each do |data|
+          doc = @wrapper_class.wrap(@bucket, data)
+          block.call(doc)
         end
+        nil
       else
-        fetch_sync(request, include_docs, quiet, block)
+        docs = request.to_a.map { |data|
+          @wrapper_class.wrap(@bucket, data)
+        }
+        docs = ArrayWithTotalRows.new(docs)
+        docs.total_rows = request.size
+        docs
       end
     end
 
@@ -421,86 +352,13 @@ module Couchbase
       end
     end
 
-    def fetch_async(request, include_docs, quiet, block)
-      filter = ["/rows/", "/errors/"]
-      parser = YAJI::Parser.new(:filter => filter, :with_path => true)
-      helper = AsyncHelper.new(@wrapper_class, @bucket, include_docs, quiet, block)
-
-      request.on_body do |chunk|
-        if chunk.success?
-          parser << chunk.value if chunk.value
-          helper.complete! if chunk.completed?
-        else
-          send_error("http_error", chunk.error)
-        end
-      end
-
-      parser.on_object do |path, obj|
-        case path
-        when "/errors/"
-          from, reason = obj["from"], obj["reason"]
-          send_error(from, reason)
-        else
-          helper.push(obj)
-        end
-      end
-
-      request.perform
-      nil
-    end
-
-    def fetch_sync(request, include_docs, quiet, block)
-      res = []
-      filter = ["/rows/", "/errors/"]
-      unless block
-        filter << "/total_rows"
-        docs = ArrayWithTotalRows.new
-      end
-      parser = YAJI::Parser.new(:filter => filter, :with_path => true)
-      last_chunk = nil
-
-      request.on_body do |chunk|
-        last_chunk = chunk
-        res << chunk.value  if chunk.success?
-      end
-
-      parser.on_object do |path, obj|
-        case path
-        when "/total_rows"
-          # if total_rows key present, save it and take next object
-          docs.total_rows = obj
-        when "/errors/"
-          from, reason = obj["from"], obj["reason"]
-          send_error(from, reason)
-        else
-          if include_docs
-            val, flags, cas = @bucket.get(obj[S_ID], :extended => true, :quiet => quiet)
-            obj[S_DOC] = {
-              S_VALUE => val,
-              S_META => {
-                S_ID => obj[S_ID],
-                S_FLAGS => flags,
-                S_CAS => cas
-              }
-            }
-          end
-          doc = @wrapper_class.wrap(@bucket, obj)
-          block ? block.call(doc) : docs << doc
-        end
-      end
-
-      request.continue
-
-      if last_chunk.success?
-        while value = res.shift
-          parser << value
-        end
+    def parse_endpoint(endpoint)
+      parts = endpoint.split('/')
+      if endpoint =~ /^_design/
+        [parts[1], parts[3]]
       else
-        send_error("http_error", last_chunk.error, nil)
+        [parts[0], parts[2]]
       end
-
-      # return nil for call with block
-      docs
     end
   end
 end

data/lib/couchbase/view_row.rb

@@ -16,6 +16,31 @@
 #
 
 module Couchbase
+
+  java_import com.couchbase.client.protocol.views.ViewRowNoDocs
+  java_import com.couchbase.client.protocol.views.ViewRowWithDocs
+  java_import com.couchbase.client.protocol.views.ViewRowReduced
+  java_import com.couchbase.client.protocol.views.SpatialViewRowNoDocs
+  java_import com.couchbase.client.protocol.views.SpatialViewRowWithDocs
+
+  module Java::ComCouchbaseClientProtocolViews::ViewRow
+
+    def doc
+      {
+        'meta'  => nil,
+        'value' => document
+      }
+    end
+
+    def [](key)
+      if respond_to?(key)
+        send(key)
+      else
+        fail NoMethodError, "ViewRow##{key} isn't defined."
+      end
+    end
+  end
+
   # This class encapsulates structured JSON document
   #
   # @since 1.2.0
@@ -24,6 +49,7 @@ module Couchbase
   #
   # @see http://www.couchbase.com/docs/couchbase-manual-2.0/couchbase-views-datastore.html
   class ViewRow
+
     include Constants
 
     # Undefine as much methods as we can to free names for views
@@ -95,15 +121,19 @@ module Couchbase
     #   representation
     def initialize(bucket, data)
       @bucket = bucket
-      @data = data
-      @key = data[S_KEY]
-      @value = data[S_VALUE]
-      if data[S_DOC]
-        @meta = data[S_DOC][S_META]
-        @doc = data[S_DOC][S_VALUE]
+      @data   = data
+      @key    = data.key
+      @value  = data.value
+      @id     = data.id
+      @last   = false
+
+      case data
+      when ViewRowWithDocs, SpatialViewRowWithDocs
+        @doc   = data.document
+      when SpatialViewRowNoDocs, SpatialViewRowWithDocs
+        @geometry = data.geometry
+        @bbox     = data.bbox
       end
-      @id = data[S_ID] || @meta && @meta[S_ID]
-      @last = data.delete(S_IS_LAST) || false
     end
 
     # Wraps data hash into ViewRow instance
@@ -179,94 +209,4 @@ module Couchbase
     end
   end
 
-  # This class encapsulates information about design docs
-  #
-  # @since 1.2.1
-  #
-  # It is subclass of ViewRow, but also gives access to view creation through method_missing
-  #
-  # @see http://www.couchbase.com/docs/couchbase-manual-2.0/couchbase-views-datastore.html
-  class DesignDoc < ViewRow
-    # It isn't allowed to change design document ID after
-    # initialization
-    undef id=
-
-    # Initialize the design doc instance
-    #
-    # @since 1.2.1
-    #
-    # It takes reference to the bucket, data hash. It will define view
-    # methods if the data object looks like design document.
-    #
-    # @param [Couchbase::Bucket] bucket the reference to connection
-    # @param [Hash] data the data hash, which was built from JSON document
-    #   representation
-    def initialize(bucket, data)
-      super
-      @all_views = {}
-      @views = @doc.has_key?('views') ? @doc['views'].keys : []
-      @spatial = @doc.has_key?('spatial') ? @doc['spatial'].keys : []
-      @views.each{|name| @all_views[name] = "#{@id}/_view/#{name}"}
-      @spatial.each{|name| @all_views[name] = "#{@id}/_spatial/#{name}"}
-    end
-
-    def method_missing(meth, *args)
-      if path = @all_views[meth.to_s]
-        View.new(@bucket, path, *args)
-      else
-        super
-      end
-    end
-
-    def respond_to?(meth, *args)
-      if @all_views[meth.to_s]
-        true
-      else
-        super
-      end
-    end
-
-    def method(meth, *args)
-      if path = @all_views[meth.to_s]
-        lambda{|*p| View.new(@bucket, path, *p)}
-      else
-        super
-      end
-    end
-
-    # The list of views defined or empty array
-    #
-    # @since 1.2.1
-    #
-    # @return [Array<View>]
-    attr_accessor :views
-
-    # The list of spatial views defined or empty array
-    #
-    # @since 1.2.1
-    #
-    # @return [Array<View>]
-    attr_accessor :spatial
-
-    # Check if the document has views defines
-    #
-    # @since 1.2.1
-    #
-    # @see DesignDoc#views
-    #
-    # @return [true, false] +true+ if the document have views
-    def has_views?
-      !@views.empty?
-    end
-
-    def inspect
-      desc = "#<#{self.class.name}:#{self.object_id}"
-      [:@id, :@views, :@spatial].each do |iv|
-        desc << " #{iv}=#{instance_variable_get(iv).inspect}"
-      end
-      desc << ">"
-      desc
-    end
-
-  end
 end