md_data 1.1.0 → 1.1.1

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 group :development do
  gem 'rspec'
+ gem "simplecov", :require => false, :group => :test
 end

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -5,15 +5,15 @@ An easy notation for describing multidimensional data.
 For example:
 
 ```
-1994      
+1994
   BuenosAires
     Coal
       19t
     Potassium
       5t
-1995 
+1995
   BuenosAires
-    Coal  
+    Coal
       8t
     Potassium
       6t
@@ -41,7 +41,7 @@ class MaterialConsumption
   end
 end
 
-MaterialConsumption.select(:year => 1994, :city => :buenos_aires, :material => :coal) #=> '8t'
+MaterialConsumption.select(:year => :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.
@@ -50,10 +50,9 @@ By defining dimensions you get helper methods that can be used in 'context' and
 context 'year_1994 && buenos_aires'  do
   add '8t', 'coal'
 end
-
 ```
 
-eqauls
+Equals
 
 ```
 context 'year == :year_1994 && city == :buenos_aires' do
@@ -65,7 +64,7 @@ Important thing here is that this is still just Ruby in quotes. You can add any
 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.
+For any type of ruled based querying, when you want to pull out specific data based on attributes and rules.
 
 ## Installation
 
@@ -84,7 +83,7 @@ Or install it yourself as:
 ## Limitations
 
 * No nested context allowed(yet)
-* Tests for misformed data definition
+* Tests for mis formed data definition
 * Support for same dimension instance value and resolving of ambiguity
 
 ## Contributing

data/lib/md_data.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require "md_data/version"
 require "md_data/md_data"
 

data/lib/md_data/md_data.rb

@@ -1,20 +1,45 @@
 module MdData
+  #raise this if you cant find appropriate rule
+  class NoRuleFound < StandardError ; end
+
   def self.included(base)
     base.extend MdDataClassMethods
   end
 
-  module MdDataClassMethods  
+  def attributes
+    @attributes
+  end
+
+  def attributes=(value)
+    @attributes = value
+  end
+
+  def define_helpers_methods(dimensions, attributes)
+    dimensions.merge(attributes).each_key { |key| define_helper(key) }
+  end
 
+  def define_helper(key)
+    Kernel.send(:define_method, key) do
+      (instance_variable_get "@attributes")[key]
+    end
+  end
+  
+  module MdDataClassMethods
     def table_data(&block)
       @table_data_block = block
     end
 
-    def select(attributes)
+    def select(attributes, parent = nil)
       @rules = []
       @current_context = nil
       load_rules
-      container = self.new
-      define_helpers_methods(attributes)
+      if (parent.nil?)
+        container = self.new
+      else
+        container = self.new(parent)
+      end
+      container.attributes = attributes
+      container.define_helpers_methods(dimensions, attributes)
       define_dimension_values_methods
       define_select_from_rules
       container.select_from_rules(@rules)
@@ -27,7 +52,6 @@ module MdData
     def dimensions
       @dimensions ||= {}
     end
-    
 
     private
     def load_rules
@@ -35,7 +59,11 @@ module MdData
     end
 
     def add(value, condition)
-      context_condition = @current_context.nil? ? '' : " && #{@current_context} "
+      if @current_context.nil?
+        context_condition = ''
+      else
+        context_condition = " && #{@current_context} "
+      end
       @rules << ( [value , (condition + context_condition)] )
     end
 
@@ -44,39 +72,33 @@ module MdData
       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
+          values.each { |value| equal?(name, value) }
         end
       end
     end
 
+    def equal?(name, value)
+      self.send(:define_method, value) do
+        instance_eval "#{name} == :#{value}"
+      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])
+          rule_is_satisfied = instance_eval(rule[1])
           if rule_is_satisfied
             result = rule[0]
             break
           end
         end
-        result
+        result.nil? ? raise(NoRuleFound.new('No rule found')) : result
       end
     end
-
-  end
-end
+  end #MdDataClassMethods
+end #MdData

data/lib/md_data/version.rb

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

data/spec/md_data/md_data_spec.rb

@@ -1,7 +1,7 @@
 require 'md_data'
 
 describe MdData do
-
+  # use this as an example of extended class
   class TestClass; include MdData end
 
   it 'adds table_data class method when included' do
@@ -13,10 +13,12 @@ describe MdData do
   end
 
   it 'should store block for latter usage and allow change' do
+    # use this as an example of extended class
     class TestClass
       table_data { "LATER" }
     end
     TestClass.send(:load_rules).should == "LATER"
+    # use this as an example of extended class
     class TestClass
       table_data { "ALIGATOR" }
     end
@@ -24,6 +26,7 @@ describe MdData do
   end
 
   it 'rules can be created with add' do
+    # use this as an example of extended class
     class TestClass
       table_data { add "8t", "year == 1994" }
     end
@@ -31,9 +34,10 @@ describe MdData do
   end
 
   it 'multiple rules can be created with add' do
+    # use this as an example of extended class
     class TestClass
       table_data do
-        add "8t", "year == 1994" 
+        add "8t", "year == 1994"
         add "9t", "year == 1995"
       end
     end
@@ -42,6 +46,7 @@ describe MdData do
   end
 
   it 'should create pull out item based on rules and attributes' do
+    # use this as an example of extended class
     class TestClass
       table_data { add "8t" , "year == 1994" }
     end
@@ -49,6 +54,7 @@ describe MdData do
   end
 
   it 'item can be anythinig' do
+    # use this as an example of extended class
     class TestClass
       table_data { add TestClass.new , "year == 1994" }
     end
@@ -56,11 +62,12 @@ describe MdData do
   end
 
 
-  it 'rules can be created with add in context' do
+  it 'rules can be created with add in precondition' do
+    # use this as an example of extended class
     class TestClass
       table_data do
         context "time_of_day == :morning" do
-          add "8t", "year == 1994" 
+          add "8t", "year == 1994"
         end
       end
     end
@@ -68,11 +75,12 @@ describe MdData do
   end
 
   it 'rules can be created to comapre with string' do
+    # use this as an example of extended class
     class TestClass
       table_data do
         context "time_of_day == 'morning'" do
-          add "8t", "year == 1995" 
-          add "6t", "year == 1994" 
+          add "8t", "year == 1995"
+          add "6t", "year == 1994"
         end
       end
     end
@@ -80,14 +88,15 @@ describe MdData do
   end
 
   it 'can have multiple contexts' do
+    # use this as an example of extended class
     class TestClass
       table_data do
         context "time_of_day == :morning" do
-          add "18t", "year == 1995" 
-          add "16t", "year == 1994" 
+          add "18t", "year == 1995"
+          add "16t", "year == 1994"
         end
         context "time_of_day == :evening" do
-          add "8t", "year == 1995" 
+          add "8t", "year == 1995"
         end
       end
     end
@@ -96,6 +105,7 @@ describe MdData do
   end
 
   it 'is aware of dimensions' do
+    # use this as an example of extended class
     class TestClass
       dimension :year, [:year_1994, :year_1995]
       dimension :time_of_day, [:morning, :evening]
@@ -107,6 +117,7 @@ describe MdData do
 
 
   it 'is creates helper methods for dimensions values' do
+    # use this as an example of extended class
     class TestClass
 
       dimension :year, [:year_1994, :year_1995]
@@ -114,16 +125,90 @@ describe MdData do
 
       table_data do
         context "morning" do
-          add "18t", "year_1995" 
-          add "16t", "year_1994" 
+          add "18t", "year_1995"
+          add "16t", "year_1994"
         end
         context "evening" do
-          add "8t", "year_1995" 
+          add "8t", "year_1995"
+        end
+      end
+    end
+    TestClass.select(:year => :year_1995, :time_of_day => :morning).should ==
+        "18t"
+  end
+
+
+  it 'is shuld create helper methods for dimensions when atttibute not sent' do
+    # use this as an example of extended class
+    class TestClassIsolated
+      include MdData
+      dimension :year, [:year_1994, :year_1995]
+      dimension :my_time_of_day, [:morning, :evening]
+
+      table_data do
+        context "my_time_of_day == :evening" do
+          add "8t", "year_1995"
+          add "7t", "year_1994"
+        end
+        context "morning" do
+          add "8t", "year_1995"
+          add "6t", "year_1994"
+        end
+        context "true" do
+          add "16t", "year_1995"
         end
       end
+
     end
-    TestClass.select(:year => :year_1995, :time_of_day => :morning).should == "18t"
+
+    TestClassIsolated.select({:year => :year_1995}).should == "16t"
+    TestClassIsolated.select({:year => :year_1995}).should == "16t"
+    TestClassIsolated.select({:year => :year_1995,
+                              :my_time_of_day => :morning}).should == "8t"
+    TestClassIsolated.select({:year => :year_1994,
+                              :my_time_of_day => :evening}).should == "7t"
   end
 
 
+  it 'is shuld create helper methods for dimensions
+       even if atttibute not sent and using delegator' do
+    # use this as an example of extended class
+    class TestClassIsolated
+      include MdData
+      dimension :year, [:year_1994, :year_1995]
+      dimension :my_2_time_of_day, [:morning, :evening]
+
+      table_data do
+        context "my_2_time_of_day == :evening" do
+          add "8t", "year_1995"
+          add "7t", "year_1994"
+        end
+        context "morning" do
+          add "8t", "year_1995"
+          add "6t", "year_1994"
+        end
+        context "true" do
+          add "16t", "year_1995"
+        end
+      end
+
+    end
+
+    # use this as an example of extended class
+    class Testing
+      attr_reader :table
+      def initialize
+        @table = TestClassIsolated
+      end
+    end
+
+    t = Testing.new
+    t.table.select({:year => :year_1995}).should == "16t"
+    t.table.select({:year => :year_1995}).should == "16t"
+    t.table.select({:year => :year_1995,
+                    :my_2_time_of_day => :morning}).should == "8t"
+    t.table.select({:year => :year_1994,
+                    :my_2_time_of_day => :evening}).should == "7t"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md_data
 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-27 00:00:00.000000000Z
+date: 2012-04-27 00:00:00.000000000Z
 dependencies: []
 description: Describe multidimensional data with simple notation
 email:
@@ -49,9 +49,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Easy way to descriebe and find values from multidimensional table.
 test_files:
 - spec/md_data/md_data_spec.rb
+has_rdoc: