dbwrapper 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f762fabe31688b2ea19c7195bce37f4b7e2277a9
-  data.tar.gz: 654c0e196c2cf66f37943c7e29ca41a19154791c
+  metadata.gz: 3406e9c4084f96f204b0e26fe913a95931be8554
+  data.tar.gz: 3de9eed66eb01b88303cc344fa9be2cd33930151
 SHA512:
-  metadata.gz: c03f7f6e141fde9a8cae719a51557cd74803e438685cad9a9bd08d864215e6fdc4b1b60087c6fcc68d8e9c6b33b9c9c61c4f296b9e77e1d5a2c98276e4d06e02
-  data.tar.gz: 05648785fd134026b03b8c9cc5317fadb840381865193798fa27059e8eb0bfd5ed944c56574561b8aaa7d3095fc308ebed7d77e8ddae2e2d1868dc08fd45ad7d
+  metadata.gz: e2a56b03747e4fc95044679e0879c68d7f9d899df71295fddf00af0453a8c805dfde1cd99cca87bd9a0411b4b011b73de03e45fa35244c42382da7fdd1a200cd
+  data.tar.gz: babc17e149acd463363643f2dd985577419203ff09f4426fc6aa6616b29b2e07b575f382e97a2fefd9043d91978c9e4917368836d5d9b5c0a4b9b70d2fef5e3a

data/lib/dbwrapper.rb

@@ -28,6 +28,9 @@ module Dbwrapper
         if setting[:host]
           db_params[:host] = setting[:host]
         end
+        if setting[:port]
+          db_params[:port] = setting[:port]
+        end
         @client = Mysql2::Client.new(db_params)
       when "postgresql"
         require 'pg'
@@ -36,6 +39,9 @@ module Dbwrapper
         if setting[:host]
           db_params[:host] = setting[:host]
         end
+        if setting[:port]
+          db_params[:port] = setting[:port]
+        end
         if setting[:username]
           db_params[:user]  = setting[:username]
         end

data/lib/dbwrapper/version.rb

@@ -1,3 +1,3 @@
 module Dbwrapper
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/dbwrapper_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'fileutils'
 require 'date'
 
-DummyDate = Time.utc(2014,6,26,0,0).utc
+DummyDate = Time.new(2014,6,26,0,0)
 describe Dbwrapper do
   describe "sqlite3" do
     before(:all) do
@@ -18,7 +18,8 @@ describe Dbwrapper do
       @db.backup_table("users",File.dirname(__FILE__) + "/table/sqlite3")
     end
     it 'select' do
-      @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
+      @db.query("select * from users").map{|r| {id: r["id"], name: r["name"], created_at: Time.parse(r["created_at"].to_s).to_s }}.should =~
+      [{id: 1,name: "hay",created_at: DummyDate.to_s },{id: 2,name: "hello",created_at: DummyDate.to_s},{id: 3,name: "good",created_at: DummyDate.to_s }]
     end
     it 'last_id' do
       @last_id.should == 3
@@ -48,7 +49,8 @@ describe Dbwrapper do
       @db.backup_table("users",File.dirname(__FILE__) + "/table/postgresql")
     end
     it 'select' do
-      @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
+      @db.query("select * from users").map{|r| {id: r["id"], name: r["name"], created_at: Time.parse(r["created_at"].to_s).to_s }}.should =~
+      [{id: 1,name: "hay",created_at: DummyDate.to_s },{id: 2,name: "hello",created_at: DummyDate.to_s},{id: 3,name: "good",created_at: DummyDate.to_s }]
     end
     it 'last_id' do
       @last_id.should == 3
@@ -78,7 +80,8 @@ describe Dbwrapper do
       @db.backup_table("users",File.dirname(__FILE__) + "/table/mysql2")
     end
     it 'select' do
-      @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
+      @db.query("select * from users").map{|r| {id: r["id"], name: r["name"], created_at: Time.parse(r["created_at"].to_s).to_s }}.should =~
+      [{id: 1,name: "hay",created_at: DummyDate.to_s },{id: 2,name: "hello",created_at: DummyDate.to_s},{id: 3,name: "good",created_at: DummyDate.to_s }]
     end
     it 'last_id' do
       @last_id.should == 3
@@ -102,7 +105,8 @@ describe Dbwrapper do
         @db.restore_table("users",File.dirname(__FILE__) + "/table/postgresql")
       end
       it 'select' do
-        @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
+        @db.query("select * from users").map{|r| {id: r["id"], name: r["name"], created_at: Time.parse(r["created_at"].to_s).to_s }}.should =~
+              [{id: 1,name: "hay",created_at: DummyDate.to_s },{id: 2,name: "hello",created_at: DummyDate.to_s},{id: 3,name: "good",created_at: DummyDate.to_s }]
       end
       after do
         @db.query("drop table users")
@@ -117,7 +121,8 @@ describe Dbwrapper do
         @db.restore_table("users",File.dirname(__FILE__) + "/table/mysql2")
       end
       it 'select' do
-        @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
+        @db.query("select * from users").map{|r| {id: r["id"], name: r["name"], created_at: Time.parse(r["created_at"].to_s).to_s }}.should =~
+        [{id: 1,name: "hay",created_at: DummyDate.to_s },{id: 2,name: "hello",created_at: DummyDate.to_s},{id: 3,name: "good",created_at: DummyDate.to_s }]
       end
       after do
         @db.query("drop table users")
@@ -134,7 +139,8 @@ describe Dbwrapper do
         @db.restore_table("users",File.dirname(__FILE__) + "/table/sqlite3")
       end
       it 'select' do
-        @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
+        @db.query("select * from users").map{|r| {id: r["id"], name: r["name"], created_at: Time.parse(r["created_at"].to_s).to_s }}.should =~
+        [{id: 1,name: "hay",created_at: DummyDate.to_s },{id: 2,name: "hello",created_at: DummyDate.to_s},{id: 3,name: "good",created_at: DummyDate.to_s }]
       end
       after do
         @db.query("drop table users")
@@ -148,7 +154,8 @@ describe Dbwrapper do
         @db.restore_table("users",File.dirname(__FILE__) + "/table/mysql2")
       end
       it 'select' do
-        @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
+        @db.query("select * from users").map{|r| {id: r["id"], name: r["name"], created_at: Time.parse(r["created_at"].to_s).to_s }}.should =~
+        [{id: 1,name: "hay",created_at: DummyDate.to_s },{id: 2,name: "hello",created_at: DummyDate.to_s},{id: 3,name: "good",created_at: DummyDate.to_s }]
       end
       after do
         @db.query("drop table users")
@@ -164,7 +171,8 @@ describe Dbwrapper do
         @db.restore_table("users",File.dirname(__FILE__) + "/table/sqlite3")
       end
       it 'select' do
-        @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
+        @db.query("select * from users").map{|r| {id: r["id"], name: r["name"], created_at: Time.parse(r["created_at"].to_s).to_s }}.should =~
+        [{id: 1,name: "hay",created_at: DummyDate.to_s },{id: 2,name: "hello",created_at: DummyDate.to_s},{id: 3,name: "good",created_at: DummyDate.to_s }]
       end
       after do
         @db.query("drop table users")
@@ -178,7 +186,8 @@ describe Dbwrapper do
         @db.restore_table("users",File.dirname(__FILE__) + "/table/postgresql")
       end
       it 'select' do
-        @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
+        @db.query("select * from users").map{|r| {id: r["id"], name: r["name"], created_at: Time.parse(r["created_at"].to_s).to_s }}.should =~
+        [{id: 1,name: "hay",created_at: DummyDate.to_s },{id: 2,name: "hello",created_at: DummyDate.to_s},{id: 3,name: "good",created_at: DummyDate.to_s }]
       end
       after do
         @db.query("drop table users")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbwrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Takeshi Morita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler