geopolitical 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c55a764fadc3fe399215272245cfec87b13cbd26
-  data.tar.gz: 9123f029747d1ea441bb3e2ea727c453814d2da0
+  metadata.gz: c839075fc478bd86ac981d8de6663d082edb3eae
+  data.tar.gz: 3e661f747bf2998c4878302f409bf5cf34acca6a
 SHA512:
-  metadata.gz: 8939c9fed0774622aa082854fae5aabc23155838019dfc979e74b4179e4befd9c605c71f796591b164eba762a442d1b63c402966ef9f71b2eb034f6f7071e990
-  data.tar.gz: 55d7c0149c46244807ce238bb2fc27db2387a39b458411e0a308f42b7bcf28a437b2985fd50b13fdc4b58db97cb30ae8eeba2cda5d3787f105f99406b1694190
+  metadata.gz: 969e0608da36268ece8f032962d79aabcfc261ab7873dc18a90bd76c79e586ff5db8af0d88e1f14c10166762da0ae4f885128b60cce0c8ce0419ce100b5bf882
+  data.tar.gz: 191cfd245bc863f4fab038bf60abd36490a3b6cd4f2e5a3829155371aba9208691b529be1eef363746332f9d10a413b3b2dc8f515904ac0b333a806086a3d8da

data/app/controllers/geopolitical/regions_controller.rb

@@ -1,7 +1,7 @@
 module Geopolitical
   class RegionsController < GeopoliticalController
     inherit_resources
-    before_filter :get_relatives, :only => [:new, :edit]
+    before_filter :get_relatives, :only => [:new, :edit, :create, :update]
 
     def collection
       @regions = Region.ordered.page(params[:page])
@@ -10,7 +10,7 @@ module Geopolitical
     private
 
     def get_relatives
-      @nations = Nation.all
+      @nations = Nation.all.map { |n| [n.name, n.id] }
     end
 
   end

data/app/models/city.rb

@@ -4,10 +4,10 @@ class City
   include Geopolitical::Helpers
 
   field :gid,    type: Integer
+  field :zip,    type: String
   field :slug,   type: String
   field :name,   type: String,  localize: true
   field :area,   type: Integer
-  field :zip,    type: Integer
   field :souls,  type: Integer
   field :geom,   type: Point,    spatial: true
   #    field :ascii, type: String

data/app/models/region.rb

@@ -15,9 +15,8 @@ class Region
   scope :ordered, order_by(name: 1)
 
   validates :nation, presence: true
-  validates :name,   presence: true
+  validates :name,   presence: true,  uniqueness: { :scope => :nation_id }
 
-  validates :name,   uniqueness: { :scope => :nation_id }
 
 
 end

data/app/views/geopolitical/cities/index.html.haml

@@ -10,6 +10,7 @@
         %thead
           %tr
             %th Nome
+            %th ZIP
             %th Region
             %th Nation
             %th Population
@@ -20,6 +21,7 @@
               %td
                 = city.name
                 = link_to city.slug , city
+              %td= city.zip
               %td= city.region.name if city.region
               %td= city.nation.name
               %td= city.souls

data/app/views/geopolitical/nations/index.html.haml

@@ -12,6 +12,7 @@
             %th Abbr
             %th ISO
             %th Name
+            %th Postal
             %th Lang
             %th Cash
             %th
@@ -25,7 +26,8 @@
               %td
                 = nation.name
                 = link_to nation.slug, nation
-              %td= nation.lang
+              %td= nation.zip
+              %td= truncate(nation.lang)
               %td= nation.cash
               %td.last
                 =# link_to "Destroy!", nation_path(nation), :method => :delete

data/app/views/geopolitical/regions/_form.html.haml

@@ -5,7 +5,8 @@
   .row
 
     = form_for(@region) do |f|
-      =# f.error_messages
+      - f.object.errors.each do |err|
+        = err
       .form-group
         = f.label :name
         = f.text_field :name

data/lib/geopolitical/engine.rb

@@ -1,3 +1,4 @@
+require 'mongoid_geospatial'
 require 'inherited_resources'
 
 module Geopolitical

data/lib/geopolitical/helpers.rb

@@ -16,7 +16,8 @@ module Geopolitical
 
     def slug= txt
       return unless txt
-      self[:slug] = txt.downcase.gsub(/\s/, '-') #.gsub(/\W/, '')
+      self[:slug] = txt.encode(Encoding::ISO_8859_1).
+        gsub(/\s/, '-').downcase
     end
 
   end

data/lib/geopolitical/version.rb

@@ -1,3 +1,3 @@
 module Geopolitical
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geopolitical
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Marcos Piccinini
@@ -160,7 +160,6 @@ files:
 - app/controllers/geopolitical/nations_controller.rb
 - app/controllers/geopolitical/zones_controller.rb
 - app/controllers/geopolitical/cities_controller.rb
-- app/controllers/zones_controller.rb
 - app/models/zone_member.rb
 - app/models/city.rb
 - app/models/address.rb

data/app/controllers/zones_controller.rb

@@ -1,17 +0,0 @@
-module Geopolitical
-  class RegionsController < GeopoliticalController
-    inherit_resources
-    before_filter :get_relatives, :only => [:new, :edit]
-
-    def collection
-      @regions = Region.ordered.page(params[:page])
-    end
-
-    private
-
-    def get_relatives
-      @nations = Nation.all
-    end
-
-  end
-end