campfire_logic 1.1.10 → 1.2.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: campfire_logic
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 10
-  version: 1.1.10
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Roderick Monje
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 Z
+date: 2012-01-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: google_maps_geocoder
+  name: geocoder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,7 +60,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mongoid
+  name: mongoid-tree
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,33 +74,33 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mongoid-tree
+  name: rails
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: redis
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 3
         - 0
-        - 0
-        version: 3.0.0
+        version: "0"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -146,7 +146,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: SystemTimer
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -157,12 +157,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: jeweler
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -174,7 +188,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 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: []
@@ -194,12 +208,11 @@ files:
 - app/controllers/locations_controller.rb
 - app/controllers/services_controller.rb
 - app/helpers/application_helper.rb
+- app/models/geocoder_google_result.rb
 - app/models/locale.rb
 - app/models/location.rb
 - app/models/location_import.rb
 - app/models/service.rb
-- app/models/zip_code.rb
-- app/models/zip_code_import.rb
 - app/views/directory/_search_form.html.erb
 - app/views/directory/_show_children.html.erb
 - app/views/directory/_show_location.html.erb
@@ -230,6 +243,7 @@ files:
 - config/environment.rb
 - config/environments/test.rb
 - config/initializers/campfire_logic.rb
+- config/initializers/geocoder.rb
 - config/initializers/metric_fu.rb
 - config/initializers/secret_token.rb
 - config/initializers/session_store.rb
@@ -237,7 +251,6 @@ files:
 - config/mongoid.yml
 - config/routes.rb
 - db/seeds.rb
-- db/zip_codes.txt
 - features/admin_manages_locations.feature
 - features/customer_browses_directory.feature
 - features/customer_searches_directory.feature
@@ -335,7 +348,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

data/app/models/zip_code.rb

@@ -1,48 +0,0 @@
-class ZipCode
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  # Attributes =====================================================================================
-  field :zip
-  field :city
-  field :state
-  field :county
-  field :lat_lng, :type => Array
-  index [[ :lat_lng, Mongo::GEO2D ]], :min => -200, :max => 200
-
-  # Indices ========================================================================================
-
-  # Constants ======================================================================================
-
-  # Scopes =========================================================================================
-
-  # Relationships ==================================================================================
-
-  # Behavior =======================================================================================
-
-  # Callbacks ======================================================================================
-  before_save :geocode
-
-  # Validations ====================================================================================
-
-  # Class methods ==================================================================================
-
-  # Instance methods ===============================================================================
-
-  # Geocodes this zip code.
-  def geocode
-    return if geocoded?
-
-    unless @geocoder
-      @geocoder = GoogleMapsGeocoder.new(self.zip)
-      self.city, self.state, self.county, self.lat_lng = @geocoder.city, @geocoder.state_short_name, @geocoder.county, [@geocoder.lat, @geocoder.lng], @geocoder.state_long_name
-    end
-  rescue SocketError
-    Rails.logger.error "Can't geocode without a network connection!"
-  end
-
-  # Returns true if this location has a latitude and longitude.
-  def geocoded?
-    self.lat_lng.is_a?(Array)
-  end
-end

data/app/models/zip_code_import.rb

@@ -1,19 +0,0 @@
-class ZipCodeImport < ScaffoldLogic::DataImport
-  def self.save(upload)
-    # create file path
-    _path = File.join('tmp', upload['datafile'].original_filename)
-
-    # write file
-     File.open(_path, 'wb') { |f| f.write(upload['datafile'].read) }
-
-    self.run(_path)
-  end
-
-  def self.test(path='db/zip_codes.txt')
-    self.run(path)
-  end
-
-  def process_row
-    zip = ZipCode.create :zip => row_map[:zip], :city => row_map[:city], :state => row_map[:state], :county => row_map[:zip_class], :lat_lng => [row_map[:latitude].to_f, row_map[:longitude].to_f]
-  end
-end