geopolitical 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef1dedddcdd21d6255957be49ef4e19bc24383d
-  data.tar.gz: 289ec378f7e4eb945f237139a5a98115a4472b45
+  metadata.gz: 3e5f18cc9f1bcf0dc111ab2545a439e13982cb6b
+  data.tar.gz: 1b9139b45fb6091fa6b0f50435507829d94dc5d1
 SHA512:
-  metadata.gz: a559223be651d74a7bcdce4361f2ff776955ae0e2c4dab57d80036ddfe8e7289139d4ff31f7a29fb53d6a2c5b27c9d57ab2d085a471773293bbf687a10b78e7d
-  data.tar.gz: 069865af512ce7c3f060feea9c79fbf8d7c5d3be697a0c690a3f3ae43cfe0d114aa7b0a805d7e13157f7a7219fbb80bbb8fee0923aafca79c1dab2b3b7288978
+  metadata.gz: 3a40d4e8c3284d3de08d7997311807e2ae7dd8f53aebf491701a0e9944c96a4240a8d33fe1b8251b69941f2eb39816d99ff283c76edeec5b24454a6bf74e242d
+  data.tar.gz: e9cb615e832174edf67b2949f55b768af7eba05c1d05275037dd757312fa2c7bd3197b31865f747b3775225e7971571a531fc0e6870bfae4a79eac68e9effe98

data/Gemfile

@@ -4,7 +4,6 @@ gem 'mongoid', '>= 5.0.0.beta'
 
 gemspec
 
-
 gem 'rails'
 gem 'faker'
 gem 'fabrication'

data/Guardfile

@@ -13,8 +13,8 @@ guard :rspec, cmd: 'bundle exec rspec' do
   watch(/^spec\/spec_helper\.rb$/) { 'spec' }
   watch(/^app\/(.+)\.rb$/)         { |m| "spec/#{m[1]}_spec.rb" }
   watch(/^lib\/(.+)\.rb$/)         { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/models/concerns/(.+)\.rb$})  { |m| "spec/models/*._spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  do |m|
+  watch(%r{^app/models/concerns/(.+)\.rb$}) { |_m| 'spec/models/*._spec.rb' }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$}) do |m|
     [
       "spec/routing/#{m[1]}_routing_spec.rb",
       "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb",

data/app/controllers/geopolitical/nations_controller.rb

@@ -1,7 +1,6 @@
 module Geopolitical
   # Nations Public Controller
   class NationsController < GeopoliticalController
-
     def collection
       @nations = Nation.ordered
     end

data/app/models/city.rb

@@ -6,8 +6,8 @@ class City
   include Mongoid::Geospatial
   include Geopolitocracy
 
-  field :area,    type: Integer  # m2 square area
-  field :geom,    type: Point,   spatial: true
+  field :area,    type: Integer # m2 square area
+  field :geom,    type: Point, spatial: true
   # field :capital, type: String
 
   spatial_scope :geom
@@ -43,7 +43,7 @@ class City
     return unless City.where(slug: slug).first
     self.slug += "-#{region.abbr}"
     return unless City.where(slug: slug).first
-    fail "Two cities with the same name in #{region}: '#{slug}'"
+    raise "Two cities with the same name in #{region}: '#{slug}'"
   end
 
   def phone

data/app/models/concerns/geopolitocracy.rb

@@ -5,15 +5,15 @@ module Geopolitocracy
   included do
     # field :gid,    type: Integer # geonames id
 
-    field :name,   type: String, localize: true
-    field :abbr,   type: String
-    field :nick,   type: String
+    field :name,    type: String, localize: true
+    field :abbr,    type: String
+    field :nick,    type: String
 
-    field :souls,  type: Integer  # Population
+    field :souls,   type: Fixnum  # Population
 
-    field :ascii,  type: String
-    field :code,   type: String
-    field :slug,   type: String  # , default: -> { name }
+    field :ascii,   type: String
+    field :code,    type: String
+    field :slug,    type: String  # , default: -> { name }
 
     field :postal,  type: String  # , default: -> { name }
     field :phone,   type: String  # , default: -> { name }
@@ -32,24 +32,29 @@ module Geopolitocracy
 
     scope :ordered, -> { order_by(name: 1) }
 
+    def ensure_slug
+      self.slug ||= name
+    end
+
+    def name=(txt)
+      txt = txt.titleize unless txt =~ /[A-Z][a-z]/
+      super txt
+    end
+
+    def slug=(txt)
+      return unless txt
+      self[:slug] = ActiveSupport::Inflector
+                    .transliterate(txt).delete('.').gsub(/\W/, '-').downcase
+    end
+
+    def to_s
+      name || slug
+    end
+
     def self.search(txt, lazy = false)
       key = ActiveSupport::Inflector.transliterate(txt).gsub(/\W/, '-')
       char = lazy ? nil : '$'
       where(slug: /^#{key}#{char}/i)
     end
   end
-
-  def ensure_slug
-    self.slug ||= name
-  end
-
-  def slug=(txt)
-    return unless txt
-    self[:slug] = ActiveSupport::Inflector.transliterate(txt)
-                  .gsub(/\W/, '-').downcase
-  end
-
-  def to_s
-    name || slug
-  end
 end

data/app/models/hood.rb

@@ -12,6 +12,11 @@ class Hood
   validates :city, presence: true
   validates :name, uniqueness: { scope: :city_id }
 
+  def ensure_slug
+    return unless city
+    self.slug ||= "#{city.slug}-#{name}"
+  end
+
   def phone
     self[:phone] || city.phone
   end

data/app/models/nation.rb

@@ -14,8 +14,8 @@ class Nation
   field :lang,   type: String # Official/main language
   field :langs,  type: Array  # All official languages
 
-  alias_method :currency, :cash
-  alias_method :iso_3166_3, :code3
+  alias currency cash
+  alias iso_3166_3 code3
 
   validates :abbr, uniqueness: true, presence: true
 

data/app/models/region.rb

@@ -9,7 +9,7 @@ class Region
 
   belongs_to :nation
 
-  has_many :cities,  dependent: :destroy
+  has_many :cities, dependent: :destroy
 
   belongs_to :capital, inverse_of: :region_capital, class_name: 'City'
 

data/lib/geopolitical/version.rb

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

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

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

@@ -13,7 +13,7 @@ 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.serve_static_files = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application