zip_search 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d64a97c6aa16248413d951fc224f8c2942f5c6f6
-  data.tar.gz: 719632834d827a784a02c0c45637927fdc8732fe
+  metadata.gz: 86153186a510fff5b6492564b57e835462a0ce55
+  data.tar.gz: 443cb172444ab807b2f6aa08b8bac6c9211fb67f
 SHA512:
-  metadata.gz: 919f138dc4487765fe4403c83107b3b5697ea7dbe317e69097e6f1ebada5c8e1af658826641fcd8a137ca2336fc50a01cea18a551d31f5c1e4bfcca34a571b59
-  data.tar.gz: f415c6e7703aada2125ba8f7994974a5fec358dfc16e3eb1ab6efa188e06bfce7799e6e26a612ec64f551bcbef3ee3a74eb94e5fa7b7c4779d21ede0429a7b1d
+  metadata.gz: b428c3c95f714a116a215bd772ef1f4606da03c75ad2ceb1e7cb66ffbfc96af270364110e76e97886f62cc8e4297b35b38d36a7a139b8f1dd1063f09b30cc532
+  data.tar.gz: c6e27cea29a19843d3647dd00406462fdb04449e5a6679739d145f330b3eee9d27494992e6aaae04df92ed2952abb55afa0a7144094f2b1f7cc6542f90778ad6

data/db/migrate/20151004201251_add_full_street_address_to_zip_search_locations.rb

@@ -0,0 +1,5 @@
+class AddFullStreetAddressToZipSearchLocations < ActiveRecord::Migration
+  def change
+    add_column :zip_search_locations, :street_address, :string
+  end
+end

data/lib/zip_search/acts_as_location.rb

@@ -23,18 +23,28 @@ module ZipSearch
         pg_search_scope :search_by_zip, against: :zip
 
         geocoded_by :to_sentence
-        after_validation :geocode
+        reverse_geocoded_by :latitude, :longitude do |obj, results|
+          if geo = results.first
+            obj.street_address ||= obj.street_address
+            obj.zip    ||= geo.postal_code
+            obj.county ||= geo.county if geo.respond_to? :county
+            obj.city   ||= geo.city
+            obj.state  ||= geo.state
+          end
+        end
+        after_validation :geocode, if: :should_geocode?
+        after_validation :reverse_geocode, if: :should_reverse_geocode?
 
         validates_presence_of :zs_association_name
 
         include ActsAsLocation::LocalInstanceMethods
       end
 
-      def location_fields; %i( zip county city state ) end
+      def location_fields; %i( street_address zip county city state ) end
 
       def params(extra_params=[])
         extra_params + [ :zs_association_name, :title, :latitude, :longitude,
-                         :zip, :county, :city, :state ]
+                         :street_address, :zip, :county, :city, :state ]
       end
 
       def nested_params(extra_params=[])
@@ -47,12 +57,18 @@ module ZipSearch
       def location_fields; self.class.location_fields end
       def location; Hash[ location_fields.map{|lf| [ lf, send(lf) ] } ] end
       def location_blank?; location.values.reject(&:blank?).empty? end
+      def location_missing_any?; location.values.select(&:blank?).any? end
 
       def to_sentence
         return 'Location unavailable' if location_blank?
         location_fields.map{|lf| send(lf) }.reject(&:blank?).join(', ')
       end
 
+      def has_coordinates?; !latitude.nil? && !longitude.nil? end
+      def coordinates; [latitude, longitude] end
+
+      def should_geocode?; !has_coordinates? && !location_blank? end
+      def should_reverse_geocode?; has_coordinates? && location_missing_any? end
       
     end
 

data/lib/zip_search/controller_helpers.rb

@@ -38,7 +38,6 @@ module ZipSearch
       response
     end
 
-
     def apply_location_filtering(target)
       return target unless params.key? :zs_location
       zl = Location.find_by(id: params[:zlid].to_i)

data/lib/zip_search/version.rb

@@ -1,3 +1,3 @@
 module ZipSearch
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/spec/models/traveler_spec.rb

@@ -35,4 +35,11 @@ describe Traveler do
     expect(new_traveler.current_location.to_sentence).to eq 'Location unavailable'
   end
 
+  it 'gets address components from street_address' do
+    expect {
+      new_traveler.current_location.street_address = '4910 E Warren Ave'
+      new_traveler.save
+    }.to change { new_traveler.current_location.latitude }
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zip_search
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -332,6 +332,7 @@ files:
 - config/spring.rb
 - db/migrate/20150914014727_create_zip_search_locations.rb
 - db/migrate/20150920034901_add_zs_association_name_to_zip_search_locations.rb
+- db/migrate/20151004201251_add_full_street_address_to_zip_search_locations.rb
 - lib/generators/zip_search/install/install_generator.rb
 - lib/tasks/zip_search_tasks.rake
 - lib/zip_search.rb