dbwrapper 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dbwrapper.rb +6 -0
  3. data/lib/dbwrapper/version.rb +1 -1
  4. data/spec/dbwrapper_spec.rb +19 -10
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f762fabe31688b2ea19c7195bce37f4b7e2277a9
4
- data.tar.gz: 654c0e196c2cf66f37943c7e29ca41a19154791c
3
+ metadata.gz: 3406e9c4084f96f204b0e26fe913a95931be8554
4
+ data.tar.gz: 3de9eed66eb01b88303cc344fa9be2cd33930151
5
5
  SHA512:
6
- metadata.gz: c03f7f6e141fde9a8cae719a51557cd74803e438685cad9a9bd08d864215e6fdc4b1b60087c6fcc68d8e9c6b33b9c9c61c4f296b9e77e1d5a2c98276e4d06e02
7
- data.tar.gz: 05648785fd134026b03b8c9cc5317fadb840381865193798fa27059e8eb0bfd5ed944c56574561b8aaa7d3095fc308ebed7d77e8ddae2e2d1868dc08fd45ad7d
6
+ metadata.gz: e2a56b03747e4fc95044679e0879c68d7f9d899df71295fddf00af0453a8c805dfde1cd99cca87bd9a0411b4b011b73de03e45fa35244c42382da7fdd1a200cd
7
+ data.tar.gz: babc17e149acd463363643f2dd985577419203ff09f4426fc6aa6616b29b2e07b575f382e97a2fefd9043d91978c9e4917368836d5d9b5c0a4b9b70d2fef5e3a
data/lib/dbwrapper.rb CHANGED
@@ -28,6 +28,9 @@ module Dbwrapper
28
28
  if setting[:host]
29
29
  db_params[:host] = setting[:host]
30
30
  end
31
+ if setting[:port]
32
+ db_params[:port] = setting[:port]
33
+ end
31
34
  @client = Mysql2::Client.new(db_params)
32
35
  when "postgresql"
33
36
  require 'pg'
@@ -36,6 +39,9 @@ module Dbwrapper
36
39
  if setting[:host]
37
40
  db_params[:host] = setting[:host]
38
41
  end
42
+ if setting[:port]
43
+ db_params[:port] = setting[:port]
44
+ end
39
45
  if setting[:username]
40
46
  db_params[:user] = setting[:username]
41
47
  end
data/lib/dbwrapper/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Dbwrapper
2
- VERSION = "0.2.1"
2
+ VERSION = "0.2.2"
3
3
  end
data/spec/dbwrapper_spec.rb CHANGED
@@ -2,7 +2,7 @@ require 'spec_helper'
2
2
  require 'fileutils'
3
3
  require 'date'
4
4
 
5
- DummyDate = Time.utc(2014,6,26,0,0).utc
5
+ DummyDate = Time.new(2014,6,26,0,0)
6
6
  describe Dbwrapper do
7
7
  describe "sqlite3" do
8
8
  before(:all) do
@@ -18,7 +18,8 @@ describe Dbwrapper do
18
18
  @db.backup_table("users",File.dirname(__FILE__) + "/table/sqlite3")
19
19
  end
20
20
  it 'select' do
21
- @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
21
+ @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 =~
22
+ [{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 }]
22
23
  end
23
24
  it 'last_id' do
24
25
  @last_id.should == 3
@@ -48,7 +49,8 @@ describe Dbwrapper do
48
49
  @db.backup_table("users",File.dirname(__FILE__) + "/table/postgresql")
49
50
  end
50
51
  it 'select' do
51
- @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
52
+ @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 =~
53
+ [{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 }]
52
54
  end
53
55
  it 'last_id' do
54
56
  @last_id.should == 3
@@ -78,7 +80,8 @@ describe Dbwrapper do
78
80
  @db.backup_table("users",File.dirname(__FILE__) + "/table/mysql2")
79
81
  end
80
82
  it 'select' do
81
- @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
83
+ @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 =~
84
+ [{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 }]
82
85
  end
83
86
  it 'last_id' do
84
87
  @last_id.should == 3
@@ -102,7 +105,8 @@ describe Dbwrapper do
102
105
  @db.restore_table("users",File.dirname(__FILE__) + "/table/postgresql")
103
106
  end
104
107
  it 'select' do
105
- @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
108
+ @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 =~
109
+ [{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 }]
106
110
  end
107
111
  after do
108
112
  @db.query("drop table users")
@@ -117,7 +121,8 @@ describe Dbwrapper do
117
121
  @db.restore_table("users",File.dirname(__FILE__) + "/table/mysql2")
118
122
  end
119
123
  it 'select' do
120
- @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
124
+ @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 =~
125
+ [{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 }]
121
126
  end
122
127
  after do
123
128
  @db.query("drop table users")
@@ -134,7 +139,8 @@ describe Dbwrapper do
134
139
  @db.restore_table("users",File.dirname(__FILE__) + "/table/sqlite3")
135
140
  end
136
141
  it 'select' do
137
- @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
142
+ @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 =~
143
+ [{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 }]
138
144
  end
139
145
  after do
140
146
  @db.query("drop table users")
@@ -148,7 +154,8 @@ describe Dbwrapper do
148
154
  @db.restore_table("users",File.dirname(__FILE__) + "/table/mysql2")
149
155
  end
150
156
  it 'select' do
151
- @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
157
+ @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 =~
158
+ [{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 }]
152
159
  end
153
160
  after do
154
161
  @db.query("drop table users")
@@ -164,7 +171,8 @@ describe Dbwrapper do
164
171
  @db.restore_table("users",File.dirname(__FILE__) + "/table/sqlite3")
165
172
  end
166
173
  it 'select' do
167
- @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
174
+ @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 =~
175
+ [{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 }]
168
176
  end
169
177
  after do
170
178
  @db.query("drop table users")
@@ -178,7 +186,8 @@ describe Dbwrapper do
178
186
  @db.restore_table("users",File.dirname(__FILE__) + "/table/postgresql")
179
187
  end
180
188
  it 'select' do
181
- @db.query("select id,name from users").should =~ [{"id" => 1,"name" => "hay"},{"id" => 2,"name" => "hello"},{"id" => 3,"name" => "good"}]
189
+ @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 =~
190
+ [{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 }]
182
191
  end
183
192
  after do
184
193
  @db.query("drop table users")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dbwrapper
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Takeshi Morita
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-27 00:00:00.000000000 Z
11
+ date: 2014-11-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler