couchbase-structures 0.0.4 → 0.0.9

data/.gitignore

@@ -1,3 +1,4 @@
+*.sh
 *.gem
 *.rbc
 .bundle

data/lib/couchbase_structures/queue.rb

@@ -5,25 +5,44 @@ module CouchbaseStructures
     include CouchbaseDocStore
 
     def initialize(key)
-      @key = key
-      @head_index_key = "#{key}::queue::head"
-      @tail_index_key = "#{key}::queue::tail"
+      @user_key = key
+      @key = "#{key}::queue"
+      @head_index_key = "#{@key}::head"
+      @tail_index_key = "#{@key}::tail"
+      initialize_document(@head_index_key, 0)
+      initialize_document(@tail_index_key, 0)
+      initialize_document(@key, { :type => "queue", :class => "CouchbaseStructures::Queue", :user_key => key } )
       self
     end
 
+    def inspect(html = false)
+      if html
+        "<strong>key</strong> = #{@key}    <br /><strong>head_index</strong> = #{get_document(@head_index_key).to_s}  <br /><strong>tail_index</strong> = #{get_document(@tail_index_key).to_s}   <br /><strong>items</strong> = #{self.to_a(true)}"
+      else
+        "key = #{@key} head_index = #{get_document(@head_index_key).to_s} tail_index = #{get_document(@tail_index_key).to_s} items = #{self.to_a}"
+      end
+    end
+    
+    # peek at item at index (zero based)
+    def peek(queue_index)
+      self
+    end
+
+    # Add an item to the end of the queue (tail)
     def enqueue(value)
       new_tail_index = increase_atomic_count(@tail_index_key)
-      create_document("#{key}::queue::#{new_tail_index}", value)
+      create_document("#{@key}::#{new_tail_index}", value)
       self
     end
 
+    # Pop an item off the front of queue (head)
     def pop()
       head_index = get_document(@head_index_key)
       tail_index = get_document(@tail_index_key)
-      if tail_index > head_index
-        increase_atomic_count(@head_index_key)
-        get_document("#{key}::queue::#{head_index}")
-      else
+      if tail_index > head_index # if there is an item in the queue
+        increase_atomic_count(@head_index_key) #incremented new_head_index is ignored, but we are incrementing and popping value
+        return get_document("#{@key}::#{head_index + 1}")
+      else # 
         nil
       end
     end
@@ -31,5 +50,45 @@ module CouchbaseStructures
     def size()
       get_document(@tail_index_key) - get_document(@head_index_key)
     end
+    
+    def delete
+      #head_index = get_document(@head_index_key)  # (not needed)
+      tail_index = get_document(@tail_index_key)
+      
+      # delete all queued documents, including those that were before the current head (those aren't deleted as of now)
+      1.upto(tail_index) do |i|
+        delete_document("#{@key}::#{i}")
+      end
+      delete_document(@head_index_key)
+      delete_document(@tail_index_key)
+      delete_document(@key)
+      @user_key = nil
+      @key = nil
+      @head_index_key = nil
+      @tail_index_key = nil
+      nil
+    end
+    
+    def to_a(html=false)
+      a = []
+      head_index = get_document(@head_index_key) + 1
+      tail_index = get_document(@tail_index_key)
+
+      # delete all queued documents, including those that were before the current head (those aren't deleted as of now)
+      head_index.upto(tail_index) do |i|
+        a << get_document("#{@key}::#{i}")
+      end
+      
+      if html
+        str = "["
+        a.each do |item|
+          str += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + item.inspect
+        end
+        str += "<br />]"
+        return str
+      else
+        return a
+      end
+    end
   end
 end

data/lib/couchbase_structures/stack.rb

@@ -5,29 +5,71 @@ module CouchbaseStructures
     include CouchbaseDocStore
 
     def initialize(key)
-      @key = key
-      @top_index_key = "#{key}::stack::top"
+      @user_key = key
+      @key = "#{@user_key}::stack"
+      @top_index_key = "#{@key}::top"
       initialize_document(@top_index_key, 0)
+      initialize_document(@key, { :type => "stack", :class => "CouchbaseStructures::Stack", :user_key => @user_key } )
       self
     end
+    
+    def inspect(html = false)
+      if html
+        "<strong>key</strong> = #{@key}    <br /><strong>top_index</strong> = #{get_document(@top_index_key).to_s}    <br /><strong>items</strong> = #{self.to_a(true)}"
+      else
+        "key = #{@key}\ntop_index = #{get_document(@top_index_key).to_s}\nitems = #{self.to_a}"
+      end
+    end
 
     def push(value)
       new_top_index = increase_atomic_count(@top_index_key)
-      create_document("#{key}::stack::#{new_top_index}", value)
+      create_document("#{@key}::#{new_top_index}", value)
       self
     end
 
     def pop()
       old_top_index = get_document(@top_index_key)
+      return nil if @top_index_key == 0 # if the stack has returned to zero items
       decrease_atomic_count(@top_index_key)
 
-      doc = get_document("#{key}::stack::#{old_top_index}")
-      delete_document("#{key}::stack::#{old_top_index}")
+      doc = get_document("#{@key}::#{old_top_index}")
+      delete_document("#{@key}::#{old_top_index}")
       doc
     end
 
     def size
       get_document(@top_index_key)
     end
+    
+    def delete
+      top_index = get_document(@top_index_key)
+      
+      top_index.downto(1) do |i|
+        delete_document("#{@key}::#{i}")
+      end
+      delete_document(@top_index_key)
+      delete_document(@key)
+    end
+    
+    def to_a(html=false)
+      a = []
+      top_index = get_document(@top_index_key)
+
+      # delete all queued documents, including those that were before the current head (those aren't deleted as of now)
+      top_index.downto(1) do |i|
+        a << get_document("#{@key}::#{i}")
+      end
+      
+      if html
+        str = "["
+        a.each do |item|
+          str += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + item.inspect
+        end
+        str += "<br />]"
+        return str
+      else
+        return a
+      end
+    end
   end
 end

data/lib/couchbase_structures/version.rb

@@ -1,3 +1,3 @@
 module CouchbaseStructures
-  VERSION = "0.0.4"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-structures
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchbase-docstore
@@ -103,3 +103,4 @@ specification_version: 3
 summary: A convenient implementation of stacks, queues and sorted lists using Couchbase
   KV patterns.
 test_files: []
+has_rdoc: