leanback 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/leanback.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "leanback"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Obi Akubue"]
-  s.date = "2012-12-02"
+  s.date = "2013-05-26"
   s.description = "lightweight Ruby interface to CouchDB"
   s.email = "obioraakubue@yahoo.com"
   s.extra_rdoc_files = [
@@ -33,8 +33,10 @@ Gem::Specification.new do |s|
     "spec/spec_base.rb",
     "test/helper.rb",
     "test/main.rb",
+    "test/my_view.json",
     "test/my_views.json",
-    "test/test_leanback.rb"
+    "test/test_leanback.rb",
+    "test/view_age.json"
   ]
   s.homepage = "http://github.com/obi-a/leanback"
   s.licenses = ["MIT"]

data/lib/leanback.rb

@@ -361,6 +361,53 @@ def self.add_finder(options,auth_session = "")
  end
 end
 
+#add a counter method to the database
+#this creates a count method that counts documents by key
+def self.add_counter(options,auth_session = "")
+ set_address 
+ db_name = options[:database]
+ key = options[:key] 
+ design_doc_name = key + '_counter'
+ 
+ view ='{
+ "language" : "javascript",
+ "views" :{
+    "count_'+key+'" : {
+      "map" : "function(doc){ if(doc.'+key+') emit(doc.'+key+',null);}", "reduce": "_count"   
+    }
+ }
+}'
+
+ begin  
+  response = RestClient.put 'http://' + @address + ':' + @port + '/' + db_name + '/_design/' + design_doc_name, view, {:cookies => {"AuthSession" => auth_session}}
+ rescue => e
+    hash = Yajl::Parser.parse(e.response.to_s)
+    raise CouchdbException.new(hash), "CouchDB: Error - " + hash.values[0] + ". Reason - "  + hash.values[1]
+ end
+end
+
+#count by key 
+def self.count(options,auth_session = "")
+ set_address 
+ db_name = options[:database]
+ index =  options.keys[1].to_s
+ search_term = options.values[1]
+ design_doc_name = index + '_counter'
+ view_name = 'count_' + index
+ 
+ begin 
+  view = { :database => db_name, :design_doc => design_doc_name, :view => view_name}
+  docs = find view,auth_session,search_term
+ rescue CouchdbException => e
+    #add a counter index if one doesn't already exist in the database
+    #then count_by_key
+    add_counter({:database => db_name, :key => index},auth_session)
+    docs = find view,auth_session,search_term
+ end
+  count = docs[0]
+ return count.to_i
+end
+
 #find by key 
 def self.find_by(options,auth_session = "")
  set_address 

data/spec/admin_party/database_spec.rb

@@ -28,14 +28,11 @@ it "should create a database add a finder method to it and then delete the datab
 end
 
 
-it "find items by key" do
-    docs = Couchdb.find_by({:database => 'friends', :lastname => 'winner'})
-    d = docs[0]
-    d["lastname"].should == "winner"
-    Couchdb.delete_doc({:database => 'friends', :doc_id => '_design/lastname_finder'})
-end
+
 
 it "should create and view document doc" do
+  Couchdb.create('friends')
+
   data = {:firstname => 'John', 
         	 :lastname =>'smith', 
        		 :phone => '202-234-1234',
@@ -50,12 +47,29 @@ it "should create and view document doc" do
   hash["_id"].should == 'john'
 end
 
+it "should count the lastnames named smith" do
+  count = Couchdb.count({:database => 'friends', :lastname => 'smith'})
+  count.should == 1
+end
+
+it "should count lastnames named brown" do
+  count = Couchdb.count({:database => 'friends', :lastname => 'brown'})
+  count.should == 0 
+end
+
+it "find items by key" do
+    docs = Couchdb.find_by({:database => 'friends', :lastname => 'smith'})
+    d = docs[0]
+    d["lastname"].should == "smith"
+    Couchdb.delete_doc({:database => 'friends', :doc_id => '_design/lastname_finder'})
+end
+
 it "should query a permanent view that doesn't exist and handle exception" do
   begin
      view = { :database => "friends", :design_doc => 'more_views', :view => 'get_user_email'}
      Couchdb.find view 
     rescue CouchdbException => e
-      e.to_s.should == "CouchDB: Error - not_found. Reason - deleted"
+      e.to_s.should == "CouchDB: Error - not_found. Reason - missing"
       e.error.should == "not_found"
     end  
 end
@@ -64,7 +78,7 @@ it "should query a permanent view and create the view on the fly, if it doesn't
     view = {:database => 'friends',
          :design_doc => 'my_views',
           :view => 'get_emails',
-           :json_doc => '/home/obi/bin/my_views.json'}
+           :json_doc => '/home/obi/bin/leanback/test/my_view.json'}
      
     docs = Couchdb.find_on_fly(view)
     docs[0].include?("Email").should == true
@@ -77,21 +91,21 @@ it "should query a permanent view and create the view on the fly, if it doesn't
 end
 
 it "should query a permanent view by key and create the view on the fly, if it doesn't already exist" do
-    view = { :database => 'contacts', 
+    view = { :database => 'friends', 
            :design_doc => 'the_view', 
             :view => 'age',
-             :json_doc => '/home/obi/bin/view_age.json'}
+             :json_doc => '/home/obi/bin/leanback/test/view_age.json'}
 
-    age = '36'
+    age = '34'
     docs = Couchdb.find_on_fly(view,"",key = age)
     docs[0].include?("age").should == true
     d = docs[0]
-    d["age"].should == '36'
+    d["age"].should == '34'
     #verify that the view was created
-    doc = {:database => 'contacts', :doc_id => '_design/the_view'}
+    doc = {:database => 'friends', :doc_id => '_design/the_view'}
     hash = Couchdb.view doc
     hash["_id"].should == '_design/the_view'
-    Couchdb.delete_doc({:database => 'contacts', :doc_id => '_design/the_view'})
+    Couchdb.delete_doc({:database => 'friends', :doc_id => '_design/the_view'})
 end
 
 it "should create a design doc/permanent view and query it" do
@@ -184,7 +198,8 @@ it "should set a config section, retrieve it and delete it" do
 
      Couchdb.get_config(data).should == "sample_value"
 
-     Couchdb.delete_config(data).should == "sample_value"
+     Couchdb.delete_config(data).should == "sample_value" 
+     Couchdb.delete 'friends' 
 
      lambda {Couchdb.get_config(data)}.should raise_error(CouchdbException,"CouchDB: Error - not_found. Reason - unknown_config_value")   
  end

data/spec/no_admin_party/database_spec.rb

@@ -36,14 +36,8 @@ it "should create a database add a finder method to it and then delete the datab
    Couchdb.delete 'wiseguys',@@auth_session 
  end
 
-it "find items by key" do
-    docs = Couchdb.find_by({:database => 'contacts', :lastname => 'winner'},@@auth_session)
-    d = docs[0]
-    d["lastname"].should == "winner"
-    Couchdb.delete_doc({:database => 'contacts', :doc_id => '_design/lastname_finder'},@@auth_session)
-end
-
 it "should create and view document doc" do
+  Couchdb.create('contacts',@@auth_session)
   data = {:firstname => 'John', 
         	 :lastname =>'smith', 
        		 :phone => '202-234-1234',
@@ -58,12 +52,33 @@ it "should create and view document doc" do
   hash["_id"].should == 'john'
 end
 
+it "should count the lastnames named smith" do
+  count = Couchdb.count({:database => 'contacts', :lastname => 'smith'},@@auth_session)
+  count.should == 1
+end
+
+it "should count lastnames named brown" do
+  count = Couchdb.count({:database => 'contacts', :lastname => 'brown'},@@auth_session)
+  count.should == 0 
+end
+
+
+it "find items by key" do
+    docs = Couchdb.find_by({:database => 'contacts', :lastname => 'smith'},@@auth_session)
+    d = docs[0]
+    d["lastname"].should == "smith"
+    Couchdb.delete_doc({:database => 'contacts', :doc_id => '_design/lastname_finder'},@@auth_session)
+end
+
+
+
+
 it "should query a permanent view that doesn't exist and handle exception" do
   begin
      view = { :database => "contacts", :design_doc => 'more_views', :view => 'get_user_email'}
      Couchdb.find view,@@auth_session 
     rescue CouchdbException => e
-      e.to_s.should == "CouchDB: Error - not_found. Reason - deleted"
+      e.to_s.should == "CouchDB: Error - not_found. Reason - missing"
       e.error.should == "not_found"
     end  
 end
@@ -72,7 +87,7 @@ it "should query a permanent view and create the view on the fly, if it doesn't
     view = {:database => 'contacts',
          :design_doc => 'my_views',
           :view => 'get_emails',
-           :json_doc => '/home/obi/bin/my_views.json'}
+           :json_doc => '/home/obi/bin/leanback/test/my_view.json'}
      
     docs = Couchdb.find_on_fly(view,@@auth_session)
     docs[0].include?("Email").should == true
@@ -88,13 +103,13 @@ it "should query a permanent view by key and create the view on the fly, if it d
     view = { :database => 'contacts', 
            :design_doc => 'the_view', 
             :view => 'age',
-             :json_doc => '/home/obi/bin/view_age.json'}
+             :json_doc => '/home/obi/bin/leanback/test/view_age.json'}
 
-    age = '36'
+    age = '34'
     docs = Couchdb.find_on_fly(view,@@auth_session,key = age)
     docs[0].include?("age").should == true
     d = docs[0]
-    d["age"].should == '36'
+    d["age"].should == '34'
     #verify that the view was created
     doc = {:database => 'contacts', :doc_id => '_design/the_view'}
     hash = Couchdb.view doc,@@auth_session
@@ -272,11 +287,16 @@ it "should non-admin user password, verify new password" do
 
 end
 
+it "should delete the database" do
+  Couchdb.delete 'contacts',@@auth_session
+end
+
 it "should switch to default bind address" do
      data = {:section => "httpd",
               :key => "port",
                 :value => "5984" }
-     Couchdb.set_config(data,@@auth_session) 
+     Couchdb.set_config(data,@@auth_session)
+  
     #Couchdb.address = nil
     #Couchdb.port = nil
     #Couchdb.all @@auth_session

data/spec/no_admin_party/non_admin_user_spec.rb

@@ -9,7 +9,9 @@ hash = Couchdb.login(username = 'obi',password ='trusted')
 
 #specs to ensure non-admin users function properly
 describe "non admin user" do
- it "should create a document, view, update and delete it" do
+ it "should create a document, view, update it" do
+  Couchdb.create('contacts',@@admin_auth_session)
+
   data = {:firstname => 'Nancy', :lastname =>'Lee', :phone => '347-808-3734',:email =>'nancy@mail.com',:gender => 'female'}
   doc = {:database => 'contacts', :doc_id => 'eeek', :data => data}
   hash = Couchdb.create_doc doc,@@auth_session 
@@ -23,16 +25,10 @@ describe "non admin user" do
   hash = Couchdb.update_doc doc,@@auth_session  
   hash["id"].should == 'eeek'
   hash["ok"].should == true    
-
-  Couchdb.delete_doc({:database => 'contacts', :doc_id => 'eeek'},@@auth_session)
-
-  hash["id"].should == 'eeek'
-  hash["ok"].should == true
-  doc = { :database => 'contacts', :doc_id => 'eeek'} 
- lambda {Couchdb.view(doc,@@auth_session)}.should raise_error(CouchdbException,"CouchDB: Error - not_found. Reason - deleted")  
 end
 
 it"should query a view" do
+  
  doc = { :database => 'contacts', :design_doc => 'more_views', :json_doc => '/home/obi/bin/leanback/test/my_views.json' }
    hash = Couchdb.create_design doc,@@admin_auth_session
 
@@ -42,11 +38,25 @@ it"should query a view" do
    
    view = { :database => "contacts", :design_doc => 'more_views', :view => 'get_email'}
    hash = Couchdb.find view,@@auth_session 
-
    hash[0].has_key?("Firstname").should == true
    hash[0].has_key?("Lastname").should == true
    hash[0].has_key?("Email").should == true
    Couchdb.delete_doc({:database => 'contacts', :doc_id => '_design/more_views'},@@admin_auth_session) 
+
+    
+end
+
+
+it "should delete document" do
+  hash = Couchdb.delete_doc({:database => 'contacts', :doc_id => 'eeek'},@@auth_session)
+  hash["id"].should == 'eeek'
+  hash["ok"].should == true
+  doc = { :database => 'contacts', :doc_id => 'eeek'} 
+ lambda {Couchdb.view(doc,@@auth_session)}.should raise_error(CouchdbException,"CouchDB: Error - not_found. Reason - deleted")  
+end
+
+it "should delete the database" do
+  Couchdb.delete 'contacts',@@admin_auth_session
 end
 
 end

data/test/my_view.json

@@ -0,0 +1,8 @@
+{
+ "language" : "javascript",
+ "views" :{
+   "get_emails" : {
+     "map" : "function(doc){ if(doc.firstname && doc.email) emit(doc.id,{Name: doc.firstname, Email: doc.email}); }"
+   }
+ }
+}

data/test/view_age.json

@@ -0,0 +1,8 @@
+{
+ "language" : "javascript",
+ "views" :{
+    "age" : {
+      "map" : "function(doc){ if(doc.age) emit(doc.age,doc); }"
+    }
+ }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leanback
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -147,8 +147,10 @@ files:
 - spec/spec_base.rb
 - test/helper.rb
 - test/main.rb
+- test/my_view.json
 - test/my_views.json
 - test/test_leanback.rb
+- test/view_age.json
 homepage: http://github.com/obi-a/leanback
 licenses:
 - MIT
@@ -164,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1267076556477492408
+      hash: -746348248553049715
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: