couchbase-docstore 0.1.4 → 0.3.0

data/{couchbase_doc_store.gemspec → couchbase-docstore.gemspec}

@@ -1,21 +1,31 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'couchbase_doc_store/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "couchbase-docstore"
-  gem.version       = CouchbaseDocStore::VERSION
+  gem.version       = "0.3.0"
   gem.authors       = ["Jasdeep Jaitla"]
   gem.email         = ["jasdeep@scalabl3.com"]
   gem.description   = %q{A Convenient Wrapper for the Couchbase gem, uses Map gem and adds new functionality}
   gem.summary       = %q{You simply use the Couchbase gem, or you can use this wrapper that encapsulates the gem and adds some subjective conveniences. }
   gem.homepage      = "https://github.com/scalabl3/couchbase-docstore"
 
-  gem.add_dependency('couchbase-settings', '>= 0.1.0')
-  gem.add_dependency('couchbase', '>= 1.2.0.z.beta3')
+  gem.add_dependency('couchbase-settings', '>= 0.2.7')
+  gem.add_dependency('couchbase', '>= 1.2')
   
-  gem.files         = `git ls-files`.split($/)
+  gem.files = [
+    "Gemfile",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "lib/couchbase-docstore.rb",
+    "lib/couchbase_doc_store/railtie.rb",
+    "lib/couchbase_doc_store/version.rb",
+    "couchbase-docstore.gemspec"
+  ]
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]

data/lib/{couchbase_doc_store.rb → couchbase-docstore.rb}

@@ -1,32 +1,10 @@
 require 'couchbase'
 require 'map'
-require 'couchbase_settings'
 require "couchbase_doc_store/version"
+require "couchbase_doc_store/railtie" if defined?(Rails)
 
 module CouchbaseDocStore
 
-  #Rails.logger.debug(CouchbaseSetting.pm)
-  
-  setting_hash = {}      
-  if (CouchbaseSetting.respond_to?("servers") && CouchbaseSetting.servers && !CouchbaseSetting.servers.empty?)
-    setting_hash[:node_list] = CouchbaseSetting.servers 
-  elsif CouchbaseSetting.respond_to?("server")
-    
-    setting_hash[:hostname] = CouchbaseSetting.server 
-  else
-    raise ArgumentError, "You didn't set a Couchbase Server in your /config/couchbase.yml file!"
-  end
-  setting_hash[:pool] = "default"
-  setting_hash[:bucket] = CouchbaseSetting.bucket
-  setting_hash[:port] = 8091
-  
-  if (CouchbaseSetting.respond_to?("password") && CouchbaseSetting.password && !CouchbaseSetting.password.blank?)
-    setting_hash[:username] = CouchbaseSetting.bucket
-    setting_hash[:password] = CouchbaseSetting.password
-  end
-  
-  CB = Couchbase.connect(setting_hash)
-  
   #### INSTANCE METHODS
 
   # Check if a key/document exists 
@@ -93,57 +71,92 @@ module CouchbaseDocStore
   #### CLASS METHODS
 
   class << self
+    
+    def connection
+      $cb
+    end
+    
+    def connect!(setting_hash = {hostname: "127.0.0.1", bucket: "default"})
+      puts "---------------------------------------------------"
+      if defined? (CouchbaseSetting)
+
+        puts "CouchbaseSetting found..."
+        
+        if (CouchbaseSetting.respond_to?("servers") && CouchbaseSetting.servers && !CouchbaseSetting.servers.empty?)
+          setting_hash[:node_list] = CouchbaseSetting.servers 
+        elsif CouchbaseSetting.respond_to?("server")
+          setting_hash[:hostname] = CouchbaseSetting.server 
+        else
+          raise ArgumentError, "You didn't set Couchbase Server(s)/Bucket in your /config/couchbase.yml file!"
+        end
+        
+        setting_hash[:pool] = "default"
+        setting_hash[:bucket] = CouchbaseSetting.bucket
+        setting_hash[:port] = 8091
+
+        if (CouchbaseSetting.respond_to?("password") && CouchbaseSetting.password && !CouchbaseSetting.password.blank?)
+          setting_hash[:username] = CouchbaseSetting.bucket
+          setting_hash[:password] = CouchbaseSetting.password
+        end
+      end
 
+      $cb = Couchbase.connect(setting_hash)
+      
+      puts "CouchbaseDocStore connected..."
+      puts $cb.inspect
+      puts "---------------------------------------------------"
+    end
+    
     def delete_all_documents!
-      CB.flush
+      $cb.flush
     end
 
     def document_exists?(key)
       return nil unless key
 
       # Save quiet setting
-      tmp = CB.quiet
+      tmp = $cb.quiet
 
       # Set quiet to be sure
-      CB.quiet = true
+      $cb.quiet = true
 
-      doc = CB.get(key)
+      doc = $cb.get(key)
 
       # Restore quiet setting
-      CB.quiet = tmp
+      $cb.quiet = tmp
 
       !doc.nil?
     end
 
     def initialize_document(key, value, args={})
       return nil unless key
-      CB.quiet = true
+      $cb.quiet = true
       doc = CouchbaseDocStore.get_document( key )
-      (value.is_a?(Fixnum) || value.is_a?(Integer) ? CB.set( key, value ) : CB.add( key, value )) unless doc
+      (value.is_a?(Fixnum) || value.is_a?(Integer) ? $cb.set( key, value ) : $cb.add( key, value )) unless doc
     end
 
     def create_document(key, value, args={})
       return nil unless key
-      CB.quiet = args[:quiet] || true
-      CB.add(key, value, args) # => if !quiet, Generates Couchbase::Error::KeyExists if key already exists
+      $cb.quiet = args[:quiet] || true
+      $cb.add(key, value, args) # => if !quiet, Generates Couchbase::Error::KeyExists if key already exists
     end
 
     def replace_document(key, value, args = {})
       return nil unless key
-      CB.quiet = args[:quiet] || true
-      CB.replace(key, value) # => if !quiet, Generates Couchbase::Error::NotFound if key doesn't exist
+      $cb.quiet = args[:quiet] || true
+      $cb.replace(key, value) # => if !quiet, Generates Couchbase::Error::NotFound if key doesn't exist
     end
 
     def get_document(key, args = {})
       return nil unless key
-      CB.quiet = args[:quiet] || true
-      doc = CB.get(key, args)
+      $cb.quiet = args[:quiet] || true
+      doc = $cb.get(key, args)
       doc.is_a?(Hash) ? Map.new(doc) : doc
     end
 
     def get_documents(keys = [], args = {})
       return nil unless keys || keys.empty?
-      values = CB.get(keys, args)
+      values = $cb.get(keys, args)
 
       if values.is_a? Hash
         tmp = []
@@ -160,27 +173,27 @@ module CouchbaseDocStore
 
     def delete_document(key, args={})
       return nil unless key
-      CB.quiet = args[:quiet] || true
-      CB.delete(key)
+      $cb.quiet = args[:quiet] || true
+      $cb.delete(key)
     end
 
     def increase_atomic_count(key, args={} )
       return nil unless key
-      CB.quiet = args[:quiet] || true
-      CB.incr(key, args[:amount] || 1)
+      $cb.quiet = args[:quiet] || true
+      $cb.incr(key, args[:amount] || 1)
     end
 
     def decrease_atomic_count(key, args={})
       return nil unless key
-      CB.quiet = args[:quiet] || true
-      CB.decr(key, args[:amount] || 1)
+      $cb.quiet = args[:quiet] || true
+      $cb.decr(key, args[:amount] || 1)
     end
 
     # preferred way is to use create/replace instead of this to make sure there are no collisions
     def force_set_document(key, value, args={})
       return nil unless key
-      CB.quiet = args[:quiet] || true
-      CB.set(key, value, args)
+      $cb.quiet = args[:quiet] || true
+      $cb.set(key, value, args)
     end
 
   end# end ClassMethods

data/lib/couchbase_doc_store/railtie.rb

@@ -0,0 +1,10 @@
+require 'rails'
+require 'couchbase-docstore'
+
+module CouchbaseDocStore
+  class Railtie < Rails::Railtie
+    config.before_initialize do
+      CouchbaseDocStore.connect!
+    end
+  end
+end

data/lib/couchbase_doc_store/version.rb

@@ -1,3 +1,3 @@
 module CouchbaseDocStore
-  VERSION = "0.1.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-docstore
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchbase-settings
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: couchbase
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0.z.beta3
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0.z.beta3
+        version: '1.2'
 description: A Convenient Wrapper for the Couchbase gem, uses Map gem and adds new
   functionality
 email:
@@ -51,14 +51,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- couchbase_doc_store.gemspec
-- lib/couchbase_doc_store.rb
+- lib/couchbase-docstore.rb
+- lib/couchbase_doc_store/railtie.rb
 - lib/couchbase_doc_store/version.rb
+- couchbase-docstore.gemspec
 homepage: https://github.com/scalabl3/couchbase-docstore
 licenses: []
 post_install_message: 

data/.gitignore

@@ -1,18 +0,0 @@
-go.sh
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp