geoip2_c 0.2.0 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2c4c6ed6506390f217b61759fe77b1523f159b7b
4
- data.tar.gz: 4ea870d8984e94dd182827b07e5ebce843527ce4
3
+ metadata.gz: 021246fe592fdc829bb576251e57ee2f81eb694f
4
+ data.tar.gz: c4ad0c50ea7c2df9c29d9c332523d8e85a38ae8c
5
5
  SHA512:
6
- metadata.gz: 2f051648f8cc6144c5d952d455c70684246ee929c2db8d016c0a8b6ac802cd0638ff3f935c455b0205081aa3767c09b14a0bdb946d6fd58c60c0c0d542400133
7
- data.tar.gz: 79e2869114777969696d0dcd0f5aeea37dc3245faf734a1595f72cb30543bd7d5e3d1876af313da9f1ba7992ae6377075b8025d2251fa0ef44fb0fba34d13046
6
+ metadata.gz: e89bbbd8d322974fdc2363810c4da90104ff77b1fc71674e42a23f89c518b25056405999c58fcbf92b9545e426a582f7da90ca03b80ed80199cc033acc5fd61f
7
+ data.tar.gz: 4343b73fd0f0a5170c1a6499ff0b0e200f61865efdb4a429bbd42cd924b5ed8f32969920acb7c07e60ad91f96577c0d2a9e84cd61c71f697b6c5f33c61fac84f
data/.gitmodules CHANGED
@@ -1,3 +1,6 @@
1
1
  [submodule "test/MaxMind-DB"]
2
2
  path = test/MaxMind-DB
3
3
  url = https://github.com/maxmind/MaxMind-DB.git
4
+ [submodule "ext/geoip2/libmaxminddb"]
5
+ path = ext/geoip2/libmaxminddb
6
+ url = https://github.com/maxmind/libmaxminddb.git
data/.travis.yml CHANGED
@@ -9,6 +9,7 @@ env:
9
9
  - TARGET_RUBY_VERSION=2.1
10
10
  - TARGET_RUBY_VERSION=2.2
11
11
  - TARGET_RUBY_VERSION=2.3
12
+ - TARGET_RUBY_VERSION=2.4
12
13
 
13
14
  before_install:
14
15
  #- sudo apt-get update
data/COPYING.txt ADDED
@@ -0,0 +1,13 @@
1
+ Copyright 2016 okkez
2
+
3
+ Licensed under the Apache License, Version 2.0 (the "License");
4
+ you may not use this file except in compliance with the License.
5
+ You may obtain a copy of the License at
6
+
7
+ http://www.apache.org/licenses/LICENSE-2.0
8
+
9
+ Unless required by applicable law or agreed to in writing, software
10
+ distributed under the License is distributed on an "AS IS" BASIS,
11
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ See the License for the specific language governing permissions and
13
+ limitations under the License.
data/LICENSE.txt CHANGED
@@ -1,21 +1,202 @@
1
- The MIT License (MIT)
2
-
3
- Copyright (c) 2016 okkez
4
-
5
- Permission is hereby granted, free of charge, to any person obtaining a copy
6
- of this software and associated documentation files (the "Software"), to deal
7
- in the Software without restriction, including without limitation the rights
8
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
- copies of the Software, and to permit persons to whom the Software is
10
- furnished to do so, subject to the following conditions:
11
-
12
- The above copyright notice and this permission notice shall be included in
13
- all copies or substantial portions of the Software.
14
-
15
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
- THE SOFTWARE.
1
+
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
5
+
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
+
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright [yyyy] [name of copyright owner]
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # GeoIP2
2
2
 
3
- This gem provides binding [libmaxminddb](http://maxmind.github.io/libmaxminddb/).
3
+ This gem provides binding of [libmaxminddb](http://maxmind.github.io/libmaxminddb/).
4
4
 
5
5
  This binding does not traverse all elements in lookup result by default.
6
6
  So you can get the element you want fast such as city name, country name or etc.
@@ -8,6 +8,7 @@ So you can get the element you want fast such as city name, country name or etc.
8
8
  ## Requirements
9
9
 
10
10
  * Ruby 2.3 or later
11
+ * libmaxminddb
11
12
 
12
13
  NOTE:
13
14
 
@@ -15,6 +16,12 @@ This library uses `Hash#dig` and `Array#dig`.
15
16
  If you want to use this library with Ruby2.1 or Ruby2.2, you can install a gem which adds support `#dig` method.
16
17
  But I don't want to add extra dependency to this library, so I decided not to add extra dependency to support old Ruby versions.
17
18
 
19
+ ### libmaxminddb
20
+
21
+ * Debian: [libmaxminddb](https://packages.debian.org/search?keywords=libmaxminddb&searchon=names&suite=all&section=all)
22
+ * Ubuntu: [Ubuntu official package](http://packages.ubuntu.com/search?keywords=libmaxminddb&searchon=names&suite=all&section=all) or [PPA of MaxMind team](https://launchpad.net/~maxmind/+archive/ubuntu/ppa)
23
+ * CentOS/Fedora: [rpms/libmaxminddb](https://admin.fedoraproject.org/pkgdb/package/rpms/libmaxminddb/)
24
+
18
25
  ## Installation
19
26
 
20
27
  Add this line to your application's Gemfile:
@@ -38,7 +45,8 @@ require "geoip2"
38
45
 
39
46
  db = GeoIP2::Databaes.new("/path/to/GeoLite2-City.mmdb")
40
47
  result = db.lookup("66.102.9.80")
41
- retuls.get_value("city", "names", "en") # => "Mountain View"
48
+ retult.get_value("city", "names", "en") # => "Mountain View"
49
+ retult.dig("city", "names", "en") # => "Mountain View"
42
50
  ```
43
51
 
44
52
  ## Development
data/docker-compose.yml CHANGED
@@ -1,24 +1,31 @@
1
1
  version: "2"
2
2
  services:
3
+ test-ruby2.4:
4
+ build:
5
+ context: .
6
+ dockerfile: dockerfiles/Dockerfile-ruby2.4
7
+ command: tail -f /dev/null
8
+ environment:
9
+ - BUNDLE_GEMFILE=Gemfile
3
10
  test-ruby2.3:
4
11
  build:
5
12
  context: .
6
13
  dockerfile: dockerfiles/Dockerfile-ruby2.3
7
- command: ruby -run -e httpd .
14
+ command: tail -f /dev/null
8
15
  environment:
9
16
  - BUNDLE_GEMFILE=Gemfile
10
17
  test-ruby2.2:
11
18
  build:
12
19
  context: .
13
20
  dockerfile: dockerfiles/Dockerfile-ruby2.2
14
- command: ruby -run -e httpd .
21
+ command: tail -f /dev/null
15
22
  environment:
16
23
  - BUNDLE_GEMFILE=gemfiles/ruby_2.2.gemfile
17
24
  test-ruby2.1:
18
25
  build:
19
26
  context: .
20
27
  dockerfile: dockerfiles/Dockerfile-ruby2.1
21
- command: ruby -run -e httpd .
28
+ command: tail -f /dev/null
22
29
  environment:
23
30
  - BUNDLE_GEMFILE=gemfiles/ruby_2.1.gemfile
24
31
 
@@ -2,7 +2,7 @@ FROM ruby:2.1-alpine
2
2
 
3
3
  ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
4
4
 
5
- RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev git
5
+ RUN apk --no-cache --update add build-base autoconf automake libtool ruby-dev libc6-compat git
6
6
 
7
7
  WORKDIR /app
8
8
  COPY . .
@@ -2,7 +2,7 @@ FROM ruby:2.2-alpine
2
2
 
3
3
  ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
4
4
 
5
- RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev git
5
+ RUN apk --no-cache --update add build-base autoconf automake libtool ruby-dev libc6-compat git
6
6
 
7
7
  WORKDIR /app
8
8
  COPY . .
@@ -2,7 +2,7 @@ FROM ruby:2.3-alpine
2
2
 
3
3
  ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
4
4
 
5
- RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev git
5
+ RUN apk --no-cache --update add build-base autoconf automake libtool ruby-dev libc6-compat git
6
6
 
7
7
  WORKDIR /app
8
8
  COPY . .
@@ -0,0 +1,8 @@
1
+ FROM ruby:2.4-alpine
2
+
3
+ ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
4
+
5
+ RUN apk --no-cache --update add build-base autoconf automake libtool ruby-dev libc6-compat git
6
+
7
+ WORKDIR /app
8
+ COPY . .
@@ -1,11 +1,26 @@
1
1
  require "mkmf"
2
+ require "rbconfig"
2
3
 
3
- dir_config("maxminddb")
4
- have_header("maxminddb.h")
5
- have_library("maxminddb")
4
+ libdir = RbConfig::CONFIG["libdir"]
5
+ includedir = RbConfig::CONFIG["includedir"]
6
+
7
+ maxminddb_dir = File.expand_path(File.join(__dir__, "libmaxminddb"))
8
+
9
+ Dir.chdir(maxminddb_dir) do
10
+ system("./bootstrap")
11
+ system({ "CFLAGS" => "-fPIC" }, "./configure", "--disable-shared", "--disable-tests")
12
+ system("make", "clean")
13
+ system("make")
14
+ end
15
+
16
+ header_dirs = [includedir, "#{maxminddb_dir}/include"]
17
+ lib_dirs = [libdir, "#{maxminddb_dir}/src/.libs"]
18
+
19
+ dir_config("maxminddb", header_dirs, lib_dirs)
6
20
  have_func("rb_sym2str", "ruby.h")
7
21
 
8
- $CFLAGS << " -std=c99"
22
+ $LDFLAGS << " -L#{maxminddb_dir}/src/.libs -lmaxminddb"
23
+ $CFLAGS << " -std=c99 -fPIC -I#{maxminddb_dir}/src/.libs"
9
24
  # $CFLAGS << " -g -O0"
10
25
 
11
26
  create_makefile("geoip2/geoip2")
data/ext/geoip2/geoip2.c CHANGED
@@ -403,9 +403,11 @@ rb_geoip2_lr_to_h(VALUE self)
403
403
  int status = 0;
404
404
  int exception = 0;
405
405
 
406
- cache = rb_ivar_get(self, rb_intern("rb_hash"));
407
- if (!NIL_P(cache)) {
408
- return cache;
406
+ if (rb_ivar_defined(self, rb_intern("rb_hash")) == Qtrue) {
407
+ cache = rb_ivar_get(self, rb_intern("rb_hash"));
408
+ if (!NIL_P(cache)) {
409
+ return cache;
410
+ }
409
411
  }
410
412
 
411
413
  TypedData_Get_Struct(self,
@@ -1,3 +1,3 @@
1
1
  module GeoIP2
2
- VERSION = "0.2.0"
2
+ VERSION = "0.3.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: geoip2_c
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - okkez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-21 00:00:00.000000000 Z
11
+ date: 2017-10-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: appraisal
@@ -92,6 +92,7 @@ files:
92
92
  - ".gitmodules"
93
93
  - ".travis.yml"
94
94
  - Appraisals
95
+ - COPYING.txt
95
96
  - Gemfile
96
97
  - LICENSE.txt
97
98
  - README.md
@@ -100,6 +101,7 @@ files:
100
101
  - dockerfiles/Dockerfile-ruby2.1
101
102
  - dockerfiles/Dockerfile-ruby2.2
102
103
  - dockerfiles/Dockerfile-ruby2.3
104
+ - dockerfiles/Dockerfile-ruby2.4
103
105
  - ext/geoip2/extconf.rb
104
106
  - ext/geoip2/geoip2.c
105
107
  - ext/geoip2/rb_compat.h
@@ -130,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
130
132
  version: '0'
131
133
  requirements: []
132
134
  rubyforge_project:
133
- rubygems_version: 2.6.4
135
+ rubygems_version: 2.6.13
134
136
  signing_key:
135
137
  specification_version: 4
136
138
  summary: Write a short summary, because Rubygems requires one.