geopolitical 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdcbe0e1d9740a0b3eeb329756b441399045be4d
-  data.tar.gz: 84519296171a9e61608db4011292078cdc37f112
+  metadata.gz: 9bb0b89bd70de2fdb5043eb0aa7df85ccb16a6e8
+  data.tar.gz: e7cd29bd02745c80a3f41c7442d94018c84f068d
 SHA512:
-  metadata.gz: c59bf8f85f44f339afd11829e958d43596167935a7daa3254fdd2bb03dffc304ab5b0d88dcb1dbdd07ef38a975ade1a6eee325d74f483f6e7f918b81e63ede81
-  data.tar.gz: c293e9bb3bb20ffd9b5cf5e270a21ee6632c134a21c96bc5280e9062f23cbcd4fd356971c31d0a6159f2ba445bb37a810f4cfd01fcecc04ebc4a0927ad6ff4da
+  metadata.gz: d72e2bdaafb73d270e2821e873b4958d9e4ac8f6c1f3a6b2cd74b3aa8119458e4e0c23f990f0901408dcc874f1613f19bdffaa1311484b8e7d8ed384e7b1bc38
+  data.tar.gz: f82ae4c772d3df1f26a198969c6cc25118d6d3ebda15b50499566e6a009eb521acf4006e4a330762b137b6b0a2b05ee482273298063a3b2ca92bff0fcde2f8fe

data/Rakefile

@@ -7,7 +7,7 @@ end
 require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
-#require 'rubocop/rake_task'
+# require 'rubocop/rake_task'
 
 require 'rdoc/task'
 
@@ -19,8 +19,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 # load 'rails/tasks/engine.rake'
 
-
 # Bundler::GemHelper.install_tasks

data/app/controllers/geopolitical/cities_controller.rb

@@ -20,7 +20,5 @@ module Geopolitical
     def load_relatives
       @regions = Region.only(:name).map { |e| [e.name, e.id] }
     end
-
   end
-
 end

data/app/controllers/geopolitical/geopolitical_controller.rb

@@ -1,7 +1,6 @@
 module Geopolitical
   # Main Geopolitical Controller
   class GeopoliticalController < ActionController::Base
-
     layout 'geopolitical'
 
     def index
@@ -14,7 +13,5 @@ module Geopolitical
     def permitted_params
       params.permit!
     end
-
   end
-
 end

data/app/controllers/geopolitical/hoods_controller.rb

@@ -15,7 +15,5 @@ module Geopolitical
     def load_relatives
       @cities = City.only(:name).map { |e| [e.name, e.id] }
     end
-
   end
-
 end

data/app/controllers/geopolitical/nations_controller.rb

@@ -12,6 +12,5 @@ module Geopolitical
     # def permitted_params
     #   params.permit! #require(:nation).permit!
     # end
-
   end
 end

data/app/controllers/geopolitical/regions_controller.rb

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

data/app/models/city.rb

@@ -4,13 +4,9 @@
 class City
   include Mongoid::Document
   include Mongoid::Geospatial
-  include GeoHelper
+  include Geopolitocracy
 
-  field :gid,    type: Integer
   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
@@ -28,7 +24,7 @@ class City
   scope :ordered, -> { order_by(name: 1) }
 
   validates :slug, presence: true, uniqueness: true
-  validates :name, uniqueness: { scope: :region_id }
+  validates :name, uniqueness: { scope: :nation_id }
 
   # scope :close_to, GeoHelper::CLOSE
 
@@ -50,5 +46,4 @@ class City
   def <=>(other)
     slug <=> other.slug
   end
-
 end

data/app/models/concerns/{geo_helper.rb → geopolitocracy.rb}

@@ -1,8 +1,16 @@
 # Geopolitical Helpers
-module GeoHelper
+module Geopolitocracy
   extend ActiveSupport::Concern
 
   included do
+    field :name,   type: String,  localize: true
+    field :abbr,   type: String
+    field :gid,    type: Integer  # geonames id
+
+    field :slug,   type: String
+    field :ascii,  type: String
+    field :code,   type: String
+
     before_validation :set_slug
   end
 
@@ -19,5 +27,4 @@ module GeoHelper
     self[:slug] = txt.encode(Encoding::ISO_8859_1)
       .gsub(/\s/, '-').downcase
   end
-
 end

data/app/models/hood.rb

@@ -3,22 +3,19 @@
 #
 class Hood
   include Mongoid::Document
+  include Geopolitocracy
 
-  field :gid,   type: Integer
-  field :slug,  type: String
-  field :name,  type: String, localize: true
   field :souls, type: Integer
-  field :zip,   type: Integer
   field :rank,  type: Integer
+  field :zip,   type: Integer
 
   belongs_to :city
 
-  validates  :city, :name, presence: true
+  validates :city, :name, presence: true
 
   scope :ordered, -> { order_by(name: 1) }
 
   def to_s
     name || slug
   end
-
 end

data/app/models/nation.rb

@@ -3,14 +3,10 @@
 #
 class Nation
   include Mongoid::Document
-  include GeoHelper
+  include Geopolitocracy
 
-  field :_id, type: String, default: ->{ abbr }
+  field :_id, type: String, default: -> { abbr }
 
-  field :gid,    type: Integer  # geonames id
-  field :slug,   type: String
-  field :name,   type: String, localize: true
-  field :abbr,   type: String
   field :code    # optional phone/whatever code
   field :zip,    type: String
   field :cash,   type: String
@@ -23,6 +19,5 @@ class Nation
 
   validates :slug, :abbr, uniqueness: true, presence: true
 
-  alias :currency :cash
-
+  alias_method :currency, :cash
 end

data/app/models/region.rb

@@ -3,12 +3,8 @@
 #
 class Region
   include Mongoid::Document
-  include GeoHelper
+  include Geopolitocracy
 
-  field :gid,    type: Integer  # geonames id
-  field :slug,   type: String
-  field :name,   type: String,  localize: true
-  field :abbr,   type: String
   field :codes,  type: Array # phone codes
 
   belongs_to :nation
@@ -19,5 +15,4 @@ class Region
 
   validates :nation, presence: true
   validates :name,   presence: true,  uniqueness: { scope: :nation_id }
-
 end

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

@@ -1,7 +1,7 @@
 %h1 Geopolitical
 %hr
 
-- [City, Region, Nation, Hood, Zone].each do |klass|
+- [Nation, Region, City, Hood].each do |klass|
   .block
     %h3.title
       = link_to klass.model_name.human.pluralize, send("#{klass.to_s.downcase.pluralize}_path")
@@ -18,4 +18,4 @@
 %hr
 %p Minimalist layout by NoCSS Co.
 %p= link_to "fireho/geopolitical", "http://github.com/fireho/geopolitical"
-%p= link_to "< Back", "/"
+%p= link_to "< Back", "/"

data/app/views/layouts/geopolitical.html.haml

@@ -14,7 +14,7 @@
     = csrf_meta_tags
     //%link{:href => image_path("favicon.png?v=111119"), :rel => "shortcut icon"}/
   %body
-    - [City, Region, Nation, Hood, Zone].each do |klass|
+    - [Nation, Region, City, Hood].each do |klass|
       = link_to klass.model_name.human.pluralize, send("#{klass.to_s.downcase.pluralize}_path")
 
     = yield

data/config/routes.rb

@@ -1,6 +1,5 @@
 # Rails.application.routes.draw
 Geopolitical::Engine.routes.draw do
-  resources :zones
   resources :hoods
   resources :cities
   resources :regions

data/lib/geopolitical/engine.rb

@@ -1,3 +1,4 @@
+require 'mongoid'
 require 'mongoid_geospatial'
 require 'inherited_resources'
 

data/lib/geopolitical/version.rb

@@ -1,4 +1,4 @@
 # :nodoc:
 module Geopolitical
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/spec/dummy/config/application.rb

@@ -1,14 +1,14 @@
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:
-#require "active_record/railtie"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "sprockets/railtie"
+# require "active_record/railtie"
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'sprockets/railtie'
 # require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
-require "geopolitical"
+require 'geopolitical'
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

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

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations
-  config.active_record.migration_error = :page_load
+  # config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large

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

@@ -14,7 +14,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets  = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/dummy/config/mongoid.yml

@@ -1,13 +1,69 @@
+development:
+  # Configure available database sessions. (required)
+  sessions:
+    # Defines the default session. (required)
+    default:
+      # Defines the name of the default database that Mongoid can connect to.
+      # (required).
+      database: geopolitical_spec_development
+      # Provides the hosts the default session can connect to. Must be an array
+      # of host:port pairs. (required)
+      hosts:
+        - localhost:27017
+      options:
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        # w: 1
+
+        # Change the default consistency model to primary, secondary.
+        # 'secondary' will send reads to secondaries, 'primary' sends everything
+        # to master. (default: primary)
+        # read: secondary_preferred
+
+        # How many times Moped should attempt to retry an operation after
+        # failure. (default: The number of nodes in the cluster)
+        # max_retries: 20
+
+        # The time in seconds that Moped should wait before retrying an
+        # operation on failure. (default: 0.25)
+        # retry_interval: 0.25
+  # Configure Mongoid specific options. (optional)
+  options:
+    # Includes the root model name in json serialization. (default: false)
+    # include_root_in_json: false
+
+    # Include the _type field in serializaion. (default: false)
+    # include_type_for_serialization: false
+
+    # Preload all models in development, needed when models use
+    # inheritance. (default: false)
+    # preload_models: false
+
+    # Protect id and type from mass assignment. (default: true)
+    # protect_sensitive_fields: true
+
+    # Raise an error when performing a #find and the document is not found.
+    # (default: true)
+    # raise_not_found_error: true
+
+    # Raise an error when defining a scope with the same name as an
+    # existing method. (default: false)
+    # scope_overwrite_exception: false
+
+    # Use Active Support's time zone in conversions. (default: true)
+    # use_activesupport_time_zone: true
+
+    # Ensure all times are UTC in the app side. (default: false)
+    # use_utc: false
 test:
   sessions:
     default:
-      database: geopolitical_test
+      database: geopolitical_spec
       hosts:
         - localhost:27017
       options:
-        consistency: :strong
+        read: primary
         # In the test environment we lower the retries and retry interval to
         # low amounts for fast failures.
         max_retries: 1
         retry_interval: 0
-

data/spec/dummy/config/routes.rb

@@ -39,7 +39,7 @@ Dummy::Application.routes.draw do
   #       get 'recent', on: :collection
   #     end
   #   end
-  
+
   # Example resource route with concerns:
   #   concern :toggleable do
   #     post 'toggle'