geopolitical 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fcaf0124ce75104648c84339eccf76ca9bef60d
-  data.tar.gz: cd2c77e60f52d17b1cba1ce4cd8e0d50d394bafd
+  metadata.gz: 8e48641bb3edaca229ec8ee388684cff45da3612
+  data.tar.gz: 1cf9b43ae4f9080148b6bbd12f0ffaf0602d48d4
 SHA512:
-  metadata.gz: bdcf8342b46bd934ef3a783f109cd5d7bc208cc56bda32fc5ebc1e62fe179d527570575af9e93784d76bb6b0aca47db4c41d871583df4c6c4a75916aea7bee3a
-  data.tar.gz: c288bdb8c35d206f49ae6c58ee35fb252a1680f7a474daf997e07b1e69dbc2f6a85b2a7655491e4ea273ed8071cc8a09cfc4ffc7c318446ff8df17fd9edff8b9
+  metadata.gz: 75ec8c8ae0d7e35033e6ce0274f37c0e2b543bdca5d4e100dd97eb0bb758d761de58c24c0f2f823c88e73146e26eedb5df938987a42939276c88d940cf2e7145
+  data.tar.gz: 8fa9fb4416f4a07b42a4c9f17c3a2986d7650727c4dbdab898e60ea4570c1e5261de3aa782296848f441bd94cd55d80dd44ffba6bc654f24daf866b65f3175a2

data/app/models/city.rb

@@ -41,7 +41,7 @@ class City
   def set_defaults
     self.nation ||= region.try(:nation)
     return unless City.where(slug: slug).first
-    self.slug += "-#{region.abbr}"
+    self.slug += "-#{region.abbr || region.slug}"
     return unless City.where(slug: slug).first
     raise "Two cities with the same name in #{region}: '#{slug}'"
   end

data/app/models/concerns/geopolitocracy.rb

@@ -9,7 +9,7 @@ module Geopolitocracy
     field :abbr,    type: String
     field :nick,    type: String
 
-    field :souls,   type: Fixnum  # Population
+    field :souls,   type: Integer # Population
 
     field :ascii,   type: String
     field :code,    type: String
@@ -23,7 +23,7 @@ module Geopolitocracy
 
     validates :name, presence: true
     validates :slug, presence: true, uniqueness: true
-    validates :code, uniqueness: { allow_nil: true }
+    validates :code, uniqueness: { scope: :nation_id, allow_nil: true }
 
     index slug: 1
     index name: 1
@@ -55,7 +55,7 @@ module Geopolitocracy
     def self.search(txt, lazy = false)
       key = ActiveSupport::Inflector.transliterate(txt).gsub(/\W/, '-')
       char = lazy ? nil : '$'
-      where(slug: /^#{key}#{char}/i)
+      where(slug: /^#{key.downcase}#{char}/)
     end
   end
 end

data/lib/geopolitical/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geopolitical
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -58,11 +58,6 @@ files:
 - app/assets/images/geopolitical/.keep
 - app/assets/javascripts/geopolitical/application.js
 - app/assets/stylesheets/geopolitical/application.css
-- app/controllers/geopolitical/cities_controller.rb
-- app/controllers/geopolitical/geopolitical_controller.rb
-- app/controllers/geopolitical/hoods_controller.rb
-- app/controllers/geopolitical/nations_controller.rb
-- app/controllers/geopolitical/regions_controller.rb
 - app/helpers/geopolitical/application_helper.rb
 - app/models/city.rb
 - app/models/concerns/geopolitocracy.rb
@@ -167,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Geopolitical models for mongoid.

data/app/controllers/geopolitical/cities_controller.rb

@@ -1,23 +0,0 @@
-module Geopolitical
-  # Cities Public Controller
-  class CitiesController < GeopoliticalController
-    # allow  "admin"
-    before_filter :load_relatives, only: [:new, :edit, :create, :update]
-
-    def collection
-      @cities = City.ordered.search(params[:search]).page(params[:page])
-    end
-
-    private
-
-    def load_marker
-    end
-
-    def load_map
-    end
-
-    def load_relatives
-      @regions = Region.only(:name).map { |e| [e.name, e.id] }
-    end
-  end
-end

data/app/controllers/geopolitical/geopolitical_controller.rb

@@ -1,17 +0,0 @@
-module Geopolitical
-  # Main Geopolitical Controller
-  class GeopoliticalController < ActionController::Base
-    layout 'geopolitical'
-
-    def index
-      @regions = Region.all
-      @cities = City.all
-    end
-
-    private
-
-    def permitted_params
-      # params.permit(:name, :slug)
-    end
-  end
-end

data/app/controllers/geopolitical/hoods_controller.rb

@@ -1,18 +0,0 @@
-module Geopolitical
-  # Hoods Main Public Interface
-  class HoodsController < GeopoliticalController
-    # belongs_to :city
-    # respond_to :html, :xml, :json
-    before_filter :load_relatives, only: [:new, :edit, :create, :update]
-
-    def collection
-      @hoods = Hood.ordered.page(params[:page])
-    end
-
-    private
-
-    def load_relatives
-      @cities = City.only(:name).map { |e| [e.name, e.id] }
-    end
-  end
-end

data/app/controllers/geopolitical/nations_controller.rb

@@ -1,13 +0,0 @@
-module Geopolitical
-  # Nations Public Controller
-  class NationsController < GeopoliticalController
-    def collection
-      @nations = Nation.ordered
-    end
-
-    # private
-    # def permitted_params
-    #   params.permit! #require(:nation).permit!
-    # end
-  end
-end

data/app/controllers/geopolitical/regions_controller.rb

@@ -1,16 +0,0 @@
-module Geopolitical
-  # Main Regions Controller
-  class RegionsController < GeopoliticalController
-    before_filter :set_nations, only: [:new, :edit, :create, :update]
-
-    def collection
-      @regions = Region.ordered.page(params[:page])
-    end
-
-    private
-
-    def set_nations
-      @nations = Nation.all.map { |n| [n.name, n.id] }
-    end
-  end
-end