b001e 0.0.0a → 0.0.1

data/README.rst

@@ -39,7 +39,7 @@ Operator / keyword style::
 
 becomes::
 
-	c1.and { c2 }.ifelse ->() { t }, ->() { c3.ifelse ->() { ei }, ->() { e } }
+	c1.and { c2 }.ifelse ->{ t }, ->{ c3.ifelse ->{ ei }, ->{ e } }
 
 .. _Smalltalk: http://Smalltalk.Org/
 
@@ -81,21 +81,19 @@ Installation
 
 ::
 
-	gem install JoergWMittag-b001e
+	gem install b001e
 
 Usage
 =====
 
 ::
 
-	begin require 'rubygems'; rescue LoadError
-	else begin gem 'JoergWMittag-b001e', '~> 0.0.3'; rescue Gem::LoadError; end end
 	require 'b001e'
 
 	true.and { nil.or { 42 } }.if { puts "It's true!" }
 	# Equivalent to: if true && (nil || 42) then puts "It's true!" end
 
-	false.ifelse ->() { puts "You'll never see this." }, ->() { puts 'But this!' }
+	false.ifelse ->{ puts "You'll never see this." }, ->{ puts 'But this!' }
 	# Equivalent to: if false then puts "You'll never see this." else puts 'But this!' end
 
 Acknowledgements

data/Rakefile.rb

@@ -6,7 +6,12 @@
 
 require 'rake'
 
-taskdir = File.expand_path File.join(File.dirname(__FILE__), 'tasks')
-$LOAD_PATH.unshift taskdir unless $LOAD_PATH.include? taskdir
+basedir = File.expand_path File.dirname(__FILE__)
+taskdir = File.expand_path File.join(basedir, 'tasks')
+specdir = File.expand_path File.join(basedir, 'spec')
+libdir  = File.expand_path File.join(basedir, 'lib')
+
+$LOAD_PATH.unshift(specdir) unless $LOAD_PATH.include?(specdir)
+$LOAD_PATH.unshift(libdir)  unless $LOAD_PATH.include?(libdir)
 
 FileList[File.join taskdir, '**', '*_task.rb'].each { |raketask| load raketask }

data/b001e.gemspec

@@ -34,7 +34,7 @@ speclist = filelist.grep /^spec/
 $spec = Gem::Specification.new do |s|
   s.name = 'b001e'
   s.summary = 'Message-sending based re-implementation of the Boolean operators.'
-  s.version = Gem::Version.new '0.0.0a'
+  s.version = Gem::Version.new '0.0.1'
   s.author = 'Jörg W Mittag'
   s.email = 'JoergWMittag+B001e@GoogleMail.Com'
   s.homepage = 'http://JoergWMittag.GitHub.Com/b001e/'

data/lib/b001e.rb

@@ -3,9 +3,6 @@
 #Copyright (c) 2009 Jörg W Mittag <JoergWMittag+B001e@GoogleMail.Com>
 #This code is licensed under the terms of the MIT License (see LICENSE.txt)
 
-libdir = File.expand_path(File.dirname __FILE__).gsub(/(.*lib).*?/, '\1')
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include? libdir
-
 require 'b001e/extensions/core/object_extensions'
 require 'b001e/extensions/core/true_class_extensions'
 require 'b001e/extensions/core/false_class_extensions'

data/lib/b001e/extensions/core/false_class_extensions.rb

@@ -3,9 +3,6 @@
 #Copyright (c) 2009 Jörg W Mittag <JoergWMittag+B001e@GoogleMail.Com>
 #This code is licensed under the terms of the MIT License (see LICENSE.txt)
 
-libdir = File.expand_path(File.dirname __FILE__).gsub(/(.*lib).*?/, '\1')
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include? libdir
-
 require 'b001e/falsiness'
 
 module B001e

data/lib/b001e/extensions/core/nil_class_extensions.rb

@@ -3,9 +3,6 @@
 #Copyright (c) 2009 Jörg W Mittag <JoergWMittag+B001e@GoogleMail.Com>
 #This code is licensed under the terms of the MIT License (see LICENSE.txt)
 
-libdir = File.expand_path(File.dirname __FILE__).gsub(/(.*lib).*?/, '\1')
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include? libdir
-
 require 'b001e/falsiness'
 
 module B001e

data/lib/b001e/extensions/core/object_extensions.rb

@@ -3,9 +3,6 @@
 #Copyright (c) 2009 Jörg W Mittag <JoergWMittag+B001e@GoogleMail.Com>
 #This code is licensed under the terms of the MIT License (see LICENSE.txt)
 
-libdir = File.expand_path(File.dirname __FILE__).gsub(/(.*lib).*?/, '\1')
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include? libdir
-
 require 'b001e/truthiness'
 
 module B001e

data/lib/b001e/extensions/core/true_class_extensions.rb

@@ -3,9 +3,6 @@
 #Copyright (c) 2009 Jörg W Mittag <JoergWMittag+B001e@GoogleMail.Com>
 #This code is licensed under the terms of the MIT License (see LICENSE.txt)
 
-libdir = File.expand_path(File.dirname __FILE__).gsub(/(.*lib).*?/, '\1')
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include? libdir
-
 require 'b001e/truthiness'
 
 module B001e

data/lib/b001e/falsiness.rb

@@ -3,16 +3,13 @@
 #Copyright (c) 2009 Jörg W Mittag <JoergWMittag+B001e@GoogleMail.Com>
 #This code is licensed under the terms of the MIT License (see LICENSE.txt)
 
-libdir = File.expand_path(File.dirname __FILE__).gsub(/(.*lib).*?/, '\1')
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include? libdir
-
 module B001e
   module Falsiness
     def if
     end
 
-    def ifelse _ = nil, else_branch = ->() {}
-      else_branch.call
+    def ifelse _ = nil, else_branch = ->{}
+      else_branch.()
     end
 
     def unless

data/lib/b001e/truthiness.rb

@@ -3,23 +3,20 @@
 #Copyright (c) 2009 Jörg W Mittag <JoergWMittag+B001e@GoogleMail.Com>
 #This code is licensed under the terms of the MIT License (see LICENSE.txt)
 
-libdir = File.expand_path(File.dirname __FILE__).gsub(/(.*lib).*?/, '\1')
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include? libdir
-
 module B001e
   module Truthiness
     def if
       yield
     end
 
-    def ifelse then_branch = ->() {}, _ = nil
-      then_branch.call
+    def ifelse then_branch = ->{}, _ = nil
+      then_branch.()
     end
 
     def unless
     end
 
-    def unlesselse _ = nil, else_branch = ->() {}
+    def unlesselse _ = nil, else_branch = ->{}
       ifelse else_branch, _
     end
 

data/spec/and_spec.rb

@@ -4,8 +4,7 @@
 #Copyright (c) 2008 Engine Yard, Inc. All rights reserved.
 #This code was directly ported from <https://GitHub.Com/RubySpec/RubySpec/tree/master/language/and_spec.rb>
 
-require File.expand_path File.join(File.dirname(__FILE__), 'spec_helper')
-
+require 'spec_helper'
 require 'b001e'
 
 describe "The 'and' operator" do

data/spec/b001e_suite.rb

@@ -5,7 +5,6 @@
 #This code is licensed under the terms of the MIT License (see LICENSE.txt)
 
 specdir = File.expand_path(File.dirname __FILE__).gsub(/(.*spec).*?/, '\1')
-$LOAD_PATH.unshift specdir unless $LOAD_PATH.include? specdir
 
 require 'spec_helper'
 

data/spec/if_spec.rb

@@ -4,8 +4,7 @@
 #Copyright (c) 2008 Engine Yard, Inc. All rights reserved.
 #This code was directly ported from <https://GitHub.Com/RubySpec/RubySpec/tree/master/language/if_spec.rb>
 
-require File.expand_path File.join(File.dirname(__FILE__), 'spec_helper')
-
+require 'spec_helper'
 require 'b001e'
 
 describe 'The if expression' do
@@ -24,12 +23,12 @@ describe 'The if expression' do
   end
 
   it 'does not evaluate else-body if expression is true' do
-    true.ifelse ->() { @result << 123 }, ->() { @result << 456 }
+    true.ifelse ->{ @result << 123 }, ->{ @result << 456 }
     @result.must_equal [123]
   end
 
   it 'evaluates only else-body if expression is false' do
-    false.ifelse ->() { @result << 123 }, ->() { @result << 456 }
+    false.ifelse ->{ @result << 123 }, ->{ @result << 456 }
     @result.must_equal [456]
   end
 
@@ -45,11 +44,11 @@ describe 'The if expression' do
   end
 
   it 'returns result of then-body evaluation if expression is true and else part is present' do
-    true.ifelse(->() { 123 }, ->() { 456 }).must_equal 123
+    true.ifelse(->{ 123 }, ->{ 456 }).must_equal 123
   end
 
   it 'returns result of else-body evaluation if expression is false' do
-    false.ifelse(->() { 123 }, ->() { 456 }).must_equal 456
+    false.ifelse(->{ 123 }, ->{ 456 }).must_equal 456
   end
 
   it 'returns nil if then-body is empty and expression is true' do
@@ -57,7 +56,7 @@ describe 'The if expression' do
   end
 
   it 'returns nil if then-body is empty, expression is true and else part is present' do
-    true.ifelse(->() {}, ->() { 456 }).must_be_nil
+    true.ifelse(->{}, ->{ 456 }).must_be_nil
   end
 
   it 'returns nil if then-body is empty, expression is true and else part is empty' do
@@ -65,7 +64,7 @@ describe 'The if expression' do
   end
 
   it 'returns nil if else-body is empty and expression is false' do
-    false.ifelse(->() { 123 }).must_be_nil
+    false.ifelse(->{ 123 }).must_be_nil
   end
 
   it 'returns nil if else-body is empty, expression is false and then-body is empty' do
@@ -73,22 +72,22 @@ describe 'The if expression' do
   end
 
   it 'considers an expression with nil result as false' do
-    nil.ifelse(->() { 123 }, ->() { 456 }).must_equal 456
+    nil.ifelse(->{ 123 }, ->{ 456 }).must_equal 456
   end
 
   it 'considers a non-nil and non-boolean object in expression result as true' do
-    MiniTest::Mock.new.ifelse(->() { 123 }, ->() { 456 }).must_equal 123
+    MiniTest::Mock.new.ifelse(->{ 123 }, ->{ 456 }).must_equal 123
   end
 
   it 'considers a zero integer in expression result as true' do
-    0.ifelse(->() { 123 }, ->() { 456 }).must_equal 123
+    0.ifelse(->{ 123 }, ->{ 456 }).must_equal 123
   end
 
   it 'evaluates subsequent elsif statements and execute body of first matching' do
-    false.ifelse(->() { 123 }, ->() { false.ifelse ->() { 234 }, ->() { true.ifelse ->() { 345 }, ->() { true.if { 456 } } } }).must_equal 345
+    false.ifelse(->{ 123 }, ->{ false.ifelse ->{ 234 }, ->{ true.ifelse ->{ 345 }, ->{ true.if { 456 } } } }).must_equal 345
   end
 
   it 'evaluates else-body if no if/elsif statements match' do
-    false.ifelse(->() { 123 }, ->() { false.ifelse ->() { 234 }, ->() { false.ifelse ->() { 345 }, ->() { 456 } } }).must_equal 456
+    false.ifelse(->{ 123 }, ->{ false.ifelse ->{ 234 }, ->{ false.ifelse ->{ 345 }, ->{ 456 } } }).must_equal 456
   end
 end

data/spec/unless_spec.rb

@@ -4,13 +4,12 @@
 #Copyright (c) 2008 Engine Yard, Inc. All rights reserved.
 #This code was directly ported from <https://GitHub.Com/RubySpec/RubySpec/tree/master/language/unless_spec.rb>
 
-require File.expand_path File.join(File.dirname(__FILE__), 'spec_helper')
-
+require 'spec_helper'
 require 'b001e'
 
 describe 'The unless expression' do
   it 'evaluates the unless body when the expression is false' do
-    false.unlesselse ->() { @result = true }, ->() { @result = false }
+    false.unlesselse ->{ @result = true }, ->{ @result = false }
     @result.must_equal true
   end
 
@@ -22,7 +21,7 @@ describe 'The unless expression' do
   end
 
   it 'evaluates the else body when the expression is true' do
-    true.unlesselse(->() { :foo }, ->() { :bar }).must_equal :bar
+    true.unlesselse(->{ :foo }, ->{ :bar }).must_equal :bar
   end
 
   it 'does not return a value when the expression is true' do

data/tasks/_default_task.rb

@@ -3,7 +3,4 @@
 
 require 'rake'
 
-taskdir = File.expand_path(File.dirname __FILE__).gsub(/(.*tasks).*?/, '\1')
-$LOAD_PATH.unshift taskdir unless $LOAD_PATH.include? taskdir
-
 task :default => :spec

data/tasks/gem_task.rb

@@ -5,10 +5,7 @@ require 'rake'
 require 'rake/gempackagetask'
 
 taskdir = File.expand_path(File.dirname __FILE__).gsub(/(.*tasks).*?/, '\1')
-$LOAD_PATH.unshift taskdir unless $LOAD_PATH.include? taskdir
-
 basedir = File.expand_path File.join(taskdir, '..')
-$LOAD_PATH.unshift basedir unless $LOAD_PATH.include? basedir
 
 load Dir[File.expand_path File.join(basedir, '*.gemspec')].first
 

data/tasks/spec_task.rb

@@ -4,9 +4,9 @@
 require 'rake'
 
 taskdir = File.expand_path(File.dirname __FILE__).gsub(/(.*tasks).*?/, '\1')
-$LOAD_PATH.unshift taskdir unless $LOAD_PATH.include? taskdir
+specdir = File.expand_path(File.join(taskdir, '..', 'spec'))
 
 desc 'Run the Specs'
 task :spec do
-  FileList[File.join taskdir, '..', 'spec', '**', '*_suite.rb'].each { |specsuite| require specsuite }
+  FileList[File.join specdir, '**', '*_suite.rb'].each { |specsuite| require specsuite }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: b001e
 version: !ruby/object:Gem::Version 
-  version: 0.0.0a
+  version: 0.0.1
 platform: ruby
 authors: 
 - "J\xC3\xB6rg W Mittag"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 +01:00
+date: 2010-01-01 00:00:00 +01:00
 default_executable: 
 dependencies: []