expects 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b50c094da2c7d2537282c168b355c2b43ed2c429
-  data.tar.gz: 769948b439dff5937954fd746270da88113420d4
+  metadata.gz: fdfcda338868a65ed97a21eb3fa5515a10c9af39
+  data.tar.gz: 522ee4b68b5ff826512abb16a215de422dd58dd6
 SHA512:
-  metadata.gz: 7444dcdeb60ab0d81d0d42d8a63ada0fa90753d668725a0eb0cbe608a934c09f4c466829aac5d963d9c9cab41f6af2b6d2fe14f98c1b755bffc8cf62daba7a21
-  data.tar.gz: 03a368aa04c7e2446fc885edd972cc2cfd79cbc65508a414b1759360daa4fa43b064140ab18cfb93daa17cd80f7d27f300cfaa9cd9c37f8488108a5fa1446cea
+  metadata.gz: 4ebf2013447a9e805ad9a00441e1704cfd61647003c6492abce25ec21d664e4428ed99b8b9ca0e01130b1417661a32f7602da94975b97d8162b0fe783dd9d69f
+  data.tar.gz: 8ba988153fcc2f9a25a5767d729bdc34144e685ff582412e865041682ec127ae103338ac09dec3cec603afe6a5b7a8ddd87e110f3bc365ddfb49113414e11fe7

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - 1.9.3
+ - 2.0.0
+ - rbx-18mode
+ - rbx-19mode
+ - ruby-head
+env:
+ - "rake=0.9"
+script: "bundle exec rspec -c"
+notifications:
+  email: false
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+    - rvm: rbx-18mode
+    - rvm: ruby-head

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'coveralls', require: false
+
 # Specify your gem's dependencies in expects.gemspec
-gemspec
+gemspec

data/README.md

@@ -1,6 +1,8 @@
 # Expects
 
-A DSL for defining input expectations for methods
+A DSL for validating input for methods
+
+[![Coverage Status](https://coveralls.io/repos/Arcath/expects/badge.png?branch=master)](https://coveralls.io/r/Arcath/expects?branch=master) [![Build Status](https://travis-ci.org/Arcath/expects.png?branch=master)](https://travis-ci.org/Arcath/expects) [![Code Climate](https://codeclimate.com/github/Arcath/expects.png)](https://codeclimate.com/github/Arcath/expects)
 
 ## Installation
 

data/lib/expects.rb

@@ -1,18 +1,31 @@
 # Version Number
 require 'expects/version'
-# Error
+# Classes
 require 'expects/error'
+require 'expects/handler'
 
 module Expects
   module ClassMethods
     def expects(subject, objects)
-      objects = [objects] unless objects.is_a? Array
-      raise UnexpectedInput.new(subject, objects) unless objects.include? subject.class
+      if objects.is_a? Regexp
+        handler = Expects::Handlers::Regex.new(subject, objects)
+      elsif objects.is_a? Proc
+        handler = Expects::Handlers::Proc.new(subject, objects)
+      else
+        handler = Expects::Handler.new(subject, [*objects])
+      end
+      handler.accept!
     end
     
     def reject(subject, objects)
-      objects = [objects] unless objects.is_a? Array
-      raise UnexpectedInput.new(subject, objects) if objects.include? subject.class
+      if objects.is_a? Regexp
+        handler = Expects::Handlers::Regex.new(subject, objects)
+      elsif objects.is_a? Proc
+        handler = Expects::Handlers::Proc.new(subject, objects)
+      else
+        handler = Expects::Handler.new(subject, [*objects])
+      end
+      handler.reject!
     end
   end
   
@@ -30,3 +43,7 @@ module Expects
   
   private :expects, :reject
 end
+
+# Handlers
+require 'expects/handlers/proc'
+require 'expects/handlers/regex'

data/lib/expects/error.rb

@@ -1,15 +1,12 @@
 class UnexpectedInput < StandardError
   attr_reader :subject, :expected
   
-  def initialize(subject = nil, expected = nil)
-    @subject, @expected = subject, expected
+  def initialize(handler)
+    @handler = handler
+    @subject, @expected = handler.subject, handler.objects
   end
   
   def message
-    @message ||= build_message
-  end
-  
-  def build_message
-    "Expected #{@subject.inspect} to be #{expected.join(", ")}"
+    @message ||= @handler.build_message
   end
 end

data/lib/expects/handler.rb

@@ -0,0 +1,26 @@
+module Expects
+  class Handler
+    attr_reader :subject, :objects
+    
+    def initialize(subject, objects)
+      @subject = subject
+      @objects = objects
+    end
+    
+    def valid?
+      @objects.include? @subject.class
+    end
+    
+    def accept!
+      raise UnexpectedInput.new(self) unless valid?
+    end
+    
+    def reject!
+      raise UnexpectedInput.new(self) if valid?
+    end
+    
+    def build_message
+      "Expected #{@subject.inspect} to be #{@objects.join(", ")}"
+    end
+  end
+end

data/lib/expects/handlers/proc.rb

@@ -0,0 +1,20 @@
+module Expects
+  module Handlers
+    class Proc < Expects::Handler
+      include Expects
+      
+      def initialize(subject, objects)
+        expects objects, ::Proc
+        super
+      end
+      
+      def valid?
+        @objects.call(@subject)
+      end
+      
+      def build_message
+        "Expected #{@subject.inspect} to get a true from the proc"
+      end
+    end
+  end
+end

data/lib/expects/handlers/regex.rb

@@ -0,0 +1,21 @@
+module Expects
+  module Handlers
+    class Regex < Expects::Handler
+      include Expects
+      
+      def initialize(subject, objects)
+        expects subject, String
+        expects objects, Regexp
+        super
+      end
+      
+      def valid?
+        @subject.match(@objects)
+      end
+      
+      def build_message
+        "Expected #{@subject.inspect} match \"#{@objects.inspect}\""
+      end
+    end
+  end
+end

data/lib/expects/version.rb

@@ -1,3 +1,3 @@
 module Expects
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/expects_error_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe UnexpectedInput do
   let(:error) do
-    UnexpectedInput.new(1234, [String])
+    UnexpectedInput.new(Expects::Handler.new(1234, [String]))
   end
   
   let(:test_class) do

data/spec/handlers/proc_handler_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe Expects::Handlers::Proc do
+  
+  let(:test_class) do
+    Class.new do
+      include Expects
+      
+      def initialize(array)
+        expects array, Proc.new(){ |array| array.length >= 3 }
+      end
+      
+      def not_good(array)
+        reject array, Proc.new(){ |array| array.length >= 3 }
+      end
+    end
+  end
+  
+  let(:fail_array) do
+    [1,2]
+  end
+  
+  let(:pass_array) do
+    [1,2,3,4,5]
+  end
+  
+  let(:working_instance) do
+    test_class.new(pass_array)
+  end
+  
+  it "should take a proc" do
+    lambda { test_class.new(pass_array) }.should_not raise_exception
+  end
+  
+  it "should raise an error if the proc returns false" do
+    lambda { test_class.new(fail_array) }.should raise_exception UnexpectedInput
+  end
+  
+  it "should support rejection" do
+    lambda { working_instance.not_good(pass_array) }.should raise_exception UnexpectedInput
+  end
+end

data/spec/handlers/regex_handler_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Expects::Handlers::Regex do
+  
+  let(:user) do
+    Class.new do
+      include Expects
+      
+      def initialize(name, email)
+        expects name, String
+        expects email, /^.*\@.*$/
+      end
+      
+      def not_email(email)
+        reject email, /^.*\@.*$/
+      end
+    end
+  end
+  
+  it "should only take a string and a regex pattern" do
+    lambda { Expects::Handlers::Regex.new("foo", /foo/) }.should_not raise_exception
+    lambda { Expects::Handlers::Regex.new(/foo/, "foo") }.should raise_exception
+  end
+  
+  it "should let you pass regex to expects" do
+    lambda { user.new("foo", "foo@bar.com") }.should_not raise_exception
+  end
+  
+  it "should raise an exception if the subject doesn't match the supplied pattern" do
+    lambda { user.new("foo", "foobar.com") }.should raise_exception
+  end
+  
+  it "should support reject aswell" do
+    lambda { user.new("foo", "foo@bar.com").not_email("foo@bar.com") }.should raise_exception
+  end
+end

data/spec/spec_helper.rb

@@ -1 +1,4 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'expects'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expects
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Adam Laycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -53,9 +54,14 @@ files:
 - expects.gemspec
 - lib/expects.rb
 - lib/expects/error.rb
+- lib/expects/handler.rb
+- lib/expects/handlers/proc.rb
+- lib/expects/handlers/regex.rb
 - lib/expects/version.rb
 - spec/expects_error_spec.rb
 - spec/expects_spec.rb
+- spec/handlers/proc_handler_spec.rb
+- spec/handlers/regex_handler_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -84,5 +90,7 @@ summary: A DSL for method inpu expectations
 test_files:
 - spec/expects_error_spec.rb
 - spec/expects_spec.rb
+- spec/handlers/proc_handler_spec.rb
+- spec/handlers/regex_handler_spec.rb
 - spec/spec_helper.rb
 has_rdoc: