ruby-hdfs-cdh4 0.0.2 → 0.0.4

data/ext/hdfs/hdfs.c

@@ -155,32 +155,55 @@ VALUE HDFS_File_System_alloc(VALUE klass) {
 
 /**
  * call-seq:
- *    hdfs.new(host='localhost', port=8020) -> hdfs
+ *    hdfs.new(options={}) -> hdfs
  *
  * Creates a new HDFS client connection, returning a new
  * Hadoop::DFS::FileSystem object if successful.  If this fails, raises a
  * ConnectError.
+ *
+ * Options:
+ *  :local
+ *  :host
+ *  :port
  */
 VALUE HDFS_File_System_initialize(int argc, VALUE* argv, VALUE self) {
-  VALUE host, port;
-  rb_scan_args(argc, argv, "02", &host, &port);
-  // Sets default values for host and port if not supplied by user.
-  char* hdfs_host = (char*) HDFS_DEFAULT_HOST;
-  int hdfs_port = HDFS_DEFAULT_PORT;
-  if (!NIL_P(host)) {
-    hdfs_host = RSTRING_PTR(host);
-  }
-  if (!NIL_P(port)) {
-    hdfs_port = NUM2INT(port);
-  }
+  VALUE options;
+  rb_scan_args(argc, argv, "01", &options);
+
   FSData* data = NULL;
   Data_Get_Struct(self, FSData, data);
-  data->fs = hdfsConnect(hdfs_host, hdfs_port); 
+
+  if (NIL_P(options)) {
+    options = rb_hash_new();
+  }
+
+  VALUE r_local = rb_hash_aref(options, rb_eval_string(":local"));
+  if (r_local == Qtrue) {
+    data->fs = hdfsConnect(NULL, 0);
+  } else {
+    VALUE r_host = rb_hash_aref(options, rb_eval_string(":host"));
+    VALUE r_port = rb_hash_aref(options, rb_eval_string(":port"));
+
+    // Sets default values for host and port if not supplied by user.
+    char* hdfs_host = (char*) HDFS_DEFAULT_HOST;
+    int hdfs_port   = HDFS_DEFAULT_PORT;
+
+    if (RTEST(r_host)) {
+      hdfs_host = RSTRING_PTR(r_host);
+    }
+
+    if (RTEST(r_port)) {
+      hdfs_port = NUM2INT(r_port);
+    }
+
+    data->fs = hdfsConnect(hdfs_host, hdfs_port);     
+  }
+ 
   if (data->fs == NULL) {
-    rb_raise(e_connect_error, "Failed to connect to HDFS at: %s:%d",
-        hdfs_host, hdfs_port);
+    rb_raise(e_connect_error, "Failed to connect to HDFS");
     return Qnil;
   } 
+
   return self;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-hdfs-cdh4
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies: []
 description: ruby hadoop libhdfs client with support for cdh4
 email:
@@ -45,12 +45,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.8.10
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ruby hadoop libhdfs client with support for cdh4
 test_files: []
-has_rdoc: