geopolitical 1.0.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cdc5dc0608aee7e4551aa5fff07dfba18ce0082
-  data.tar.gz: 4e7df3738dbef03c080f63438c4291a3414eb1f2
+  metadata.gz: 3fcaf0124ce75104648c84339eccf76ca9bef60d
+  data.tar.gz: cd2c77e60f52d17b1cba1ce4cd8e0d50d394bafd
 SHA512:
-  metadata.gz: f6cc5e141efec1ca2c62eb1ac996848ca95412e8cabdf59d40142c7e73d0b9249b8c3286b89298ea5cfd4d8206cb01ee23399132fa4ef473ae739148869a522c
-  data.tar.gz: f62c59c08282e0c87e1032fcc22e172fc2e709c633145db0e7a6de095c6fb664ff825087c0ca6f9e27c51d8c70799dcb16a5e444a86b70edfa8b04d56e681131
+  metadata.gz: bdcf8342b46bd934ef3a783f109cd5d7bc208cc56bda32fc5ebc1e62fe179d527570575af9e93784d76bb6b0aca47db4c41d871583df4c6c4a75916aea7bee3a
+  data.tar.gz: c288bdb8c35d206f49ae6c58ee35fb252a1680f7a474daf997e07b1e69dbc2f6a85b2a7655491e4ea273ed8071cc8a09cfc4ffc7c318446ff8df17fd9edff8b9

data/app/models/city.rb

@@ -14,7 +14,7 @@ class City
 
   attr_writer :x, :y, :z
 
-  belongs_to :region, inverse_of: :cities
+  belongs_to :region, inverse_of: :cities, optional: true
   belongs_to :nation, inverse_of: :cities
   has_many :hoods
 

data/app/models/nation.rb

@@ -19,7 +19,8 @@ class Nation
 
   validates :abbr, uniqueness: true, presence: true
 
-  belongs_to :capital, inverse_of: :nation_capital, class_name: 'City'
+  belongs_to :capital, inverse_of: :nation_capital, class_name: 'City',
+                       optional: true
 
   has_many :regions, dependent: :destroy
   has_many :cities,  dependent: :destroy

data/app/models/region.rb

@@ -11,7 +11,8 @@ class Region
 
   has_many :cities, dependent: :destroy
 
-  belongs_to :capital, inverse_of: :region_capital, class_name: 'City'
+  belongs_to :capital, inverse_of: :region_capital, class_name: 'City',
+                       optional: true
 
   validates :nation, presence: true
   validates :name,   uniqueness: { scope: :nation_id }

data/lib/geopolitical/version.rb

@@ -1,4 +1,4 @@
 # :nodoc:
 module Geopolitical
-  VERSION = '1.0.5'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/spec/dummy/config/environments/test.rb

@@ -13,8 +13,8 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.serve_static_files  = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true