metrix_db 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metrix_db (0.0.6)
+    metrix_db (0.0.7)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -1,7 +1,9 @@
 Metrix DB
 =============
 
-Simple DB base on ruby Array.  The main usage is data mapping.
+Simple DB base on ruby Array.  The main usage is data mapping. 
+
+Notice: Do not use it in large dataset
 
 Installation
 -----------
@@ -52,17 +54,17 @@ use `[]` as query syntax, it will use ref field to query data.
 Iteration
 -----
 
-You can use MyDB as Array, because of it include Enumerable.
+    MyDB.all #=>  Array of MyDB instance
 
-    MyDB.each do |inst|
+    MyDB.all.each do |inst|
       puts inst.col1 
     end 
     
-    MyDB.each_with_index do |inst, index|
+    MyDB.all.each_with_index do |inst, index|
       puts inst.col1 
     end 
 
-    MyDB.map { |inst| inst.col1 } # [1,2]
+    MyDB.all.map { |inst| inst.col1 } # [1,2]
     
 
 

data/lib/metrix_db/version.rb

@@ -1,3 +1,3 @@
 module MetrixDb
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/metrix_db.rb

@@ -14,7 +14,6 @@ module MetrixDB
   end
 
   module ClassMethods 
-    include Enumerable
     def field(name, options = {})
       default_options = {:uniq => true}
       options = default_options.merge(options)
@@ -25,8 +24,12 @@ module MetrixDB
       @uniq_fields ||= {}
       @uniq_fields[index] = name.to_s if options[:uniq] 
 
-      raise UsageError.new("Already defined '#{@ref_field}' as ref column") if options[:ref] && @ref_field 
-      @ref_field = name.to_sym if options[:ref]
+      if !@ref_field
+        @ref_field = name.to_sym 
+      end
+      if options[:ref]
+        @ref_field = name.to_sym
+      end
 
       define_method "#{name}" do  
         @data[self.class.fields[name.to_sym]]
@@ -39,7 +42,6 @@ module MetrixDB
 
     def dataset(_dataset)
       @dataset = _dataset
-      @ref_field ||= @fields.keys.first
       check_uniq_fields(_dataset)
     end
 
@@ -55,9 +57,11 @@ module MetrixDB
 
     def on(conditions={}) 
       return nil if @dataset.nil? || @fields.nil? 
-      @dataset.each do |data|
+      @dataset.each_with_index do |data, index|
         conditions.each_pair do |k, v|
-          return self.new(data) if data[@fields[k.to_sym]] == v
+          if data[@fields[k.to_sym]] == v
+            return get_from_cache(index)
+          end
         end
       end
       return nil
@@ -67,10 +71,18 @@ module MetrixDB
       self.on(@ref_field => value)
     end
 
-    def each
-      @dataset.each do |data|
-        yield self.new(data) if block_given?
+    def all
+      result = []
+      @dataset.each_with_index do |data, index| 
+        result << get_from_cache(index)
       end
+      result
+    end
+
+    private
+    def get_from_cache(index) 
+      @inst_cache ||= {}
+      @inst_cache[index] ||= self.new(@dataset[index])
     end
 
   end

data/spec/metrix_db/data_spec.rb

@@ -27,7 +27,7 @@ describe MetrixDB do
       end
     end
     it "should iterate all data use each_with_index" do 
-      @klass.each_with_index do |inst, index|
+      @klass.all.each_with_index do |inst, index|
         if index == 0
           inst.col1.should == 1
           inst.col2.should == 2
@@ -38,12 +38,12 @@ describe MetrixDB do
       end
     end
     it "should iterate all data use each" do 
-      @klass.each do |inst, index|
+      @klass.all.each do |inst, index|
         inst.col1.should == 1
         inst.col2.should == 2
         break
       end
-      @klass.each do |inst, index|
+      @klass.all.each do |inst, index|
         next
         inst.col1.should == 2
         inst.col2.should == 3
@@ -52,7 +52,11 @@ describe MetrixDB do
     end
 
     it "should respond_to map" do 
-      @klass.map(&:col2).should == [2,3]
+      @klass.all.map(&:col2).should == [2,3]
+    end
+
+    it "should respond_to all" do 
+      @klass.all.should have(2).things
     end
   end
 end

data/spec/metrix_db/field_spec.rb

@@ -68,15 +68,6 @@ describe MetrixDB do
       end
       klass.instance_variable_get("@ref_field").should == :field2
     end
-
-     it "will raise error if define two ref field" do 
-      lambda {Class.new {
-        include MetrixDB 
-        field :field1, :ref => true
-        field :field2, :ref => true
-        dataset [[1,2],[2,3]]
-      }}.should raise_error MetrixDB::UsageError, "Already defined 'field1' as ref column"
-    end
-
+     
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metrix_db
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Allen Wei