md_data 1.0.0 → 1.1.0

data/README.md

@@ -25,21 +25,47 @@ Can be written down as:
 class MaterialConsumption
   include MdData
 
-   table_data do
-     context "year == 1994 && city == :buenos_aires" do
-       add "8t", "meterial == :coal"
-       add "5t", "meterial == :potassium"
-     end
-
-     context "year == 1995 && city == :buenos_aires" do
-       add "8t", "meterial == :coal"
-       add "5t", "meterial == :potassium"
-     end
-   end
+  dimension :year, [:year_1994, :year_1995]
+  dimension :city, [:buenos_aires, :zagreb]
+  dimension :material, [:coal, :potassium]
+
+  table_data do
+    context 'year_1994 && buenos_aires' do
+      add '8t', 'coal'
+      add '5t', 'potassium'
+    end
+    context 'year_1995 && buenos_aires' do
+      add '8t', 'coal'
+      add '5t', 'potassium'
+    end
+  end
 end
 
 MaterialConsumption.select(:year => 1994, :city => :buenos_aires, :material => :coal) #=> '8t'
 ```
+##Usage
+By defining dimensions you get helper methods that can be used in 'context' and 'add' conditionals.
+
+```
+context 'year_1994 && buenos_aires'  do
+  add '8t', 'coal'
+end
+
+```
+
+eqauls
+
+```
+context 'year == :year_1994 && city == :buenos_aires' do
+  add '8t', 'material == :coal'
+end
+```
+
+Important thing here is that this is still just Ruby in quotes. You can add any conditionals that you need
+while you still have basic scenario covered and simplified.
+
+##Usage
+For any type of ruled based queryingr, when you want to pull out specific data based on attributes and rules.
 
 ## Installation
 
@@ -59,6 +85,7 @@ Or install it yourself as:
 
 * No nested context allowed(yet)
 * Tests for misformed data definition
+* Support for same dimension instance value and resolving of ambiguity
 
 ## Contributing
 

data/lib/md_data/md_data.rb

@@ -3,7 +3,8 @@ module MdData
     base.extend MdDataClassMethods
   end
 
-  module MdDataClassMethods
+  module MdDataClassMethods  
+
     def table_data(&block)
       @table_data_block = block
     end
@@ -13,30 +14,22 @@ module MdData
       @current_context = nil
       load_rules
       container = self.new
-      attributes.each do |key,value|
-        self.send(:define_method, key) do
-          value
-        end
-      end
-      self.send(:define_method, :select_from_rules) do |rules|
-        result = nil
-        rules.each do |rule|
-          begin 
-            rule_is_satisfied = eval(rule[1])
-            if rule_is_satisfied
-              result = rule[0]
-              break
-            end
-          rescue
-            #nasty, allows me not to define dimensions for now TODO: fix
-          end
-        end
-        result
-      end
+      define_helpers_methods(attributes)
+      define_dimension_values_methods
+      define_select_from_rules
       container.select_from_rules(@rules)
     end
 
- private
+    def dimension(name, allowed_values)
+      dimensions[name] = allowed_values
+    end
+
+    def dimensions
+      @dimensions ||= {}
+    end
+    
+
+    private
     def load_rules
       @table_data_block.call
     end
@@ -50,6 +43,40 @@ module MdData
       @current_context = condition
       block.call
     end
-    
+
+    def  define_helpers_methods(attributes)
+      attributes.each do |key,value|
+        self.send(:define_method, key) do
+          value
+        end
+      end
+    end
+
+    def define_dimension_values_methods
+      unless @dimensions.nil?
+        @dimensions.each do |name, values|
+          values.each do |value|
+            self.send(:define_method, value) do
+              eval "#{name} == :#{value}"
+            end
+          end
+        end
+      end
+    end
+
+    def define_select_from_rules
+      self.send(:define_method, :select_from_rules) do |rules|
+        result = nil
+        rules.each do |rule|
+          rule_is_satisfied = eval(rule[1])
+          if rule_is_satisfied
+            result = rule[0]
+            break
+          end
+        end
+        result
+      end
+    end
+
   end
 end

data/lib/md_data/version.rb

@@ -1,3 +1,3 @@
 module MdData
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/md_data.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["kresimir.bojcic@gmail.com"]
   gem.description   = %q{Describe multidimensional data with simple notation}
   gem.summary       = %q{Easy way to descriebe and find values from multidimensional table.}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/drKreso/md_data"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

data/spec/md_data/md_data_spec.rb

@@ -95,4 +95,35 @@ describe MdData do
     TestClass.select(:year => 1995, :time_of_day => :evening).should == "8t"
   end
 
+  it 'is aware of dimensions' do
+    class TestClass
+      dimension :year, [:year_1994, :year_1995]
+      dimension :time_of_day, [:morning, :evening]
+    end
+
+    TestClass.dimensions.should == {:year => [:year_1994, :year_1995],
+                                   :time_of_day => [:morning, :evening] }
+  end
+
+
+  it 'is creates helper methods for dimensions values' do
+    class TestClass
+
+      dimension :year, [:year_1994, :year_1995]
+      dimension :time_of_day, [:morning, :evening]
+
+      table_data do
+        context "morning" do
+          add "18t", "year_1995" 
+          add "16t", "year_1994" 
+        end
+        context "evening" do
+          add "8t", "year_1995" 
+        end
+      end
+    end
+    TestClass.select(:year => :year_1995, :time_of_day => :morning).should == "18t"
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md_data
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -29,7 +29,7 @@ files:
 - lib/md_data/version.rb
 - md_data.gemspec
 - spec/md_data/md_data_spec.rb
-homepage: ''
+homepage: https://github.com/drKreso/md_data
 licenses: []
 post_install_message: 
 rdoc_options: []