ShyCouch 0.2.0 → 0.3.0

data/ShyCouch.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ShyCouch}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Shy Inc.}, %q{Daniel Bryan}, %q{Cerales}]

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/ShyCouch.rb

@@ -15,29 +15,23 @@ require 'shyrubyjs'
 # require everything from the 'ShyCouch' subdirectory
 Dir.new(File.dirname(__FILE__)+'/ShyCouch').each { |f| require 'shycouch/' + f.split('.')[0] unless f == '.' or f == '..' }
 
-module Kernel
-  def shycouch
-    $database = ShyCouch::Connection.Create
-  end
-  
-  
-end
-
-module Camping
-  module Models
-    CouchDocument = ShyCouch::Data::CouchDocument
-  end
-end
-
 
 module ShyCouch
-  
-  attr_accessor :database
-  
-  class Connection
-    # Test that the database is accessible and give back a CouchDBAPI object if so.
-    # Doesn't actually gets instantiated - is just here to allow nice ShyCouch::Connection.Create syntax
-    def self.Create(settings=nil)
+  class << self
+    def goes(m)
+      Camping.goes m
+      c = %{
+        #{m.to_s}::Models::CouchDocument = ShyCouch::Data::CouchDocument
+      }
+      eval(c)
+      ShyCouch.create
+    end
+    
+    def create(settings=nil)
+      $couchdb = ShyCouch.getDB(settings)
+    end
+    
+    def getDB(settings=nil)
       settings = $settings unless settings
       database = CouchDBAPI.new(settings["db"]["host"], settings["db"]["port"], settings["db"]["name"], settings["db"]["user"], settings["db"]["password"])
       puts database.connect unless database.connect["ok"]
@@ -45,6 +39,20 @@ module ShyCouch
       return database
     end
     
+  end
+  attr_accessor :database
+  
+  class Connection
+    # Test that the database is accessible and give back a CouchDBAPI object if so.
+    # Doesn't actually gets instantiated - is just here to allow nice ShyCouch::Connection.Create syntax
+    # def self.Create(settings=nil)
+    #   settings = $settings unless settings
+    #   database = CouchDBAPI.new(settings["db"]["host"], settings["db"]["port"], settings["db"]["name"], settings["db"]["user"], settings["db"]["password"])
+    #   puts database.connect unless database.connect["ok"]
+    #   database.create unless database.on_server?
+    #   return database
+    # end
+    
     def push_generic_views
       #TODO 
     end

data/lib/ShyCouch/data.rb

@@ -63,7 +63,7 @@ module ShyCouch
     
       def push(database = nil)
         # assumes $database unless it receives a database argument
-        database = $database unless database
+        database = $couchdb unless database
         res = database.push_document(self)
         self["_id"] = res["id"]
         self["_rev"] = res["rev"]

data/test/test_couch_document.rb

@@ -6,11 +6,11 @@ class CouchDocumentTests# < Test::Unit::TestCase
   class TestDocumentCreation < Test::Unit::TestCase
     def setup
       valid_settings = $settings
-      @database = ShyCouch::Connection.Create(valid_settings)
+      @couchdb = ShyCouch.create(valid_settings)
     end
     def teardown
-      @database.delete_database
-      @database = nil
+      @couchdb.delete_database
+      @couchdb = nil
     end
 
     def test_create_from_empty_hash
@@ -53,7 +53,8 @@ class CouchDocumentTests# < Test::Unit::TestCase
     # assumes success of the stuff in TestDocumentPulling
     def setup
       valid_settings = $settings
-      $database = ShyCouch::Connection.Create(valid_settings)
+      $couchdb = ShyCouch.create(valid_settings)
+      
       
       @valid_documents = [
         ShyCouch::Data::CouchDocument.new({"kind"=>"post", "message"=>"BUY TRAMADOL ONLINE!!"}),
@@ -73,8 +74,8 @@ class CouchDocumentTests# < Test::Unit::TestCase
       @invalid_documents = nil # make sure user can't set rev maybe? or is that legal?
     end
     def teardown
-      $database.delete_database
-      $database = nil
+      $couchdb.delete_database
+      $couchdb = nil
       # delete the database
     end
     
@@ -97,7 +98,7 @@ class CouchDocumentTests# < Test::Unit::TestCase
         assert(doc["_id"])
         assert(doc["_rev"])
         # get the new doc
-        newDoc = $database.get_document(doc._id)
+        newDoc = $couchdb.get_document(doc._id)
         # test equality of all the attributes aside from id and rev on the new document
         doc.attr_keys.each { |k|
           assert_equal(doc["k"], newDoc["k"])
@@ -119,7 +120,7 @@ class CouchDocumentTests# < Test::Unit::TestCase
         assert(res["ok"])
         
         # pull it from the database again
-        checkDoc = $database.get_document(doc._id)
+        checkDoc = $couchdb.get_document(doc._id)
         
         # check that the one from the database has all the new attributes
         assert_equal(doc.owner, checkDoc.owner)

data/test/test_couchdb_api.rb

@@ -4,7 +4,7 @@ require_relative '../lib/ShyCouch.rb'
 class TestCouchDBAPI < Test::Unit::TestCase
   def setup
     valid_settings = $settings
-    $database = ShyCouch::Connection.Create(valid_settings)
+    $database = ShyCouch.create(valid_settings)
   end
   
   def teardown

data/test/test_couchdb_factory.rb

@@ -10,6 +10,6 @@ class TestCouchDBFactory < Test::Unit::TestCase
   end
   
   def test_create_database
-    assert_kind_of(ShyCouch::CouchDBAPI, ShyCouch::Connection.Create(@valid_settings))
+    assert_kind_of(ShyCouch::CouchDBAPI, ShyCouch.create(@valid_settings))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ShyCouch
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-08-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70277019101960 !ruby/object:Gem::Requirement
+  requirement: &70094608804280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70277019101960
+  version_requirements: *70094608804280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70277019099720 !ruby/object:Gem::Requirement
+  requirement: &70094608801900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70277019099720
+  version_requirements: *70094608801900
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70277019097000 !ruby/object:Gem::Requirement
+  requirement: &70094608799800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277019097000
+  version_requirements: *70094608799800
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70277019094280 !ruby/object:Gem::Requirement
+  requirement: &70094608797500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70277019094280
+  version_requirements: *70094608797500
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70277019091840 !ruby/object:Gem::Requirement
+  requirement: &70094608795700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277019091840
+  version_requirements: *70094608795700
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70277019089840 !ruby/object:Gem::Requirement
+  requirement: &70094608794440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277019089840
+  version_requirements: *70094608794440
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70277019088080 !ruby/object:Gem::Requirement
+  requirement: &70094608793120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277019088080
+  version_requirements: *70094608793120
 description: Ruby API for CouchDB, designed to work with the Camping micro-framework.
 email: danbryan@gmail.com
 executables: []
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 366040615116575159
+      hash: -2635305617772024091
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: