fat 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cb164e13d70c6ba83c7a6388dee09b09f1c16ad
-  data.tar.gz: c83ade83a11961ed0e878f4be1f983864d02f185
+  metadata.gz: 0e695c0dfe4c5034dc2977e30ba13260f4359fcc
+  data.tar.gz: 92c736aa2db12b4f06926cf5d3065c56720b317d
 SHA512:
-  metadata.gz: dcbb1ecdb3c05e52ce5575fc5c4f5f9c46c25ab591e63237fcbe5b7efb1ec78385b7e8e4037c8bf614095486de2bd48de102d1817c24e4699859e47fdf5831b8
-  data.tar.gz: 1c4e40eafe1e97a2eee88b5f2042d3189575d3fadd223ec0c30570c49546395a4d9b1f238bdd2f30e4af202bbdde40a05fc0af05f836cad0266f439eebe48b80
+  metadata.gz: a8595a6a2bf6701c6b9477d79eb875cbe05c70b2db92ce76a1b1f0475da22bfb93dd8f904a7944f35e30015c3a93edfb51677ee9be4ef9c194ccef53c78bd495
+  data.tar.gz: b2cc74a7a6015d67b172ca55a3eaf25beda14b4129309e8a9dfe88b5c5f69f29330aa5848576a2a786b39e24490c8ca79bd5d146a43e9ed0c7fa6f5fa0794d91

data/.gems

@@ -1,2 +1,2 @@
 rake-compiler -v 0.9.3
-cutest -v 1.2.1
+cutest -v 1.2.2

data/ext/fat/fat.c

@@ -18,6 +18,8 @@ static inline void parse_singleton_args(int argc, VALUE *argv, VALUE *hash, VALU
 static inline void parse_method_args(int argc, VALUE *argv, VALUE *fields);
 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 str_to_sym(VALUE str);
+static inline VALUE sym_to_str(VALUE sym);
 
 void Init_fat(void) {
   Fat = rb_define_module("Fat");
@@ -61,6 +63,18 @@ static VALUE fat(VALUE hash, VALUE fields) {
 static inline void parse_fields(VALUE args, VALUE *fields) {
   if (RARRAY_LEN(args) == 1) {
     *fields = rb_str_split(RARRAY_PTR(args)[0], ".");
+
+    if (RARRAY_LEN(*fields) == 1) {
+      VALUE split = rb_str_split(RARRAY_PTR(args)[0], ":");
+
+      if (RARRAY_LEN(split) == 1) {
+        rb_raise(rb_eFatError, "Single argument expected to be a namespace with dots (.) or colons (:)");
+      } else {
+        for (long i = 0; i < RARRAY_LEN(split); i++) {
+          rb_ary_store(*fields, i, str_to_sym(RARRAY_AREF(split, i)));
+        }
+      }
+    }
   } else {
     *fields = args;
   }
@@ -93,16 +107,20 @@ static inline long compute_error_message_length(VALUE fields, long index) {
     VALUE field = RARRAY_AREF(fields, j);
 
     if (TYPE(field) == T_SYMBOL) {
-      error_length += rb_str_length(rb_id2str(SYM2ID(field)));
+      error_length += RSTRING_LEN(sym_to_str(field));
     } else {
       error_length += RSTRING_LEN(field);
     }
 
+    // "." separator for the message.
     if (j != index) {
       error_length++;
     }
   }
 
+  // The last character is '\0'.
+  error_length++;
+
   return error_length;
 }
 
@@ -114,8 +132,8 @@ static inline void copy_error_message(VALUE fields, long index, char* error_mess
 
     long size;
     if (TYPE(field) == T_SYMBOL) {
-      size = rb_str_length(rb_id2str(SYM2ID(field)));
-      memcpy(current_char_pointer, RSTRING_PTR(rb_id2str(SYM2ID(field))), size);
+      size = RSTRING_LEN(sym_to_str(field));
+      memcpy(current_char_pointer, RSTRING_PTR(sym_to_str(field)), size);
     } else {
       size = RSTRING_LEN(field);
       memcpy(current_char_pointer, RSTRING_PTR(field), size);
@@ -128,5 +146,14 @@ static inline void copy_error_message(VALUE fields, long index, char* error_mess
       current_char_pointer++;
     }
   }
+
+  *current_char_pointer++ = '\0';
+}
+
+static inline VALUE str_to_sym(VALUE str) {
+  return ID2SYM(rb_intern(RSTRING_PTR(str)));
 }
 
+static inline VALUE sym_to_str(VALUE sym) {
+  return rb_id2str(SYM2ID(sym));
+}

data/fat.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "fat"
-  s.version = "0.1.0"
+  s.version = "1.0.0"
   s.summary = "C extension to find values in nested hashes without pain"
   s.description = s.summary
   s.authors = ["Lucas Tolchinsky"]
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.extensions = ["ext/fat/extconf.rb"]
 
-  s.add_development_dependency "cutest"
+  s.add_development_dependency "cutest", ">= 1.2.2"
   s.add_development_dependency "rake-compiler"
 end
 

data/test/fat_test.rb

@@ -13,12 +13,20 @@ scope do
   end
 
   test "honor key type" do |hash|
-    assert_raise(Fat::FatError) { Fat.at(hash, :foo, :not, :found) }
+    exception = assert_raise(Fat::FatError) { Fat.at(hash, :foo, :bar, :found) }
+    assert_equal "No hash found at foo.bar", exception.message
 
     assert_equal :found, Fat.at(hash, :foo, "bar", :baz)
   end
 end
 
+scope do
+  test "single argument must be a namespace" do
+    exception = assert_raise(Fat::FatError) { Fat.at({"foo" => "bar"}, "foo") }
+    assert_equal "Single argument expected to be a namespace with dots (.) or colons (:)", exception.message
+  end
+end
+
 scope do
   setup do
     {
@@ -30,41 +38,39 @@ scope do
     }
   end
 
-  test "namespaced string keys" do |hash|
-    assert_raise(Fat::FatError) { Fat.at(hash, "foo", :not, :found) }
-
+  test "namespaced strings" do |hash|
     assert_equal :found, Fat.at(hash, "foo.bar.baz")
+
+    exception = assert_raise(Fat::FatError) { Fat.at(hash, "foo.not.baz") }
+    assert_equal "No hash found at foo.not", exception.message
   end
 end
 
 scope do
   setup do
-    Hash.include(Fat)
-
     {
-      "foo" => {
-        "bar" => {
-          "baz" => :found
+      foo: {
+        bar: {
+          baz: :found
         }
       }
     }
   end
 
-  test "include the module" do |hash|
-    assert hash.respond_to?(:at)
-  end
+  test "namespaced symbols" do |hash|
+    assert_equal :found, Fat.at(hash, "foo:bar:baz")
 
-  test "honor Fat interface" do |hash|
-    assert_equal :found, hash.at("foo", "bar", "baz")
-    assert_equal :found, hash.at("foo.bar.baz")
+    exception = assert_raise(Fat::FatError) { Fat.at(hash, "foo:not:baz") }
+    assert_equal "No hash found at foo.not", exception.message
   end
 end
 
 scope do
   setup do
+    Hash.include(Fat)
+
     {
       "foo" => {
-        "not_a_hash" => :wat,
         "bar" => {
           "baz" => :found
         }
@@ -72,8 +78,13 @@ scope do
     }
   end
 
-  test "raise error if a value is not a hash" do |hash|
-    assert_raise(Fat::FatError) { Fat.at(hash, "foo.not_a_hash.baz") }
+  test "include the module" do |hash|
+    assert hash.respond_to?(:at)
+  end
+
+  test "honor Fat interface" do |hash|
+    assert_equal :found, hash.at("foo", "bar", "baz")
+    assert_equal :found, hash.at("foo.bar.baz")
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Lucas Tolchinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: C extension to find values in nested hashes without pain