option 0.0.2 → 0.0.3

data/.travis.yml

@@ -8,3 +8,5 @@ rvm:
   - rbx-19mode
   - ruby-head
   - jruby-head
+  - 1.8.7
+  - ree

data/lib/option.rb

@@ -105,6 +105,7 @@ class NoneClass < OptionClass
 end
 
 None = NoneClass.new
+Some = SomeClass
 
 def Some(value)
   SomeClass.new(value)

data/lib/option/version.rb

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

data/option.gemspec

@@ -16,6 +16,5 @@ Gem::Specification.new do |gem|
   gem.version       = Option::VERSION
 
   gem.add_development_dependency "rake",     "= 0.9.2.2"
-  gem.add_development_dependency "rr",       "= 1.0.4"
   gem.add_development_dependency "minitest", "= 3.4.0"
 end

data/spec/option_spec.rb

@@ -1,13 +1,8 @@
 require "minitest/autorun"
 require "minitest/spec"
 
-require "rr"
-require "rr/adapters/rr_methods"
-
 require "option"
 
-include RR::Adapters::RRMethods
-
 def value
   12
 end
@@ -27,12 +22,10 @@ describe NoneClass do
   end
 
   it "#foreach does not execute the block" do
-    blk = proc {}
-    dont_allow(blk).call
+    expected = nil
+    None.foreach { |v| expected = v }
 
-    None.foreach(&blk)
-
-    RR.verify
+    expected.must_be_nil
   end
 
   it "#or_nil should return nil" do
@@ -75,12 +68,10 @@ describe SomeClass do
   end
 
   it "#get_or_else does not execute the block;" do
-    blk = proc { value }
-    dont_allow(blk).call
-
-    Some(value).get_or_else(&blk)
+    expected = nil
+    Some(value).get_or_else { expected = true }
 
-    RR.verify
+    expected.must_be_nil
   end
 
   it "#get_or_else returns the value" do
@@ -88,12 +79,10 @@ describe SomeClass do
   end
 
   it "#foreach executes the block passing the inner value" do
-    blk = proc {}
-    mock(blk).call(value)
+    expected = nil
+    Some(value).foreach { |v| expected = v }
 
-    Some(value).foreach(&blk)
-
-    RR.verify
+    expected.must_equal(value)
   end
 
   it "#or_nil should return the inner value" do
@@ -133,11 +122,11 @@ describe SomeClass do
   end
 
   it "should wrap the creation of a Some" do
-    mock(SomeClass).new(value)
-
-    Some(value)
+    Some(value).must_be_instance_of(SomeClass)
+  end
 
-    RR.verify
+  it "should be aliased to Some" do
+    Some.new(value).must_equal(Some(value))
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: option
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70192629393660 !ruby/object:Gem::Requirement
+  requirement: &70272275046440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,21 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70192629393660
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &70192629393160 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :development
-  prerelease: false
-  version_requirements: *70192629393160
+  version_requirements: *70272275046440
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70192629392700 !ruby/object:Gem::Requirement
+  requirement: &70272275062320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +32,7 @@ dependencies:
         version: 3.4.0
   type: :development
   prerelease: false
-  version_requirements: *70192629392700
+  version_requirements: *70272275062320
 description: Ruby port of Scala's Option Monad
 email:
 - rob.ares@gmail.com