Skip to content

Commit 689161a

Browse files
committed
cleanup up warnings
1 parent 8232582 commit 689161a

File tree

10 files changed

+50
-27
lines changed

10 files changed

+50
-27
lines changed

Rakefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ spec = Gem::Specification.new do |s|
8484
s.requirements << "none"
8585
s.require_path = "lib"
8686
s.description = LONG_DESC
87-
s.has_rdoc = true
8887
s.authors = ["Tim Becker", "Slava Kravchenko"]
8988
s.email = ["tim.becker@kuriositaet.de","cordawyn@gmail.com"]
9089
s.homepage = "http://github.com/a2800276/8583/"
@@ -125,7 +124,7 @@ end
125124
Rake::TestTask.new do |t|
126125
t.libs << "test"
127126
t.libs << "."
128-
t.ruby_opts = ["-rubygems"]
127+
t.ruby_opts = ["-rrubygems"]
129128
t.test_files = FileList["test/*.rb"]
130129
t.verbose = true
131130
end

iso8583.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
1717
s.required_rubygems_version = ">= 1.3.6"
1818
s.required_ruby_version = ">= 1.9"
1919
s.rubyforge_project = "iso8583"
20-
s.has_rdoc = true
2120

2221
s.requirements << "none"
2322

lib/iso8583/berlin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class BerlinMessage < Message
7272
mes[2] = 474747474747
7373
mes["Processing Code"] = "123456"
7474

75-
pan = mes["Primary Account Number (PAN)"]
75+
#pan = mes["Primary Account Number (PAN)"]
7676
#mes.pan = 47474747474747
7777

7878
#puts mes.pan

lib/iso8583/codec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def encode(value)
113113
[val].pack("H*")
114114
}
115115
Packed_Number.decoder = lambda{|encoded|
116-
d = encoded.unpack("H*")[0].to_i
116+
encoded.unpack("H*")[0].to_i
117117
}
118118

119119
A_Codec = Codec.new

lib/iso8583/fields.rb

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,63 +57,75 @@ module ISO8583
5757
}
5858

5959
LL_BCD = BCDField.new
60+
LL_BCD.name = "LL_BCD"
6061
LL_BCD.length = 2
6162
LL_BCD.codec = Packed_Number
6263

6364
# Two byte variable length ASCII numeral, payload ASCII numerals
6465
LLVAR_N = Field.new
66+
LLVAR_N.name = "LLVAR_N"
6567
LLVAR_N.length = LL
6668
LLVAR_N.codec = ASCII_Number
6769

6870
# Three byte variable length ASCII numeral, payload ASCII numerals
6971
LLLVAR_N = Field.new
72+
LLLVAR_N.name = "LLLVAR_N"
7073
LLLVAR_N.length = LLL
7174
LLLVAR_N.codec = ASCII_Number
7275

7376
# Two byte variable length ASCII numeral, payload Track2 data
7477
LLVAR_Z = Field.new
78+
LLVAR_Z.name = "LLVAR_Z"
7579
LLVAR_Z.length = LL
7680
LLVAR_Z.codec = Track2
7781

7882
# Two byte variable length ASCII numeral, payload ASCII, fixed length, zeropadded (right)
7983
LLVAR_AN = Field.new
84+
LLVAR_AN.name = "LLVAR_AN"
8085
LLVAR_AN.length = LL
8186
LLVAR_AN.codec = AN_Codec
8287

8388
# Two byte variable length ASCII numeral, payload ASCII+special
8489
LLVAR_ANS = Field.new
90+
LLVAR_ANS.name = "LLVAR_ANS"
8591
LLVAR_ANS.length = LL
8692
LLVAR_ANS.codec = ANS_Codec
8793

8894
# Three byte variable length ASCII numeral, payload ASCII, fixed length, zeropadded (right)
8995
LLLVAR_AN = Field.new
96+
LLLVAR_AN.name = "LLLVAR_AN"
9097
LLLVAR_AN.length = LLL
9198
LLLVAR_AN.codec = AN_Codec
9299

93100
# Three byte variable length ASCII numeral, payload ASCII+special
94101
LLLVAR_ANS = Field.new
102+
LLLVAR_ANS.name = "LLLVAR_ANS"
95103
LLLVAR_ANS.length = LLL
96104
LLLVAR_ANS.codec = ANS_Codec
97105

98106
# Two byte variable length binary payload
99107
LLVAR_B = Field.new
108+
LLVAR_B.name = "LLVAR_B"
100109
LLVAR_B.length = LL
101110
LLVAR_B.codec = Null_Codec
102111

103112

104113
# Three byte variable length binary payload
105114
LLLVAR_B = Field.new
115+
LLLVAR_B.name = "LLLVAR_B"
106116
LLLVAR_B.length = LLL
107117
LLLVAR_B.codec = Null_Codec
108118

109119
# Fixed lengh numerals, repesented in ASCII, padding right justified using zeros
110120
N = Field.new
121+
N.name = "N"
111122
N.codec = ASCII_Number
112123
N.padding = lambda {|val, len|
113124
sprintf("%0#{len}d", val)
114125
}
115126

116127
N_BCD = BCDField.new
128+
N_BCD.name = "N_BCD"
117129
N_BCD.codec = Packed_Number
118130

119131
PADDING_LEFT_JUSTIFIED_SPACES = lambda {|val, len|
@@ -122,25 +134,30 @@ module ISO8583
122134

123135
# Fixed length ASCII letters [A-Za-z]
124136
A = Field.new
137+
A.name = "A"
125138
A.codec = A_Codec
126139

127140
# Fixed lengh ASCII [A-Za-z0-9], padding left justified using spaces.
128141
AN = Field.new
142+
AN.name = "AN"
129143
AN.codec = AN_Codec
130144
AN.padding = PADDING_LEFT_JUSTIFIED_SPACES
131145

132146
# Fixed lengh ASCII [A-Za-z0-9] and space, padding left, spaces
133147
ANP = Field.new
148+
ANP.name = "ANP"
134149
ANP.codec = ANP_Codec
135150
ANP.padding = PADDING_LEFT_JUSTIFIED_SPACES
136151

137152
# Fixed length ASCII [\x20-\x7E], padding left, spaces
138153
ANS = Field.new
154+
ANS.name = ANS
139155
ANS.codec = ANS_Codec
140156
ANS.padding = PADDING_LEFT_JUSTIFIED_SPACES
141157

142158
# Binary data, padding left using nulls (0x00)
143159
B = Field.new
160+
B.name = "B"
144161
B.codec = Null_Codec
145162
B.padding = lambda {|val, len|
146163
while val.length < len
@@ -151,24 +168,29 @@ module ISO8583
151168

152169
# Date, formatted as described in ASCII numerals
153170
MMDDhhmmss = Field.new
171+
MMDDhhmmss.name = "MMDDhhmmss"
154172
MMDDhhmmss.codec = MMDDhhmmssCodec
155173
MMDDhhmmss.length = 10
156174

157175
#Date, formatted as described in ASCII numerals
158176
YYMMDDhhmmss = Field.new
177+
YYMMDDhhmmss.name = "YYMMDDhhmmss"
159178
YYMMDDhhmmss.codec = YYMMDDhhmmssCodec
160179
YYMMDDhhmmss.length = 12
161180

162181
#Date, formatted as described in ASCII numerals
163182
YYMM = Field.new
183+
YYMM.name = "YYMM"
164184
YYMM.codec = YYMMCodec
165185
YYMM.length = 4
166186

167187
MMDD = Field.new
188+
MMDD.name = "MMDD"
168189
MMDD.codec = MMDDCodec
169190
MMDD.length = 4
170191

171192
Hhmmss = Field.new
193+
Hhmmss.name = "Hhmmss"
172194
Hhmmss.codec = HhmmssCodec
173195
Hhmmss.length = 6
174196

lib/iso8583/message.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def initialize(mti = nil)
135135
# mes = MyMessage.new
136136
# mes.mti = 1100 # or mes.mti = "Authorization Request Acquirer Gateway"
137137
def mti=(value)
138-
num, name = _get_mti_definition(value)
138+
num, _ = _get_mti_definition(value)
139139
@mti = num
140140
end
141141

test/BitmapTests.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ def test_create_empty
2222

2323
assert_raises(ISO8583Exception) {b.set 1000 }
2424
assert_raises(ISO8583Exception) { b.set 1 }
25-
assert_raises(ISO8583Exception) { b.set -1 }
25+
assert_raises(ISO8583Exception) { b.set(-1) }
2626
end
2727

2828
def test_out_of_bounds_errors
2929
b = Bitmap.new
3030
assert_raises(ISO8583Exception) {b.set 1000 }
3131
assert_raises(ISO8583Exception) { b.set 1 }
32-
assert_raises(ISO8583Exception) { b.set -1 }
32+
assert_raises(ISO8583Exception) { b.set(-1) }
3333
end
3434

3535
def test_parse_bmp
@@ -82,7 +82,7 @@ def test_each_w_two_bitmaps_doesnt_yield_first_field
8282
tst = "\x80\x00\x10\x20\x40\x81\x02\x04\x08\x10\x20\x40\x81\x02\x04\x08"
8383
bmp = Bitmap.new tst
8484
arr = []
85-
first = bmp.each{|bit|
85+
bmp.each{|bit|
8686
arr.push bit
8787
}
8888
assert_equal 20, arr.first

test/message_test.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_parse
3838
pan = 474747474747
3939

4040
assert_raises(ISO8583Exception) {
41-
mes = BerlinMessage.parse "@\000\000\000\000\000\000\00012474747474747"
41+
BerlinMessage.parse "@\000\000\000\000\000\000\00012474747474747"
4242
}
4343
mes = BerlinMessage.parse "1430@\000\000\000\000\000\000\00012474747474747"
4444
assert_equal pan, mes.pan
@@ -50,6 +50,7 @@ def test_rescue_standard_error
5050
begin
5151
BerlinMessage.parse("bogus")
5252
rescue => error
53+
assert_instance_of ISO8583Exception, error
5354
rescued = true
5455
end
5556

@@ -168,8 +169,8 @@ def test_round_trip
168169
mes[64] = "\xF0\xF0\xF0\xF0"
169170

170171
bytes = mes.to_b
171-
mes2 = BerlinMessage.parse(mes.to_b)
172-
assert_equal(mes.to_b, mes2.to_b)
172+
mes2 = BerlinMessage.parse(bytes)
173+
assert_equal(bytes, mes2.to_b)
173174
end
174175

175176
def test_remove_field

test/test_codec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,26 +101,26 @@ def test_YMMCodec
101101
end
102102
def test_A_Codec
103103
assert_raise(ISO8583Exception) {
104-
dt = A_Codec.encode "!!!"
104+
A_Codec.encode "!!!"
105105
}
106106
assert_equal "bla", AN_Codec.encode("bla")
107107
assert_equal "bla", AN_Codec.decode("bla")
108108
end
109109

110110
def test_AN_Codec
111111
assert_raise(ISO8583Exception) {
112-
dt = AN_Codec.encode "!!!"
112+
AN_Codec.encode "!!!"
113113
}
114114
assert_equal "bla", AN_Codec.encode("bla")
115115
assert_equal "bla", AN_Codec.decode("bla")
116116
end
117117

118118
def test_Track2_Codec
119119
assert_raise(ISO8583Exception) {
120-
dt = Track2.encode "!!!"
120+
Track2.encode "!!!"
121121
}
122122
assert_raise(ISO8583Exception) {
123-
dt = Track2.encode ";12312312=123?5"
123+
Track2.encode ";12312312=123?5"
124124
}
125125
assert_equal ";123123123=123?5", Track2.encode(";123123123=123?5")
126126
assert_equal ";123123123=123?5", Track2.decode(";123123123=123?5")
@@ -133,10 +133,10 @@ def test_packed_codec
133133
assert_equal "\x02", Packed_Number.encode(2)
134134
assert_equal "\x02\x55", Packed_Number.encode(0xff)
135135
assert_raise(ISO8583Exception) {
136-
dt = Packed_Number.encode ";12312312=123?5"
136+
Packed_Number.encode ";12312312=123?5"
137137
}
138138
assert_raise(ISO8583Exception) {
139-
dt = Packed_Number.encode "F"
139+
Packed_Number.encode "F"
140140
}
141141
end
142142

@@ -145,7 +145,7 @@ def test_BE_U16
145145
BE_U16.encode 2**16
146146
}
147147
assert_raise(ISO8583Exception) {
148-
BE_U16.encode -1
148+
BE_U16.encode(-1)
149149
}
150150
assert_equal "\0\0", BE_U16.encode(0)
151151
expected = "\xff\xff".force_encoding('ASCII-8BIT')
@@ -164,7 +164,7 @@ def test_BE_U32
164164
BE_U32.encode 2**32
165165
}
166166
assert_raise(ISO8583Exception) {
167-
BE_U32.encode -1
167+
BE_U32.encode(-1)
168168
}
169169
assert_equal "\0\0\0\0", BE_U32.encode(0)
170170
expected = "\xff\xff\xff\xff".force_encoding('ASCII-8BIT')

test/test_fields.rb

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def test_LLL
1010
assert_equal "456", rest
1111

1212
assert_raise(ISO8583ParseException) {
13-
l,rest = LLL.parse "12"
13+
_,rest = LLL.parse "12"
1414
}
1515

1616
enc = LLL.encode 123
@@ -50,10 +50,10 @@ def test_LLVAR_AN
5050
assert_equal "123ABC", value
5151
assert_equal "", rest
5252
assert_raise(ISO8583ParseException) {
53-
l,rest = LLLVAR_AN.parse "12"
53+
_,rest = LLLVAR_AN.parse "12"
5454
}
5555
assert_raise(ISO8583ParseException) {
56-
l,rest = LLVAR_AN.parse "12123"
56+
_,rest = LLVAR_AN.parse "12123"
5757
}
5858

5959
enc = LLVAR_AN.encode "123A"
@@ -83,10 +83,10 @@ def test_LLVAR_N
8383
assert_equal 1234, value
8484
assert_equal "", rest
8585
assert_raise(ISO8583ParseException) {
86-
l,rest = LLLVAR_N.parse "12"
86+
_,rest = LLLVAR_N.parse "12"
8787
}
8888
assert_raise(ISO8583ParseException) {
89-
l,rest = LLVAR_N.parse "12123"
89+
_,rest = LLVAR_N.parse "12123"
9090
}
9191

9292
enc = LLVAR_N.encode 1234
@@ -116,10 +116,10 @@ def test_LLVAR_Z
116116
assert_equal ";123123123=123?5", value
117117
assert_equal "", rest
118118
assert_raise(ISO8583ParseException) {
119-
l,rest = LLVAR_Z.parse "12"
119+
_,rest = LLVAR_Z.parse "12"
120120
}
121121
assert_raise(ISO8583ParseException) {
122-
l,rest = LLVAR_Z.parse "17;123123123=123?5"
122+
_,rest = LLVAR_Z.parse "17;123123123=123?5"
123123
}
124124

125125
enc = LLVAR_Z.encode ";123123123=123?5"
@@ -213,6 +213,7 @@ def test_N_BCD
213213
fld.length=3
214214
value, rest = fld.parse "\x01\x23\x45"
215215
assert_equal 123, value
216+
assert_equal "\x45", rest
216217

217218
assert_equal "\x01\x23", fld.encode(123)
218219
assert_equal "\x01\x23", fld.encode("123")
@@ -241,6 +242,7 @@ def test_Hhmmss
241242
assert_equal 12, dt.hour
242243
assert_equal 34, dt.min
243244
assert_equal 56, dt.sec
245+
assert_equal "", rest
244246

245247
assert_raise(ISO8583Exception) {
246248
fld.encode 1234567

0 commit comments

Comments
 (0)