optional 0.0.6 → 0.0.7

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - rbx-19mode

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    optional (0.0.5)
+    optional (0.0.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.1)
     multi_json (1.7.2)
+    rake (10.0.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -26,5 +27,6 @@ PLATFORMS
 
 DEPENDENCIES
   optional!
+  rake
   rspec
   simplecov

data/README.md

@@ -1,6 +1,9 @@
 # optional
 ## option types to make nils a thing of the past
 
+[![Build Status](https://travis-ci.org/rsslldnphy/optional.png?branch=master)](https://travis-ci.org/rsslldnphy/optional)
+[![Code Climate](https://codeclimate.com/github/rsslldnphy/optional.png)](https://codeclimate.com/github/rsslldnphy/optional)
+
 Tony Hoare, inventor of the null reference, calls it his "billion-dollar mistake".
 You will be no stranger to the ubiquitous `NoMethodError: undefined method 'foo' for nil:NilClass`.
 But it doesn't have to be this way.
@@ -114,6 +117,11 @@ You can simply use the `collection` key when rendering the partial - you don't e
 
     <%= render partial: 'hat', collection: @person.hat %>
 
+You can also use `select` and `reject` to assert things about the value:
+
+    Some[5].select(&:odd?) # => Some[5]
+    Some[5].reject(&:odd?) # => None
+
 And one last useful example, `flatten`:
 
     Some[Some[5], None, Some[7]].flatten # => Some[5,7]

data/Rakefile

@@ -0,0 +1,8 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+
+task :default => :spec
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new

data/lib/optional.rb

@@ -1 +1,7 @@
-require_relative 'optional/all'
+require 'optional/option/enumerable'
+require 'optional/option/errors'
+require 'optional/option/match'
+
+require 'optional/option'
+require 'optional/some'
+require 'optional/none'

data/lib/optional/option/enumerable.rb

@@ -15,7 +15,7 @@ module Option
     end
 
     def map_through(*methods)
-      map &methods.reduce(->(x){x}){ |acc, m| ->(x) { acc.call(x).send(m) } }
+      map &methods.reduce(lambda { |x| x}) { |acc, m| lambda { |x| acc.call(x).send(m) } }
     end
 
     def map

data/lib/optional/option/match.rb

@@ -42,7 +42,7 @@ module Option
 
     class SomeClause
 
-      def initialize(guard=always, block)
+      def initialize(guard=always, block=lambda{})
         @guard = guard
         @block = block
       end
@@ -60,7 +60,7 @@ module Option
       attr_reader :block
 
       def guard
-        @guard.is_a?(Proc) ? @guard : ->(x) { x == @guard }
+        @guard.is_a?(Proc) ? @guard : (lambda { |x| x == @guard })
       end
 
     end

data/lib/optional/some.rb

@@ -37,7 +37,7 @@ class Some
 
   def merge(other, &block)
     other.match do |m|
-      m.some { |v| block.nil? ? Some[*value, v] : Some[block.call(value, v)] }
+      m.some { |v| block.nil? ? Some[([value] + [v]).flatten] : Some[block.call(value, v)] }
       m.none { self }
     end
   end

data/optional.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'optional'
-  s.version       = '0.0.6'
+  s.version       = '0.0.7'
   s.date          = '2013-04-19'
   s.summary       = "Optional values with pattern matching"
   s.description   = "Make nils a thing of the past with Options!"
@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.homepage      = 'http://github.com/rsslldnphy/optional'
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"
 

data/spec/lib/optional/option/enumerable_spec.rb

@@ -43,14 +43,9 @@ describe Option::Enumerable do
   end
 
   describe "#flat_map" do
-    it 'works as expected over an array of options' do
-      [None, Some[3], None, Some[2]].flat_map do |x|
-        x.map(&:succ)
-      end.should eq [4,3]
-    end
 
-    it 'also works for a some that returns a nested some' do
-      x = Some[stub(y: Some[4])]
+    it 'works for a some that returns a nested some' do
+      x = Some[stub(:y => Some[4])]
       x.flat_map(&:y).should eq Some[4]
     end
   end

data/spec/lib/optional/option_spec.rb

@@ -33,8 +33,8 @@ describe Option do
 
     it "can take a lambda as a guard to match against" do
       Some[cat].match do |m|
-        m.some ->(pet) { pet.name == "DOGGIE!" } { :fishsticks }
-        m.some ->(pet) { pet.name == "MOGGIE!" } { :canteloupe }
+        m.some lambda { |pet| pet.name == "DOGGIE!" } do :fishsticks end
+        m.some lambda { |pet| pet.name == "MOGGIE!" } do :canteloupe end
       end.should eq :canteloupe
     end
   end

data/spec/spec_helper.rb

@@ -4,8 +4,8 @@ SimpleCov.start do
 end
 
 require 'rspec'
-require_relative 'support/cat'
-require_relative '../lib/optional'
+require 'support/cat'
+require 'optional'
 
 
 RSpec.configure do |config|

metadata

@@ -1,62 +1,83 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: optional
-version: !ruby/object:Gem::Version
-  version: 0.0.6
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
-authors:
+authors: 
 - Russell Dunphy
 - Radek Molenda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2013-04-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: simplecov
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Make nils a thing of the past with Options!
-email:
+email: 
 - russell@russelldunphy.com
 - radek.molenda@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
 - README.md
+- Rakefile
 - lib/optional.rb
 - lib/optional/all.rb
 - lib/optional/none.rb
@@ -69,39 +90,49 @@ files:
 - optional.gemspec
 - spec/lib/optional/none_spec.rb
 - spec/lib/optional/option/enumerable_spec.rb
+- spec/lib/optional/option/match_spec.rb
 - spec/lib/optional/option_spec.rb
 - spec/lib/optional/some_spec.rb
 - spec/spec_helper.rb
 - spec/support/cat.rb
 homepage: http://github.com/rsslldnphy/optional
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Optional values with pattern matching
-test_files:
+test_files: 
 - spec/lib/optional/none_spec.rb
 - spec/lib/optional/option/enumerable_spec.rb
+- spec/lib/optional/option/match_spec.rb
 - spec/lib/optional/option_spec.rb
 - spec/lib/optional/some_spec.rb
 - spec/spec_helper.rb
 - spec/support/cat.rb
-has_rdoc: