MasterRecord 0.2.0 → 0.3.0

data/MasterRecord.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "MasterRecord"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takeshi Morita"]

data/README.rdoc

@@ -32,7 +32,11 @@
     # MasterRecord::CSV.load_file(file_path,header exists)
     User.load_data(MasterRecord::CSV.load_file(File.expand_path("./data/user.csv", File.dirname(__FILE__)),true))
     User.find().count => 4
+    User.find("1").name => "ひろし"
     User.find_by_name("ひろし")[0].age => 10
+    User.find(:name => "たけし",:age => 21) => []
+    User.find(:name => "たけし",:age => 20).count => 1
+    User.find_one(:name => "たけし",:age => 20).id => "2"
 
     #1	あめ	30
     #2	チョコレート	40

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/data/country.yml

@@ -1,8 +1,8 @@
 1:
   name: "Japan"
-  population: 120000000
   salutation: "こんにちは"
+  population: 120000000
 2:   
   name: "China"
-  population: 500000000
   salutation: "您好"
+  population: 500000000

data/lib/MasterRecord.rb

@@ -61,18 +61,47 @@ module MasterRecord
       end
     end
 
-    def c.find(identity=nil)
-      return all unless identity
-      identity = identity.to_s
-      if identity.include?("@")
-        id = identity.split("@")[-1]
+    def c.find_one(condition=nil)
+      if condition == nil 
+        if @master_records.count == 0
+          return nil
+        else
+          return new(@master_records.first)  
+        end
+      end
+      if condition.is_a? Hash
+        filtered = @master_records.detect do |id,rec|
+          break new(id) if coincide?(id,rec,condition)
+        end
       else
-        id = identity
+        id = condition.to_s
+        if @master_records[id]
+          new(id)
+        else
+          nil
+        end
       end
-      if @master_records[id]
-        new(id)
+    end
+
+    def c.coincide?(id,rec,condition)
+      condition.each do|k,v| 
+        if k.to_s == "id" 
+          break nil if id != v
+        else
+          break nil if rec[k.to_sym] != v
+        end
+      end != nil
+    end
+
+    def c.find(condition=nil)
+      return all unless condition
+      if condition.is_a? Hash
+        filtered = @master_records.select do |id,rec|
+          coincide?(id,rec,condition)
+        end
+        filtered.map{|k,v| new(k)}
       else
-        nil
+        find_one(condition)
       end
     end
   end

data/spec/MasterRecord_spec.rb

@@ -26,13 +26,24 @@ end
 describe "Masterrecord" do
   describe "csv" do
     before do
+      #1,ひろし,10
+      #2,たけし,20
+      #3,まこと,30
+      #4,けん,40
       User.load_data(MasterRecord::CSV.load_file(File.expand_path("../data/user.csv", File.dirname(__FILE__)),true))
     end
     it{ User.find().count.should == 4}
+    it{ User.find("1").name.should == "ひろし"}
     it{ User.find_by_name("ひろし")[0].age.should == 10}
+    it{ User.find(:name => "たけし",:age => 21).should == []}
+    it{ User.find(:name => "たけし",:age => 20).count.should == 1}
+    it{ User.find_one(:name => "たけし",:age => 20).id.should == "2"}
   end
   describe "tsv" do
     before do
+      #1	あめ	30
+      #2	チョコレート	40
+      #3	ガム	50
       Item.load_data(MasterRecord::TSV.load_file(File.expand_path("../data/item.tsv", File.dirname(__FILE__))))
     end
     it{ Item.find().count.should == 3}
@@ -40,6 +51,14 @@ describe "Masterrecord" do
   end
   describe "yml" do
     before do
+      #1:
+      #  name: "Japan"
+      #  population: 120000000
+      #  salutation: "こんにちは"
+      #2:   
+      #  name: "China"
+      #  population: 500000000
+      #  salutation: "您好"
       Country.load_data(
         MasterRecord::YAML.load_file(Country.fields,File.expand_path("../data/country.yml", File.dirname(__FILE__))))
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MasterRecord
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17965520 !ruby/object:Gem::Requirement
+  requirement: &20301620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *17965520
+  version_requirements: *20301620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17963240 !ruby/object:Gem::Requirement
+  requirement: &20300880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17963240
+  version_requirements: *20300880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17960820 !ruby/object:Gem::Requirement
+  requirement: &20300320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *17960820
+  version_requirements: *20300320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &17958860 !ruby/object:Gem::Requirement
+  requirement: &20299320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17958860
+  version_requirements: *20299320
 description: Object Mapper for csv or tsv or yaml etc.. you can use find,find_one_by|field|,find_by_|field|
 email: laten@nifty.com
 executables: []
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3410631809793611323
+      hash: -1265236637701093746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: