hash_police 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c88a2f2754bcb69fb42484064e449b19ccfe298f
-  data.tar.gz: 7090be452d009ad83b02332efb1728a5e5c4c0e7
+  metadata.gz: 2cb08c7624e26e2f6dd120205fc763775529cb97
+  data.tar.gz: 1ab033f86e8b6a75057b604ee8adfc4be7642bef
 SHA512:
-  metadata.gz: 800ff7adfd4390e9e73ac23e8cdf3c98d6f149d381109eeec6002ecc2008ddfca33780be071ad0f5a58f34ab96f9f308b6816da09745745065c85b7da1073fcd
-  data.tar.gz: 539f2ea73356ccf466e947de2e04b68b99f2f4d06196ebc7065ed1d157ac125fd562e063ff4fbe2c12d0cbee97d477cfad85001c44779db4bfa51fc1c5b4c138
+  metadata.gz: 7cc7106d520b66cbc5652bbe1951b8df2dd9d516835f0f7abedf4a2f1a91020a4d84406b49c788873fb597d333a668716a4b1d8fc142e17281eb1cd072d4b61b
+  data.tar.gz: c5e41ea33a01c90740cb0115435511ce549e68aa34a83c31b90eb41ec995cb10b88099cd98f552052b1af368ff955a7930ffa48c3957cb23e3aa91538df05862

data/README.md

@@ -17,47 +17,43 @@ Or install it yourself as:
 
 ## Usage
 
-``ruby
-
-rule = {
-  :name => "a string",
-  :age => 28,
-  :favorites => [ "a string" ],
-  :locations => [
-    { :name => "string", :duration => 3 }
-  ]
-}
-
-valid = {
-  :name => "Jack",
-  :age => 28,
-  :favorites => [ "sport", "music" ],
-  :locations => [
-    { :name => "Taiwan", :duration => 25 },
-    { :name => "US", :duration => 5 }
-  ]
-}
-
-invalid = {
-  :name => [],
-  :age => "not a number",
-  :locations => [
-    { :name => "Taiwan", :duration => 25 },
-    { :name => 23 }
-  ]
-}
-
-police = HashPolice::Police.new(rule)
-
-result = police.check(valid)
-result.passed? # => true
-result.error_messages # => ""
-
-result = police.check(invalid)
-result.passed? # => false
-result.error_messages # => "`name`: expect String, got Array; `favorites`: missing; `locations.1.name`: expect String, got Array; `locations.1.duration`: missing"
-
-``
+        rule = {
+          :name => "a string",
+          :age => 28,
+          :favorites => [ "a string" ],
+          :locations => [
+            { :name => "string", :duration => 3 }
+          ]
+        }
+
+        valid = {
+          :name => "Jack",
+          :age => 28,
+          :favorites => [ "sport", "music" ],
+          :locations => [
+            { :name => "Taiwan", :duration => 25 },
+            { :name => "US", :duration => 5 }
+          ]
+        }
+
+        invalid = {
+          :name => [],
+          :age => "not a number",
+          :locations => [
+            { :name => "Taiwan", :duration => 25 },
+            { :name => 23 }
+          ]
+        }
+
+        police = HashPolice::Police.new(rule)
+
+        result = police.check(valid)
+        result.passed? # => true
+        result.error_messages # => ""
+
+        result = police.check(invalid)
+        result.passed? # => false
+        result.error_messages # => "`name`: expect String, got Array; `favorites`: missing; `locations.1.name`: expect String, got Array; `locations.1.duration`: missing"
 
 ## Contributing
 

data/lib/hash_police/police.rb

@@ -12,11 +12,7 @@ module HashPolice
     def check target
       result = CheckResult.new(context_key)
       unless type_matched?(rule, target)
-        if context_key != "" && target.nil?
-          result.missing
-        else
-          result.differ_type(:expect => rule.class, :got => target.class)
-        end
+        result.differ_type(:expect => rule.class, :got => target.class)
         return result
       end
 
@@ -34,8 +30,12 @@ module HashPolice
           target = stringify_keys(target)
 
           rule.each do |rule_key, rule_val|
-            police = self.class.new(rule_val, "#{context_prefix}#{rule_key}")
-            result.concat(police.check(target[rule_key]))
+            if target.has_key?(rule_key)
+              police = self.class.new(rule_val, "#{context_prefix}#{rule_key}")
+              result.concat(police.check(target[rule_key]))
+            else
+              result.missing("#{context_prefix}#{rule_key}")
+            end
           end
         end
       end

data/lib/hash_police/version.rb

@@ -1,3 +1,3 @@
 module HashPolice
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/hash_police/police_spec.rb

@@ -8,7 +8,7 @@ describe HashPolice::Police do
     end
   end
 
-  describe "#check" do
+  describe "#check(target)" do
     let(:police) { HashPolice::Police.new(rule) }
     let(:rule) { "a string" }
     let(:target) { rule.clone }
@@ -59,7 +59,7 @@ describe HashPolice::Police do
       end
     end
 
-    context "when rule is a hash of scalar" do
+    context "when rule is a nested hash" do
       let(:rule) do
         {
           :name => "Jack",
@@ -69,15 +69,17 @@ describe HashPolice::Police do
           }
         }
       end
-      let(:nested_result1) { double(:nested_result1) }
-      let(:nested_result2) { double(:nested_result2) }
-      let(:nested_result3) { double(:nested_result3, :concat => nil) }
+      let(:result_name) { double(:result_name) }
+      let(:result_married) { double(:result_married) }
+      let(:result_nested) { double(:result_nested, :concat => nil) }
+      let(:result_key) { double(:result_key) }
 
       before(:each) do
         HashPolice::CheckResult.stub(:new).and_return(result, 
-                                                      nested_result1,
-                                                      nested_result2,
-                                                      nested_result3)
+                                                      result_name,
+                                                      result_married,
+                                                      result_nested,
+                                                      result_key)
       end
 
       it "passes if all keys are matched" do
@@ -91,8 +93,19 @@ describe HashPolice::Police do
       end
 
       it "failed if missing key" do
+        HashPolice::CheckResult.stub(:new).and_return(result, 
+                                                      result_married,
+                                                      result_nested,
+                                                      result_key)
         target.delete :name
-        nested_result1.should_receive(:missing).with()
+        result.should_receive(:missing).with("name")
+
+        police.check(target)
+      end
+
+      it "failed if expect string but nil" do
+        target[:nested] = { :key => nil }
+        result_key.should_receive(:differ_type).with(:expect => String, :got => NilClass)
 
         police.check(target)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_police
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yang-Hsing Lin