axiom 0.1.1 → 0.2.0

data/lib/axiom/attribute/comparable.rb

@@ -3,28 +3,23 @@
 module Axiom
   class Attribute
 
-    # A mixin for attributes that have comparable values
+    # A mixin for attributes that have comparable objects
     module Comparable
       include Function::Predicate::GreaterThan::Methods,
               Function::Predicate::GreaterThanOrEqualTo::Methods,
               Function::Predicate::LessThan::Methods,
-              Function::Predicate::LessThanOrEqualTo::Methods,
-              Aggregate::Minimum::Methods,
-              Aggregate::Maximum::Methods,
-              Aggregate::Mean::Methods,
-              Aggregate::Variance::Methods,
-              Aggregate::StandardDeviation::Methods
+              Function::Predicate::LessThanOrEqualTo::Methods
 
       # Sort the attribute in ascending order
       #
       # @example
       #   ascending = attribute.asc
       #
-      # @return [Relation::Operation::Order::Ascending]
+      # @return [Axiom::Relation::Operation::Sorted::Ascending]
       #
       # @api public
       def asc
-        Relation::Operation::Order::Ascending.new(self)
+        Axiom::Relation::Operation::Sorted::Ascending.new(self)
       end
 
       # Sort the attribute in descending order
@@ -32,11 +27,20 @@ module Axiom
       # @example
       #   descending = attribute.desc
       #
-      # @return [Relation::Operation::Order::Descending]
+      # @return [Axiom::Relation::Operation::Sorted::Descending]
       #
       # @api public
       def desc
-        Relation::Operation::Order::Descending.new(self)
+        Axiom::Relation::Operation::Sorted::Descending.new(self)
+      end
+
+      # The range for the objects
+      #
+      # @return [Range]
+      #
+      # @api public
+      def range
+        type.range
       end
 
     end # module Comparable

data/lib/axiom/attribute/date.rb

@@ -5,7 +5,7 @@ module Axiom
 
     # Represents a Date value in a relation tuple
     class Date < Object
-      include Comparable
+      include ValueComparable
 
       # The attribute type
       #

data/lib/axiom/attribute/date_time.rb

@@ -5,7 +5,7 @@ module Axiom
 
     # Represents a DateTime value in a relation tuple
     class DateTime < Object
-      include Comparable
+      include ValueComparable
 
       # The attribute type
       #

data/lib/axiom/attribute/length_comparable.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+module Axiom
+  class Attribute
+
+    # A mixin for attributes that have comparable lengths
+    module LengthComparable
+      include Comparable
+
+      # Initialize a length comparable attribute
+      #
+      # @param [#to_sym] _name
+      #   the attribute name
+      # @param [#to_hash] options
+      #   the options for the attribute
+      # @option options [Boolean] :required (true)
+      #   if true, then the value cannot be nil
+      # @option options [::Integer] :minimum_length
+      #   The minimum string length for a valid value
+      # @option options [::Integer] :maximum_length
+      #   The maximum string length for a valid value
+      #
+      # @return [undefined]
+      #
+      # @api private
+      def initialize(_name, options = EMPTY_HASH)
+        super
+        min, max = options.values_at(:minimum_length, :maximum_length)
+        if min || max
+          @type = type.new do
+            minimum_length(min) if min
+            maximum_length(max) if max
+          end
+        end
+      end
+
+    end # module LengthComparable
+  end # class Attribute
+end # module Axiom

data/lib/axiom/attribute/numeric.rb

@@ -5,7 +5,7 @@ module Axiom
 
     # Represents a Numeric value in a relation tuple
     class Numeric < Object
-      include Comparable,
+      include ValueComparable,
               Aggregate::Sum::Methods
 
       # The attribute type
@@ -20,31 +20,6 @@ module Axiom
         Types::Numeric
       end
 
-      # Initialize a Numeric Attribute
-      #
-      # @param [#to_sym] _name
-      #   the attribute name
-      # @param [#to_hash] options
-      #   the options for the attribute
-      # @option options [Boolean] :required (true)
-      #   if true, then the value cannot be nil
-      # @option options [Range<::Numeric>] :size
-      #   The numeric range for a valid value
-      #
-      # @return [undefined]
-      #
-      # @api private
-      def initialize(_name, options = EMPTY_HASH)
-        super
-        size = options[:size]
-        if size
-          @type = type.new do
-            minimum(size.first)
-            maximum(size.last)
-          end
-        end
-      end
-
     end # class Numeric
   end # class Attribute
 end # module Axiom

data/lib/axiom/attribute/relation.rb

@@ -0,0 +1,64 @@
+# encoding: utf-8
+
+module Axiom
+  class Attribute
+
+    # Represents a Relation value in a relation tuple
+    class Relation < Object
+      include Equalizer.new(:name, :header)
+
+      # The tuple header
+      #
+      # @return [Header]
+      #
+      # @api private
+      attr_reader :header
+
+      # Initialize a Relation Attribute
+      #
+      # @param [#to_sym] _name
+      #   the attribute name
+      # @param [Hash] options
+      #   the options for the attribute
+      # @option options [Boolean] :required (true)
+      #   if true, then the value cannot be nil
+      # @option options [Header] :header
+      #   the header for the relation
+      #
+      # @return [undefined]
+      #
+      # @api private
+      def initialize(_name, options)
+        super
+        @header = Axiom::Relation::Header.coerce(options.fetch(:header))
+      end
+
+      # The attribute type
+      #
+      # @example
+      #   type = Axiom::Attribute::Relation.type  # => Axiom::Types::Relation
+      #
+      # @return [Class<Types::Relation>]
+      #
+      # @api public
+      def self.type
+        Types::Relation
+      end
+
+      # Initialize a new relation with the tuples provided
+      #
+      # @example
+      #   relation = attribute.new_relation(tuples)
+      #
+      # @param [Enumerable] tuples
+      #
+      # @return [Relation]
+      #
+      # @api public
+      def new_relation(tuples)
+        type.primitive.new(@header, tuples)
+      end
+
+    end # class Relation
+  end # class Attribute
+end # module Axiom

data/lib/axiom/attribute/string.rb

@@ -5,7 +5,7 @@ module Axiom
 
     # Represents a String value in a relation tuple
     class String < Object
-      include Comparable,
+      include LengthComparable,
               Function::Predicate::Match::Methods,
               Function::Predicate::NoMatch::Methods
 
@@ -21,33 +21,6 @@ module Axiom
         Types::String
       end
 
-      # Initialize a String Attribute
-      #
-      # @param [#to_sym] _name
-      #   the attribute name
-      # @param [#to_hash] options
-      #   the options for the attribute
-      # @option options [Boolean] :required (true)
-      #   if true, then the value cannot be nil
-      # @option options [::Integer] :minimum_length
-      #   The minimum string length for a valid value
-      # @option options [::Integer] :maximum_length
-      #   The maximum string length for a valid value
-      #
-      # @return [undefined]
-      #
-      # @api private
-      def initialize(_name, options = EMPTY_HASH)
-        super
-        min, max = options.values_at(:minimum_length, :maximum_length)
-        if min || max
-          @type = type.new do
-            minimum_length(min) if min
-            maximum_length(max) if max
-          end
-        end
-      end
-
     end # class String
   end # class Attribute
 end # module Axiom

data/lib/axiom/attribute/time.rb

@@ -5,7 +5,7 @@ module Axiom
 
     # Represents a Time value in a relation tuple
     class Time < Object
-      include Comparable
+      include ValueComparable
 
       # The attribute type
       #

data/lib/axiom/attribute/tuple.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+module Axiom
+  class Attribute
+
+    # Represents a tuple value in a relation tuple
+    class Tuple < Object
+      include Equalizer.new(:name, :header)
+
+      # The header
+      #
+      # @return [Header]
+      #
+      # @api private
+      attr_reader :header
+
+      # Initialize a Tuple Attribute
+      #
+      # @param [#to_sym] _name
+      #   the attribute name
+      # @param [Hash] options
+      #   the options for the attribute
+      # @option options [Boolean] :required (true)
+      #   if true, then the value cannot be nil
+      # @option options [Header] :header
+      #   the header for the tuple
+      #
+      # @return [undefined]
+      #
+      # @api private
+      def initialize(_name, options)
+        super
+        @header = Axiom::Relation::Header.coerce(options.fetch(:header))
+      end
+
+      # The attribute type
+      #
+      # @example
+      #   type = Axiom::Attribute::Tuple.type  # => Axiom::Types::Tuple
+      #
+      # @return [Class<Types::Tuple>]
+      #
+      # @api public
+      def self.type
+        Types::Tuple
+      end
+
+    end # class Tuple
+  end # class Attribute
+end # module Axiom

data/lib/axiom/attribute/value_comparable.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+module Axiom
+  class Attribute
+
+    # A mixin for attributes that have comparable values
+    module ValueComparable
+      include Comparable,
+              Aggregate::Minimum::Methods,
+              Aggregate::Maximum::Methods,
+              Aggregate::Mean::Methods,
+              Aggregate::Variance::Methods,
+              Aggregate::StandardDeviation::Methods
+
+      # Initialize a value comparable attribute
+      #
+      # @param [#to_sym] _name
+      #   the attribute name
+      # @param [#to_hash] options
+      #   the options for the attribute
+      # @option options [Boolean] :required (true)
+      #   if true, then the value cannot be nil
+      # @option options [Range<::Numeric>] :size
+      #   The numeric range for a valid value
+      #
+      # @return [undefined]
+      #
+      # @api private
+      def initialize(_name, options = EMPTY_HASH)
+        super
+        size = options[:size]
+        if size
+          @type = type.new do
+            minimum(size.first)
+            maximum(size.last)
+          end
+        end
+      end
+
+    end # module ValueComparable
+  end # class Attribute
+end # module Axiom

data/lib/axiom/function.rb

@@ -21,7 +21,7 @@ module Axiom
     #
     # @api private
     def self.rename_attributes(operand, aliases)
-      if operand.respond_to?(:rename) && ! operand.kind_of?(Attribute)
+      if operand.respond_to?(:rename) && !operand.kind_of?(Attribute)
         operand.rename(aliases)
       else
         aliases[operand]

data/lib/axiom/function/binary.rb

@@ -73,21 +73,7 @@ module Axiom
 
       # Mixin for invertable binary functions
       module Invertible
-
-        # Hook called when module is included
-        #
-        # @param [Module] descendant
-        #   the module or class including Invertible
-        #
-        # @return [undefined]
-        #
-        # @api private
-        def self.included(descendant)
-          super
-          descendant.memoize :inverse
-        end
-
-        private_class_method :included
+        include Adamantium
 
         # Return the inverse function
         #
@@ -98,9 +84,11 @@ module Axiom
         #
         # @api public
         def inverse
-          self.class.inverse.new(left, right).memoize(:inverse, self)
+          self.class.inverse.new(left, right).memoize(inverse: self)
         end
 
+        memoize :inverse
+
       end # module Invertible
     end # module Binary
   end # class Function

data/lib/axiom/function/comparable.rb

@@ -35,7 +35,7 @@ module Axiom
         #
         # @api public
         def call(left, right)
-          left.send(operation, right)
+          left.public_send(operation, right)
         end
 
       end # module Classmethods

data/lib/axiom/function/connective/conjunction.rb

@@ -44,7 +44,7 @@ module Axiom
         # @api public
         def inverse
           Disjunction.new(Negation.new(left), Negation.new(right))
-            .memoize(:inverse, self)
+            .memoize(inverse: self)
         end
 
         module Methods

data/lib/axiom/function/connective/disjunction.rb

@@ -44,7 +44,7 @@ module Axiom
         # @api public
         def inverse
           Conjunction.new(Negation.new(left), Negation.new(right))
-            .memoize(:inverse, self)
+            .memoize(inverse: self)
         end
 
         module Methods

data/lib/axiom/function/connective/negation.rb

@@ -36,7 +36,7 @@ module Axiom
         #
         # @api public
         def self.call(operand)
-          ! operand
+          !operand
         end
 
         # Return the operand