faststep 0.0.7 → 0.0.8

data/ext/faststep/collection.c

@@ -8,11 +8,6 @@
 void faststep_collection_main() {
   rb_cFaststepCollection = rb_define_class_under(rb_mFaststep, "Collection", rb_cObject);
 
-  rb_define_attr(rb_cFaststepCollection, "name", 1, 0);
-  rb_define_attr(rb_cFaststepCollection, "db", 1, 0);
-
-  rb_define_method(rb_cFaststepCollection, "initialize",   faststep_collection_init, 2);
-  rb_define_method(rb_cFaststepCollection, "connection",   faststep_collection_connection, 0);
   rb_define_method(rb_cFaststepCollection, "ns",           faststep_collection_ns, 0);
   rb_define_method(rb_cFaststepCollection, "find",         faststep_collection_find, -1);
   rb_define_method(rb_cFaststepCollection, "find_one",     faststep_collection_find_one, -1);
@@ -25,18 +20,6 @@ void faststep_collection_main() {
   return;
 }
 
-static VALUE faststep_collection_init(VALUE self, const VALUE name, const VALUE database) {
-  rb_iv_set(self, "@name", name);
-  rb_iv_set(self, "@db", database);
-
-  return self;
-}
-
-static VALUE faststep_collection_connection(const VALUE self) {
-  VALUE db = rb_iv_get(self, "@db");
-  return rb_iv_get(db, "@connection");
-}
-
 VALUE faststep_collection_ns(const VALUE self) {
   VALUE db_name         = rb_str_new2(_ivar_name(rb_iv_get(self, "@db")));
   VALUE collection_name = rb_str_new2(_ivar_name(self));

data/ext/faststep/collection.h

@@ -5,8 +5,6 @@
 #define COLLECTION_H
 
 void  faststep_collection_main();
-static VALUE faststep_collection_init(VALUE, const VALUE, const VALUE);
-static VALUE faststep_collection_connection(const VALUE);
 static VALUE faststep_collection_find(int, VALUE*, const VALUE);
 static VALUE faststep_collection_find_one(int, VALUE*, const VALUE);
 static VALUE faststep_collection_count(int, VALUE*, VALUE);

data/ext/faststep/connection.c

@@ -4,10 +4,6 @@
 
 void faststep_connection_main() {
   rb_cFaststepConnection = rb_define_class_under(rb_mFaststep, "Connection", rb_cObject);
-  rb_define_const(rb_cFaststepConnection, "DEFAULT_PORT", INT2FIX(27017));
-
-  rb_define_attr(rb_cFaststepConnection, "host", 1, 0);
-  rb_define_attr(rb_cFaststepConnection, "port", 1, 0);
 
   rb_define_singleton_method(rb_cFaststepConnection, "new", faststep_connection_new, -1);
 
@@ -16,9 +12,6 @@ void faststep_connection_main() {
   rb_define_method(rb_cFaststepConnection, "disconnect!", faststep_connection_disconnect, 0);
   rb_define_method(rb_cFaststepConnection, "connected?",  faststep_connection_connected, 0);
   rb_define_method(rb_cFaststepConnection, "master?",     faststep_connection_master, 0);
-  rb_define_method(rb_cFaststepConnection, "db",          faststep_connection_db, 1);
-
-  rb_define_alias(rb_cFaststepConnection, "[]", "db");
 
   return;
 }
@@ -29,7 +22,7 @@ static VALUE faststep_connection_init(int argc, VALUE* argv, VALUE self) {
   rb_scan_args(argc, argv, "02", &host, &port);
 
   if(!RTEST(host)) { host = rb_str_new2("127.0.0.1"); }
-  if(!RTEST(port)) { port = INT2NUM(27017); }
+  if(!RTEST(port)) { port = rb_const_get(rb_cFaststepConnection, rb_intern("DEFAULT_PORT")); }
 
   rb_iv_set(self, "@host", host);
   rb_iv_set(self, "@port", port);
@@ -74,10 +67,6 @@ static VALUE faststep_connection_master(const VALUE self) {
   return bool_to_ruby(mongo_cmd_ismaster(GetFaststepConnection(self), NULL));
 }
 
-static VALUE faststep_connection_db(const VALUE self, const VALUE database_name) {
-  return rb_funcall(rb_cFaststepDb, rb_intern("new"), 2, database_name, self);
-}
-
 static void _faststep_connect_or_raise(mongo_connection* conn, mongo_connection_options* options) {
   mongo_connect(conn, options);
 

data/ext/faststep/connection.h

@@ -10,7 +10,6 @@ static VALUE faststep_connection_connect(VALUE);
 static VALUE faststep_connection_disconnect(const VALUE);
 static VALUE faststep_connection_connected(const VALUE);
 static VALUE faststep_connection_master(const VALUE);
-static VALUE faststep_connection_db(const VALUE, const VALUE);
 
 mongo_connection* GetFaststepConnection(const VALUE);
 

data/ext/faststep/cursor.c

@@ -6,16 +6,10 @@
 void faststep_cursor_main() {
   rb_cFaststepCursor = rb_define_class_under(rb_mFaststep, "Cursor", rb_cObject);
 
-  rb_define_attr(rb_cFaststepCursor, "collection", 1, 0);
-  rb_include_module(rb_cFaststepCursor, rb_mEnumerable);
-
   rb_define_singleton_method(rb_cFaststepCursor, "new", faststep_cursor_new, -1);
 
   rb_define_method(rb_cFaststepCursor, "initialize", faststep_cursor_init, -1);
   rb_define_method(rb_cFaststepCursor, "explain",    faststep_cursor_explain, 0);
-  rb_define_method(rb_cFaststepCursor, "skip",       faststep_cursor_skip, 1);
-  rb_define_method(rb_cFaststepCursor, "limit",      faststep_cursor_limit, 1);
-  rb_define_method(rb_cFaststepCursor, "fields",     faststep_cursor_fields, 1);
   rb_define_method(rb_cFaststepCursor, "order",      faststep_cursor_order, 1);
   rb_define_method(rb_cFaststepCursor, "each",       faststep_cursor_each, 0);
 
@@ -80,21 +74,6 @@ static VALUE faststep_cursor_explain(VALUE self) {
   return result;
 }
 
-static VALUE faststep_cursor_skip(VALUE self, const VALUE skip_count) {
-  rb_iv_set(self, "@skip", skip_count);
-  return self;
-}
-
-static VALUE faststep_cursor_limit(VALUE self, const VALUE limit_count) {
-  rb_iv_set(self, "@limit", limit_count);
-  return self;
-}
-
-static VALUE faststep_cursor_fields(VALUE self, const VALUE fields) {
-  rb_iv_set(self, "@fields", fields);
-  return self;
-}
-
 static VALUE faststep_cursor_order(VALUE self, const VALUE order) {
   rb_iv_set(self, "@order", ruby_array_to_bson_ordered_hash(order));
   return self;

data/ext/faststep/cursor.h

@@ -13,9 +13,6 @@ static VALUE faststep_cursor_init(int, VALUE*, VALUE);
 static VALUE faststep_cursor_new(int, VALUE*, VALUE);
 static VALUE faststep_cursor_each(const VALUE);
 static VALUE faststep_cursor_explain(VALUE);
-static VALUE faststep_cursor_skip(VALUE, const VALUE);
-static VALUE faststep_cursor_limit(VALUE, const VALUE);
-static VALUE faststep_cursor_fields(VALUE, const VALUE);
 static VALUE faststep_cursor_order(VALUE, const VALUE);
 static mongo_cursor* _faststep_build_mongo_cursor(VALUE);
 static VALUE _faststep_build_full_query(VALUE);

data/ext/faststep/db.c

@@ -9,24 +9,11 @@
 void faststep_db_main() {
   rb_cFaststepDb = rb_define_class_under(rb_mFaststep, "Db", rb_cObject);
 
-  rb_define_attr(rb_cFaststepDb, "name", 1, 0);
-  rb_define_attr(rb_cFaststepDb, "connection", 1, 0);
-
-  rb_define_alias(rb_cFaststepDb, "[]", "collection");
-
-  rb_define_method(rb_cFaststepDb, "initialize",     faststep_db_init, 2);
   rb_define_method(rb_cFaststepDb, "drop",           faststep_db_drop, 0);
   rb_define_method(rb_cFaststepDb, "command",        faststep_db_command, 1);
   rb_define_method(rb_cFaststepDb, "get_last_error", faststep_db_get_last_error, 0);
 }
 
-static VALUE faststep_db_init(VALUE self, VALUE name, VALUE connection) {
-  rb_iv_set(self, "@name", name);
-  rb_iv_set(self, "@connection", connection);
-
-  return self;
-}
-
 static VALUE faststep_db_drop(VALUE self) {
   mongo_connection* conn = GetFaststepConnection(rb_iv_get(self, "@connection"));
 

data/ext/faststep/db.h

@@ -2,7 +2,6 @@
 #include <ruby.h>
 #define DB_H
 void  faststep_db_main();
-static VALUE faststep_db_init(VALUE, VALUE, VALUE);
 static VALUE faststep_db_drop(VALUE);
 static VALUE faststep_db_command(VALUE, VALUE);
 static VALUE faststep_db_get_last_error(VALUE);

data/lib/faststep/collection.rb

@@ -1,5 +1,16 @@
 module Faststep
   class Collection
+    attr_reader :name, :db
+
+    def initialize(name, db)
+      @name = name
+      @db   = db
+    end
+
+    def connection
+      db.connection
+    end
+
     def index_information
       info = {}
       db["system.indexes"].find({:ns => ns}).each do |index|
@@ -9,7 +20,10 @@ module Faststep
     end
 
     def rename(new_name)
-      connection["admin"].command(:renameCollection => ns, :to => "#{db.name}.#{new_name}")
+      command = BSON::OrderedHash.new
+      command[:renameCollection] = ns
+      command[:to] = "#{db.name}.#{new_name}"
+      connection["admin"].command(command)
       @name = new_name
       true
     end

data/lib/faststep/connection.rb

@@ -1,5 +1,15 @@
 module Faststep
   class Connection
+    DEFAULT_PORT = 27017
+
+    attr_reader :host, :port
+
+    def db(database_name)
+      Db.new(database_name, self)
+    end
+
+    alias [] db
+
     def drop_database(database_name)
       db(database_name).drop
     end

data/lib/faststep/cursor.rb

@@ -1,5 +1,24 @@
 module Faststep
   class Cursor
+    include Enumerable
+
+    attr_reader :collection
+
+    def skip(count)
+      @skip = count
+      self
+    end
+
+    def limit(count)
+      @limit = count
+      self
+    end
+
+    def fields(field_array)
+      @fields = field_array
+      self
+    end
+
     def to_a
       super
     end

data/lib/faststep/db.rb

@@ -1,9 +1,18 @@
 module Faststep
   class Db
+    attr_reader :name, :connection
+
+    def initialize(name, connection)
+      @name       = name
+      @connection = connection
+    end
+
     def collection(collection_name)
       Collection.new(collection_name, self)
     end
 
+    alias [] collection
+
     def collection_names
       names = collections_info.map {|doc| doc["name"] }
       names.reject! {|name| name.index(@name).nil? || name.index('$') }

data/lib/faststep/version.rb

@@ -1,3 +1,3 @@
 module Faststep
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: faststep
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Josh Clayton
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler