must 0.2.7 → 0.2.8

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/README

@@ -19,6 +19,10 @@ Must
     pages = [{:name=>"...", :url=>"...",} ...]
     pages.must.struct([Hash])
 
+  You want Boolean class? try this!
+
+    flag = hash["flag"].must(true, false)
+
 
 Asking Methods
 ==============

data/Rakefile

@@ -1,3 +1,5 @@
+require "bundler/gem_tasks"
+
 require 'rake'
 require 'rake/testtask'
 require 'rdoc/task'

data/lib/must/rule.rb

@@ -42,7 +42,8 @@ module Must
     def kind_of(*targets, &block)
       bool = targets.any?{|klass| is_a?(klass)}
       block ||= proc {
-        target = targets.map{|i| instance?(i) ? i.class.name : i.name}.join('/')
+        target = targets.map{|i| instance?(i) ? i.class.name : i.name}.join('|')
+        target = "(#{target})" if targets.size > 1
         raise Invalid, "expected #{target} but got #{object.class}"
       }
       valid?(bool, &block)
@@ -104,6 +105,7 @@ module Must
     end
 
     def struct(target, &block)
+      block ||= proc{ raise Invalid, Must::StructInfo::Differ.new(@object, target, "").execute.to_s }
       valid?(struct?(target), &block)
     end
 

data/lib/must/struct_info.rb

@@ -75,6 +75,56 @@ module Must
       extend self
     end
 
+    class Differ
+      attr_reader :a, :b, :path
+
+      def initialize(a, b, path)
+        @a, @b, @path = a, b, path
+      end
+
+      def execute!
+        sa = StructInfo::new(a).inspect
+        sb = StructInfo::new(b).inspect
+
+        unless sa == sb
+          failed("%s expected %s, but got %s" % [path, sb, sa])
+        end
+
+        if a.class == Array
+          max = [a.size, b.size].max
+          (0...max).each do |i|
+            Differ.new(a[i], b[i], "#{path}[#{i}]").execute!
+          end
+          return true
+        end
+
+        if a.class == Hash
+          (a.keys | b.keys).each do |key|
+            Differ.new(a[key], b[key], "#{path}[#{key}]").execute!
+          end
+          return true
+        end
+
+        unless a == b
+          failed("%s expected %s, but got %s" % [path, a.inspect, b.inspect])
+        end
+
+        return nil
+      end
+
+      def execute
+        execute!
+        return nil
+      rescue => err
+        return err
+      end
+
+      private
+        def failed(msg)
+          raise msg
+        end
+    end
+
     ######################################################################
     ### StructInfo
 

data/lib/must/version.rb

@@ -1,3 +1,3 @@
 module Must
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/must.gemspec

@@ -16,7 +16,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_development_dependency "rspec"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'rspec'
+
+require File.dirname(__FILE__) + '/../init'
+
+RSpec.configure do |config|
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+end

data/spec/struct_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Must do
+  let(:obj) { {"xyz" => ["a","b"] } }
+
+  specify "show more info about struct differs" do
+    lambda {
+      obj.must.struct({String => [Hash]})
+    }.should raise_error(/expected \{String=>\[Hash\]/)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: must
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - maiha
@@ -15,10 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-27 00:00:00 +09:00
-default_executable: 
-dependencies: []
-
+date: 2013-02-22 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: add Object#must method to constrain its origin and conversions
 email: 
 - maiha@wota.jp
@@ -29,6 +41,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
 - README
 - Rakefile
 - init.rb
@@ -38,13 +51,14 @@ files:
 - lib/must/struct_info.rb
 - lib/must/version.rb
 - must.gemspec
+- spec/spec_helper.rb
+- spec/struct_spec.rb
 - test/coerced_test.rb
 - test/duck_test.rb
 - test/match_test.rb
 - test/must_test.rb
 - test/struct_info_test.rb
 - test/struct_test.rb
-has_rdoc: true
 homepage: http://github.com/maiha/must
 licenses: []
 
@@ -74,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: a runtime specification tool