multidimensional_table 1.0.1 → 1.1.0

data/README.md

@@ -38,27 +38,31 @@ Or install it yourself as:
     $ gem install multidimensional_table
 
 ## Usage
-
 ```
 class MaterialConsumption
   include MultidimensionalTable
 
-  dimensions  :year => [:year_1994, :year_1995],
-              :city => [:buenos_aires],
-              :material => [:coal, :potassium]
+  def dimensions
+    {
+     :year => [:year_1994, :year_1995],
+     :city => [:buenos_aires],
+     :material => [:coal, :potassium]
+    }
+  end
 
-  table_data do
-    year_1994 do
-      buenos_aires do
-        coal '8t' 
-        potassium '5t' 
+  def data
+    table_data do
+      year_1994 do
+        buenos_aires do
+          coal '8t' 
+          potassium '5t' 
+        end
       end
-    end
-
-    year_1995 do
-      buenos_aires do
-        coal '8t' 
-        potassium '6t' 
+      year_1995 do
+        buenos_aires do
+          coal '8t' 
+          potassium '6t' 
+        end
       end
     end
   end

data/lib/multidimensional_table/multidimensional_table.rb

@@ -3,11 +3,17 @@ require 'multidimensional_table/non_valid_dimension'
 
 module MultidimensionalTable
 
-  def dimensions=(map)
+  def initialize
+    set_dimensions(dimensions)
+    data
+  end
+
+  def set_dimensions(map)
     @dimensions = map
     check_duplicates(map)
     @dimensions.each do |key, value|
       value.each do |possible_value|
+        Kernel.class_eval do
         define_method possible_value do |value = nil,  &block|
           if value.nil? && !block.nil?
             @index_level += 1
@@ -23,6 +29,7 @@ module MultidimensionalTable
             @table_rules[value] = context << ["@attributes[:#{key}] == :#{possible_value}"]  
           end
         end
+        end
       end
     end
   end
@@ -55,7 +62,7 @@ module MultidimensionalTable
   end
 
   def table_result
-    @table_rules.each { |key, condition| return key if class_eval(condition.join(' && ')) == true }
+    @table_rules.each { |key, condition| return key if eval(condition.join(' && ')) == true }
   end
 
   def table_data
@@ -69,4 +76,5 @@ module MultidimensionalTable
   def dimensions
     @dimensions ||= {}
   end
+
 end

data/lib/multidimensional_table/test_class.rb

@@ -0,0 +1,16 @@
+require 'multidimensional_table/multidimensional_table'
+
+class TestClass
+  include MultidimensionalTable
+
+  def dimensions
+    { :test_material => [:test_potassium, :coal, :sugar] }
+  end
+
+  def data
+    table_data do
+      coal '8t' 
+      sugar '9t' 
+    end
+  end
+end

data/lib/multidimensional_table/version.rb

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

data/spec/multidimensional_table/multidimensional_table_spec.rb

@@ -6,13 +6,13 @@ module MultidimensionalTable
     context 'basic setup' do
       it 'knows dimenions it has' do
         subject.extend(MultidimensionalTable)
-        subject.dimensions = { :material => [:potassium, :coal, :sugar] }
+        subject.set_dimensions ( { :material => [:potassium, :coal, :sugar] })
         subject.dimensions[:material].should == [:potassium, :coal, :sugar]
       end
 
       it 'creates methods for dimensions' do
         subject.extend(MultidimensionalTable)
-        subject.dimensions = { :material => [:potassium, :coal, :sugar] }
+        subject.set_dimensions ( { :material => [:potassium, :coal, :sugar] })
         subject.respond_to?(:potassium).should == true
         subject.respond_to?(:coal).should == true
         subject.respond_to?(:sugar).should == true
@@ -20,7 +20,7 @@ module MultidimensionalTable
 
       it 'should be able to find data from table' do
         subject.extend(MultidimensionalTable)
-        subject.dimensions = { :material => [:potassium, :coal, :sugar] }
+        subject.set_dimensions ( { :material => [:potassium, :coal, :sugar] })
         subject.table_data do
           subject.coal '8t' 
           subject.sugar '9t' 
@@ -35,7 +35,7 @@ module MultidimensionalTable
     context 'two dimensional' do
       before(:each) do
         subject.extend(MultidimensionalTable)
-        subject.dimensions = { :material => [:potassium, :coal, :sugar], :city => [:zagreb, :zadar] }
+        subject.set_dimensions ( { :material => [:potassium, :coal, :sugar], :city => [:zagreb, :zadar] })
         subject.table_data do
           subject.zagreb do
             subject.coal '8t' 
@@ -62,9 +62,9 @@ module MultidimensionalTable
     context 'three dimensional' do
       before(:each) do
         subject.extend(MultidimensionalTable)
-        subject.dimensions = { :material => [:potassium, :coal, :sugar],
+        subject.set_dimensions ( { :material => [:potassium, :coal, :sugar],
           :city => [:zagreb, :zadar],
-          :time_of_day => [:morning, :evening] }
+          :time_of_day => [:morning, :evening] } )
         subject.table_data do
           subject.zagreb do
             subject.morning do
@@ -101,9 +101,9 @@ module MultidimensionalTable
 
     it 'should complain if dimension does not exist' do
       subject.extend(MultidimensionalTable)
-      subject.dimensions = { :material => [:potassium, :coal, :sugar],
+      subject.set_dimensions( { :material => [:potassium, :coal, :sugar],
         :city => [:zagreb, :zadar],
-        :time_of_day => [:morning, :evening] }
+        :time_of_day => [:morning, :evening] })
 
       expect do
         subject.table_data do
@@ -120,9 +120,9 @@ module MultidimensionalTable
     it 'should complain if same dimension name exists' do
       subject.extend(MultidimensionalTable)
       expect do
-        subject.dimensions = { :material => [:potassium, :coal, :sugar],
+        subject.set_dimensions ({ :material => [:potassium, :coal, :sugar],
           :city => [:zagreb, :zadar],
-          :time_of_day => [:coal, :zagreb] }
+          :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')
     end
 

data/spec/multidimensional_table/test_class_spec.rb

@@ -0,0 +1,17 @@
+require 'multidimensional_table/test_class'
+
+describe TestClass do
+    context 'basic setup' do
+      it 'knows dimensions it has' do
+        subject.dimensions[:test_material].should == [:test_potassium, :coal, :sugar]
+      end
+
+      it 'can pinpoint right one' do
+        subject.update_attributes(:test_material => :sugar)
+        subject.table_result.should == '9t'
+      end
+    end
+
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multidimensional_table
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -28,9 +28,11 @@ files:
 - 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
 - spec/multidimensional_table/multidimensional_table_spec.rb
+- spec/multidimensional_table/test_class_spec.rb
 homepage: https://github.com/drKreso/multidimensional_table
 licenses: []
 post_install_message: 
@@ -57,3 +59,4 @@ specification_version: 3
 summary: Attempt to make generic API for describing multidimensional data in Ruby
 test_files:
 - spec/multidimensional_table/multidimensional_table_spec.rb
+- spec/multidimensional_table/test_class_spec.rb