geopolitical 0.8.1 → 0.8.2

data/spec/fabricators/address_fabricator.rb

@@ -0,0 +1,8 @@
+Fabricator :address do
+  nation
+  city
+  title  { Faker::Address.street_name }
+  number { rand(5000) }
+  zip    { Faker::Address.zip_code }
+  # geom  { [rand(30) - 50, rand(40) - 30] }
+end

data/spec/fabricators/city_fabricator.rb

@@ -1,6 +1,6 @@
 Fabricator :city do
   nation
-  name  { sequence(:name) { |i| "#{Faker::Address.city}#{i}" }}
+  name  { sequence(:name) { |i| "#{Faker::Address.city}#{i}" } }
   geom  { [rand(30) - 50, rand(40) - 30] }
-  #code { object.name[0..2].upcase }
+  # code { object.name[0..2].upcase }
 end

data/spec/fabricators/hood_fabricator.rb

@@ -1,6 +1,5 @@
 Fabricator :hood do
   city
-  name  { sequence(:name) { |i| "#{Faker::Address.city}#{i}" }}
+  name  { sequence(:name) { |i| "#{Faker::Address.city}#{i}" } }
   geom  { [rand(30) - 50, rand(40) - 30] }
-  #code { object.name[0..2].upcase }
 end

data/spec/fabricators/nation_fabricator.rb

@@ -1,4 +1,4 @@
 Fabricator :nation do
-  name { sequence {  |i| Faker::Address.country }}
+  name { sequence {  |i| Faker::Address.country } }
   abbr { |c| c[:name].first.upcase + ('A'..'Z').to_a[rand(23)] }
 end

data/spec/models/city_spec.rb

@@ -3,23 +3,23 @@ require 'spec_helper'
 
 describe City do
 
-  it "should create a city" do
-    lambda { City.make! }.should_not raise_error
+  it 'should create a city' do
+    -> { City.make! }.should_not raise_error
   end
 
-  describe "instance" do
-    let(:city) { City.make! }
+  describe 'instance' do
 
+    let(:city) { City.make! }
 
-    describe "Relatives" do
+    describe 'Relatives' do
       let(:nation) { Nation.make! }
 
-      it "should belongs to nation" do
+      it 'should belongs to nation' do
         city.nation = nation
         city.save.should be_true
       end
 
-      it "should belongs to region" do
+      it 'should belongs to region' do
         city.nation = nation
         city.save.should be_true
       end
@@ -28,24 +28,22 @@ describe City do
 
   end
 
-  describe "geoenabled" do
+  describe 'geoenabled' do
     before do
       City.create_indexes
     end
 
-    it "should find closest one" do
-      pending
+    it 'should find closest one' do
       city = City.make!
-      City.closest_to(city.geom).should eql(city)
+      City.nearby(city.geom).first.should eql(city)
     end
 
   end
 
-  describe "validations" do
-
-    it "should have a slug" do
-      city = City.new(name: "")
+  describe 'validations' do
 
+    it 'should have a slug' do
+      city = City.new(name: '')
 
       city.save
       city.should_not be_valid
@@ -53,22 +51,25 @@ describe City do
     end
 
   end
-#   it { should have_indices :name, :geom, :area, [:region_id, :nation_id] }
 
+end
+
+#   it { should have_indices :name, :geom, :area, [:region_id, :nation_id] }
 
-#   it "should accept an area" do
-#     @city = City.make(:area =>  Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]]))
+#   it 'should accept an area' do
+#     @city = City.make(:area =>  Polygon.from_coordinates([
+#     [[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]]))
 #     @city.area.should be_instance_of(Polygon)
 #   end
 
-#   describe "some helpers" do
-#     it "should have some nice x y z" do
+#   describe 'some helpers' do
+#     it 'should have some nice x y z' do
 #       @city = City.make
 #       @city.should respond_to(:x,:y,:z)
 #     end
 #   end
 
-#   describe "Find by proximity" do
+#   describe 'Find by proximity' do
 
 #     def pt(x,y);      Point.from_x_y(x,y); end
 
@@ -79,20 +80,19 @@ describe City do
 #       @ponto = pt(12,12)
 #     end
 
-#     it "should find the closest city" do
+#     it 'should find the closest city' do
 #       @city = City.close_to(@ponto).first
 #       @city.should eql(@perto)
 #     end
 
-#     it "should find the closest city to make sure" do
+#     it 'should find the closest city to make sure' do
 #       ponto = pt(22,22)
 #       @city = City.close_to(ponto).first
 #       @city.should eql(@medio)
 #     end
 
-#     it "should find the closest" do
+#     it 'should find the closest' do
 #       @poi = City.close_to(@ponto).first(2)
 #       @poi.should eql([@perto,@medio])
 #     end
 #   end
-end

data/spec/models/hood_spec.rb

@@ -2,15 +2,12 @@ require 'spec_helper'
 
 describe Hood do
 
-
-  it "should create a nation" do
-    lambda {  Hood.make! }.should_not raise_error
+  it 'should create a nation' do
+    -> { Hood.make! }.should_not raise_error
   end
 
-
-  it "should belong to city" do
-    Fabricate.build(:hood, :city => nil).should have(1).error_on(:city)
+  it 'should belong to city' do
+    Fabricate.build(:hood, city: nil).should have(1).error_on(:city)
   end
 
-
 end

data/spec/models/nation_spec.rb

@@ -2,11 +2,31 @@ require 'spec_helper'
 
 describe Nation do
 
+  it 'should create a nation' do
+    -> {  Nation.make! }.should_not raise_error
+  end
 
-  it "should create a nation" do
-    lambda {  Nation.make! }.should_not raise_error
+  it 'should require an abbr' do
+    Nation.make(abbr: nil).should have(1).error_on(:abbr)
   end
 
+  it 'should validates uniqueness of abbr' do
+    Nation.make!(abbr: 'BR')
+    Nation.make(abbr: 'BR').should have(1).error_on(:abbr)
+  end
 
+  it 'should have abbr as _id' do
+    Nation.make!(abbr: 'BR')
+    Nation.first[:_id].should eq('BR')
+  end
+
+  it 'may have a localized name' do
+    I18n.locale = :pt
+    n = Nation.new(name: 'Brasil')
+    n.name.should eq('Brasil')
+    I18n.locale = :en
+    n.name = 'Brazil'
+    n.name_translations.should eq('pt' => 'Brasil', 'en' => 'Brazil')
+  end
 
 end

data/spec/models/region_spec.rb

@@ -2,11 +2,8 @@ require 'spec_helper'
 
 describe Region do
 
-
-  it "should create a region" do
-    lambda {  Region.make! }.should_not raise_error
+  it 'should create a region' do
+    -> {  Region.make! }.should_not raise_error
   end
 
-
-
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'faker'
@@ -9,15 +9,15 @@ require 'fabrication/syntax/make'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
 
 Fabrication.configure do |config|
-  #config.fabricator_path = 'data/fabricators'
-  config.path_prefix = Rails.root.join("../../")
+  # config.fabricator_path = 'data/fabricators'
+  config.path_prefix = Rails.root.join('../../')
 end
 
 RSpec.configure do |config|
@@ -50,5 +50,5 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = "random"
+  config.order = 'random'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geopolitical
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +161,8 @@ files:
 - app/views/geopolitical/regions/index.html.haml
 - app/views/geopolitical/regions/_form.html.haml
 - app/views/geopolitical/regions/_region.html.haml
+- app/views/geopolitical/addresses/_address.html.haml
+- app/views/geopolitical/addresses/_form.html.haml
 - app/views/geopolitical/geopolitical/new.html.haml
 - app/views/geopolitical/geopolitical/index.html.haml
 - app/views/geopolitical/geopolitical/edit.html.haml
@@ -187,6 +217,7 @@ files:
 - spec/fabricators/hood_fabricator.rb
 - spec/fabricators/nation_fabricator.rb
 - spec/fabricators/region_fabricator.rb
+- spec/fabricators/address_fabricator.rb
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/public/favicon.ico
@@ -252,6 +283,7 @@ test_files:
 - spec/fabricators/hood_fabricator.rb
 - spec/fabricators/nation_fabricator.rb
 - spec/fabricators/region_fabricator.rb
+- spec/fabricators/address_fabricator.rb
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/public/favicon.ico