iso3166_ru 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8fe43ebdc3f7044480975473a8492dc8cdb9a51
-  data.tar.gz: 7c340d166f4bcd3450c580e570848f3a5a64b1fb
+  metadata.gz: 9ac8ba9920bc84e46cebb8198fad7d773af5bd95
+  data.tar.gz: eded2644c25134f4b2fce892c755a24601097cb6
 SHA512:
-  metadata.gz: 004572b9ddbe5dd03dde5471370146934a788176a6c42982c6ab328c78d1d698ecd5856f25748f65dbfa02855c12da7a310ded1895da2246df9273ec3c1aae47
-  data.tar.gz: f34633d7bfc9e5f368d9ad2bda4e9b340d64e8392aed2a6e845eb61156f60a021ea8c5759f2b4da4dc1a4332c1442750f95663f3c15d87941d39740e46a43143
+  metadata.gz: d118e53e5fee42cea08b5606574b4cc924f63e0051878a5257df3101db71b2f10f462619495c4c8c2adac1bcc47148382170aa1a5a72f95be4bc7865ed53522a
+  data.tar.gz: cfa69a2eabccd7b5745f6a5ba19471b0bf4517dfc7827676c10fe0792a71da6378c1850f4862c66ccd0f739fa9c08f581e09ca2b47a574ccf5914ca18442c405

data/README.md

@@ -6,7 +6,7 @@
 
 Add this line to your application's Gemfile:
 
-    gem 'iso3166_ru'
+    gem 'iso3166_ru', '~> 0.2.0'
 
 And then execute:
 
@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-### Simple ActiveRecord-alike finders
+### Country finders
 
     Iso3166Ru.find_by(alpha2: "RU")
     Iso3166Ru.find_by(alpha3: "RUS")
@@ -27,21 +27,6 @@ Or install it yourself as:
     Iso3166Ru.find_by(english: "Russian Federation")
     Iso3166Ru.find_by(iso: "643")
 
-### Performant finding
-
-If you don't want to load country data for each request, you can initialize `Iso3166Ru::CountryList` and use it:
-
-    country_list = Iso3166Ru::CountryList.new
-
-    country_list.find_by(alpha2: "RU")
-    country_list.find_by(alpha3: "RUS")
-    country_list.find_by(name: "Россия")
-    country_list.find_by(full_name: "Российская Федерация")
-    country_list.find_by(english: "Russian Federation")
-    country_list.find_by(iso: "643")
-    
-This chops away ~99.8% of execution time.
-
 All finders return an `Iso3166Ru::Country` struct.
 
 ### Country

data/iso3166_ru.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency 'minitest', '~> 5.0.6'
 end

data/lib/iso3166_ru.rb

@@ -3,6 +3,6 @@ require "iso3166_ru/country_list"
 
 module Iso3166Ru
   def self.find_by(query)
-    CountryList.new.find_by(query)
+    CountryList.instance.find_by(query)
   end
 end

data/lib/iso3166_ru/country_list.rb

@@ -1,16 +1,16 @@
 require "iso3166_ru/country"
+require 'singleton'
 
 module Iso3166Ru
   class CountryList
-    attr_reader :data, :countries, :indexes
+    include Singleton
+    
+    attr_reader :countries, :indexes
 
     def initialize
       File.open(File.expand_path("../data.dat", __FILE__)) do |f|
-        @data = Marshal.load(f)
+        @countries, @indexes = Marshal.load(f)
       end
-
-      @countries = data[0]
-      @indexes   = data[1]
     end
 
     def find_by(query)
@@ -22,8 +22,8 @@ module Iso3166Ru
     private
 
     def prepare_query(query)
-      key = query.keys.first
-      value = key == :iso ? "%03d" % query[key].to_i : query[key]
+      key, value = query.first
+      value = "%03d" % value.to_i if key == :iso
 
       [key, value]
     end

data/lib/iso3166_ru/version.rb

@@ -1,3 +1,3 @@
 module Iso3166Ru
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/test/iso3166_ru_test.rb

@@ -3,7 +3,7 @@
 require "minitest_helper"
 require "iso3166_ru"
 
-class Iso3166RuTest < MiniTest::Unit::TestCase
+class Iso3166RuTest < Minitest::Test
   RUSSIA = Iso3166Ru::Country.new("Россия", "Российская Федерация", 
     "Russian Federation", "RU", "RUS", "643", "Европа", "Восточная Европа")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso3166_ru
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Artem Shitov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.6
 description: Lets you find country names in English and Russian, based on country
   codes (and vice versa)
 email: