multidimensional_table 1.1.0 → 1.1.1

data/lib/multidimensional_table/multidimensional_table.rb

@@ -1,5 +1,5 @@
 require 'multidimensional_table/non_existant_dimension_attribute'
-require 'multidimensional_table/non_valid_dimension'
+require 'multidimensional_table/more_than_one_result'
 
 module MultidimensionalTable
 
@@ -10,7 +10,6 @@ module MultidimensionalTable
 
   def set_dimensions(map)
     @dimensions = map
-    check_duplicates(map)
     @dimensions.each do |key, value|
       value.each do |possible_value|
         Kernel.class_eval do
@@ -34,35 +33,16 @@ module MultidimensionalTable
     end
   end
 
-  def check_duplicates(map)
-    list = {}
-    combined = map.each_value.reduce([]) { |all, value| all << value }.flatten
-    combined.each do |item|
-      if list[item].nil? 
-        list[item] = 1
-      else
-        list[item] = list[item] + 1
-      end
-    end
-    duplicates = list.select { |key, value| key if value > 1 }
-    if duplicates != {}
-      non_valid_dimensions = {}
-      duplicates.each_key do |duplicate|
-        non_valid_dimensions[duplicate] = []
-        map.each do |key,value|
-          non_valid_dimensions[duplicate] << key if value.include?(duplicate)
-        end
-      end
-      raise NonValidDimension, non_valid_dimensions
-    end
-  end
-
   def update_attributes(attrs)
     attrs.each do |key, value| @attributes[key] = value end
   end
 
   def table_result
-    @table_rules.each { |key, condition| return key if eval(condition.join(' && ')) == true }
+    result =  @table_rules.each { |key, condition| return key if eval(condition.join(' && ')) == true }
+    if result.size > 1
+      raise MoreThanOneResult, result
+    end
+    result
   end
 
   def table_data

data/lib/multidimensional_table/version.rb

@@ -1,3 +1,3 @@
 module MultidimensionalTable
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/multidimensional_table/multidimensional_table_spec.rb

@@ -117,13 +117,25 @@ module MultidimensionalTable
       end.to raise_error(NonExistantDimensionAttribute, 'Nonexistan dimension attribute :coal_error')
     end
 
-    it 'should complain if same dimension name exists' do
+    it 'should complain when there are multiple results' do
       subject.extend(MultidimensionalTable)
+      subject.set_dimensions( { :material => [:potassium, :coal, :sugar],
+        :city => [:zagreb, :zadar],
+        :time_of_day => [:morning, :evening] })
+
+        subject.table_data do
+          subject.zagreb do
+            subject.morning do
+              subject.coal '8t' 
+              subject.sugar '9t' 
+            end
+          end
+        end
+        subject.update_attributes(:material => :coal, :city => :zagreb, :time_of_day => :evening)
+
       expect do
-        subject.set_dimensions ({ :material => [:potassium, :coal, :sugar],
-          :city => [:zagreb, :zadar],
-          :time_of_day => [:coal, :zagreb] })
-      end.to raise_error(NonValidDimension, 'Multiple definitions are not allowed : coal for dimension material and time_of_day, zagreb for dimension city and time_of_day')
+        subject.table_result.should == '8t'
+      end.to raise_error(MoreThanOneResult, 'More than one result :8t, 9t')
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multidimensional_table
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000Z
 dependencies: []
 description: Describe a multidimensional table in pure Ruby
 email:
@@ -27,7 +27,6 @@ files:
 - lib/multidimensional_table.rb
 - lib/multidimensional_table/multidimensional_table.rb
 - lib/multidimensional_table/non_existant_dimension_attribute.rb
-- lib/multidimensional_table/non_valid_dimension.rb
 - lib/multidimensional_table/test_class.rb
 - lib/multidimensional_table/version.rb
 - multidimensional_table.gemspec

data/lib/multidimensional_table/non_valid_dimension.rb

@@ -1,18 +0,0 @@
-module MultidimensionalTable
-  class NonValidDimension < StandardError
-    attr_accessor :duplicate
-    def initialize(duplicate)
-      @duplicate = duplicate
-    end
-
-    def to_s
-      "Multiple definitions are not allowed : #{represent_duplicates}"
-    end
-
-    def represent_duplicates
-      duplicate.map do |key, value|
-         "#{key} for dimension " << value.join(' and ')
-      end.join(', ')
-    end
-  end
-end