MasterRecord 0.3.0 → 0.3.1

data/ChangeLog

@@ -0,0 +1,3 @@
+0.3.1
+* add attributes method (ex Item.find_one_by_price(40).attributes => {:id => "2",:identity => "Item@2",:name => "チョコレート",:price => 40})
+* add []access (ex Item.find_one_by_price(50)[:id] => "3")

data/MasterRecord.gemspec

@@ -5,20 +5,22 @@
 
 Gem::Specification.new do |s|
   s.name = "MasterRecord"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takeshi Morita"]
-  s.date = "2011-12-17"
+  s.date = "2011-12-20"
   s.description = "Object Mapper for csv or tsv or yaml etc.. you can use find,find_one_by|field|,find_by_|field|"
   s.email = "laten@nifty.com"
   s.extra_rdoc_files = [
+    "ChangeLog",
     "LICENSE.txt",
     "README.rdoc"
   ]
   s.files = [
     ".document",
     ".rspec",
+    "ChangeLog",
     "Gemfile",
     "LICENSE.txt",
     "MasterRecord.gemspec",

data/README.rdoc

@@ -21,6 +21,7 @@
         :name => MasterRecord.string,
         :population => MasterRecord.integer,
         :salutation => lambda{|r| "'#{r}!!'" }
+        :now => lambda{|r|"lambda{ Time.now.localtime('" + r + "')}"},
       }
       include MasterRecord
     end
@@ -45,6 +46,8 @@
     Item.load_data(MasterRecord::TSV.load_file(File.expand_path("./data/item.tsv", File.dirname(__FILE__))))
     Item.find().count => 3
     Item.find_by_price(50)[0].name => "ガム"
+    Item.find_one_by_price(50)[:id] => "3"
+    Item.find_one_by_price(40).attributes => {:id => "2",:identity => "Item@2",:name => "チョコレート",:price => 40}
 
     #1:
     #  name: "Japan"
@@ -60,6 +63,8 @@
     Country.find().count => 2
     Country.find_one_by_population(500000000).name => "China"
     Country.find().map(&:salutation) => ["こんにちは!!","您好!!"]}
+    Country.find("1").now.call.to_s => "2011-12-18 01:01:00 +0900"
+    Country.find("2").now.call.to_s => "2011-12-18 00:01:00 +0800"
 
 
 == Contributing to MasterRecord

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/data/country.yml

@@ -2,7 +2,9 @@
   name: "Japan"
   salutation: "こんにちは"
   population: 120000000
+  now: "+09:00"
 2:   
   name: "China"
   salutation: "您好"
   population: 500000000
+  now: "+08:00"

data/lib/MasterRecord.rb

@@ -53,6 +53,14 @@ module MasterRecord
       @info = rec[@id]
     end
 
+    def attributes
+      @info.merge({:id => @id,:identity => @identity})
+    end
+
+    def [](field)
+      attributes[field.to_sym]
+    end
+
     attr_reader :identity, :id
 
     def c.all

data/spec/MasterRecord_spec.rb

@@ -19,13 +19,15 @@ class Country
   CountryFields = {
     :name => MasterRecord.string,
     :population => MasterRecord.integer,
-    :salutation => lambda{|r| "'#{r}!!'" }
+    :salutation => lambda{|r| "'#{r}!!'" },
+    :now => lambda{|r|"lambda{ Time.now.localtime('" + r + "')}"},
   }
   include MasterRecord
 end
 describe "Masterrecord" do
   describe "csv" do
     before do
+      #id,name,age
       #1,ひろし,10
       #2,たけし,20
       #3,まこと,30
@@ -47,7 +49,9 @@ describe "Masterrecord" do
       Item.load_data(MasterRecord::TSV.load_file(File.expand_path("../data/item.tsv", File.dirname(__FILE__))))
     end
     it{ Item.find().count.should == 3}
-    it{ Item.find_by_price(50)[0].name.should == "ガム"}
+    it{ Item.find_by_price(50)[0]["name"].should == "ガム"}
+    it{ Item.find_one_by_price(50)[:id].should == "3"}
+    it{ Item.find_one_by_price(40).attributes.should == {:id => "2",:identity => "Item@2",:name => "チョコレート",:price => 40}}
   end
   describe "yml" do
     before do
@@ -55,15 +59,20 @@ describe "Masterrecord" do
       #  name: "Japan"
       #  population: 120000000
       #  salutation: "こんにちは"
+      #  now: "+09:00"
       #2:   
       #  name: "China"
       #  population: 500000000
       #  salutation: "您好"
+      #  now: "+08:00"
       Country.load_data(
         MasterRecord::YAML.load_file(Country.fields,File.expand_path("../data/country.yml", File.dirname(__FILE__))))
+      @now = Time.new(2011,12,18,1,1,0)
+      Time.stub!(:now).and_return(@now)
     end
     it{ Country.find().count.should == 2}
-    it{ Country.find_one_by_population(500000000).name.should == "China"}
     it{ Country.find().map(&:salutation).should == ["こんにちは!!","您好!!"]}
+    it{ Country.find("1").now.call.to_s.should == "2011-12-18 01:01:00 +0900"}
+    it{ Country.find("2").now.call.to_s.should == "2011-12-18 00:01:00 +0800"}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MasterRecord
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-17 00:00:00.000000000 Z
+date: 2011-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20301620 !ruby/object:Gem::Requirement
+  requirement: &11611540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *20301620
+  version_requirements: *11611540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20300880 !ruby/object:Gem::Requirement
+  requirement: &11610740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20300880
+  version_requirements: *11610740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20300320 !ruby/object:Gem::Requirement
+  requirement: &11609720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *20300320
+  version_requirements: *11609720
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &20299320 !ruby/object:Gem::Requirement
+  requirement: &11608860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,17 +54,19 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20299320
+  version_requirements: *11608860
 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: []
 extensions: []
 extra_rdoc_files:
+- ChangeLog
 - LICENSE.txt
 - README.rdoc
 files:
 - .document
 - .rspec
+- ChangeLog
 - Gemfile
 - LICENSE.txt
 - MasterRecord.gemspec
@@ -96,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1265236637701093746
+      hash: -2812055945714536566
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: