faststep 0.0.6 → 0.0.7

data/ext/faststep/collection.c

@@ -9,8 +9,10 @@ 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);
@@ -19,7 +21,7 @@ void faststep_collection_main() {
   rb_define_method(rb_cFaststepCollection, "update",       faststep_collection_update, -1);
   rb_define_method(rb_cFaststepCollection, "remove",       faststep_collection_remove, -1);
   rb_define_method(rb_cFaststepCollection, "drop",         faststep_collection_drop, 0);
-  rb_define_method(rb_cFaststepCollection, "create_index", faststep_collection_create_index, 1);
+  rb_define_method(rb_cFaststepCollection, "create_index", faststep_collection_create_index, -1);
   return;
 }
 
@@ -30,13 +32,16 @@ static VALUE faststep_collection_init(VALUE self, const VALUE name, const VALUE
   return self;
 }
 
-VALUE faststep_collection_ns(const VALUE self) {
+static VALUE faststep_collection_connection(const VALUE self) {
   VALUE db = rb_iv_get(self, "@db");
+  return rb_iv_get(db, "@connection");
+}
 
-  char ns[255] = "";
-  build_collection_ns(ns, _ivar_name(db), _ivar_name(self));
+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));
 
-  return rb_str_new2(ns);
+  return build_collection_ns(db_name, collection_name);
 }
 
 static VALUE faststep_collection_count(int argc, VALUE* argv, VALUE self) {
@@ -95,12 +100,14 @@ static VALUE faststep_collection_find_one(int argc, VALUE* argv, VALUE self) {
   return rb_funcall(result, rb_intern("first"), 0);
 }
 
-void build_collection_ns(char* ns, const char* database, const char* collection) {
-  strcat(ns, database);
-  strcat(ns, ".");
-  strcat(ns, collection);
+VALUE build_collection_ns(const VALUE db_name, const VALUE collection_name) {
+  VALUE ns = rb_str_new2("");
 
-  return;
+  rb_str_concat(ns, db_name);
+  rb_str_concat(ns, rb_str_new2("."));
+  rb_str_concat(ns, collection_name);
+
+  return ns;
 }
 
 static VALUE faststep_collection_insert(int argc, VALUE* argv, const VALUE self) {
@@ -174,13 +181,29 @@ static VALUE faststep_collection_drop(const VALUE self) {
   return bool_to_ruby(result);
 }
 
-static VALUE faststep_collection_create_index(const VALUE self, const VALUE indexes) {
+static VALUE faststep_collection_create_index(int argc, VALUE* argv, const VALUE self) {
+  VALUE indexes, options;
+
+  rb_scan_args(argc, argv, "02", &indexes, &options);
   bson* bson_indexes = create_bson_from_ruby_hash(indexes);
 
+
+  int index_flags = 0;
+
+  if(TYPE(options) == T_HASH) {
+    if(rb_indiff_hash_aref(options, rb_str_new2("unique")) == Qtrue) {
+      index_flags |= MONGO_INDEX_UNIQUE;
+    }
+
+    if(rb_indiff_hash_aref(options, rb_str_new2("drop_dups")) == Qtrue) {
+      index_flags |= MONGO_INDEX_DROP_DUPS;
+    }
+  }
+
   bson_bool_t result = mongo_create_index(GetFaststepConnectionForCollection(self),
                                           RSTRING_PTR(faststep_collection_ns(self)),
                                           bson_indexes,
-                                          0,
+                                          index_flags,
                                           NULL);
   bson_destroy(bson_indexes);
 

data/ext/faststep/collection.h

@@ -6,6 +6,7 @@
 
 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);
@@ -13,7 +14,7 @@ static VALUE faststep_collection_insert(int, VALUE*, const VALUE);
 static VALUE faststep_collection_update(int, VALUE*, const VALUE);
 static VALUE faststep_collection_remove(int, VALUE*, VALUE);
 static VALUE faststep_collection_drop(const VALUE);
-static VALUE faststep_collection_create_index(const VALUE, const VALUE);
+static VALUE faststep_collection_create_index(int, VALUE*, const VALUE);
 VALUE faststep_collection_ns(const VALUE);
 
 static void _faststep_collection_insert_one(mongo_connection*, const char*, const VALUE);
@@ -22,6 +23,6 @@ mongo_connection* GetFaststepConnectionForCollection(const VALUE);
 static void _faststep_collection_destroy(bson**, const int);
 static VALUE _faststep_safe_operation(const VALUE, const VALUE);
 
-void build_collection_ns(char*, const char*, const char*);
+VALUE build_collection_ns(const VALUE, const VALUE);
 static char* _ivar_name(const VALUE);
 #endif

data/ext/faststep/db.c

@@ -37,11 +37,10 @@ static VALUE faststep_db_command(VALUE self, VALUE command) {
   bson* result       = (bson*)bson_malloc(sizeof(bson));
   bson* bson_command = create_bson_from_ruby_hash(command);
 
-  char ns[500] = "";
-  build_collection_ns(ns, RSTRING_PTR(rb_iv_get(self, "@name")), "$cmd");
+  VALUE ns = build_collection_ns(rb_iv_get(self, "@name"), rb_str_new2("$cmd"));
 
   mongo_find_one(GetFaststepConnection(rb_iv_get(self, "@connection")),
-                 ns,
+                 RSTRING_PTR(ns),
                  bson_command,
                  NULL,
                  result);

data/lib/faststep/collection.rb

@@ -2,10 +2,21 @@ module Faststep
   class Collection
     def index_information
       info = {}
-      @db["system.indexes"].find({:ns => ns}).each do |index|
+      db["system.indexes"].find({:ns => ns}).each do |index|
         info[index['name']] = index
       end
       info
     end
+
+    def rename(new_name)
+      connection["admin"].command(:renameCollection => ns, :to => "#{db.name}.#{new_name}")
+      @name = new_name
+      true
+    end
+
+    def drop_index(index_name)
+      db.command(:deleteIndexes => self.name, :index => index_name)
+      true
+    end
   end
 end

data/lib/faststep/version.rb

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

data/spec/collection_spec.rb

@@ -189,4 +189,34 @@ describe Faststep::Collection, "indexes" do
       "_foo" => { "name" => "_foo", "ns" => collection.ns, "key" => { "foo" => 1 }, "v" => 0 }
     }
   end
+
+  it "creates unique indexes" do
+    collection.create_index({ :foo => 1 }, { :unique => true })
+    2.times { collection.insert(:foo => 2) }
+    collection.count.should == 1
+  end
+
+  it "creates unique indexes that drop dups" do
+    2.times { collection.insert(:foo => 2) }
+    collection.create_index({ :foo => 1 }, { :unique => true, :drop_dups => true })
+    collection.count.should == 1
+  end
+
+  it "drops indexes" do
+    collection.create_index(:foo => 1)
+    collection.index_information.keys.should include("_foo")
+    collection.drop_index("_foo")
+    collection.index_information.keys.should_not include("_foo")
+  end
+end
+
+describe Faststep::Collection, "#rename" do
+  let(:collection) { $faststep_test_db["something"] }
+
+  it "renames collections" do
+    collection.insert(:foo => "bar")
+    collection.rename("something_else")
+    collection.name.should == "something_else"
+    $faststep_test_db["something_else"].count.should == 1
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: faststep
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Josh Clayton
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 -04:00
-default_executable: 
+date: 2011-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -117,7 +116,6 @@ files:
 - spec/db_spec.rb
 - spec/spec_helper.rb
 - spec/support_spec.rb
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -141,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Mongo on Speed