countries 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8fc719a6c875b10fcb6e46302add80010155e19
-  data.tar.gz: f020ded0676f664d3dbfb587844ff37321d66606
+  metadata.gz: 735b197a9e7e8fda800a39ab7e2558da8ee59b80
+  data.tar.gz: 7af8cbb88f8301bf72f8831fffffa2d556f38a81
 SHA512:
-  metadata.gz: 149f9e07816af0d46bdf9ae28fd3c4199dccd0f44d914756402addfe1186f7d2e4bf877d6b42c75a0f02cb88c7aab71e5b7f07c430c00ea792ed5d877b103947
-  data.tar.gz: 7a372638737464c1bd72d1fdc1c036fe8b75d05d4aa47cace4d253ce997ff2599cd5c21e10b7aa63a6599daef01065a45e875fa37a4af1bf79497e8917dd3424
+  metadata.gz: 5d3b4230c7a1500f5eab70351d027b1ede91811817cac14e8e602a222d7fdc68b61bb8af5ef5b8150e5ae888e9e9ce01cc003dd85e6b27c33c8e822e9ddcf127
+  data.tar.gz: 8e9d46e88acad56b12dbead0157f0895a4c80b10bc850e3bf26fe15a10a950241d5ee54763719d39cf332a236eb16e62c99d5488bfad7a6e891997bad2af19b3

data/lib/countries/data.rb

@@ -2,6 +2,7 @@ module ISO3166
   ##
   # Handles building the in memory store of countries data
   class Data
+    @@cache_dir = [File.dirname(__FILE__), 'cache']
     @@cache = {}
     @@registered_data = {}
 
@@ -14,6 +15,14 @@ module ISO3166
     end
 
     class << self
+      def cache_dir
+        @@cache_dir
+      end
+
+      def cache_dir=(value)
+        @@cache_dir = value
+      end
+
       def register(data)
         alpha2 = data[:alpha2].upcase
         @@registered_data[alpha2] = \
@@ -52,7 +61,7 @@ module ISO3166
 
       def load_data!
         return @@cache unless load_required?
-        @@cache = load_cache %w(cache countries.json)
+        @@cache = load_cache %w(countries.json)
         @@_country_codes = @@cache.keys
         @@cache = @@cache.merge(@@registered_data)
         @@cache
@@ -106,7 +115,7 @@ module ISO3166
       end
 
       def load_translations(locale)
-        locale_names = load_cache(['cache', 'locales', "#{locale}.json"])
+        locale_names = load_cache(['locales', "#{locale}.json"])
         internal_codes.each do |alpha2|
           @@cache[alpha2]['translations'] ||= Translations.new
           @@cache[alpha2]['translations'][locale] = locale_names[alpha2].freeze
@@ -129,7 +138,7 @@ module ISO3166
       end
 
       def datafile_path(file_array)
-        File.join([File.dirname(__FILE__)] + file_array)
+        File.join([@@cache_dir] + file_array)
       end
     end
   end

data/lib/countries/subdivision.rb

@@ -1,6 +1,7 @@
 module ISO3166
   Subdivision = KwargStruct.new(
     :name,
+    :code,
     :unofficial_names,
     :geo,
     :translations,

data/lib/countries/version.rb

@@ -1,3 +1,3 @@
 module Countries
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/spec/data_spec.rb

@@ -81,12 +81,12 @@ describe ISO3166::Data do
 
   describe '#load_cache' do
     it 'will return an empty hash for an unsupported locale' do
-      file_array = %w(cache locales unsupported.json)
+      file_array = %w(locales unsupported.json)
       expect(ISO3166::Data.send(:load_cache, file_array)).to eql({})
     end
 
     it 'will return json for a supported locale' do
-      file_array = %w(cache locales en.json)
+      file_array = %w(locales en.json)
       expect(ISO3166::Data.send(:load_cache, file_array)).not_to be_empty
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Josh Robinson