geopolitical 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c839075fc478bd86ac981d8de6663d082edb3eae
-  data.tar.gz: 3e661f747bf2998c4878302f409bf5cf34acca6a
+  metadata.gz: 3ba638d2868ace9fb9e0caebe149994928b9d6ef
+  data.tar.gz: bb3a1a730a0f71772c57b120538282dde7110fad
 SHA512:
-  metadata.gz: 969e0608da36268ece8f032962d79aabcfc261ab7873dc18a90bd76c79e586ff5db8af0d88e1f14c10166762da0ae4f885128b60cce0c8ce0419ce100b5bf882
-  data.tar.gz: 191cfd245bc863f4fab038bf60abd36490a3b6cd4f2e5a3829155371aba9208691b529be1eef363746332f9d10a413b3b2dc8f515904ac0b333a806086a3d8da
+  metadata.gz: 56cbf39e36148afb57aad0bb868dfa0b31b75effea99b2c1e0939c1ba672a479a1b1b83ea202fc4d29abb6911441a3b95673ad972341dd637f1c2a7186d092d9
+  data.tar.gz: e0cee615ed978bb7b1a4df5c88d1f0c1a2241f393cbfeb1533f88e5ce4f14404873214dbd5ab0f472def1b344e3258e2a1d73547395b9ef220ebd2f96b79364f

data/README.md

@@ -8,8 +8,30 @@ Geopolitical
 
 Geopolitical models ready to use!
 
-Use
----
+
+With
+----
+
+
+    gem "geopolitical"
+
+
+
+I have
+------
+
+
+Hood, City, Region, Nation + Spot.
+
+
+
+Geopolitical
+------------
+
+
+
+
+
 
 
 

data/app/controllers/geopolitical/cities_controller.rb

@@ -1,11 +1,12 @@
 module Geopolitical
+  # Cities Public Controller
   class CitiesController < GeopoliticalController
     # allow  "admin"
     inherit_resources
-    before_filter :load_relatives, :only => [:new, :edit, :create, :update]
+    before_filter :load_relatives, only: [:new, :edit, :create, :update]
 
     def collection
-      @cities = City.ordered.search(params[:search]).page(params[:page]) # @cc.nation.cities
+      @cities = City.ordered.search(params[:search]).page(params[:page])
     end
 
     private
@@ -17,7 +18,9 @@ module Geopolitical
     end
 
     def load_relatives
-      @regions = Region.only(:name).map {|e| [e.name,e.id]}
+      @regions = Region.only(:name).map { |e| [e.name, e.id] }
     end
+
   end
+
 end

data/app/controllers/geopolitical/geopolitical_controller.rb

@@ -1,21 +1,20 @@
 module Geopolitical
-class GeopoliticalController < ActionController::Base
+  # Main Geopolitical Controller
+  class GeopoliticalController < ActionController::Base
 
-  layout 'geopolitical'
+    layout 'geopolitical'
 
-  def index
-    @regions = Region.all
-    @cities = City.all
-  end
+    def index
+      @regions = Region.all
+      @cities = City.all
+    end
 
+    private
 
-  private
+    def permitted_params
+      params.permit!
+    end
 
-  def permitted_params
-    params.permit!
   end
 
-
-
-end
 end

data/app/controllers/geopolitical/hoods_controller.rb

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

data/app/controllers/geopolitical/nations_controller.rb

@@ -1,9 +1,10 @@
 module Geopolitical
+  # Nations Public Controller
   class NationsController < GeopoliticalController
     inherit_resources
 
     def collection
-      @nations = Nation.ordered #.page(params[:page])
+      @nations = Nation.ordered
     end
 
     private

data/app/controllers/geopolitical/regions_controller.rb

@@ -1,7 +1,8 @@
 module Geopolitical
+  # Main Regions Controller
   class RegionsController < GeopoliticalController
     inherit_resources
-    before_filter :get_relatives, :only => [:new, :edit, :create, :update]
+    before_filter :get_relatives, only: [:new, :edit, :create, :update]
 
     def collection
       @regions = Region.ordered.page(params[:page])

data/app/controllers/geopolitical/zones_controller.rb

@@ -1,4 +1,5 @@
 module Geopolitical
+  # Main Zones Controller
   class ZonesController < GeopoliticalController
     inherit_resources
 
@@ -9,4 +10,5 @@ module Geopolitical
     private
 
   end
+
 end

data/app/helpers/geopolitical/application_helper.rb

@@ -1,4 +1,5 @@
 module Geopolitical
+  # Geopolitical Views Helper
   module ApplicationHelper
   end
 end

data/app/models/address.rb

@@ -1,3 +1,6 @@
+#
+# Geopolitical Address
+#
 class Address
   include Mongoid::Document
   # include Mongoid::Symbolize
@@ -5,9 +8,9 @@ class Address
   include Mongoid::Geospatial
 
   field :zip,     type: String
-  field :name,    type: String
-  field :title,   type: String
-  field :number,  type: String
+  field :name,    type: String # My house, my work...
+  field :title,   type: String # St, Rd, Av, Area, Park Foo
+  field :number,  type: String # least surprise fail
   field :extra,   type: String
   field :info,    type: String
 
@@ -18,14 +21,22 @@ class Address
   field :region_name,    type: String
   field :nation_name,    type: String
 
-  embedded_in :addressable, polymorphic: true
+  # embedded_in :addressable, polymorphic: true
+  belongs_to :addressable, polymorphic: true
 
   belongs_to :nation
   belongs_to :region
   belongs_to :city
   belongs_to :hood
 
-  validates :name, presence: true
+  validates :title, presence: true
+
+  before_save :set_caches
+
+  def set_caches
+    self.city_name ||= city.name if city
+    self.nation_name ||= nation.name if nation
+  end
 
   def print_location
     "#{hood_name} #{city_name} - #{region_name} "
@@ -59,7 +70,7 @@ class Address
   def to_s
     "#{name} #{number}" + print_location
   end
-  #index tie_id: 1, created_at: -1
+  # index tie_id: 1, created_at: -1
   # symbolize :kind, :in => [:street, :avenue, :road], default: :street
 
 end

data/app/models/city.rb

@@ -1,3 +1,6 @@
+#
+# Cities
+#
 class City
   include Mongoid::Document
   include Mongoid::Geospatial
@@ -7,10 +10,10 @@ class City
   field :zip,    type: String
   field :slug,   type: String
   field :name,   type: String,  localize: true
+  field :ascii,  type: String
   field :area,   type: Integer
   field :souls,  type: Integer
-  field :geom,   type: Point,    spatial: true
-  #    field :ascii, type: String
+  field :geom,   type: Point,   spatial: true
 
   spatial_scope :geom
 
@@ -20,34 +23,32 @@ class City
   belongs_to :nation
   has_many :hoods
 
-
   index name: 1
 
   scope :ordered, order_by(name: 1)
 
   validates :slug, presence: true, uniqueness: true
-  validates :name, uniqueness: {  :scope => :region_id  }
+  validates :name, uniqueness: { scope: :region_id }
 
   # scope :close_to, GeoHelper::CLOSE
 
   before_validation :set_defaults
 
-
   def set_defaults
     self.nation ||= region.try(:nation)
   end
 
   def abbr
+    return unless region || nation
     region ? region.abbr : nation.abbr
   end
 
-  def self.search txt
+  def self.search(txt)
     where(slug: /#{txt}/i)
   end
 
-  def <=> other
-    self.slug <=> other.slug
+  def <=>(other)
+    slug <=> other.slug
   end
 
-
 end

data/app/models/hood.rb

@@ -1,3 +1,6 @@
+#
+# Hood/Neighborhood
+#
 class Hood
   include Mongoid::Document
 

data/app/models/nation.rb

@@ -1,7 +1,12 @@
+#
+# Nation/Country/Flag
+#
 class Nation
   include Mongoid::Document
   include Geopolitical::Helpers
 
+  field :_id, type: String, default: ->{ abbr }
+
   field :gid,    type: Integer  # geonames id
   field :slug,   type: String
   field :name,   type: String, localize: true
@@ -11,8 +16,8 @@ class Nation
   field :cash,   type: String
   field :lang,   type: String
 
-  has_many :regions, :dependent => :destroy
-  has_many :cities,    :dependent => :destroy
+  has_many :regions, dependent: :destroy
+  has_many :cities,  dependent: :destroy
 
   scope :ordered, order_by(name: 1)
 
@@ -20,5 +25,4 @@ class Nation
 
   alias :currency :cash
 
-
 end

data/app/models/region.rb

@@ -1,3 +1,6 @@
+#
+# Region/Province/Estado
+#
 class Region
   include Mongoid::Document
   include Geopolitical::Helpers
@@ -10,13 +13,11 @@ class Region
 
   belongs_to :nation
 
-  has_many :cities, :dependent => :destroy
+  has_many :cities,  dependent: :destroy
 
   scope :ordered, order_by(name: 1)
 
   validates :nation, presence: true
-  validates :name,   presence: true,  uniqueness: { :scope => :nation_id }
-
-
+  validates :name,   presence: true,  uniqueness: { scope: :nation_id }
 
 end

data/app/models/zone.rb

@@ -1,3 +1,5 @@
+#
+# User created zones
 class Zone
   include Mongoid::Document
 
@@ -7,13 +9,12 @@ class Zone
   field :abbr,   type: String
   field :kind,   type: String
 
-  has_many :zone_members, :dependent => :destroy
+  has_many :zone_members, dependent: :destroy
 
   scope :ordered, order_by(name: 1)
 
   validates :name, presence: true, uniqueness: true
 
-
   def members
     zone_members.map(&:member)
   end

data/app/models/zone_member.rb

@@ -1,9 +1,10 @@
+#
+# Zone x Member (polymorphic geopolitical model)
+#
 class ZoneMember
   include Mongoid::Document
 
   belongs_to :zone
   belongs_to :member, polymorphic: true
 
-
-
 end

data/app/views/geopolitical/addresses/_address.html.haml

@@ -0,0 +1,6 @@
+.address
+  %i.icon-map-marker
+  #{address.name}, #{address.number}
+  %span.gray= "#{address.zip} #{address.print_location}"
+  -# - if address.info
+  -#   %span.gray= address.info

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

@@ -0,0 +1,17 @@
+=# vjs 'cep'
+%fieldset.address
+  .row.pull-right= f.link_to_remove "×".html_safe, :class => "close"
+  .row
+    -# .col-sm-3= f.select :kind, Address.get_kind_values, {}, :class => "input-auto"
+    .col-sm-12= ftext f, :title, :placeholder => "Nome"
+
+  .row
+    -# .col-sm-3= f.select :kind, Address.get_kind_values, {}, :class => "input-auto"
+    .col-sm-8= ftext f, :name, :placeholder => "Nome da Rua, Av...", :class => "street-field col-sm-12"
+    .col-sm-2= ftext f, :number, :class => "", :placeholder => "Num"
+    .col-sm-2= ftext f, :zip, :placeholder => "CEP", :class => "cep"
+  .row
+    .col-sm-4= ftext f, :city_name, :class => "city-field"
+    .col-sm-4= ftext f, :hood_name, :placeholder => "Bairro", :class => "input-small col-sm-12"
+    .col-sm-4= ftext f, :info, :placeholder => "Extra" #, :class => "col-sm-12"
+%hr

data/config/routes.rb

@@ -1,4 +1,4 @@
-#Rails.application.routes.draw
+# Rails.application.routes.draw
 Geopolitical::Engine.routes.draw do
   resources :zones
   resources :hoods
@@ -8,5 +8,5 @@ Geopolitical::Engine.routes.draw do
 
   resource :geopolitical
 
-  root :to => "geopolitical#index"
+  root to: 'geopolitical#index'
 end

data/lib/geopolitical.rb

@@ -1,8 +1,13 @@
-require "mongoid"
-require "mongoid_geospatial"
-require "geopolitical/engine"
-require "geopolitical/helpers"
+require 'mongoid'
+require 'mongoid_geospatial'
+require 'geopolitical/engine'
+require 'geopolitical/helpers'
 
+#
+# Geopolitical
+#
+# Nations, Regions, Cities...
+#
+#
 module Geopolitical
-
 end