jgeoip 0.2.0-java → 0.2.1-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/.rvmrc +1 -1
  2. data/lib/java/{jgeoip-0.2.0.jar → jgeoip-0.2.1.jar} +0 -0
  3. data/lib/jgeoip/version.rb +1 -1
  4. data/src/main/java/org/github/tobsch/jgeoip/JGeoIP.java +10 -0
  5. data/test/unit/jgeoip_test.rb +3 -1
  6. metadata +52 -19
data/.rvmrc CHANGED
@@ -1 +1 @@
1
- rvm use jruby-1.6.7
1
+ rvm use jruby-1.7.0 --create
data/lib/jgeoip/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class JGeoIP
2
- VERSION = "0.2.0"
2
+ VERSION = "0.2.1"
3
3
  end
data/src/main/java/org/github/tobsch/jgeoip/JGeoIP.java CHANGED
@@ -51,4 +51,14 @@ public class JGeoIP extends RubyObject {
51
51
 
52
52
  return context.runtime.newString(org);
53
53
  }
54
+
55
+ @JRubyMethod
56
+ public IRubyObject id(ThreadContext context, IRubyObject searchString) throws IOException {
57
+ Integer id = cl.getID(searchString.toString());
58
+ if (id == null) {
59
+ return context.runtime.getNil();
60
+ }
61
+
62
+ return context.runtime.newFixnum((long)id);
63
+ }
54
64
  }
data/test/unit/jgeoip_test.rb CHANGED
@@ -10,8 +10,10 @@ class JGeoIPTest < Test::Unit::TestCase
10
10
  end
11
11
 
12
12
  should 'find the correct isp by ip' do
13
- assert_equal "Gruner + Jahr AG & Co, Hamburg", @geo.org('194.12.192.169')
13
+ assert_equal "Gruner + Jahr AG & Co KG", @geo.org('194.12.192.0')
14
14
  assert_equal "Deutsche Telekom AG", @geo.org('193.159.61.143')
15
+ #assert_equal 722985, @geo.id('193.159.61.143')
16
+ assert_equal 844724, @geo.id('194.12.192.169')
15
17
  end
16
18
  end
17
19
 
metadata CHANGED
@@ -2,57 +2,83 @@
2
2
  name: jgeoip
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.2.0
5
+ version: 0.2.1
6
6
  platform: java
7
7
  authors:
8
8
  - Tobias Schlottke
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-10-10 00:00:00.000000000Z
12
+ date: 2012-11-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: shoulda-context
16
- version_requirements: &2056 !ruby/object:Gem::Requirement
16
+ version_requirements: !ruby/object:Gem::Requirement
17
17
  requirements:
18
18
  - - ! '>='
19
19
  - !ruby/object:Gem::Version
20
- version: '0'
20
+ version: !binary |-
21
+ MA==
22
+ none: false
23
+ requirement: !ruby/object:Gem::Requirement
24
+ requirements:
25
+ - - ! '>='
26
+ - !ruby/object:Gem::Version
27
+ version: !binary |-
28
+ MA==
21
29
  none: false
22
- requirement: *2056
23
30
  prerelease: false
24
31
  type: :development
25
32
  - !ruby/object:Gem::Dependency
26
33
  name: buildr
27
- version_requirements: &2074 !ruby/object:Gem::Requirement
34
+ version_requirements: !ruby/object:Gem::Requirement
35
+ requirements:
36
+ - - '='
37
+ - !ruby/object:Gem::Version
38
+ version: 1.4.6
39
+ none: false
40
+ requirement: !ruby/object:Gem::Requirement
28
41
  requirements:
29
- - - =
42
+ - - '='
30
43
  - !ruby/object:Gem::Version
31
44
  version: 1.4.6
32
45
  none: false
33
- requirement: *2074
34
46
  prerelease: false
35
47
  type: :development
36
48
  - !ruby/object:Gem::Dependency
37
49
  name: ci_reporter
38
- version_requirements: &2090 !ruby/object:Gem::Requirement
50
+ version_requirements: !ruby/object:Gem::Requirement
39
51
  requirements:
40
52
  - - ! '>='
41
53
  - !ruby/object:Gem::Version
42
- version: '0'
54
+ version: !binary |-
55
+ MA==
56
+ none: false
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: !binary |-
62
+ MA==
43
63
  none: false
44
- requirement: *2090
45
64
  prerelease: false
46
65
  type: :development
47
66
  - !ruby/object:Gem::Dependency
48
67
  name: test-unit
49
- version_requirements: &2106 !ruby/object:Gem::Requirement
68
+ version_requirements: !ruby/object:Gem::Requirement
69
+ requirements:
70
+ - - ! '>='
71
+ - !ruby/object:Gem::Version
72
+ version: !binary |-
73
+ MA==
74
+ none: false
75
+ requirement: !ruby/object:Gem::Requirement
50
76
  requirements:
51
77
  - - ! '>='
52
78
  - !ruby/object:Gem::Version
53
- version: '0'
79
+ version: !binary |-
80
+ MA==
54
81
  none: false
55
- requirement: *2106
56
82
  prerelease: false
57
83
  type: :development
58
84
  description: This gem wraps maxminds original java library, which should make things faster than using other pure ruby libraries.
@@ -70,7 +96,7 @@ files:
70
96
  - Rakefile
71
97
  - jgeoip.gemspec
72
98
  - lib/java/geoip-1.2.5.jar
73
- - lib/java/jgeoip-0.2.0.jar
99
+ - lib/java/jgeoip-0.2.1.jar
74
100
  - lib/jgeoip.rb
75
101
  - lib/jgeoip/version.rb
76
102
  - script/benchmark.rb
@@ -89,21 +115,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
89
115
  requirements:
90
116
  - - ! '>='
91
117
  - !ruby/object:Gem::Version
92
- version: '0'
118
+ segments:
119
+ - 0
120
+ hash: 2
121
+ version: !binary |-
122
+ MA==
93
123
  none: false
94
124
  required_rubygems_version: !ruby/object:Gem::Requirement
95
125
  requirements:
96
126
  - - ! '>='
97
127
  - !ruby/object:Gem::Version
98
- version: '0'
128
+ segments:
129
+ - 0
130
+ hash: 2
131
+ version: !binary |-
132
+ MA==
99
133
  none: false
100
134
  requirements: []
101
135
  rubyforge_project:
102
- rubygems_version: 1.8.15
136
+ rubygems_version: 1.8.24
103
137
  signing_key:
104
138
  specification_version: 3
105
139
  summary: Fast jRuby library for Maxminds GeoIP Databases
106
140
  test_files:
107
141
  - test/test_helper.rb
108
142
  - test/unit/jgeoip_test.rb
109
- ...