axiom 0.1.1 → 0.2.0

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 41
-total_score: 919
+total_score: 1037

data/config/reek.yml

@@ -19,8 +19,8 @@ Attribute:
   - Axiom::Relation::Materialized
   - Axiom::Relation::Operation::Limit
   - Axiom::Relation::Operation::Offset
-  - Axiom::Relation::Operation::Order
-  - Axiom::Relation::Operation::Order::Direction
+  - Axiom::Relation::Operation::Sorted
+  - Axiom::Relation::Operation::Sorted::Direction
   - Axiom::Relation::Proxy
   - Axiom::Tuple
 BooleanParameter:
@@ -31,7 +31,12 @@ ClassVariable:
   exclude: []
 ControlParameter:
   enabled: true
-  exclude: []
+  exclude:
+  - Axiom::Aggregate::Count#self.call
+  - Axiom::Function::Connective::Conjunction#self.call
+  - Axiom::Function::Connective::Disjunction#self.call
+  - Axiom::Function::Predicate::Enumerable#self.compare_method
+  - Axiom::Relation::Operation::Limit::Methods#assert_no_more_than_one_tuple
 DataClump:
   enabled: true
   exclude:
@@ -57,9 +62,9 @@ DuplicateMethodCall:
   - Axiom::Algebra::Restriction::Methods#coerce_to_predicate
   - Axiom::Function::Binary#rename
   - Axiom::Function::Unary#rename
-  - Axiom::Relation::Operation::Order::Direction#call
-  - Axiom::Relation::Operation::Order::Direction#rename
-  - Axiom::Relation::Operation::Order::Methods#coerce_to_directions
+  - Axiom::Relation::Operation::Sorted::Direction#call
+  - Axiom::Relation::Operation::Sorted::Direction#rename
+  - Axiom::Relation::Operation::Sorted::Methods#coerce_to_directions
   - Axiom::Relation::Proxy#forward
   - Axiom::Relation::Proxy#method_missing
   max_calls: 1
@@ -92,6 +97,7 @@ NestedIterators:
   - Axiom::Equalizer#define_cmp_method
   - Axiom::Equalizer#define_hash_method
   - Axiom::Equalizer#define_inspect_method
+  - Axiom::Relation::Operation::Ungroup#each
   max_allowed_nesting: 1
   ignore_iterators: []
 NilCheck:
@@ -105,11 +111,15 @@ NilCheck:
   - Axiom::Aggregate::Variance#self.call
   - Axiom::Attribute#valid_or_optional?
   - Axiom::Relation#self.materialized?
+  - Axiom::Relation::Materialized#self.empty?
   - Axiom::Relation::Operation::Limit#self.assert_valid_limit
   - Axiom::Relation::Operation::Offset#self.assert_valid_offset
+  - Axiom::Relation::Operation::Sorted::Ascending#self.call
+  - Axiom::Relation::Operation::Sorted::Descending#self.call
 RepeatedConditional:
   enabled: true
-  exclude: []
+  exclude:
+  - Axiom::Aggregate::Mean
   max_ifs: 1
 TooManyInstanceVariables:
   enabled: true
@@ -122,6 +132,7 @@ TooManyMethods:
   - Axiom::Relation
   - Axiom::Relation::Header
   - Axiom::Relation::Keys
+  - Axiom::Tuple
   max_methods: 10
 TooManyStatements:
   enabled: true
@@ -129,6 +140,7 @@ TooManyStatements:
   - Axiom::Aggregate::Variance#self.call
   - Axiom::Algebra::Rename::Aliases#union
   - Axiom::Attribute#self.coerce
+  - Axiom::Equalizer#initialize
   - each
   max_statements: 5
 UncommunicativeMethodName:

data/config/rubocop.yml

@@ -1,11 +1,4 @@
-AllCops:
-  Includes:
-    - '../**/*.rake'
-    - 'Gemfile'
-    - 'Gemfile.devtools'
-  Excludes:
-    - '**/vendor/**'
-    - '**/benchmarks/**'
+inherit_from: ../.rubocop.yml
 
 # Avoid parameter lists longer than five parameters.
 ParameterLists:
@@ -30,7 +23,7 @@ CollectionMethods:
 # sections of code and visually separate them. When the keyword is at the same
 # level I think it sort of blends in with the def keywords and makes it harder
 # to scan the code and see where the sections are.
-AccessControl:
+AccessModifierIndentation:
   Enabled: false
 
 # Limit line length
@@ -60,3 +53,7 @@ ConstantName:
 # Not all trivial readers/writers can be defined with attr_* methods
 TrivialAccessors:
   Enabled: false
+
+# Allow empty lines around body
+EmptyLinesAroundBody:
+  Enabled: false

data/lib/axiom.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'bigdecimal'
+require 'bigdecimal/util'
 require 'date'
 require 'set'
 require 'singleton'
@@ -24,10 +25,10 @@ module Axiom
   # Raised when the offset is not a positive integer
   class InvalidOffsetError < ArgumentError; end
 
-  # Raised when a method requiring ordering is called on an unordered relation
-  class OrderedRelationRequiredError < StandardError; end
+  # Raised when a method requiring ordering is called on an unsorted relation
+  class SortededRelationRequiredError < StandardError; end
 
-  # Raised when a binary operation mixes ordered and unordered relations
+  # Raised when a binary operation mixes sorted and unsorted relations
   class RelationMismatchError < StandardError; end
 
   # Raised when a name is a duplicate of another name in a set
@@ -49,7 +50,7 @@ module Axiom
   class ExtensionMismatchError < WriteError; end
 
   # Raised when inserting into an order with a mismatching relation
-  class OrderMismatchError < WriteError; end
+  class SortedMismatchError < WriteError; end
 
   # Raised when inserting into an immutable relation
   class ImmutableRelationError < WriteError; end
@@ -128,13 +129,11 @@ require 'axiom/aggregate/standard_deviation'
 
 require 'axiom/relation'
 
-require 'axiom/relation/proxy'
-
 require 'axiom/relation/keys'
 require 'axiom/relation/header'
+require 'axiom/relation/index'
 
 require 'axiom/relation/base'
-require 'axiom/relation/variable'
 
 require 'axiom/relation/materialized'
 require 'axiom/relation/empty'
@@ -142,13 +141,18 @@ require 'axiom/relation/empty'
 require 'axiom/relation/operation/unary'
 require 'axiom/relation/operation/binary'
 require 'axiom/relation/operation/combination'
-require 'axiom/relation/operation/set'
-require 'axiom/relation/operation/offset'
-require 'axiom/relation/operation/order'
-require 'axiom/relation/operation/order/direction'
-require 'axiom/relation/operation/order/direction_set'
+
+require 'axiom/relation/operation/group'
 require 'axiom/relation/operation/limit'
+require 'axiom/relation/operation/offset'
+require 'axiom/relation/operation/sorted'
+require 'axiom/relation/operation/sorted/direction'
+require 'axiom/relation/operation/sorted/direction_set'
 require 'axiom/relation/operation/reverse'
+require 'axiom/relation/operation/set'
+require 'axiom/relation/operation/ungroup'
+require 'axiom/relation/operation/unwrap'
+require 'axiom/relation/operation/wrap'
 
 require 'axiom/algebra/difference'
 require 'axiom/algebra/extension'
@@ -164,14 +168,19 @@ require 'axiom/algebra/summarization/summaries'
 require 'axiom/algebra/summarization/summary'
 require 'axiom/algebra/union'
 
+require 'axiom/relation/proxy'
+require 'axiom/relation/variable'
 require 'axiom/relation/operation/deletion'
 require 'axiom/relation/operation/insertion'
 
 require 'axiom/attribute/comparable'
+require 'axiom/attribute/length_comparable'
+require 'axiom/attribute/value_comparable'
 
 require 'axiom/attribute'
 require 'axiom/attribute/object'
 require 'axiom/attribute/numeric'
+
 require 'axiom/attribute/boolean'
 require 'axiom/attribute/class'
 require 'axiom/attribute/date'
@@ -179,8 +188,8 @@ require 'axiom/attribute/date_time'
 require 'axiom/attribute/decimal'
 require 'axiom/attribute/float'
 require 'axiom/attribute/integer'
-require 'axiom/attribute/time'
 require 'axiom/attribute/string'
+require 'axiom/attribute/time'
 
 require 'axiom/function/numeric'
 
@@ -202,6 +211,12 @@ require 'axiom/version'
 
 require 'axiom-types'
 
+require 'axiom/types/relation'
+require 'axiom/types/tuple'
+
+require 'axiom/attribute/relation'
+require 'axiom/attribute/tuple'
+
 module Axiom
 
   # Represent a relation with an empty header and no tuples

data/lib/axiom/aggregate/mean.rb

@@ -17,14 +17,14 @@ module Axiom
       #
       # @param [Numeric] value
       #
-      # @return [Array(Integer, Numeric)]
+      # @return [Array(Integer, Rational)]
       #
       # @api public
       def self.call(accumulator, value)
         return accumulator if value.nil?
         count, mean = accumulator
         count       = Count.call(count, value)
-        [count, mean ? Rational(value - mean, count) + mean : Rational(value)]
+        [count, mean ? Rational(value - mean, count) + mean : value.to_r]
       end
 
       # Extract the mean from the accumulator
@@ -41,7 +41,8 @@ module Axiom
       #
       # @api public
       def self.finalize(accumulator)
-        accumulator.last
+        mean = accumulator.last
+        mean.to_f if mean
       end
 
       # Return the type returned from #call

data/lib/axiom/aggregate/sum.rb

@@ -43,7 +43,7 @@ module Axiom
       # @api public
       def default
         if    type <= Types::Float   then super.to_f
-        elsif type <= Types::Decimal then BigDecimal(super)
+        elsif type <= Types::Decimal then super.to_d
         else
           super
         end

data/lib/axiom/algebra/extension.rb

@@ -109,7 +109,7 @@ module Axiom
       # @api private
       def assert_matching_extensions(other, event)
         unless other.kind_of?(self.class) && extensions.eql?(other.extensions)
-          raise ExtensionMismatchError, "other relation must have matching extensions to be #{event}"
+          fail ExtensionMismatchError, "other relation must have matching extensions to be #{event}"
         end
       end
 

data/lib/axiom/algebra/join.rb

@@ -47,12 +47,9 @@ module Axiom
         return to_enum unless block_given?
         util  = Relation::Operation::Combination
         index = build_index
-
         left.each do |left_tuple|
-          right_tuples = index[join_tuple(left_tuple)]
-          util.combine_tuples(header, left_tuple, right_tuples, &block)
+          util.combine_tuples(header, left_tuple, index[left_tuple], &block)
         end
-
         self
       end
 
@@ -94,27 +91,7 @@ module Axiom
       #
       # @api private
       def build_index
-        index = Hash.new { |hash, tuple| hash[tuple] = Set.new }
-        right.each { |tuple| index[join_tuple(tuple)] << disjoint_tuple(tuple) }
-        index
-      end
-
-      # Generate a tuple with the join attributes between relations
-      #
-      # @return [Tuple]
-      #
-      # @api private
-      def join_tuple(tuple)
-        tuple.project(join_header)
-      end
-
-      # Generate a tuple with the disjoint attributes between relations
-      #
-      # @return [Tuple]
-      #
-      # @api private
-      def disjoint_tuple(tuple)
-        tuple.project(@disjoint_header)
+        Index.new(join_header, @disjoint_header).merge(right)
       end
 
       # Insert the other relation into the left operand
@@ -189,9 +166,9 @@ module Axiom
         # @return [Join, Restriction]
         #
         # @api public
-        def join(other)
+        def join(other, &block)
           relation = Join.new(self, other)
-          relation = relation.restrict { |context| yield context } if block_given?
+          relation = relation.restrict(&block) if block
           relation
         end
 

data/lib/axiom/algebra/product.rb

@@ -36,7 +36,7 @@ module Axiom
       # @api private
       def self.assert_disjointed_headers(left, right)
         if (left.header & right.header).any?
-          raise InvalidHeaderError, 'the headers must be disjointed'
+          fail InvalidHeaderError, 'the headers must be disjointed'
         end
       end
 
@@ -77,7 +77,7 @@ module Axiom
       #
       # @api public
       def insert(*)
-        raise ImmutableRelationError, 'inserting into a product is impossible'
+        fail ImmutableRelationError, 'inserting into a product is impossible'
       end
 
       # Raise an exception when deleting from the Product
@@ -92,7 +92,7 @@ module Axiom
       #
       # @api public
       def delete(*)
-        raise ImmutableRelationError, 'deleting from a product is impossible'
+        fail ImmutableRelationError, 'deleting from a product is impossible'
       end
 
       module Methods

data/lib/axiom/algebra/projection.rb

@@ -102,7 +102,7 @@ module Axiom
       def assert_removed_attributes_optional
         names = required_attribute_names
         if names.any?
-          raise RequiredAttributesError, "required attributes #{names.inspect} have been removed"
+          fail RequiredAttributesError, "required attributes #{names} have been removed"
         end
       end
 
@@ -118,7 +118,7 @@ module Axiom
       # @api private
       def assert_equivalent_headers(other)
         if header != other.header
-          raise InvalidHeaderError, 'the headers must be equivalent'
+          fail InvalidHeaderError, 'the headers must be equivalent'
         end
       end
 

data/lib/axiom/algebra/rename.rb

@@ -17,7 +17,7 @@ module Axiom
 
       # The relation sort order
       #
-      # @return [Operation::Order::DirectionSet]
+      # @return [Operation::Sorted::DirectionSet]
       #
       # @api private
       attr_reader :directions
@@ -55,7 +55,7 @@ module Axiom
       # @api public
       def each
         return to_enum unless block_given?
-        operand.each { |operand_tuple| yield Tuple.new(header, operand_tuple.to_ary) }
+        operand.each { |tuple| yield tuple.rename(header) }
         self
       end
 

data/lib/axiom/algebra/rename/aliases.rb

@@ -39,7 +39,7 @@ module Axiom
         # @api private
         def self.assert_unique_aliases(aliases)
           if aliases.values.uniq!
-            raise DuplicateAliasError, 'the aliases must be unique'
+            fail DuplicateAliasError, 'the aliases must be unique'
           end
         end
 
@@ -54,7 +54,7 @@ module Axiom
         #
         # @api public
         def initialize(aliases)
-          @aliases = freeze_object(aliases)
+          @aliases = self.class.freezer.call(aliases)
         end
 
         # Lookup the new attribute given the old attribute
@@ -144,7 +144,7 @@ module Axiom
         # @api public
         def inverse
           self.class.new(@aliases.invert)
-            .memoize(:inverse, self)
+            .memoize(inverse: self)
         end
 
         # Compare the aliases with other aliases for equivalency

data/lib/axiom/algebra/summarization.rb

@@ -55,7 +55,7 @@ module Axiom
       # @api private
       def self.assert_subset_headers(operand, summarize_per)
         unless summarize_per.header.to_set.proper_subset?(operand.header.to_set)
-          raise InvalidHeaderError, 'the summarize_per header must be a proper subset of the operand header'
+          fail InvalidHeaderError, 'the summarize_per header must be a proper subset of the operand header'
         end
       end
 
@@ -112,7 +112,7 @@ module Axiom
       #
       # @api public
       def insert(*)
-        raise ImmutableRelationError, 'inserting into a summarization is impossible'
+        fail ImmutableRelationError, 'inserting into a summarization is impossible'
       end
 
       # Raise an exception when deleting from a Summarization
@@ -127,7 +127,7 @@ module Axiom
       #
       # @api public
       def delete(*)
-        raise ImmutableRelationError, 'deleting from a summarization is impossible'
+        fail ImmutableRelationError, 'deleting from a summarization is impossible'
       end
 
     private

data/lib/axiom/attribute.rb

@@ -35,10 +35,11 @@ module Axiom
     def self.coerce(object)
       if object.kind_of?(Attribute)
         object
+      elsif equal?(Attribute)
+        Object.coerce(object)
       else
         name, type, options = object
-        klass = equal?(Attribute) ? Object : self
-        klass = const_get(type.name) if type
+        klass = type ? const_get(type.name) : self
         klass.new(name, options || EMPTY_HASH)
       end
     end
@@ -104,7 +105,7 @@ module Axiom
     #
     # @api public
     def call(tuple)
-      tuple.call(self)
+      tuple[self]
     end
 
     # Rename an attribute
@@ -149,7 +150,7 @@ module Axiom
     #
     # @api public
     def optional?
-      ! required?
+      !required?
     end
 
     # Test if the value matches the attribute constraints