geopolitical 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba638d2868ace9fb9e0caebe149994928b9d6ef
-  data.tar.gz: bb3a1a730a0f71772c57b120538282dde7110fad
+  metadata.gz: cdcbe0e1d9740a0b3eeb329756b441399045be4d
+  data.tar.gz: 84519296171a9e61608db4011292078cdc37f112
 SHA512:
-  metadata.gz: 56cbf39e36148afb57aad0bb868dfa0b31b75effea99b2c1e0939c1ba672a479a1b1b83ea202fc4d29abb6911441a3b95673ad972341dd637f1c2a7186d092d9
-  data.tar.gz: e0cee615ed978bb7b1a4df5c88d1f0c1a2241f393cbfeb1533f88e5ce4f14404873214dbd5ab0f472def1b344e3258e2a1d73547395b9ef220ebd2f96b79364f
+  metadata.gz: c59bf8f85f44f339afd11829e958d43596167935a7daa3254fdd2bb03dffc304ab5b0d88dcb1dbdd07ef38a975ade1a6eee325d74f483f6e7f918b81e63ede81
+  data.tar.gz: c293e9bb3bb20ffd9b5cf5e270a21ee6632c134a21c96bc5280e9062f23cbcd4fd356971c31d0a6159f2ba445bb37a810f4cfd01fcecc04ebc4a0927ad6ff4da

data/README.md

@@ -44,3 +44,7 @@ Use Geonames_local to populate data easily!
 
 
 This project rocks and uses MIT-LICENSE.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/fireho/geopolitical/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -4,6 +4,11 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
+require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+#require 'rubocop/rake_task'
+
 require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
@@ -15,9 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-
+# load 'rails/tasks/engine.rake'
 
-Bundler::GemHelper.install_tasks
 
+# Bundler::GemHelper.install_tasks

data/app/controllers/geopolitical/zones_controller.rb

@@ -9,6 +9,10 @@ module Geopolitical
 
     private
 
+    def permitted_params
+      params.permit!
+    end
+
   end
 
 end

data/app/models/address.rb

@@ -39,7 +39,7 @@ class Address
   end
 
   def print_location
-    "#{hood_name} #{city_name} - #{region_name} "
+    "#{hood_name}, #{city_name} - #{region_name}"
   end
 
   def print_full_location
@@ -68,7 +68,7 @@ class Address
   end
 
   def to_s
-    "#{name} #{number}" + print_location
+    "#{name} #{number} " + print_location
   end
   # index tie_id: 1, created_at: -1
   # symbolize :kind, :in => [:street, :avenue, :road], default: :street

data/app/models/city.rb

@@ -4,7 +4,7 @@
 class City
   include Mongoid::Document
   include Mongoid::Geospatial
-  include Geopolitical::Helpers
+  include GeoHelper
 
   field :gid,    type: Integer
   field :zip,    type: String
@@ -25,7 +25,7 @@ class City
 
   index name: 1
 
-  scope :ordered, order_by(name: 1)
+  scope :ordered, -> { order_by(name: 1) }
 
   validates :slug, presence: true, uniqueness: true
   validates :name, uniqueness: { scope: :region_id }

data/app/models/concerns/geo_helper.rb

@@ -0,0 +1,23 @@
+# Geopolitical Helpers
+module GeoHelper
+  extend ActiveSupport::Concern
+
+  included do
+    before_validation :set_slug
+  end
+
+  def to_s
+    name || slug
+  end
+
+  def set_slug
+    self.slug ||= name
+  end
+
+  def slug=(txt)
+    return unless txt
+    self[:slug] = txt.encode(Encoding::ISO_8859_1)
+      .gsub(/\s/, '-').downcase
+  end
+
+end

data/app/models/hood.rb

@@ -15,7 +15,7 @@ class Hood
 
   validates  :city, :name, presence: true
 
-  scope :ordered, order_by(name: 1)
+  scope :ordered, -> { order_by(name: 1) }
 
   def to_s
     name || slug

data/app/models/nation.rb

@@ -3,7 +3,7 @@
 #
 class Nation
   include Mongoid::Document
-  include Geopolitical::Helpers
+  include GeoHelper
 
   field :_id, type: String, default: ->{ abbr }
 
@@ -19,7 +19,7 @@ class Nation
   has_many :regions, dependent: :destroy
   has_many :cities,  dependent: :destroy
 
-  scope :ordered, order_by(name: 1)
+  scope :ordered, -> { order_by(name: 1) }
 
   validates :slug, :abbr, uniqueness: true, presence: true
 

data/app/models/region.rb

@@ -3,7 +3,7 @@
 #
 class Region
   include Mongoid::Document
-  include Geopolitical::Helpers
+  include GeoHelper
 
   field :gid,    type: Integer  # geonames id
   field :slug,   type: String
@@ -15,7 +15,7 @@ class Region
 
   has_many :cities,  dependent: :destroy
 
-  scope :ordered, order_by(name: 1)
+  scope :ordered, -> { order_by(name: 1) }
 
   validates :nation, presence: true
   validates :name,   presence: true,  uniqueness: { scope: :nation_id }

data/app/models/zone.rb

@@ -2,25 +2,39 @@
 # User created zones
 class Zone
   include Mongoid::Document
+  include GeoHelper
 
   field :gid,    type: Integer  # geonames id
   field :slug,   type: String
-  field :name,   type: String,  localize: true
+  field :name,   type: String
   field :abbr,   type: String
+  field :i18n,   type: String,  localize: true
   field :kind,   type: String
+  field :info,   type: String,  localize: true
 
-  has_many :zone_members, dependent: :destroy
+  field :active, type: Mongoid::Boolean
 
-  scope :ordered, order_by(name: 1)
+  has_many :members, class_name: "Zone::Member", dependent: :destroy
 
-  validates :name, presence: true, uniqueness: true
+  scope :ordered,  -> { order_by(name: 1) }
+  scope :active,   -> { where(active: true) }
 
-  def members
-    zone_members.map(&:member)
-  end
+  # validates :name, presence: true# , uniqueness: true
 
   def to_s
     name
   end
 
+  def self.icon
+    "globe"
+  end
+
+  # Zone::Member
+  class Member
+    include Mongoid::Document
+
+    belongs_to :zone
+    belongs_to :member, polymorphic: true
+  end
+
 end

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

@@ -18,6 +18,5 @@
       .form-group
         = f.label :kind
         = f.text_field :kind
-
       .forms-buttons
         = f.submit

data/lib/geopolitical.rb

@@ -1,7 +1,6 @@
 require 'mongoid'
 require 'mongoid_geospatial'
 require 'geopolitical/engine'
-require 'geopolitical/helpers'
 
 #
 # Geopolitical

data/lib/geopolitical/version.rb

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

data/spec/dummy/config/routes.rb

@@ -1,4 +1,56 @@
-Rails.application.routes.draw do
+Dummy::Application.routes.draw do
+  # The priority is based upon order of creation: first created -> highest priority.
+  # See how all your routes lay out with "rake routes".
 
-  mount Geopolitical::Engine => "/geopolitical"
+  # You can have the root of your site routed with "root"
+  # root 'welcome#index'
+
+  # Example of regular route:
+  #   get 'products/:id' => 'catalog#view'
+
+  # Example of named route that can be invoked with purchase_url(id: product.id)
+  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
+
+  # Example resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Example resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Example resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Example resource route with more complex sub-resources:
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', on: :collection
+  #     end
+  #   end
+  
+  # Example resource route with concerns:
+  #   concern :toggleable do
+  #     post 'toggle'
+  #   end
+  #   resources :posts, concerns: :toggleable
+  #   resources :photos, concerns: :toggleable
+
+  # Example resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
 end