faststep 0.0.3 → 0.0.4

data/README.markdown

@@ -12,7 +12,11 @@ Add to your Gemfile and `bundle`; otherwise,
 
 Connect to mongo:
 
-    >> conn = Faststep::Connection.new("127.0.0.1", 27017)
+    >> conn = Faststep::Connection.new # defaults to 127.0.0.1:27017
+
+Or connect to a custom host and port:
+
+    >> conn = Faststep::Connection.new("custom.host", 12345)
 
 Pick a database:
 

data/ext/faststep/connection.c

@@ -9,19 +9,28 @@ void faststep_connection_main() {
   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, 2);
+  rb_define_singleton_method(rb_cFaststepConnection, "new", faststep_connection_new, -1);
 
-  rb_define_method(rb_cFaststepConnection, "initialize",  faststep_connection_init, 2);
+  rb_define_method(rb_cFaststepConnection, "initialize",  faststep_connection_init, -1);
   rb_define_method(rb_cFaststepConnection, "connect!",    faststep_connection_connect, 0);
   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;
 }
 
-static VALUE faststep_connection_init(VALUE self, const VALUE host, const VALUE port) {
+static VALUE faststep_connection_init(int argc, VALUE* argv, VALUE self) {
+  VALUE host, port;
+
+  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); }
+
   rb_iv_set(self, "@host", host);
   rb_iv_set(self, "@port", port);
 
@@ -30,16 +39,12 @@ static VALUE faststep_connection_init(VALUE self, const VALUE host, const VALUE
   return self;
 }
 
-static VALUE faststep_connection_new(VALUE class, const VALUE host, const VALUE port) {
+static VALUE faststep_connection_new(int argc, VALUE* argv, VALUE class) {
   mongo_connection* conn = (mongo_connection*)bson_malloc(sizeof(mongo_connection));
 
   VALUE tdata = Data_Wrap_Struct(class, NULL, mongo_destroy, conn);
 
-  VALUE argv[2];
-  argv[0] = host;
-  argv[1] = port;
-
-  rb_obj_call_init(tdata, 2, argv);
+  rb_obj_call_init(tdata, argc, argv);
 
   return tdata;
 }

data/ext/faststep/connection.h

@@ -4,8 +4,8 @@
 #define CONNECTION_H
 void faststep_connection_main();
 
-static VALUE faststep_connection_init(VALUE, const VALUE, const VALUE);
-static VALUE faststep_connection_new(VALUE, const VALUE, const VALUE);
+static VALUE faststep_connection_init(int, VALUE*, VALUE);
+static VALUE faststep_connection_new(int, VALUE*, VALUE);
 static VALUE faststep_connection_connect(VALUE);
 static VALUE faststep_connection_disconnect(const VALUE);
 static VALUE faststep_connection_connected(const VALUE);

data/lib/faststep/version.rb

@@ -1,3 +1,3 @@
 module Faststep
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/connection_spec.rb

@@ -3,17 +3,10 @@ require "spec_helper"
 describe Faststep::Connection do
   subject { Faststep::Connection.new("127.0.0.1", 27017) }
 
-  it "knows its host" do
-    subject.host == "127.0.0.1"
-  end
-
-  it "knows its port" do
-    subject.port == 27017
-  end
-
-  it "connects to Mongo automatically" do
-    subject.should be_connected
-  end
+  its(:host) { should == "127.0.0.1" }
+  its(:port) { should == 27017 }
+  it { should be_connected }
+  it { should be_master }
 
   it "closes a connection to Mongo" do
     subject.disconnect!
@@ -21,9 +14,22 @@ describe Faststep::Connection do
     subject.connect!
     subject.should be_connected
   end
+end
+
+describe Faststep::Connection, "host and port defaults" do
+  subject { Faststep::Connection.new }
+  its(:host) { should == "127.0.0.1" }
+  its(:port) { should == 27017 }
+  it { should be_connected }
+  it { should be_master }
+end
+
+describe Faststep::Connection, "getting a database" do
+  subject { Faststep::Connection.new }
 
-  it "connects to master by default" do
-    subject.should be_master
+  it "uses a database" do
+    subject[$faststep_test_db.name]["something"].insert(:foo => "bar")
+    $faststep_test_db["something"].count.should == 1
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: faststep
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Josh Clayton
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -04:00
+date: 2011-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency