wildcard_matchers 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.2
+* minor bug fix and refactoring
+
 ## 0.1.1
 * ENHANCEMENT
  * for_any helper

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/wildcard_matchers/helpers/for_all.rb

@@ -1,10 +1,6 @@
 module WildcardMatchers
   module Helpers
-    def for_all(expectation = nil, &block)
-      expectation = block_given? ? block : expectation
-
-      ForAll.new(expectation)
-    end
+    define_wildcard_helper(:for_all)
 
     class ForAll < ::WildcardMatchers::WildcardMatcher
       protected

data/lib/wildcard_matchers/helpers/for_any.rb

@@ -1,10 +1,6 @@
 module WildcardMatchers
   module Helpers
-    def for_any(expectation = nil, &block)
-      expectation = block_given? ? block : expectation
-
-      ForAny.new(expectation)
-    end
+    define_wildcard_helper(:for_any)
 
     class ForAny < ::WildcardMatchers::WildcardMatcher
       protected

data/lib/wildcard_matchers/helpers/nil_or.rb

@@ -1,10 +1,6 @@
 module WildcardMatchers
   module Helpers
-    def nil_or(expectation = nil, &block)
-      expectation = block_given? ? block : expectation
-
-      NilOr.new(expectation)
-    end
+    define_wildcard_helper(:nil_or)
 
     class NilOr < ::WildcardMatchers::WildcardMatcher
       protected

data/lib/wildcard_matchers/helpers.rb

@@ -1,5 +1,14 @@
-module WildcardMathcers
+module WildcardMatchers
   module Helpers
+    class << self
+      def define_wildcard_helper(name)
+        define_method(name) do |expectation = nil, &block|
+          expectation = block_given? ? block : expectation
+
+          ::WildcardMatchers::Helpers.const_get(name.to_s.camelcase(:upper)).new(expectation)
+        end
+      end
+    end
   end
 end
 

data/lib/wildcard_matchers/matchers/hash_includes.rb

@@ -1,15 +1,13 @@
 module WildcardMatchers
   module Matchers
     # RSpeck::Mocks has hash_including
-    def hash_includes(*args)
-      HashIncludes.new(args)
-    end
+    define_wildcard_matcher(:hash_includes)
 
     class HashIncludes < ::WildcardMatchers::WildcardMatcher
       protected
       def wildcard_match(actual)
         unless actual.is_a?(Hash)
-          erros.push "#{position}: expect #{actual} to Hash"
+          errors.push "#{position}: expect #{actual} to Hash"
         end
 
         hash_to_match = {}

data/lib/wildcard_matchers/matchers/is_uri.rb

@@ -12,16 +12,12 @@ module WildcardMatchers
           require "addressable/uri"
           uri = ::Addressable::URI.parse(actual) # if actual is ::URI re-parse
         rescue LoadError
-          require "uri"
-          uri = actual.is_a?(URI) ? actual : ::URI.parse(actual)
+          require "uri".tapp
+          uri = actual.is_a?(::URI) ? actual : ::URI.parse(actual)
         end
 
-        begin
-          expectation.each do |key, value|
-            errors.push(*self.class.superclass.check_errors(uri.__send__(key), value, position + "[#key.inspect}]"))
-          end
-        rescue ::URI::Error
-          errors.push("#{position}: expect #{actual} to be parsed as uri")
+        expectation.each do |key, value|
+          errors.push(*self.class.superclass.check_errors(uri.__send__(key), value, position + "[#{key.inspect}]"))
         end
       end
     end

data/lib/wildcard_matchers/matchers.rb

@@ -1,28 +1,55 @@
+require "facets/string/camelcase"
+
 module WildcardMatchers
   module Matchers
-    def is_a(klass)
+    class << self
+      def define_wildcard_matcher(name, &block)
+        if block_given?
+          define_method(name, &block)
+        else
+          define_method(name) do |*args|
+            ::WildcardMatchers::Matchers.const_get(name.to_s.camelcase(:upper)).new(args)
+          end
+        end
+      end
+
+      def define_wildcard_matcher_with_proc(name, &block)
+        raise "no block defined" unless block_given?
+
+        define_method(name) do
+          block
+        end
+      end
+    end
+
+    # is_a(klass)
+    define_wildcard_matcher(:is_a) do |klass|
       klass
     end
 
+    # is_a_string
+    # is_a_integer
+    # is_a_float
+    # is_a_hash
+    # is_a_array
     [ String, Integer, Float, Hash, Array ].each do |klass|
-      module_eval %{
-        def is_a_#{klass.to_s.downcase}
-          #{klass.inspect}
-        end
-      }
+      define_wildcard_matcher("is_a_#{klass.to_s.downcase}") do
+        klass
+      end
     end
 
-    def is_bool
-      lambda {|bool| TrueClass === bool or FalseClass === bool }
+    # is_bool
+    define_wildcard_matcher_with_proc(:is_bool) do |bool|
+      TrueClass === bool or FalseClass === bool
     end
 
-    def is_time
-      lambda do |time|
-        require "time"
-        time.is_a?(Time) or (Time.parse(time) rescue false)
-      end
+    # is_time
+    define_wildcard_matcher_with_proc(:is_time) do |time|
+      require "time"
+      time.is_a?(Time) or (Time.parse(time) rescue false)
     end
 
+    # TODO: DSL
     def is_a_member_of(*args)
       lambda do |item|
         args.flatten.any? {|expected| expected === item }

data/wildcard_matchers.gemspec

@@ -14,11 +14,13 @@ Gem::Specification.new do |gem|
 
   gem.version       = File.read(File.join(File.dirname(__FILE__), "VERSION")).chomp
 
+  gem.add_dependency "facets"
+
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "autowatchr"
 
-  # your choic
+  # your choice
   gem.add_development_dependency "addressable"
 
   # for debug

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildcard_matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement