hash-query 1.0.1 → 1.0.2

data/lib/hash_query.rb

@@ -40,11 +40,16 @@ module HashQuery
     #     entity.query('a:string')
     #
     # Returns a value or collection of values that are found.
-    def query(selectors)
+    def query_values(selectors)
       @_query ||= HashQuery::Query.new(self)
       @_query.query(selectors)
     end
 
+    def query_value(selectors)
+      values = query_values(selectors)
+      values && values.first
+    end
+
   end
 
   class Query
@@ -59,8 +64,6 @@ module HashQuery
   
       if found.empty?
         nil
-      elsif found.size == 1
-        found.first
       else
         found
       end

data/lib/hash_query/version.rb

@@ -1,3 +1,3 @@
 module HashQuery
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/test/test_hash_query.rb

@@ -1,8 +1,8 @@
 require 'helper'
 
-class TestHquery < MiniTest::Unit::TestCase
+class TestHquery_value < MiniTest::Unit::TestCase
 
-   def setup
+  def setup
     @movie = {
       'title'  => 'Goodfellas',
       'rating' => 'R',
@@ -62,65 +62,76 @@ class TestHquery < MiniTest::Unit::TestCase
 
   def test_included_in_hash
     h = {}
-    assert h.respond_to?(:query)
-    assert h.respond_to?(:query)
+    assert h.respond_to?(:query_value)
+    assert h.respond_to?(:query_values)
   end
 
   def test_finds_nothing
-    assert_nil @hquery.query('z')
+    assert_nil @hquery.query_value('z')
   end
 
   def test_finding_deep_array_value
-    assert_equal [8,9,10,11], @hquery.query('i')
+    assert_equal [8,9,10,11], @hquery.query_value('i')
   end
 
   def test_can_be_querried_shallow
-    assert_equal 'Goodfellas', @movie.query('title')
-    assert_equal 'R',          @movie.query('rating')
+    assert_equal 'Goodfellas', @movie.query_value('title')
+    assert_equal 'R',          @movie.query_value('rating')
   end
 
   def test_can_be_querried_one_level_deep
-    assert_equal 'Martin Scorsese', @movie.query('director name')
+    assert_equal 'Martin Scorsese', @movie.query_value('director name')
   end
 
   def test_can_be_querried_shallow_for_a_deep_value
-    assert_equal 23, @movie.query('award_count')
+    assert_equal 23, @movie.query_value('award_count')
   end
 
   def test_can_be_querried_two_levels_deep
-    assert_equal 2, @movie.query('actors awards academy')
-    assert_equal 5, @movie.query('actors awards emmies')
+    assert_equal 2, @movie.query_value('actors awards academy')
+    assert_equal 5, @movie.query_value('actors awards emmies')
   end
 
   def test_can_be_querried_to_find_an_array
-    assert_equal ['a', 'b', 'c'], @movie.query('encodings')
+    assert_equal ['a', 'b', 'c'], @movie.query_value('encodings')
   end
    
   def test_can_be_querried_for_multiple_values
-    assert_equal ['Robert De Niro', 'Ray Liotta'], @movie.query('actors name')
+    assert_equal ['Robert De Niro', 'Ray Liotta'], @movie.query_values('actors name')
+  end
+
+  def test_can_be_querried_for_one_value_when_multiple_exist
+    assert_equal 'Robert De Niro', @movie.query_value('actors name')
   end
 
   def test_can_query_for_type
-    assert_equal 'Goodfellas', @movie.query('title:string')
+    assert_equal 'Goodfellas', @movie.query_value('title:string')
   end
 
   def test_can_deep_query_for_type
-    assert_equal 2, @movie.query('academy:fixnum')
-    assert_equal 2, @movie.query('actors awards academy:fixnum')
+    assert_equal 2, @movie.query_value('academy:fixnum')
+    assert_equal 2, @movie.query_value('actors awards academy:fixnum')
   end
 
   def test_will_return_nil_if_type_is_not_matched
-    assert_equal nil, @movie.query('title:fixnum')
+    assert_equal nil, @movie.query_value('title:fixnum')
   end
 
   def test_can_query_for_complex_type
-    assert_equal ['a', 'b', 'c'], @movie.query('encodings:array')
+    assert_equal ['a', 'b', 'c'], @movie.query_value('encodings:array')
   end
 
   def test_raises_exception_if_type_not_found
     assert_raises NameError do
-      @movie.query('title:bogus')
+      @movie.query_value('title:bogus')
     end
   end
 
+  def test_changed_hash_after_initialization
+    hash = { 'a' => 1, 'b' => 2, 'c' => 3 }
+    assert_equal 2, hash.query_value('b')
+    hash['b'] = 3
+    assert_equal 3, hash.query_value('b')
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash-query
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors: