Add aliases for Boolean attribute class

* It will now be possible to specify TrueClass or FalseClass for a Boolean attribute.
dkubb · Jun 19, 2013 · d995759 · d995759
1 parent 61e00ab
commit d995759
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/config/flay.yml b/config/flay.yml
@@ -1,3 +1,3 @@
 ---
 threshold: 41
-total_score: 945.0
+total_score: 947.0
diff --git a/lib/axiom/attribute.rb b/lib/axiom/attribute.rb
@@ -68,7 +68,7 @@ def self.name_from(object)
     def self.infer_type(operand)
       case operand
       when Attribute, Function, Aggregate then operand.type
-      when FalseClass                     then Boolean
+      when ::FalseClass                   then Boolean
       else
         type = operand.class
         descendants.detect { |descendant| type <= descendant.primitive }

diff --git a/lib/axiom/attribute/boolean.rb b/lib/axiom/attribute/boolean.rb
@@ -18,7 +18,7 @@ class Boolean < Object
       #
       # @api public
       def self.primitive
-        TrueClass
+        ::TrueClass
       end
 
       # Test if the value is a boolean
@@ -33,9 +33,14 @@ def self.primitive
       #
       # @api public
       def valid_value?(value)
-        valid_or_optional?(value) { super || value.kind_of?(FalseClass) }
+        valid_or_optional?(value) { super || value.kind_of?(::FalseClass) }
       end
 
     end # class Boolean
+
+    # Add aliases for Boolean
+    TrueClass  = Boolean
+    FalseClass = Boolean
+
   end # class Attribute
 end # module Axiom
diff --git a/spec/unit/axiom/algebra/join/methods/join_spec.rb b/spec/unit/axiom/algebra/join/methods/join_spec.rb
@@ -18,7 +18,7 @@
     context 'with a block' do
       subject { object.send(method, other, &block) }
 
-      let(:other) { described_class.new([ Attribute::Boolean.new(:active) ], [ [ true ] ]) }
+      let(:other) { described_class.new([ [ :active, TrueClass ] ], [ [ true ] ]) }
       let(:block) do
         lambda do |relation|
           relation[:id].eq(1).and(relation[:active].eq(true))