geonames_local 3.3.1 → 3.3.3

data/spec/geonames_local/features/spot_spec.rb

@@ -1,275 +1,272 @@
-# -*- coding: utf-8 -*-
-require "spec_helper"
-require "geo_ruby"
+require 'spec_helper'
 
 describe Spot do
 
-  describe "Parsing Dump" do
+  describe 'Parsing Dump' do
 
     let(:spot) { Spot.new("6319037\tMaxaranguape\tMaxaranguape\t\t-5.46874226086957\t-35.3565714695652\tA\tADM2\tBR\t22\t2407500\t6593\t\t12\t\t\t\tAmerica/Recife\t2006-12-17", :dump) }
 
-    it "should parse geoid integer" do
-      spot.geoname_id.should eql(6319037)
-      spot.gid.should eql(6319037)
+    it 'should parse geoid integer' do
+      expect(spot.geoname_id).to eql(6_319_037)
+      expect(spot.gid).to eql(6_319_037)
     end
 
-    it "should parse code" do
-      spot.code.should eql("6593")
+    it 'should parse code' do
+      expect(spot.code).to eql('6593')
     end
 
-    it "should parse region code" do
-      spot.region.should eql("2407500")
+    it 'should parse region code' do
+      expect(spot.region).to eql('2407500')
     end
 
-    it "should parse name" do
-      spot.name.should eql("Maxaranguape")
-      spot.ascii.should eql("Maxaranguape")
+    it 'should parse name' do
+      expect(spot.name).to eql('Maxaranguape')
+      expect(spot.ascii).to eql('Maxaranguape')
     end
 
-    it "should parse geostuff" do
-      spot.lat.should be_within(0.001).of(-5.4687)
-      spot.y.should be_within(0.001).of(-5.4687)
-      spot.lon.should be_within(0.001).of(-35.3565)
+    it 'should parse geostuff' do
+      expect(spot.lat).to be_within(0.001).of(-5.4687)
+      expect(spot.y).to be_within(0.001).of(-5.4687)
+      expect(spot.lon).to be_within(0.001).of(-35.3565)
     end
 
-    it "should parse spot kind" do
-      spot.kind.should eql(:city)
+    it 'should parse spot kind' do
+      expect(spot.kind).to eql(:city)
     end
 
-    it "should parse spot nation" do
-      spot.nation.should eql("BR")
+    it 'should parse spot nation' do
+      expect(spot.nation).to eql('BR')
     end
 
-    it "shuold parse timezone" do
-      spot.tz.should eql("America/Recife")
+    it 'shuold parse timezone' do
+      expect(spot.tz).to eql('America/Recife')
     end
 
-    it "should parse updated_at" do
-      spot.updated_at.should be_instance_of(Time)
-      spot.updated_at.day.should eql(17)
+    it 'should parse updated_at' do
+      expect(spot.updated_at).to be_instance_of(Time)
+      expect(spot.updated_at.day).to eql(17)
     end
   end
 
-  describe "More Parsing" do
+  describe 'More Parsing' do
 
     let(:spot) { Geonames::Spot.new("3384862\tRiacho Zuza\tRiacho Zuza\t\t-9.4333333\t-37.6666667\tH\tSTMI\tBR\t\t02\t\t\t\t0\t\t241\tAmerica/Maceio\t1993-12-17\n", :dump) }
 
-    it "should parse geoid integer" do
-      spot.geoname_id.should eql(3384862)
+    it 'should parse geoid integer' do
+      expect(spot.geoname_id).to eql(3_384_862)
     end
 
-    it "should parse name" do
-      spot.name.should eql("Riacho Zuza")
-      spot.ascii.should eql("Riacho Zuza")
+    it 'should parse name' do
+      expect(spot.name).to eql('Riacho Zuza')
+      expect(spot.ascii).to eql('Riacho Zuza')
     end
 
-    it "should parse geostuff" do
-      spot.lat.should be_within(0.001).of(-9.4333333)
-      spot.lon.should be_within(0.001).of(-37.6666667)
+    it 'should parse geostuff' do
+      expect(spot.lat).to be_within(0.001).of(-9.4333333)
+      expect(spot.lon).to be_within(0.001).of(-37.6666667)
     end
 
-    it "should parse spot kind" do
-      spot.kind.should eql(:other)
+    it 'should parse spot kind' do
+      expect(spot.kind).to eql(:other)
     end
 
-    it "should parse spot nation" do
-      spot.nation.should eql("BR")
+    it 'should parse spot nation' do
+      expect(spot.nation).to eql('BR')
     end
 
-    it "shuold parse timezone" do
-      spot.tz.should eql("America/Maceio")
+    it 'shuold parse timezone' do
+      expect(spot.tz).to eql('America/Maceio')
     end
 
-    it "should parse updated_at" do
-      spot.updated_at.should be_instance_of(Time)
-      spot.updated_at.day.should eql(17)
+    it 'should parse updated_at' do
+      expect(spot.updated_at).to be_instance_of(Time)
+      expect(spot.updated_at.day).to eql(17)
     end
   end
 
-  describe "Parsing Region" do
+  describe 'Parsing Region' do
 
     let(:spot) { Geonames::Spot.new("3457153\tEstado de Minas Gerais\tEstado de Minas Gerais\tMinas,Minas Geraes,Minas Gerais\t-18.0\t-44.0\tA\tADM1\tBR\tBR\t15\t\t\t\t16672613\t\t1219\tAmerica/Sao_Paulo\t2007-05-15\n", :dump) }
 
-    it "should be kind of region" do
-      spot.kind.should eql(:region)
+    it 'should be kind of region' do
+      expect(spot.kind).to eql(:region)
     end
 
-    it "should parse geoid" do
-    spot.geoname_id.should eql(3457153)
-      spot.gid.should eql(3457153)
+    it 'should parse geoid' do
+      expect(spot.geoname_id).to eql(3_457_153)
+      expect(spot.gid).to eql(3_457_153)
     end
 
-    it "should parse code" do
-      spot.code.should be_empty
+    it 'should parse code' do
+      expect(spot.code).to be_empty
     end
 
-    it "should parse region code" do
-      spot.region.should eql("15")
+    it 'should parse region code' do
+      expect(spot.region).to eql('15')
     end
 
-    it "should create abbr" do
-      spot.abbr.should eql("MG")
+    it 'should create abbr' do
+      expect(spot.abbr).to eql('MG')
     end
 
-    it "should parse name" do
-      spot.name.should eql("Minas Gerais")
-      spot.ascii.should eql("Estado de Minas Gerais")
+    it 'should parse name' do
+      expect(spot.name).to eql('Minas Gerais')
+      expect(spot.ascii).to eql('Estado de Minas Gerais')
     end
 
-    it "should parse geostuff" do
-      spot.lat.should be_within(0.001).of(-18.0)
-      spot.lon.should be_within(0.001).of(-44.0)
+    it 'should parse geostuff' do
+      expect(spot.lat).to be_within(0.001).of(-18.0)
+      expect(spot.lon).to be_within(0.001).of(-44.0)
     end
 
   end
 
-  describe "Parsing City" do
+  describe 'Parsing City' do
 
     let(:spot) {  Spot.new "3386859\tTamboril\tTamboril\t\t-4.9931\t-40.26738\tA\tADM2\tBR\t\t06\t2313203\t\t\t25455\t\t401\tAmerica/Fortaleza\t2011-04-21" }
 
-    it "should parse name" do
-      spot.name.should eql("Tamboril")
+    it 'should parse name' do
+      expect(spot.name).to eql('Tamboril')
     end
 
-    it "should parse ascii name" do
-      spot.name.should eql("Tamboril")
+    it 'should parse ascii name' do
+      expect(spot.name).to eql('Tamboril')
     end
 
-    it "should parse x" do
-      spot.x.should be_within(0.001).of(-40.26738)
+    it 'should parse x' do
+      expect(spot.x).to be_within(0.001).of(-40.26738)
     end
 
-    it "should parse y" do
-      spot.y.should be_within(0.001).of(-4.9931)
+    it 'should parse y' do
+      expect(spot.y).to be_within(0.001).of(-4.9931)
     end
 
-    it "should parse tz" do
-      spot.tz.should eql("America/Fortaleza")
+    it 'should parse tz' do
+      expect(spot.tz).to eql('America/Fortaleza')
     end
 
-    it "should parse kind" do
-      spot.kind.should eql(:city)
+    it 'should parse kind' do
+      expect(spot.kind).to eql(:city)
     end
 
-    it "should parse nation" do
-      spot.nation.should eql("BR")
+    it 'should parse nation' do
+      expect(spot.nation).to eql('BR')
     end
 
-    it "should parse region" do
-      spot.region.should eql("06")
+    it 'should parse region' do
+      expect(spot.region).to eql('06')
     end
 
-    it "should parse pop" do
-      spot.pop.should eql("25455")
+    it 'should parse pop' do
+      expect(spot.pop).to eql('25455')
     end
 
   end
 
-  describe "Parsing Big City" do
+  describe 'Parsing Big City' do
 
     let(:spot) {  Spot.new "6322846\tLondrina\tLondrina\t\t-23.58643\t-51.08739\tA\tADM2\tBR\t\t18\t4113700\t\t\t506645\t\t544\tAmerica/Sao_Paulo\t2011-04-21" }
 
-    it "should parse name" do
-      spot.name.should eql("Londrina")
+    it 'should parse name' do
+      expect(spot.name).to eql('Londrina')
     end
 
-    it "should parse ascii name" do
-      spot.name.should eql("Londrina")
+    it 'should parse ascii name' do
+      expect(spot.name).to eql('Londrina')
     end
 
-    it "should parse x" do
-      spot.x.should be_within(0.001).of(-51.08739)
+    it 'should parse x' do
+      expect(spot.x).to be_within(0.001).of(-51.08739)
     end
 
-    it "should parse y" do
-      spot.y.should be_within(0.001).of(-23.58643)
+    it 'should parse y' do
+      expect(spot.y).to be_within(0.001).of(-23.58643)
     end
 
-    it "should parse tz" do
-      spot.tz.should eql("America/Sao_Paulo")
+    it 'should parse tz' do
+      expect(spot.tz).to eql('America/Sao_Paulo')
     end
 
-    it "should parse kind" do
-      spot.kind.should eql(:city)
+    it 'should parse kind' do
+      expect(spot.kind).to eql(:city)
     end
 
-    it "should parse nation" do
-      spot.nation.should eql("BR")
+    it 'should parse nation' do
+      expect(spot.nation).to eql('BR')
     end
 
-    it "should parse region" do
-      spot.region.should eql("18")
+    it 'should parse region' do
+      expect(spot.region).to eql('18')
     end
 
-    it "should parse pop" do
-      spot.pop.should eql("506645")
+    it 'should parse pop' do
+      expect(spot.pop).to eql('506645')
     end
 
-
   end
 
-  describe "Parsing Zip" do
+  describe 'Parsing Zip' do
 
     let(:spot) { Geonames::Spot.new("BR\t76375-000\tHidrolina\tGoias\t\t5209804\t29\t\t\t-14.7574\t-49.3596\t\n", :zip) }
 
-    it "should parse zip oO" do
-      spot.zip.should eql("76375-000")
+    it 'should parse zip oO' do
+      expect(spot.zip).to eql('76375-000')
     end
 
-    it "should be a city" do
-      spot.kind.should eql(:city)
+    it 'should be a city' do
+      expect(spot.kind).to eql(:city)
     end
 
-    it "should parse code" do
-      spot.code.should eql("29")
+    it 'should parse code' do
+      expect(spot.code).to eql('29')
     end
 
-    it "should parse geoid integer" do
-      spot.gid.should be_nil # eql(3384862)
+    it 'should parse geoid integer' do
+      expect(spot.gid).to be_nil # eql(3384862)
     end
 
-    it "should parse name" do
-      spot.name.should eql("Hidrolina")
-      spot.ascii.should be_nil # eql("Hidrolina")
+    it 'should parse name' do
+      expect(spot.name).to eql('Hidrolina')
+      expect(spot.ascii).to be_nil # eql("Hidrolina")
     end
 
-    it "should parse lat" do
-      spot.lat.should be_within(0.001).of(-14.7574)
+    it 'should parse lat' do
+      expect(spot.lat).to be_within(0.001).of(-14.7574)
     end
 
-    it "should parse lon" do
-      spot.lon.should be_within(0.001).of(-49.3596)
+    it 'should parse lon' do
+      expect(spot.lon).to be_within(0.001).of(-49.3596)
     end
 
   end
 
-  describe "From Hash" do
+  describe 'From Hash' do
 
-    let(:spot) { Spot.from_hash({"id" => 9, "name" => "Sao Rock", "geom" => [15,15], "kind" => "city", "nation" => "BR", "gid" => 13232, "tz" => "America/Foo", "ascii" => "Rock"}) }
+    let(:spot) { Spot.from_hash('id' => 9, 'name' => 'Sao Rock', 'geom' => [15, 15], 'kind' => 'city', 'nation' => 'BR', 'gid' => 13_232, 'tz' => 'America/Foo', 'ascii' => 'Rock') }
 
-    it "should be an spot" do
-      spot.should be_instance_of Spot
+    it 'should be an spot' do
+      expect(spot).to be_instance_of Spot
     end
 
-    it "should set the name" do
-      spot.name.should eql("Sao Rock")
+    it 'should set the name' do
+      expect(spot.name).to eql('Sao Rock')
     end
 
-    it "should set the geom" do
-      spot.geom.should be_instance_of(GeoRuby::SimpleFeatures::Point)
-      spot.geom.x.should eql(15)
+    it 'should set the geom' do
+      expect(spot.geom).to be_instance_of(GeoRuby::SimpleFeatures::Point)
+      expect(spot.geom.x).to eql(15)
     end
 
-    it "should set the tz" do
-      spot.tz.should eql("America/Foo")
+    it 'should set the tz' do
+      expect(spot.tz).to eql('America/Foo')
     end
 
-    it "should set the ascii" do
-      spot.ascii.should eql("Rock")
+    it 'should set the ascii' do
+      expect(spot.ascii).to eql('Rock')
     end
 
-    it "should set the nation abbr" do
-      spot.nation.should eql("BR")
+    it 'should set the nation abbr' do
+      expect(spot.nation).to eql('BR')
     end
 
   end

data/spec/geonames_local/features/zone_spec.rb

@@ -1,56 +1,55 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require "geo_ruby"
+require 'spec_helper'
 
 describe Zone do
 
-  describe "Parsing Dump" do
+  describe 'Parsing Dump' do
 
     before do
       @zone = Zone.new([:name, :null, :geom], "Copacabana\t2\t0106000020E6100000010000000103000020E6100000010000001B000000DE024322029645C0E3263B4536F736C06A78FF7D099745C05F4C17BC3AF836C016ECF835959745C0A6303C5AF6F836C031D79B0DEE9745C02A86A360EDF936C0BBC7A929259845C054515A9559FB36C0050527EF109845C02AD15A3969FC36C0A5705221BD9745C031151F7ACBFC36C0A96DC310049845C0055C26CBE0FC36C0C0FA3CDA6E9845C02424EED2F6FC36C08D80123FF49845C03C190018D7FB36C02E4C5C15199945C0A11ABD694CFB36C00D94B215269945C0F04B5E66CAFA36C03440A3EA169945C029ADE30D51FA36C082988494F89845C06DF6F65FD3F936C0E1CC3ABED39845C00B593959CFF836C0C0ED50117D9845C045937E53F2F736C03440A3EA169945C0CDFE644A93F636C0BA204AE9E29845C0C2EF96F233F636C08C60DFA8C29845C0A38B4DC61DF636C06DA128929D9845C03DE8AF4604F636C047CEF70F499845C08B67D19D49F636C0E87201390A9845C073BEF5F5B5F636C05F50930A799745C0B707094838F636C06CEAA05AAD9645C049A9FD439CF536C034760E48739645C0B9F4FBDC84F536C0F2A307AC159645C0CCEA3108E3F636C0DE024322029645C0E3263B4536F736C0")
     end
 
-    it "should parse code" do
-      @zone.name.should eql("Copacabana")
+    it 'should parse code' do
+      expect(@zone.name).to eql('Copacabana')
     end
 
-    it "should parse kind" do
-      @zone.kind.should eql(:zone)
+    it 'should parse kind' do
+      expect(@zone.kind).to eql(:zone)
     end
 
-    it "should parse geom" do
-      @zone.geom.should be_kind_of(GeoRuby::SimpleFeatures::MultiPolygon)
+    it 'should parse geom' do
+      expect(@zone.geom).to be_kind_of(GeoRuby::SimpleFeatures::MultiPolygon)
     end
 
-    it "should have 1 geometry" do
-      @zone.geom.should have(1).geometries
+    it 'should have 1 geometry' do
+      expect(@zone.geom.size).to eq(1)
     end
 
-    it "should have 1 geometry polygon" do
+    it 'should have 1 geometry polygon' do
       geom = @zone.geom.geometries[0]
-      geom.should be_kind_of(GeoRuby::SimpleFeatures::Polygon)
+      expect(geom).to be_kind_of(GeoRuby::SimpleFeatures::Polygon)
     end
 
-    it "should have 1 geometry polygon with n points" do
-      @zone.geom.geometries[0][0].should have(27).points
+    it 'should have 1 geometry polygon with n points' do
+      expect(@zone.geom.geometries[0][0].size).to eq(27)
     end
 
   end
 
-  describe "Another parse" do
+  describe 'Another parse' do
     before do
       @zone = Zone.new([:name, :null, :geom], "Botafogo\t4\t0106000020E6100000010000000103000020E610000001000000260000008C60DFA8C29845C0A38B4DC61DF636C0D68132D5E79845C090FADA554EF536C069D119B12A9945C0D857001102F436C0298D2075189945C0BFEDCBEBA8F336C049DBDD0FFA9845C0EEE2E7537BF336C0D68132D5E79845C0C2DCE6FB5FF336C0A761EE3BB99845C0FD7DA07637F336C048D58ABADF9845C061341567FBF136C0D5CD0D24649845C01D4DDC69AEF136C0106FC79E3B9845C058EE95E485F136C0739E6AE14F9845C043737CCFE3F036C0C10619C0459845C0466297DF9AF036C0BD63D9FE0A9845C0AF6F70421DF036C0A8E8BFE9689745C022C3C82715F036C0AF7A1ABB5A9745C08103515A72F036C0805AD6212C9745C0A04BBB9F39F036C03FFE0258109745C0E861C12D4AF036C0FD2EA4E8CC9645C08103515A72F036C03F62B834969645C0A9913A22AFF036C0C96B208E639645C0875AB5CC30F136C02DFC02077A9645C03E01065281F136C0BD3A35D49B9645C04CFB74214EF136C04048B7CBD99645C0F0F4ABBE6EF136C0ABD7DAF91F9745C0521060C417F236C083C8D321229745C0BC1081D776F236C009643E7BF99645C083E4C80ECAF236C0D16BCFB3BF9645C0EFBC652AD8F236C084595B73599645C07CA67AEF3AF336C0B1592EAC6B9645C0A3A74E6AB4F336C03DAE50A9189645C0D653696356F436C02127B0EE3C9645C070D22BCB62F536C034760E48739645C0B9F4FBDC84F536C06CEAA05AAD9645C049A9FD439CF536C05F50930A799745C0B707094838F636C0E87201390A9845C073BEF5F5B5F636C047CEF70F499845C08B67D19D49F636C06DA128929D9845C03DE8AF4604F636C08C60DFA8C29845C0A38B4DC61DF636C0")
     end
 
-    it "should parse code" do
-      @zone.name.should eql("Botafogo")
+    it 'should parse code' do
+      expect(@zone.name).to eql('Botafogo')
     end
 
-    it "should parse geom" do
-      @zone.geom.should be_kind_of(GeoRuby::SimpleFeatures::MultiPolygon)
+    it 'should parse geom' do
+      expect(@zone.geom).to be_kind_of(GeoRuby::SimpleFeatures::MultiPolygon)
     end
 
-    it "should have 1 geometry polygon with n points" do
-      @zone.geom.geometries[0][0].should have(38).points
+    it 'should have 1 geometry polygon with n points' do
+      expect(@zone.geom.geometries[0][0].size).to eq(38)
     end
 
   end

data/spec/geonames_local/models/mongodb_spec.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require "spec_helper"
+require 'spec_helper'
 
 # require 'geonames_local/models/mongodb'
 # include Models::Mongo

data/spec/geonames_local/models/tokyo_spec.rb

@@ -1,29 +1,29 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "Tokyo" do
+describe 'Tokyo' do
 
-#   it "should write down a spot" do
-#     t = Geonames::Tokyo.new('localhost', 1978)
-#     m = mock(Geonames::Spot, { :gid => 888, :to_hash => { "gid" => 888, "kind" => "city", "lat" => 5.5 }})
-#     t.write(m)
-#   end
+  #   it "should write down a spot" do
+  #     t = Geonames::Tokyo.new('localhost', 1978)
+  #     m = mock(Geonames::Spot, { :gid => 888, :to_hash => { "gid" => 888, "kind" => "city", "lat" => 5.5 }})
+  #     t.write(m)
+  #   end
 
-#   it "should read it up" do
-#     t = Geonames::Tokyo.new('localhost', 1978)
-#     record = t.find(888)
-#     record.should be_instance_of Geonames::Spot
-#   end
+  #   it "should read it up" do
+  #     t = Geonames::Tokyo.new('localhost', 1978)
+  #     record = t.find(888)
+  #     record.should be_instance_of Geonames::Spot
+  #   end
 
-#   it "should not duplicate" do
-#     t = Geonames::Tokyo.new('localhost', 1978)
-#     t.all({ :gid => 888}).length.should eql(1)
-#   end
+  #   it "should not duplicate" do
+  #     t = Geonames::Tokyo.new('localhost', 1978)
+  #     t.all({ :gid => 888}).length.should eql(1)
+  #   end
 
-#   it "should return all countries" do
-#     all = Geonames::Nation.all
-#     all.should be_instance_of Array
-#     all[0].should be_instance_of Geonames::Nation
-#     all[0].gid.should eql(1)
-#   end
+  #   it "should return all countries" do
+  #     all = Geonames::Nation.all
+  #     all.should be_instance_of Array
+  #     all[0].should be_instance_of Geonames::Nation
+  #     all[0].gid.should eql(1)
+  #   end
 
 end

data/spec/geonames_local_spec.rb

@@ -3,9 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Geonames do
 
-  it "should have a cache" do
-    Cache.should be_instance_of(Hash)
+  it 'should have a cache' do
+    expect(Cache).to be_instance_of(Hash)
   end
 
-
 end

data/spec/spec_ar_helper.rb

@@ -30,8 +30,6 @@
 #   exit
 # end
 
-
-
 # ActiveRecord::Schema.define() do
 
 #   create_table :users, :force => true do |t|
@@ -92,5 +90,4 @@
 #     DatabaseCleaner.clean
 #   end
 
-
 # end

data/spec/spec_helper.rb

@@ -3,9 +3,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'geonames_local'
 require 'geonames_local/cli'
 require 'rspec'
-require 'rspec/autorun'
 include Geonames
 
-RSpec.configure do |config|
-
-end
+# RSpec.configure do |config|
+# end

data/task/benchmark.rb

@@ -11,17 +11,15 @@ require 'geonames_local'
 def b1(db)
   puts "#{db.count} Objects"
   Benchmark.bmbm do |b|
-    b.report("All Country") { db.all({ :kind => "country" })}
-    b.report("Find by GID") { db.find(888) }
-    b.report("Find by name") { db.all({ :name => "Maxaranguape"}) }
-    b.report("Find on country") { db.all({ :country => "CL"}) }
+    b.report('All Country') { db.all(kind: 'country') }
+    b.report('Find by GID') { db.find(888) }
+    b.report('Find by name') { db.all(name: 'Maxaranguape') }
+    b.report('Find on country') { db.all(country: 'CL') }
   end
 end
 
-print "Tyrant => "
+print 'Tyrant => '
 b1(Geonames::Tokyo.new(:tyrant))
 
-
-print "Cabinet => "
+print 'Cabinet => '
 b1(Geonames::Tokyo.new)
-

data/task/benchmark_cabinet.rb

@@ -8,17 +8,15 @@ require 'geonames_local'
 include Geonames
 # @db.flush
 
-
 def b1(db)
   puts "#{db.count} Objects"
   Benchmark.bmbm do |b|
-    b.report("All Country") { Country.all }
-    b.report("Find by GID") { db.find(888) }
-    b.report("Find by name") { db.all({ :name => "Maxaranguape"}) }
-    b.report("Find on country") { db.all({ :country => "CL"}) }
+    b.report('All Country') { Country.all }
+    b.report('Find by GID') { db.find(888) }
+    b.report('Find by name') { db.all(name: 'Maxaranguape') }
+    b.report('Find on country') { db.all(country: 'CL') }
   end
 end
 
-print "Cabinet => "
+print 'Cabinet => '
 b1(Tokyo.new)
-