campfire_logic 1.1.8 → 1.1.9

data/Gemfile

@@ -3,8 +3,9 @@ source 'http://rubygems.org'
 gem 'bson_ext'
 gem 'fastercsv'
 gem 'google_maps_geocoder'
+gem 'mongoid', '< 2.4'
 gem 'mongoid-tree'
-gem 'rails', '3.0.10'
+gem 'rails', '~> 3.1'
 gem 'scaffold_logic'
 gem 'stateflow'
 gem 'stringex'

data/Gemfile.local

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'bson_ext'
 gem 'fastercsv'
-gem 'google_maps_geocoder'
+gem 'google_maps_geocoder', :path => '~/Documents/projects/google_maps_geocoder'
 gem 'mongoid-tree'
 gem 'rails', '3.0.10'
 gem 'scaffold_logic', :path => '~/Documents/projects/scaffold_logic'
@@ -20,4 +20,4 @@ group :test do
   gem 'launchy'
   gem 'mocha'
   gem 'rspec-rails'
-end
+end

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.1.9

data/app/models/location_import.rb

@@ -14,7 +14,7 @@ class LocationImport < ScaffoldLogic::DataImport
   end
 
   def process_row
-    @required_fields ||= [:'location #']
+    @required_fields ||= [:'location_#']
 
     if valid_row? && _location = Location.find_or_initialize_by(:location_number => row_map[@required_fields.first])
       COLUMNS_BY_MODEL_FIELDS.keys.each do |_field|
@@ -33,14 +33,14 @@ class LocationImport < ScaffoldLogic::DataImport
   protected
 
   COLUMNS_BY_MODEL_FIELDS = {
-    'location_number' => 'row_map[:"location #"]',
+    'location_number' => 'row_map[:"location_#"]',
     'name' => 'row_map[:"name"]',
-    'address1' => 'row_map[:"address 1"]',
-    'address2' => 'row_map[:"address 2"]',
+    'address1' => 'row_map[:"address_1"]',
+    'address2' => 'row_map[:"address_2"]',
     'city' => 'row_map[:"city"]',
     'state' => 'row_map[:"state"]',
-    'zip' => 'row_map[:"postal code"]',
-    'country' => 'row_map[:"country code"]',
+    'zip' => 'row_map[:"postal_code"]',
+    'country' => 'row_map[:"country_code"]',
     'phone' => 'row_map[:"phone"]',
     'email' => 'row_map[:"email"]',
     'meta_description' => 'row_map[:"description"]'

data/campfire_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "1.1.8"
+  s.version = "1.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]
-  s.date = "2011-11-30"
+  s.date = "2012-01-12"
   s.description = "Users can browse locations by country, city, and state and search locations by string or zip code. Administrators can manage locations and the services they offer."
   s.email = "rod@seologic.com"
   s.extra_rdoc_files = [
@@ -141,7 +141,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ivanoblomov/campfire_logic"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Rails engine that adds a location directory to your web app"
 
   if s.respond_to? :specification_version then
@@ -151,8 +151,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
       s.add_runtime_dependency(%q<google_maps_geocoder>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, ["< 2.4"])
       s.add_runtime_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, ["= 3.0.10"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.1"])
       s.add_runtime_dependency(%q<scaffold_logic>, [">= 0"])
       s.add_runtime_dependency(%q<stateflow>, [">= 0"])
       s.add_runtime_dependency(%q<stringex>, [">= 0"])
@@ -162,8 +163,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
       s.add_dependency(%q<google_maps_geocoder>, [">= 0"])
+      s.add_dependency(%q<mongoid>, ["< 2.4"])
       s.add_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_dependency(%q<rails>, ["= 3.0.10"])
+      s.add_dependency(%q<rails>, ["~> 3.1"])
       s.add_dependency(%q<scaffold_logic>, [">= 0"])
       s.add_dependency(%q<stateflow>, [">= 0"])
       s.add_dependency(%q<stringex>, [">= 0"])
@@ -174,8 +176,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
     s.add_dependency(%q<google_maps_geocoder>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["< 2.4"])
     s.add_dependency(%q<mongoid-tree>, [">= 0"])
-    s.add_dependency(%q<rails>, ["= 3.0.10"])
+    s.add_dependency(%q<rails>, ["~> 3.1"])
     s.add_dependency(%q<scaffold_logic>, [">= 0"])
     s.add_dependency(%q<stateflow>, [">= 0"])
     s.add_dependency(%q<stringex>, [">= 0"])

data/spec/models/locale_spec.rb

@@ -1,64 +1,56 @@
 require 'spec_helper'
 
 describe Locale do
-  before(:all) do
+  before :all do
     Locale.delete_all
     Locale.init_root
-  end
-
-  before(:each) do
     GoogleMapsGeocoder.stubs(:new).returns(stub('prospect park zoo', :city => 'Brooklyn', :country_long_name => 'United States', :country_short_name => 'US', :formatted_address => '450 Flatbush Avenue', :formatted_street_address => '450 Flatbush Avenue', :lat => 1, :lng => 1, :partial_match? => false, :postal_code => '11217', :state_long_name => 'New York', :state_short_name => 'NY'))
-    location = Location.new(:address1 => '450 Flatbush Avenue', :city => 'Brooklyn', :name => 'Prospect Park Zoo', :state => 'NY')
+    location = Location.new :address1 => '450 Flatbush Avenue', :city => 'Brooklyn', :name => 'Prospect Park Zoo', :state => 'NY'
     location.validate_address!
     location.localize
-    @locale = location.locale
   end
 
-  it 'inits the root locale' do
-    Locale.root.name.should == 'Earth'
-  end
-
-  it 'inits a country locale' do
-    Locale.us.first.name.should == 'United States'
+  it 'can skip geocoding on creation' do
+    locale = Locale.new :name => 'White House', :skip_geocoding => true
+    locale.stubs :save
+    locale.save
+    locale.geocoded?.should be_false
   end
 
-  it 'sets its slug' do
-    @locale.to_url.include?('new-york/brooklyn/prospect-park-zoo').should be_true
+  context 'when root' do
+    subject { Locale.root }
+    specify{ subject.name.should == 'Earth' }
+    specify{ subject.should be_planet }
   end
 
-  it 'returns an address for geocoding' do
-    @locale.location.state_locale.parent.geocoding_address.should == 'United States'
-    @locale.location.state_locale.geocoding_address.should == 'New York'
-    @locale.location.city_locale.geocoding_address.should == 'Brooklyn New York'
-    @locale.geocoding_address.should be_nil
+  context 'when country' do
+    subject { Locale.us.first }
+    specify { subject.name.should == 'United States' }
+    specify { subject.should be_country }
+    specify { subject.geocoding_address.should == 'United States' }
   end
 
-  it 'returns its geographical kind' do
-    @locale.kind.should == 'location'
-    @locale.parent.kind.should == 'city'
-    @locale.parent.parent.kind.should == 'state'
+  context 'when state' do
+    subject { Locale.states.first }
+    specify { subject.name.should == 'New York' }
+    specify { subject.should be_state }
+    specify { subject.geocoding_address.should == 'New York' }
+    specify { subject.friendly_name.should == 'New York' }
   end
 
-  it 'can skip geocoding on creation' do
-    @locale = Locale.new :name => 'White House', :skip_geocoding => true
-    @locale.stubs(:save)
-    @locale.save
-    @locale.geocoded?.should be_false
+  context 'when city' do
+    subject { Locale.cities.first }
+    specify { subject.name.should == 'Brooklyn' }
+    specify { subject.should be_city }
+    specify { subject.geocoding_address.should == 'Brooklyn New York' }
+    specify { subject.friendly_name.should == 'Brooklyn, New York' }
   end
 
-  describe "friendly names" do
-
-    it 'returns a friendly name for a city' do
-      city = Locale.cities.first
-      city.friendly_name.should =~ /#{city.name}/
-      city.friendly_name.should =~ /#{city.parent.name}/
-    end
-
-    it 'returns a friendly name for a state' do
-      state = Locale.states.first
-      state.friendly_name.should == state.name
-    end
-
+  context 'when location' do
+    subject { Locale.locations.first }
+    specify { subject.name.should == 'Prospect Park Zoo' }
+    specify { subject.should be_location }
+    specify { subject.geocoding_address.should be_nil }
+    specify { subject.to_url.should =~ /united-states\/new-york\/brooklyn\/prospect-park-zoo$/ }
   end
-
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: campfire_logic
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 1
-  - 8
-  version: 1.1.8
+  - 9
+  version: 1.1.9
 platform: ruby
 authors: 
 - Roderick Monje
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2012-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -60,9 +60,24 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mongoid-tree
+  name: mongoid
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 4
+        version: "2.4"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mongoid-tree
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,27 +87,26 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 5
         segments: 
         - 3
-        - 0
-        - 10
-        version: 3.0.10
+        - 1
+        version: "3.1"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: scaffold_logic
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,11 +116,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: stateflow
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -116,11 +130,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: stringex
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -130,11 +144,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -144,11 +158,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -160,7 +174,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: Users can browse locations by country, city, and state and search locations by string or zip code. Administrators can manage locations and the services they offer.
 email: rod@seologic.com
 executables: []
@@ -321,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Rails engine that adds a location directory to your web app