case 0.2.2 → 0.3

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/clean'
 
-GEM_VERSION = "0.2.2"
+GEM_VERSION = "0.3"
 
 Rake::RDocTask.new do |task|
   task.rdoc_files.add [ 'lib/**/*.rb' ]

data/lib/case.rb

@@ -26,12 +26,23 @@ class Any
     @options = options
   end
 
-  def options
-    @options.dup
+  def ===(obj)
+    @options.any? { |e| e === obj }
+  end
+end
+
+# Pattern-matching conjunction
+class All
+  class << self
+    alias_method :[], :new
+  end
+
+  def initialize(*patterns)
+    @patterns = patterns
   end
 
   def ===(obj)
-    @options.any? { |e| e === obj }
+    @patterns.all? { |e| e === obj }
   end
 end
 
@@ -53,7 +64,7 @@ class Array < ::Array
   end
 end
 
-class Predicate
+class Guard
   def initialize(&predicate)
     @predicate = predicate
   end
@@ -63,6 +74,10 @@ class Predicate
   end
 end
 
+def self.guard(&predicate)
+  Guard.new &predicate
+end
+
 # Shorthand for Case::Array.[]
 def self.[](*args)
   Array[*args]

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: case
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: "0.3"
 date: 2008-01-17 00:00:00 -05:00
 summary: Pattern matching for Ruby
 require_paths: