fat 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e614f67b483c476550fd7b144dbb8e03ae010c
-  data.tar.gz: 0f4ace7f1c241251e27eaa37eccba1d9e29cdef6
+  metadata.gz: e703ba437bab9b2607d4aabe4ad6b95f195910b5
+  data.tar.gz: e8b2024b26dd761b98ad7fdc168f95030a0bb54e
 SHA512:
-  metadata.gz: 3e5bee3db122f8470ec1403273f72274192affdb2479d129798447d4535420f555f49e7fe6997830e59828686f5f4922913e83803fef0e89aeb680cbfdf55156
-  data.tar.gz: 8e0241de729d4daa1f03711c519b73929dfdbcf14dafef0d282a10b2ead4181509081dd34de380e9a4eb8db6f589fef18fbe0fd4974b4f9a9d552d532a59f936
+  metadata.gz: 97db99398e768a5203d462de5ec9d184b07091e63a9aa9f8d1190a114029bd90367c2c912e55e63524c141fa9b46a7086b0010c8f288b49c4833bf7e856f7c53
+  data.tar.gz: 3b91dced2d19e27d3af4508557d51853216bf98dd1e6f36808611898fb99d0fa4e643508a24e4936e0c02d11d158c2c40056a90099f3a9e12d8df61257c78ecc

data/ext/fat/fat.c

@@ -9,14 +9,13 @@ void Init_fat();
 static VALUE singleton_method_at(int argc, VALUE *argv, VALUE self);
 static VALUE method_at(int argc, VALUE *argv, VALUE hash);
 
-static VALUE fat(VALUE hash, VALUE fields, VALUE default_value);
+static VALUE fat(VALUE hash, VALUE fields, VALUE keywords);
 
 // Helpers
 static inline VALUE fields_upto_index(VALUE fields, long index);
 static inline long compute_error_message_length(VALUE fields, long index);
 static inline void copy_error_message(VALUE fields, long index, char* error_message_pointer);
 static inline VALUE sym_to_str(VALUE sym);
-static inline VALUE extract_default(VALUE keywords);
 
 void Init_fat(void) {
   Fat = rb_define_module("Fat");
@@ -33,7 +32,7 @@ static VALUE singleton_method_at(int argc, VALUE *argv, VALUE self) {
 
   rb_scan_args(argc, argv, "1*:", &hash, &fields, &keywords);
 
-  return fat(hash, fields, extract_default(keywords));
+  return fat(hash, fields, keywords);
 }
 
 static VALUE method_at(int argc, VALUE *argv, VALUE hash) {
@@ -42,18 +41,18 @@ static VALUE method_at(int argc, VALUE *argv, VALUE hash) {
 
   rb_scan_args(argc, argv, "*:", &fields, &keywords);
 
-  return fat(hash, fields, extract_default(keywords));
+  return fat(hash, fields, keywords);
 }
 
-static VALUE fat(VALUE hash, VALUE fields, VALUE default_value) {
+static VALUE fat(VALUE hash, VALUE fields, VALUE keywords) {
   VALUE value = hash;
 
   for (long i = 0; i < RARRAY_LEN(fields); i++) {
     value = rb_hash_aref(value, RARRAY_AREF(fields, i));
 
     if (NIL_P(value)) {
-      if (!NIL_P(default_value)) {
-        return default_value;
+      if (!NIL_P(keywords)) {
+        return rb_hash_aref(keywords, ID2SYM(rb_intern("default")));
       } else {
         rb_raise(rb_eFatError, "%s is nil", RSTRING_PTR(fields_upto_index(fields, i)));
       }
@@ -125,12 +124,3 @@ static inline VALUE sym_to_str(VALUE sym) {
   return rb_id2str(SYM2ID(sym));
 }
 
-static inline VALUE extract_default(VALUE keywords) {
-  VALUE result = Qnil;
-
-  if (!NIL_P(keywords)) {
-    result = rb_hash_aref(keywords, ID2SYM(rb_intern("default")));
-  }
-
-  return result;
-}

data/fat.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "fat"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
   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

@@ -26,7 +26,7 @@ scope do
 
   test "return default value" do |hash|
     assert_equal "default", Fat.at(hash, "foo", "wat", "baz", default: "default")
-    assert_equal "default", Fat.at(hash, "foo", "bar", "wat", default: "default")
+    assert_equal nil, Fat.at(hash, "foo", "bar", "wat", default: nil)
   end
 
   test "include the module" do |hash|
@@ -34,6 +34,11 @@ scope do
 
     assert hash.respond_to?(:at)
     assert_equal :found, hash.at("foo", "bar", "baz")
+
+    exception = assert_raise(Fat::FatError) { hash.at("foo", "wat", "baz") }
+    assert_equal "foo.wat is nil", exception.message
+
+    assert_equal nil, hash.at("foo", "bar", "wat", default: nil)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Lucas Tolchinsky