custom_boolean 0.1.0 → 0.1.1

data/examples/example_horse.rb

@@ -0,0 +1,18 @@
+require '../lib/custom_boolean'
+
+# only :horse is true
+CustomBoolean.truth_test = proc { |b| b == :horse }
+
+if?(true) {
+  puts 'evaluates to true' 
+}.
+else {
+  puts 'reached else'
+}
+
+if?(:horse) {
+  puts 'evaluates to true' 
+}.
+else {
+  puts 'reached else'
+}

data/examples/example_nested.rb

@@ -0,0 +1,21 @@
+require '../lib/custom_boolean'
+
+x = :delighted
+y = :aroused
+
+if?(x == :sad) {
+  puts 'evaluates to true' 
+}.
+else_if(x == :delighted) {
+  if?(y == :happy) {
+    puts 'delighted and happy'
+  }.
+  else_if(y == :aroused) {
+    puts 'delighted and aroused'
+  }.
+  else { puts 'just delighted' }
+}.
+else {
+  puts 'not delighted'
+}
+

data/examples/example_operators.rb

@@ -0,0 +1,11 @@
+require '../lib/custom_boolean'
+
+CustomBoolean.truth_test = CustomBoolean::PERL_TRUTH
+
+x = "0"
+if?(negate(x)) {
+  puts 'evaluates to true' 
+}.
+else {
+  puts 'reached else'
+}

data/lib/custom_boolean.rb

@@ -1,26 +1,32 @@
 # CustomBoolean by John Mair (banisterfiend)
 # MIT license
 
-module CustomBooleanOperators
-  def &(other)
-    CustomBoolean.truthy?(self) && CustomBoolean.truthy?(other)
-  end
-  alias and &
-  
-  def |(other)
-    CustomBoolean.truthy?(self) || CustomBoolean.truthy?(other)
+
+direc = File.dirname(__FILE__)
+require "#{direc}/custom_boolean/version"
+
+class CustomBoolean
+  module Operators
+    def &(other)
+      CustomBoolean.truthy?(self) && CustomBoolean.truthy?(other)
+    end
+    alias_method :and, :"&"
+    
+    def |(other)
+      CustomBoolean.truthy?(self) || CustomBoolean.truthy?(other)
+    end
+    alias_method :or, :"|"
   end
-  alias or |
 end
 
-true.extend(CustomBooleanOperators)
-false.extend(CustomBooleanOperators)
-Object.send(:include, CustomBooleanOperators)
+true.extend(CustomBoolean::Operators)
+false.extend(CustomBoolean::Operators)
+Object.send(:include, CustomBoolean::Operators)
 
-def negate(other)
-  !CustomBoolean.truthy?(self)
+def negate(expr)
+  !CustomBoolean.truthy?(expr)
 end
-  
+
 def if_(condition, &block)
   truth = !!CustomBoolean.truthy?(condition)
   bvalue = block.call if truth
@@ -52,7 +58,7 @@ class CustomBoolean
   STRICT_TRUTH = proc { |expr| raise "Expression must be strictly true or false." if expr != true && expr != false; expr }
   PERL_TRUTH = proc { |expr| expr && expr != 0 && expr != "" && expr != "0" }
   C_TRUTH = proc { |expr| expr && expr != 0 }
-    
+  
   # default truth test is Ruby's
   self.truth_test = RUBY_TRUTH
   

data/lib/custom_boolean/version.rb

@@ -1,3 +1,3 @@
 class CustomBoolean
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/test.rb

@@ -319,6 +319,104 @@ class CustomBooleanTest < Test::Unit::TestCase
     end
     CustomBoolean.truth_test = CustomBoolean::RUBY_TRUTH
   end
+
+  def test_perl_truth_operators
+    CustomBoolean.truth_test = CustomBoolean::PERL_TRUTH
+
+    truthy_value = "0"
+    
+    [:and, :or].each do |o|
+      v = +if?(truthy_value.send(o, true)) {
+        true
+      }.
+      else! {
+        false
+      }
+
+      assert_equal(true, v) if o == :or
+        assert_equal(false, v) if o == :and
+    end
+
+    v = +if?(negate(truthy_value)) {
+            true
+              }.
+            else! {
+                false
+              }
+
+    assert_equal(true, v)
+    
+    CustomBoolean.truth_test = CustomBoolean::RUBY_TRUTH
+  end
+             
+  def test_python_truth_operators
+    CustomBoolean.truth_test = CustomBoolean::PYTHON_TRUTH
+
+    truthy_value = []
+    [:and, :or].each do |o|
+      v = +if?(truthy_value.send(o, true)) {
+        true
+      }.
+      else! {
+        false
+      }
+
+      assert_equal(true, v) if o == :or
+        assert_equal(false, v) if o == :and
+    end
+
+    v = +if?(negate(truthy_value)) {
+            true
+              }.
+            else! {
+                false
+              }
+
+    assert_equal(true, v)
+    
+    CustomBoolean.truth_test = CustomBoolean::RUBY_TRUTH
+  end
+
+  def test_c_truth_operators
+    CustomBoolean.truth_test = CustomBoolean::C_TRUTH
+
+    truthy_value = 0
+    [:and, :or].each do |o|
+      v = +if?(truthy_value.send(o, true)) {
+        true
+      }.
+      else! {
+        false
+      }
+
+      assert_equal(true, v) if o == :or
+        assert_equal(false, v) if o == :and
+    end
+
+    v = +if?(negate(truthy_value)) {
+            true
+              }.
+            else! {
+                false
+              }
+
+    assert_equal(true, v)
+    
+    CustomBoolean.truth_test = CustomBoolean::RUBY_TRUTH
+  end
+
+  def test_if_expression
+    CustomBoolean.truth_test = CustomBoolean::RUBY_TRUTH
+
+    v = +if?(true) {
+      :hero
+    }.
+    else {
+      :ostrich
+    }
+
+    assert_equal(:hero, v)
+  end
 end
 
  

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: custom_boolean
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 +13:00
+date: 2010-09-28 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +33,9 @@ files:
 - lib/custom_boolean.rb
 - lib/custom_boolean/version.rb
 - examples/example.rb
+- examples/example_horse.rb
+- examples/example_nested.rb
+- examples/example_operators.rb
 - test/test.rb
 has_rdoc: true
 homepage: http://banisterfiend.wordpress.com
@@ -49,7 +51,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -58,7 +59,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"