sputnik 0.1 → 0.2

data/lib/sputnik.rb

@@ -5,13 +5,15 @@ require 'faraday'
 require 'sputnik/connection'
 
 module Sputnik
+  ConnectionNotAuthenticatedError = Class.new(RuntimeError)
+
   class << self
     def authenticate(options={})
       Sputnik.client = Sputnik::Connection.new(options)
     end
 
     def client
-      Thread.current[:sputnik_client]
+      Thread.current[:sputnik_client] || (raise ConnectionNotAuthenticatedError, 'You must first call the authenticate method to connect to MongoHQ.')
     end
 
     def client=(new_client)

data/lib/sputnik/collection.rb

@@ -5,8 +5,9 @@ module Sputnik
         response = client.get("/databases/#{database_name}/collections")
         values = []
         response.each do |item|
-          values << Collection.new(item)
+          values << Collection.new({col: item})
         end
+        values
       end
 
       def find(database_name, collection_name)
@@ -24,8 +25,37 @@ module Sputnik
       # TODO: how about a "save" option? I could add it here, but it would be two server hits
 
       def delete(database_name, collection_name)
-        client.delete("/databases/#{database_name}/collections/#{collection_name}", params)
+        client.delete("/databases/#{database_name}/collections/#{collection_name}")
       end
     end
+
+    def all
+      Collection.all(database.db)
+    end
+
+    def find(collection_name=nil)
+      Collection.find(database.db, collection_name || self.name)
+    end
+
+    def create(params=nil)
+      Collection.create(database.db, params || self.to_hash)
+    end
+
+    def update(collection_name=nil, params=nil)
+      Collection.update(database.db, collection_name || self.name, params || self.to_hash)
+    end
+
+    def delete(collection_name=nil)
+      Collection.delete(database.db, collection_name || self.name)
+    end
+
+
+    def documents
+      Document.new(:database => self.database, :collection => self)
+    end
+
+    def indexes
+      Index.new(:database => self.database, :collection => self)
+    end
   end
 end

data/lib/sputnik/connection.rb

@@ -25,6 +25,7 @@ module Sputnik
       params = params.merge({:_apikey => apikey})
       response = connect.get do |req|
         req.url(path)
+        req.headers['User-Agent'] = default_header
         req.params = params
       end
 
@@ -38,7 +39,8 @@ module Sputnik
       response = connect.post do |req|
         req.url(path)
         req.params = params
-        req.header = {'Content-Type' => 'application/json'}
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['User-Agent'] = default_header
       end
 
       verify_status!(response)
@@ -46,12 +48,16 @@ module Sputnik
       return JSON.parse(response.body) || {}
     end
 
+    def default_header
+      "Sputnik/#{VERSION}/ruby"
+    end
+
   private
 
     def verify_status!(response)
       case response.status
       when 500
-        raise InternalServerError
+        raise InternalServerError, (JSON.parse(response.body) || {})['error']
       when 501
         raise NotImplementedError
       when 403

data/lib/sputnik/database.rb

@@ -1,12 +1,7 @@
+# TODO: use command pattern to build an enumerable
+# command that's not called until it's used
 module Sputnik
   class Database < Base
-    def collection
-      raise "Not Yet Implemented"
-      # TODO: call this database's collection
-      # for example, to get a database's collections:
-      # Sputnik::Database.new(:name => 'derp').collection.all
-    end
-
     class << self
       def all
         response = client.get('/databases')
@@ -14,6 +9,7 @@ module Sputnik
         response.each do |item|
           values << Database.new(item)
         end
+        values
       end
 
       def find(database_name)
@@ -28,5 +24,14 @@ module Sputnik
         client.delete("/databases/#{database_name}", params)
       end
     end
+
+    # Sputnik::Database.new(:name => 'derp').collection.all
+    def collection
+      Collection.new(:database => self)
+    end
+
+    def stats
+      DatabaseStats.find(db)
+    end
   end
 end

data/lib/sputnik/document.rb

@@ -1,13 +1,13 @@
-# TODO: this has room to be considerably cooler...
 module Sputnik
   class Document < Base
     class << self
-      def all(database_name, collection_name)
-        response = client.get("/databases/#{database_name}/collections/#{collection_name}/documents")
+      def all(database_name, collection_name, params={})
+        response = client.get("/databases/#{database_name}/collections/#{collection_name}/documents", params)
         values = []
         response.each do |item|
           values << Document.new(item)
         end
+        values
       end
 
       def find(database_name, collection_name, document_id)
@@ -25,8 +25,28 @@ module Sputnik
       # TODO: how about a "save" option? I could add it here, but it would be two server hits
 
       def delete(database_name, collection_name, document_id)
-        client.delete("/databases/#{database_name}/collections/#{collection_name}/documents/#{document_id}", params)
+        client.delete("/databases/#{database_name}/collections/#{collection_name}/documents/#{document_id}")
       end
     end
+
+    def all(params=nil)
+      Document.all(collection.database.db, collection.name, params || self.to_hash)
+    end
+
+    def find(id=nil, params=nil)
+      Document.find(collection.database.db, collection.name, id || self._id, params || self.to_hash)
+    end
+
+    def create(params=nil)
+      Document.create(collection.database.db, collection.name, params || self.to_hash)
+    end
+
+    def update(id=nil, params=nil)
+      Document.update(collection.database.db, collection.name, id || self._id, params || self.to_hash)
+    end
+
+    def delete(id=nil)
+      Document.delete(collection.database.db, collection.name, id || self._id)
+    end
   end
 end

data/lib/sputnik/index.rb

@@ -7,6 +7,7 @@ module Sputnik
         response.each do |item|
           values << Index.new(item)
         end
+        values
       end
 
       def find(database_name, collection_name, index_name)
@@ -18,8 +19,24 @@ module Sputnik
       end
 
       def delete(database_name, collection_name, index_name)
-        client.delete("/databases/#{database_name}/collections/#{collection_name}/indexes/#{index_name}", params)
+        client.delete("/databases/#{database_name}/collections/#{collection_name}/indexes/#{index_name}")
       end
     end
+
+    def all(params=nil)
+      Index.all(collection.database.db, collection.name, params || self.to_hash)
+    end
+
+    def find(name=nil, params=nil)
+      Index.find(collection.database.db, collection.name, name || self.name, params || self.to_hash)
+    end
+
+    def create(params=nil)
+      Index.create(collection.database.db, collection.name, params || self.to_hash)
+    end
+
+    def delete(name=nil)
+      Index.delete(collection.database.db, collection.name, name || self.name)
+    end
   end
 end

data/lib/sputnik/version.rb

@@ -1,3 +1,3 @@
 module Sputnik
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sputnik
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2011-11-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70259773429420 !ruby/object:Gem::Requirement
+  requirement: &70124238869940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259773429420
+  version_requirements: *70124238869940
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70259773429000 !ruby/object:Gem::Requirement
+  requirement: &70124238869520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259773429000
+  version_requirements: *70124238869520
 description: Connects to MongoHQ API
 email:
 - eric.redmond@gmail.com