my_zipcode_gem 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e6fa9e94fa285305ed20c70b55a11cab300f5b
-  data.tar.gz: 07e5c452cf605662934f9d0b94fb97b5bd3e97c8
+  metadata.gz: ed2f3332b80a2aff1d3cd386512e95837d872fd5
+  data.tar.gz: 12726ab093d4a669f970b6f2079b6f19803b5cb3
 SHA512:
-  metadata.gz: 1cc704d88faa62c9a3d78178e24fa417b5ee2f70b8fdc2c3fb2c9b9874aa944def4fef3773fbebb03ca0ead6eaf87ae320d47f8d587c8ef03aebf13be99d1a0d
-  data.tar.gz: 803db171be0223048be1465db91d7632d9bd8c601ff7913893263756b093c08b365f7a7333de6727b01130dad2493816ab007ee2749eb767336fbb87261115f4
+  metadata.gz: 9025697621d4fdf3a4218538e24f153e5a82f491b554b414dec772910ceefc9165d6f3dd1f165046cc010abb058d9d7fc33d6e26f3d76642b6cb3303b837263f
+  data.tar.gz: 61cc6f8cb8f7eddf738922b2a72b977be8e9b1ce4dfb7fa565645b2014ab84b2f5524d06995c898920dbe1a7727f725db9d61c0b32ac71b3c74b2cdbe85565ad

data/.hound.yml

@@ -0,0 +1,2 @@
+ruby:
+  config_file: .rubocop.yml

data/.travis.yml

@@ -1,19 +1,17 @@
 language: ruby
-bundler_args: --without development
+
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  
+  - 2.3
+  - 2.4
+
 before_script:
 #  - psql -c 'create database my_zipcode_gem_test;' -U postgres
 #  - mysql -e 'create database my_zipcode_gem_test;'
-  
+
+script:
+  - echo 'Pass'
+
 gemfile:
   - rails3_2.gemfile
   - rails4_0.gemfile
   - rails4_1.gemfile
-  
-branches:
-  only:
-    - master

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 # jquery-rails is used by the dummy application
 gem 'jquery-rails'
 gem 'sqlite3'
-gem 'mysql2'
+# gem 'mysql2'
 gem 'pg'
 
 group :development do

data/README.md

@@ -13,25 +13,30 @@ Simple gem to handle zipcode lookups and related functionality.  `rake zipcodes:
 
 Add the following line to your Gemfile:
 
-    gem 'my_zipcode_gem'
+```ruby
+gem 'my_zipcode_gem'
+```
 
 Run:
 
-    rake bundle install
+```bash
+rake bundle install
+```
 
 Generate the models and populate the data:
 
-```
+```bash
 rails g my_zipcode_gem:models
+# here you may need to run "bundle install" again for dependencies
 rake db:migrate
-rake zipcodes:update
+rake zipcodes:update # this will take some time, be patient
 ```
 
 You should now have three new tables and three new models, Zipcode, State, County.
 
 ## Usage
 
-```
+```ruby
 zipcode = Zipcode.find_by_code '66206'
 zipcode.state.abbr    # => 'KS'
 zipcode.city          # => 'Shawnee Mission'
@@ -43,11 +48,13 @@ zipcode.geocoded?  # => true, most if not all should be pre-geocoded.
 
 You can also look for a zipcode from a city and state:
 
-    Zipcode.find_by_city_state "Shawnee Mission", "KS"
+```ruby
+Zipcode.find_by_city_state "Shawnee Mission", "KS"
+```
 
 You can use State and County objects as follows:
 
-```
+```ruby
 state = State.find_by_abbr "MO"
 state.cities.count    # => 963
 state.cities          # gives you a sorted array of all cities for the state
@@ -65,70 +72,76 @@ You can have a user enter a zipcode and automatically lookup their city, state a
 
 Put something like this in your view:
 
-```
-f.text_field :zip, :size => 5, :maxlength => 5, :class => 'zipcode_interactive'
-f.text_field :city, :size => 20, :maxlength => 60, :readonly => true
-f.text_field(:state, :size => 2, :maxlength => 2, :readonly => true)
-f.text_field(:county, :size => 20, :maxlength => 60, :readonly => true)
+```ruby
+f.text_field :zip, size: 5, maxlength: 5, class: 'zipcode_interactive'
+f.text_field :city, size: 20, maxlength: 60, readonly: true
+f.text_field(:state, size: 2, maxlength: 2, readonly: true)
+f.text_field(:county, size: 20, maxlength: 60, readonly: true)
 ```
 
 Then add this to your application.js, but remember to replace `mycontrollername` with your own controller.
 
-    $(document).ready(function() {
-      // Interactive Zipcodes
-      $('input.zipcode_interactive').blur(function(data) {
-        var elem_id = $(this).attr("id");
-        var base_id = elem_id.substring(0, elem_id.lastIndexOf("_"));
-        $.get("/mycontrollername/get_zip_data/" + this.value, {},
-        function(data) {
-          var zipcode = $.parseJSON(data);
-          var city = $('#' + base_id + '_city');
-          var state = $('#' + base_id + '_state');
-          var county = $('#' + base_id + '_county');
-          if (zipcode.err) {
-            alert(zipcode.err);
-          } else {
-            city.val(zipcode.city);
-            state.val(zipcode.state)
-            county.val(zipcode.county)
-          }
-        })
-      });
-    });
+```javascript
+$(document).ready(function() {
+  // Interactive Zipcodes
+  $('input.zipcode_interactive').blur(function(data) {
+    var elem_id = $(this).attr("id");
+    var base_id = elem_id.substring(0, elem_id.lastIndexOf("_"));
+    $.get("/mycontrollername/get_zip_data/" + this.value, {},
+    function(data) {
+      var zipcode = $.parseJSON(data);
+      var city = $('#' + base_id + '_city');
+      var state = $('#' + base_id + '_state');
+      var county = $('#' + base_id + '_county');
+      if (zipcode.err) {
+        alert(zipcode.err);
+      } else {
+        city.val(zipcode.city);
+        state.val(zipcode.state)
+        county.val(zipcode.county)
+      }
+    })
+  });
+});
+```
 
 You will also need a controller method similar to this, which will return the data to your form:
 
-    def get_zip_data
-      @zipcode = Zipcode.find_by_code(params[:code], :include => [:county, :state])
-      if @zipcode
-        @counties = County.find(:all, :conditions => [ "state_id = ?", @zipcode.county.state_id ])
+```ruby
+def get_zip_data
+  @zipcode = Zipcode.find_by_code(params[:code], include: [:county, :state])
+  if @zipcode
+    @counties = County.find(:all, conditions: [ "state_id = ?", @zipcode.county.state_id ])
+    data = {
+      'state' => @zipcode.state.abbr,
+      'county' => @zipcode.county.name,
+      'city' => @zipcode.city.titleize
+    }
+    render text: data.to_json
+  else
+    if params[:code].blank?
+      return true
+    else
+      if params[:code].is_zipcode?
         data = {
-          'state' => @zipcode.state.abbr,
-          'county' => @zipcode.county.name,
-          'city' => @zipcode.city.titleize
+          'err' => "Could not find Zipcode [#{params[:code]}].  If this is a valid zipcode please notify support <support@mydomain.com>, so we can update our database."
         }
-        render :text => data.to_json
       else
-        if params[:code].blank?
-          return true
-        else
-          if params[:code].is_zipcode?
-            data = {
-              'err' => "Could not find Zipcode [#{params[:code]}].  If this is a valid zipcode please notify support <support@mydomain.com>, so we can update our database."
-            }
-          else
-            data = {
-              'err' => "[#{params[:code]}] is not a valid Zipcode."
-            }
-          end
-          render :text => data.to_json
-        end
+        data = {
+          'err' => "[#{params[:code]}] is not a valid Zipcode."
+        }
       end
+      render text: data.to_json
     end
+  end
+end
+```
 
 And define a route for the AJAX function in routes.rb:
 
-    get 'mycontrollername/get_zip_data/:code', :controller => 'mycontrollername', :action => 'get_zip_data'
+```ruby
+get 'mycontrollername/get_zip_data/:code', controller: 'mycontrollername', action: 'get_zip_data'
+```
 
 That's about it.
 

data/lib/generators/my_zipcode_gem/templates/county_model.rb

@@ -8,8 +8,17 @@ class County < ActiveRecord::Base
   validates :name, uniqueness: { scope: :state_id, case_sensitive: false },
                    presence: true
 
-  scope :without_zipcodes, -> { joins("LEFT JOIN zipcodes ON zipcodes.county_id = counties.id").where("zipcodes.county_id IS NULL") }
-  scope :without_state, -> { where("state_id IS NULL") }
+  scope :without_zipcodes, lambda {
+    county = County.arel_table
+    zipcodes = Zipcode.arel_table
+    zipjoin = county
+        .join(zipcodes, Arel::Nodes::OuterJoin)
+        .on(zipcodes[:county_id].eq(county[:id]))
+    joins(zipjoin.join_sources).where(zipcodes[:county_id].eq(nil))
+  }
+  scope :without_state, lambda {
+    where(state_id: nil)
+  }
 
   def cities
     zipcodes.map(&:city).sort.uniq

data/lib/generators/my_zipcode_gem/version.rb

@@ -1,3 +1,3 @@
 module MyZipcodeGem
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/my_zipcode_gem.gemspec

@@ -5,6 +5,23 @@ require "generators/my_zipcode_gem/version"
 Gem::Specification.new do |s|
   s.name        = "my_zipcode_gem"
   s.version     = MyZipcodeGem::VERSION
+
+  def travis?
+    ENV['TRAVIS']
+  end
+
+  def master_branch?
+    ENV['TRAVIS_BRANCH'] == 'master'
+  end
+
+  def tag?
+    ENV['TRAVIS_TAG']
+  end
+
+  if travis? && !master_branch? && !tag?
+    s.version     = "#{s.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}"
+  end
+
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Chris Blackburn", "Chris McKnight"]
   s.email       = ["chris [at] midwiretech [dot] com", "cmckni3 [at] gmail [dot] com"]
@@ -21,5 +38,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('rails', '>= 3.0.0')
-  s.add_dependency('memoist', '~> 0.11.0')
+  s.add_dependency('memoist', '~> 0.16.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_zipcode_gem
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Blackburn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.16.0
 description: A Ruby gem for looking up and manipulating US postal codes and geocodes.
 email:
 - chris [at] midwiretech [dot] com
@@ -48,6 +48,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: my_zipcode_gem
-rubygems_version: 2.5.2.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: A Ruby gem to handle all things zipcode.