rb_lovely 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5d7473f46f078962567e35e26f31e444a221cbd
-  data.tar.gz: 8ed3631fc234e853cae5cd35d3dbe16db41af6bf
+  metadata.gz: 67d03675c3c6b63a3ebfd789c053a98df9b4a55c
+  data.tar.gz: c77b233b9b82b11f00f1d0fb37ed1ac7be8d8c17
 SHA512:
-  metadata.gz: aebd51f11653b4fcb7c198d54405d6d2394f624fa57dab474de57b34806c54f588fb29b3dc172a0538ef59993aab3f236363c28b925afa84582a0dcc14f225d3
-  data.tar.gz: d3f14f1f337dfe379f0d9b279e02d6b2cf068b55d3e1a3263060c22b3d14617138c6e0e4a1d95e933b2d3a169e439077f21e8b51eedf4cf7e12b88b4ef424e28
+  metadata.gz: 8605022a32d4df8a51bfd6460774f64ea8fef9983f028f4eab839f663c6d5ec671b3d450c91525b84ff8f980e4e670f632f136cf9b022584749addb48512fe70
+  data.tar.gz: 256fbbace880eca76a8a3373e1622c57a9ac34324580f9904311770abd3b10579dfbb9ff719cfbcd7357dfdfd499440846594225b31bfda3b640f1cfc0afe55b

data/ext/rb_lovely/sorted_hash.cpp

@@ -179,6 +179,9 @@ VALUE hashToString(VALUE self) {
   return rb_str_new(stlString.data(), stlString.size());
 }
 
+enum class ValueOrKey { VALUE, KEY, BOTH };
+
+template <ValueOrKey V>
 VALUE hashFirst(VALUE self) {
   Hash* hash = rubyCast<Hash>(self);
   if (hash->container.empty()) {
@@ -186,9 +189,15 @@ VALUE hashFirst(VALUE self) {
   }
 
   auto &pair = *hash->container.get<1>().begin();
-  return rb_ary_new3(2, pair.key, pair.val);
+  if (V == ValueOrKey::BOTH) {
+    return rb_ary_new3(2, pair.key, pair.val);
+  }
+  else {
+    return V == ValueOrKey::VALUE ? pair.val : pair.key;
+  }
 }
 
+template <ValueOrKey V>
 VALUE hashLast(VALUE self) {
   Hash* hash = rubyCast<Hash>(self);
   if (hash->container.empty()) {
@@ -197,22 +206,13 @@ VALUE hashLast(VALUE self) {
 
   auto it = hash->container.get<1>().end();
   --it;
-  return rb_ary_new3(2, it->key, it->val);
-}
-
-VALUE hashFirstValue(VALUE self) {
-  Hash* hash = rubyCast<Hash>(self);
-  return hash->container.empty() ? Qnil : hash->container.get<1>().begin()->val;
-}
 
-VALUE hashLastValue(VALUE self) {
-  Hash* hash = rubyCast<Hash>(self);
-  if (hash->container.empty())
-    return Qnil;
-
-  auto last = hash->container.get<1>().end();
-  --last;
-  return last->val;
+  if (V == ValueOrKey::BOTH) {
+    return rb_ary_new3(2, it->key, it->val);
+  }
+  else {
+    return V == ValueOrKey::VALUE ? it->val : it->key;
+  }
 }
 
 VALUE hashDelete(VALUE self, VALUE toDelete) {
@@ -228,8 +228,6 @@ VALUE hashDelete(VALUE self, VALUE toDelete) {
   }
 }
 
-enum class ValueOrKey { VALUE, KEY, BOTH };
-
 template <ValueOrKey V>
 VALUE hashShift(VALUE self) {
   Hash* hash = rubyCast<Hash>(self);
@@ -311,10 +309,12 @@ extern "C" {
     rb_define_method(rbHash, "[]", RUBY_METHOD_FUNC(hashGet), 1);
     rb_define_method(rbHash, "each", RUBY_METHOD_FUNC(hashEach), 0);
     rb_define_method(rbHash, "to_s", RUBY_METHOD_FUNC(hashToString), 0);
-    rb_define_method(rbHash, "first", RUBY_METHOD_FUNC(hashFirst), 0);
-    rb_define_method(rbHash, "last", RUBY_METHOD_FUNC(hashLast), 0);
-    rb_define_method(rbHash, "first_value", RUBY_METHOD_FUNC(hashFirstValue), 0);
-    rb_define_method(rbHash, "last_value", RUBY_METHOD_FUNC(hashLastValue), 0);
+    rb_define_method(rbHash, "first", RUBY_METHOD_FUNC(hashFirst<ValueOrKey::BOTH>), 0);
+    rb_define_method(rbHash, "first_value", RUBY_METHOD_FUNC(hashFirst<ValueOrKey::VALUE>), 0);
+    rb_define_method(rbHash, "first_key", RUBY_METHOD_FUNC(hashFirst<ValueOrKey::KEY>), 0);
+    rb_define_method(rbHash, "last", RUBY_METHOD_FUNC(hashLast<ValueOrKey::BOTH>), 0);
+    rb_define_method(rbHash, "last_value", RUBY_METHOD_FUNC(hashLast<ValueOrKey::VALUE>), 0);
+    rb_define_method(rbHash, "last_key", RUBY_METHOD_FUNC(hashLast<ValueOrKey::KEY>), 0);
     rb_define_method(rbHash, "delete", RUBY_METHOD_FUNC(hashDelete), 1);
     // rb_define_method(rbHash, "reject!", RUBY_METHOD_FUNC(hashMutatingReject), 0);
     // rb_define_method(rbHash, "reject_first!", RUBY_METHOD_FUNC(hashMutatingRejectFirst), 0);

data/yard.rb

@@ -209,7 +209,7 @@ module RbLovely
     # @complexity O(c)
     # @return The value associated with the deleted key or nil if the key was not in the hash.
     # @example
-    #   hash = RbLovely::SortedHash [:a, 5 ]
+    #   hash = RbLovely::SortedHash [:a, 5]
     #   expect(hash.delete(:a)).to equal 5
     #   expect(hash.delete(:b)).to equal nil
     def delete key ; end
@@ -264,7 +264,7 @@ module RbLovely
     # @return The first key in the hash
     # @example
     #   @set = RbLovely::SortedHash [:a, 1, :b, 2]
-    #   expect(@set.first_value).to equal :a
+    #   expect(@set.first_key).to equal :a
     def first_key ; end
 
     # Retrieve last key-value pair as determined by value sort order or nil if the hash is empty.
@@ -298,23 +298,23 @@ module RbLovely
     #   expect(hash.shift).to equal [:a, 2]
     def shift ; end
 
-    # Remove the first key-value pair in the hash and return the key or return nil if the hash is empty.
+    # Remove the first key-value pair in the hash and return the value or return nil if the hash is empty.
     # @complexity O(c).
-    # @see #pop_key
+    # @see #pop_value
     # @return The first key pair according to the <=> method defined on each member or nil if the hash is empty.
     # @example
     #   set = RbLovely::SortedHash [:a, 2, :b, 10]
-    #   expect(hash.shift_key).to equal :a
-    def shift_key ; end
+    #   expect(hash.shift_value).to equal 2
+    def shift_value ; end
 
-    # Remove the first key-value pair in the hash and return the value or return nil if the hash is empty.
+    # Remove the first key-value pair in the hash and return the key or return nil if the hash is empty.
     # @complexity O(c).
-    # @see #pop_value
+    # @see #pop_key
     # @return The first key pair according to the <=> method defined on each member or nil if the hash is empty.
     # @example
     #   set = RbLovely::SortedHash [:a, 2, :b, 10]
-    #   expect(hash.shift_value).to equal 2
-    def shift_value ; end
+    #   expect(hash.shift_key).to equal :a
+    def shift_key ; end
 
     # Remove the last key-value pair in the hash and return it or return nil if the hash is empty.
     # @complexity O(c).
@@ -325,15 +325,6 @@ module RbLovely
     #   expect(hash.pop).to equal [:b, 10]
     def pop ; end
 
-    # Remove the last key-value pair in the hash and return the key or return nil if the hash is empty.
-    # @complexity O(c).
-    # @see #shift_key
-    # @return The last key according to the <=> method defined on each member or nil if the hash is empty.
-    # @example
-    #   set = RbLovely::SortedHash [:a, 2, :b, 10]
-    #   expect(hash.pop_key).to equal :b
-    def pop_key ; end
-
     # Remove the last key-value pair in the hash and return the value or return nil if the hash is empty.
     # @complexity O(c).
     # @see #shift_value
@@ -343,23 +334,14 @@ module RbLovely
     #   expect(hash.pop_value).to equal 10
     def pop_value ; end
 
-    # Remove the first key-value pair in the hash and return it or return nil if the hash is empty.
-    # @complexity O(c).
-    # @see #pop_value
-    # @return The first value according to the <=> method defined on each member or nil if the hash is empty.
-    # @example
-    #   set = RbLovely::SortedHash [:a, 2, :b, 10]
-    #   expect(hash.shift_value).to equal 2
-    def shift_value ; end
-
-    # Remove the last key-value pair in the hash and return it or return nil if the hash is empty.
+    # Remove the last key-value pair in the hash and return the key or return nil if the hash is empty.
     # @complexity O(c).
-    # @see #shift_value
-    # @return The last value according to the <=> method defined on each member or nil if the hash is empty.
+    # @see #shift_key
+    # @return The last key according to the <=> method defined on each member or nil if the hash is empty.
     # @example
     #   set = RbLovely::SortedHash [:a, 2, :b, 10]
-    #   expect(hash.pop_value).to equal 10
-    def pop_value ; end
+    #   expect(hash.pop_key).to equal :b
+    def pop_key ; end
 
     # Gets the number of elements in the hash.
     # @complexity O(c).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_lovely
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - James Pike