masterplan 0.3.1 → 0.4.0

data/README.rdoc

@@ -150,11 +150,16 @@ Note that for the moment, schemes, i.e. the outermost object, can only be hashes
 
 == Installation
 
-Currently, you can only install from Github. Add this to your Gemfile:
+    (sudo) gem install masterplan
+
+Or, install latest version from Github with bundler by adding this to your Gemfile:
 
     gem 'masterplan', :git => 'git://github.com/traveliq/masterplan.git'
 
-If you don't use bundler, you're on your own, sorry.
+== Dependencies
+
+You'll need ActiveSupport, but that should be handled automatically.
+Under Ruby 1.9.x, however, you need the test-unit gem. It works for us with test-unit 1.2.3.
 
 == Authors
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/masterplan.rb

@@ -3,6 +3,9 @@ require 'active_support/version'
 if ActiveSupport::VERSION::STRING >= "3.0.0"
   require 'active_support/core_ext'
 end
+if RUBY_VERSION > '1.9'
+  gem 'test-unit'
+end
 require 'test/unit/assertions'
 require 'masterplan'
 require 'masterplan/rule'

data/masterplan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{masterplan}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Tepper"]
-  s.date = %q{2011-02-02}
+  s.date = %q{2011-02-09}
   s.description = %q{Masterplan is a library for comparing Ruby data structures against predefined templates - like XML Schema without the XML. Please see the README on github for more information.}
   s.email = %q{developer@traveliq.net}
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/traveliq/masterplan}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Masterplan is a library for comparing Ruby data structures against predefined templates - like XML Schema without the XML.}
   s.test_files = [
     "spec/masterplan_spec.rb",
@@ -45,7 +45,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/masterplan_spec.rb

@@ -10,17 +10,28 @@ describe "Masterplan" do
           {
             "name" => "Mast",
             "length" => rule(12.3, :allow_nil => true),
-            "material" => rule("wood", :included_in => ['wood', 'steel', 'human'])
+            "material" => rule("wood", :included_in => ['wood', 'steel', 'human']),
+            "scream" => rule("AAAAAAH", :matches => /[A-Z]/),
           },
           {
             "name" => "Rudder",
             "length" => nil,
-            "material" => "steel"
+            "material" => "steel",
+            "scream" => "HAAAAAARGH"
           }
         ]
       }
     })
   end
+
+  def test_value_and_expect(testee, *error_and_descripton)
+    lambda do
+      Masterplan.compare(
+        :scheme => @scheme,
+        :to => testee
+      )
+    end.should raise_error(*error_and_descripton)
+  end
   
   describe "Testing with #compare" do
 
@@ -32,29 +43,72 @@ describe "Masterplan" do
             :parts => [
               :name => "Thingy",
               :length => 1.0,
-              :material => "human"
+              :material => "human",
+              :scream => "UUUUUUUUH"
             ]
           }
         }
       ).should be_true
     end
+
     it "complains if a key is missing" do
+      test_value_and_expect(
+        { :tank => {} },
+        Masterplan::FailedError, /expected:	ship*\n*received:	tank/
+      )
+    end
+
+    it "complains if not given a Masterplan::Document" do
       lambda do
         Masterplan.compare(
-          :scheme => @scheme,
-          :to => {
-            :tank => {}
-          }
+          :scheme => {},
+          :to => {}
         )
-      end.should raise_error(Masterplan::FailedError, /expected:	ship*\n*received:	tank/)
+      end.should raise_error(ArgumentError, /scheme needs to be a Masterplan::Document/)
+    end
+
+    it "complains if there are extra keys" do
+      test_value_and_expect(
+        { :ship => {}, :boat => {} },
+        Masterplan::FailedError, /expected:	ship*\n*received:	boat,ship/
+      )
+    end
+    
+    it "complains if a value is of the wrong class" do
+      test_value_and_expect(
+        { :ship => [] },
+        Masterplan::FailedError, /value at 'root'=>'ship' \(Array\) is not a Hash/
+      )
     end
-    it "complains if not given a Masterplan::Document"
-    it "complains if there are extra keys"
-    it "complains if a value is of the wrong class"
-    it "complains if a value is nil"
-    it "does not complain if a value is nil and the rule allows nil"
-    it "complains if a value does not match the regexp rule"
-    it "complains if a value is not included in the rule list"
+
+    it "complains if a value is nil" do
+      test_value_and_expect(
+        { :ship => {:parts => [{:name => nil, :length => 1.0, :material => "wood", :scream => "BLEEEEERGH"}]} },
+        Masterplan::FailedError, /value at 'root'=>'ship'=>'parts'=>'0'=>'name' \(NilClass\) is not a String/
+      )
+    end
+
+    it "does not complain if a value is nil and the rule allows nil" do
+      Masterplan.compare(
+          :scheme => @scheme,
+          :to => { :ship => {:parts => [{:name => "haha", :length => nil, :material => "wood", :scream => "UUUUAUAUAUAH"}]} }
+     ).should == true
+    end
+
+    it "complains if a value does not match the regexp rule" do
+      test_value_and_expect(
+        { :ship => {:parts => [{:name => "thing", :length => 1.0, :material => "wood", :scream => "omai !"}]} },
+        Masterplan::FailedError, /value at 'root'=>'ship'=>'parts'=>'0'=>'scream' "omai !" \(String\) does not match \/\[A-Z\]\//
+      )
+    end
+
+    it "complains if a value is not included in the rule list" do
+      test_value_and_expect(
+        { :ship => {:parts => [{:name => "thing", :length => 1.0, :material => "socks", :scream => "GRAGRAGR"}]} },
+        Masterplan::FailedError, /value at 'root'=>'ship'=>'parts'=>'0'=>'material' "socks" \(String\) is not one of \["wood", "steel", "human"\]/
+      )
+    end
+
     it "checks all values of value arrays, but only against the first array value of the scheme"
     it "checks all array values one-to-one if the compare_each rule is used"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: masterplan
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Martin Tepper
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +01:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activesupport
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +31,11 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  requirement: *id001
   prerelease: false
   type: :runtime
-  name: activesupport
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: rspec
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +47,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  requirement: *id002
   prerelease: false
   type: :development
-  name: rspec
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  name: bundler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +63,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
   prerelease: false
   type: :development
-  name: bundler
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +79,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id004
   prerelease: false
   type: :development
-  name: jeweler
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: rcov
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,10 +93,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   prerelease: false
   type: :development
-  name: rcov
+  requirement: *id005
 description: Masterplan is a library for comparing Ruby data structures against predefined templates - like XML Schema without the XML. Please see the README on github for more information.
 email: developer@traveliq.net
 executables: []
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Masterplan is a library for comparing Ruby data structures against predefined templates - like XML Schema without the XML.