fat 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ac96972401cdfcbe6d2ff6f0b694a18058fbfff
-  data.tar.gz: 34dd46ab23e6a79fc1fe930aedc6a509532fa47f
+  metadata.gz: 1fd45ba2047a3be07e832e7fb9a7ba405098b080
+  data.tar.gz: b28efdaad73f42987a52f813b6ca6292e23cbfd7
 SHA512:
-  metadata.gz: 28ff990d2559cebfd2169f02b6314a96de8de73ea368c1ecc00c44718adc6ba1fb86708f3485b86b8a3e5f10fa71b86bb26a0ac5dea38d27532b67d997f70ecf
-  data.tar.gz: a38cf3afb91a3bb4fbccd9009df7ab93ae116cef0e1b4ab8fc1a4c0316ce0b39701f67ef39ec71a53f83396fd6c9bc7debf8fc08c56a34f390280f1734e941f2
+  metadata.gz: 45feaf74742e8023bf38e02b52667627f49a638ea6d9a6e41715c94665a02d1b5a88b9e36bea854445271d229fc5ee1564d1f6efc5112372a6aa1fe7a375b18e
+  data.tar.gz: 234d08f9d9c752fce80a6e3dda850b3abcd2896b8ac83a33ad1ef09031a59b3b4df804eecdcc66bd2d36f76b8c95cc54758eb8c5fee7996fe46ab1fcfd8a2288

data/ext/fat/fat.c

@@ -4,16 +4,25 @@ VALUE Fat = Qnil;
 
 void Init_fat();
 
+// Interface methods
 static VALUE singleton_method_at(int argc, VALUE *argv, VALUE self);
+static VALUE singleton_method_fetch_at(int argc, VALUE *argv, VALUE self);
 static VALUE method_at(int argc, VALUE *argv, VALUE hash);
+static VALUE method_fetch_at(int argc, VALUE *argv, VALUE hash);
 
-static VALUE fat(VALUE hash, VALUE fields);
-void parse_fields(VALUE args, VALUE *fields);
+static VALUE fat(VALUE hash, VALUE fields, int raise_on_nil);
+
+// Helpers
+static void parse_fields(VALUE args, VALUE *fields);
+static VALUE fields_upto_index(VALUE fields, int index);
 
 void Init_fat(void) {
   Fat = rb_define_module("Fat");
+
   rb_define_module_function(Fat, "at", singleton_method_at, -1);
+  rb_define_module_function(Fat, "fetch_at", singleton_method_fetch_at, -1);
   rb_define_method(Fat, "at", method_at, -1);
+  rb_define_method(Fat, "fetch_at", method_fetch_at, -1);
 }
 
 static VALUE singleton_method_at(int argc, VALUE *argv, VALUE self) {
@@ -25,7 +34,19 @@ static VALUE singleton_method_at(int argc, VALUE *argv, VALUE self) {
   VALUE fields;
   parse_fields(args, &fields);
 
-  return fat(hash, fields);
+  return fat(hash, fields, 0);
+}
+
+static VALUE singleton_method_fetch_at(int argc, VALUE *argv, VALUE self) {
+  VALUE hash;
+  VALUE args;
+
+  rb_scan_args(argc, argv, "1*", &hash, &args);
+
+  VALUE fields;
+  parse_fields(args, &fields);
+
+  return fat(hash, fields, 1);
 }
 
 static VALUE method_at(int argc, VALUE *argv, VALUE hash) {
@@ -35,16 +56,32 @@ static VALUE method_at(int argc, VALUE *argv, VALUE hash) {
   VALUE fields;
   parse_fields(args, &fields);
 
-  return fat(hash, fields);
+  return fat(hash, fields, 0);
 }
 
-static VALUE fat(VALUE hash, VALUE fields) {
+static VALUE method_fetch_at(int argc, VALUE *argv, VALUE hash) {
+  VALUE args;
+  rb_scan_args(argc, argv, "*", &args);
+
+  VALUE fields;
+  parse_fields(args, &fields);
+
+  return fat(hash, fields, 1);
+}
+
+static VALUE fat(VALUE hash, VALUE fields, int raise_on_nil) {
   VALUE value = hash;
+
   for (int i = 0; i < RARRAY_LEN(fields); i++) {
-    value = rb_hash_aref(value, RARRAY_PTR(fields)[i]);
+    VALUE key = RARRAY_PTR(fields)[i];
+    value = rb_hash_aref(value, key);
 
     if (value == Qnil) {
-      return Qnil;
+      if (raise_on_nil == 1) {
+        rb_raise(rb_eKeyError, "No value found at %s", RSTRING_PTR(fields_upto_index(fields, i)));
+      } else {
+        return Qnil;
+      }
     }
 
     if (TYPE(value) != T_HASH) {
@@ -55,16 +92,19 @@ static VALUE fat(VALUE hash, VALUE fields) {
   return value;
 }
 
-void parse_fields(VALUE args, VALUE *fields) {
+static void parse_fields(VALUE args, VALUE *fields) {
   if (RARRAY_LEN(args) == 1) {
     VALUE chain = RARRAY_PTR(args)[0];
 
     StringValue(chain);
-    const char* dot = ".";
-
-    *fields = rb_str_split(chain, dot);
+    *fields = rb_str_split(chain, ".");
   } else {
     *fields = args;
   }
 }
 
+static VALUE fields_upto_index(VALUE fields, int index) {
+  VALUE range = rb_range_new(INT2FIX(0), INT2FIX(index), 0);
+  VALUE slice = rb_funcall(fields, rb_intern("slice"), 1, range);
+  return rb_ary_join(slice, rb_str_new2("."));
+}

data/fat.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "fat"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   s.summary = "C extension to find values in nested hashes without pain"
   s.description = s.summary
   s.authors = ["Lucas Tolchinsky"]

data/test/fat_test.rb

@@ -14,8 +14,10 @@ scope do
 
   test "honor key type" do |hash|
     assert_equal nil, Fat.at(hash, "foo", :not, :found)
+    assert_raise { Fat.fetch_at(hash, "foo", :not, :found) }
 
     assert_equal :found, Fat.at(hash, :foo, "bar", :baz)
+    assert_equal :found, Fat.fetch_at(hash, :foo, "bar", :baz)
   end
 end
 
@@ -32,8 +34,10 @@ scope do
 
   test "namespaced string keys" do |hash|
     assert_equal nil, Fat.at(hash, "foo.not.found")
+    assert_raise { Fat.fetch_at(hash, "foo.not.found") }
 
     assert_equal :found, Fat.at(hash, "foo.bar.baz")
+    assert_equal :found, Fat.fetch_at(hash, "foo.bar.baz")
   end
 end
 
@@ -46,7 +50,7 @@ scope do
     assert Hash.new.respond_to?(:at)
   end
 
-  test "uses both interfaces" do
+  test "honor Fat interface" do
     hash = {
       "foo" => {
         "bar" => {
@@ -57,6 +61,9 @@ scope do
 
     assert_equal :found, hash.at("foo", "bar", "baz")
     assert_equal :found, hash.at("foo.bar.baz")
+
+    assert_equal :found, hash.fetch_at("foo", "bar", "baz")
+    assert_equal :found, hash.fetch_at("foo.bar.baz")
   end
 end
 
@@ -72,8 +79,9 @@ scope do
     }
   end
 
-  test "break if a key doesn't hold a hash" do |hash|
+  test "break and return if a value is not a hash" do |hash|
     assert_equal :wat, Fat.at(hash, "foo.not_a_hash.baz")
+    assert_equal :wat, Fat.fetch_at(hash, "foo.not_a_hash.baz")
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Lucas Tolchinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest