my_zipcode_gem 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d3ec6ac0913b1985b5a253854cc8dcd8ca4a368
-  data.tar.gz: 0bfdcd2e8f58e7331d6f3c10a59b069e8e0777d2
+  metadata.gz: 70c300c19c90f28c2ac614a2795c600bfb3f0d4d
+  data.tar.gz: 671303664dee6662adbd54f57ab3b8d9f3046f41
 SHA512:
-  metadata.gz: 0f40da7399ab9d2bbcf797ac9c6161ad3bad987ca5e0555484603b84f58e83a40c67dd2ed2843aa73b0b65b1637f4438bd2d56225664712bddc6dfd26f5e2fe0
-  data.tar.gz: e7eba2596d384366fea8fc4bf76e7809d5fb55804b3ae5fa9b372a1b7514532603e473b4d5292aed3a84e477818f2d7879b8a41854fbd3adef72076f189f8947
+  metadata.gz: 1a36d6a90fea133bbd531fc0e9d7faa98c9e5f12a0e534b1babd12fa1a8aa317aff7b8d8781771c8e468e426c3119b22fc931f7557ce08a08cf1622c7d7a0215
+  data.tar.gz: 704517c8c1140868b71af6203cacb6ad77e3f96d9125a24d6d83b8c0249bba85362f6b3b9c1bd8308c7e6fb963ca31ec463cf0c1379c9ee00bfcb4e36366e00c

data/.travis.yml

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

data/Gemfile

@@ -1,4 +1,24 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-# Specify your gem's dependencies in my_zipcode_gem.gemspec
 gemspec
+
+# jquery-rails is used by the dummy application
+gem 'jquery-rails'
+gem 'sqlite3'
+gem 'mysql2'
+gem 'pg'
+
+group :development do
+  gem 'midwire_common'
+end
+
+group :test do
+  gem 'capybara'
+  gem 'guard-rspec'
+  gem 'guard-spork'
+  gem 'shoulda', '~> 3.5'
+  gem 'rspec', '~> 2.12'
+  gem 'rspec-rails', '~> 2.12'
+  gem 'cucumber'
+  gem 'cucumber-rails', '~> 1.3.0', require: false
+end

data/features/step_definitions/common_steps.rb

@@ -65,7 +65,7 @@ Then(/^I should see (\d+) records in the "([^\"]*)" table$/) do |count, table_na
   FileUtils.chdir(@current_directory)
   ActiveRecord::Base.establish_connection(
     :adapter => 'sqlite3', 
-    :database => "db/development.sqlite3",
+    :database => "db/test.sqlite3",
     :pool => 5,
     :timeout => 5000
   )

data/features/step_definitions/rails_setup_steps.rb

@@ -1,7 +1,7 @@
 Given(/^a new Rails app$/) do
   FileUtils.rm_rf "tmp/rails_app"
   FileUtils.mkdir_p("tmp")
-  system("rails new tmp/rails_app").should be_true
+  system("rails new tmp/rails_app -T --no-rc").should be_true
   system("ln -s ../../../lib/generators tmp/rails_app/lib/generators").should be_true
   @current_directory = File.expand_path("tmp/rails_app")
 end

data/features/support/env.rb

@@ -3,6 +3,8 @@ require 'rspec'
 require 'rails'
 require 'active_record'
 
+ENV["RAILS_ENV"] = "test"
+
 Before do
   # FileUtils.rm_rf "tmp/rails_app"
 end

data/features/zipcodes.feature

@@ -13,7 +13,7 @@ Feature: My Zipcode Gem
       | app/models/county.rb     |
       | lib/tasks/zipcodes.rake  |
       | db/migrate               |
-    And I should see "gem "mocha", :group => :test" in file "Gemfile"
+    And I should see "gem "mocha"" in file "Gemfile"
     And I should successfully run "rake db:migrate"
 
   Scenario: Update data for zipcodes, counties and states tables

data/lib/generators/my_zipcode_gem/models_generator.rb

@@ -3,19 +3,20 @@ module MyZipcodeGem
     include Rails::Generators::Migration
 
     source_root File.expand_path('../templates', __FILE__)
-    
+
     def initialize(*args, &block)
       super
+      migration_template 'migration.rb', "db/migrate/create_my_zipcode_gem_models.rb"
     end
 
     def generate_models
       # puts ">>> generate_zipcodes:"
     end
-    
+
     def add_gems
       add_gem "mocha", :group => :test
     end
-    
+
     def create_models
       template 'zipcode_model.rb', "app/models/zipcode.rb"
       template 'county_model.rb', "app/models/county.rb"
@@ -31,16 +32,15 @@ module MyZipcodeGem
         "%.3d" % (current_migration_number(dirname) + 1)
       end
     end
-    
-    def create_migration
-      migration_template 'migration.rb', "db/migrate/create_my_zipcode_gem_models.rb"
+
+    def create_zipcode_migration
+      destination_file = "db/migrate/create_my_zipcode_gem_models.rb"
+      migration_template "migration.rb", destination_file
     end
-    
+
     def create_rakefile
       template 'zipcodes.rake', "lib/tasks/zipcodes.rake"
     end
-    
+
   end
 end
-
-# /Users/cblackburn/.rvm/gems/ruby-1.9.2-p136/gems/activerecord-3.0.3/lib/rails/generators/active_record/

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

@@ -1,5 +1,6 @@
+require 'memoist'
 class County < ActiveRecord::Base
-  extend ActiveSupport::Memoizable
+  extend Memoist
   attr_accessible :state_id, :region_id, :abbr, :name, :count_seat
 
   belongs_to :state

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

@@ -1,5 +1,6 @@
+require 'memoist'
 class State < ActiveRecord::Base
-  extend ActiveSupport::Memoizable
+  extend Memoist
   attr_accessible :abbr, :name
 
   has_many :zipcodes

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

@@ -7,13 +7,13 @@ class Zipcode < ActiveRecord::Base
   validates :code, :uniqueness => true, :presence => true
   validates :state_id, :county_id, :city, :presence => true
   
-  scope :without_county, where("county_id IS NULL")
-  scope :without_state, where("state_id IS NULL")
-  scope :ungeocoded, where("lat IS NULL OR lon IS NULL")
+  scope :without_county, -> { where("county_id IS NULL") }
+  scope :without_state, -> { where("state_id IS NULL") }
+  scope :ungeocoded, -> { where("lat IS NULL OR lon IS NULL") }
 
   class << self
     def find_by_city_state(city, state)
-      find(:first, :conditions => "city like '#{city}%' AND states.abbr like '%#{state}%'", :include => [:county => :state])
+      includes(:county => :state).where("city like '#{city}%' AND states.abbr like '%#{state}%'").first
     end
   end
 

data/lib/generators/my_zipcode_gem/templates/zipcodes.rake

@@ -18,7 +18,7 @@ namespace :zipcodes do
     end
     CSV.foreach(file.path, :headers => true) do |row|
       puts "Updating state: [#{row['name']}]"
-      state = State.find_or_initialize_by_abbr(row['abbr'])
+      state = State.where(abbr: row['abbr']).first_or_initialize
       state.update_attribute(:name, row['name'])
     end
     data.close
@@ -43,7 +43,7 @@ namespace :zipcodes do
       puts "Updating county: [#{row['name']}]"
       # lookup state
       state = State.find_by_abbr!(row['state'])
-      county = County.find_or_initialize_by_name_and_state_id(row['name'], state.to_param)
+      county = County.where(name: row['name'], state_id: state.to_param).first_or_initialize
       county.update_attribute(:county_seat, row['county_seat'])
     end
     data.close
@@ -75,7 +75,7 @@ namespace :zipcodes do
         puts ">>>> No county found for zipcode: [#{row['code']}], '#{row['city']}, #{row['state']}, #{row['county']}... SKIPPING..."
         next
       end
-      zipcode = Zipcode.find_or_initialize_by_code(row['code'])
+      zipcode = Zipcode.where(code: row['code']).first_or_initialize
       zipcode.update_attributes!(
         :city => row['city'].titleize,
         :state_id => state.to_param,

data/lib/generators/my_zipcode_gem/version.rb

@@ -1,3 +1,3 @@
 module MyZipcodeGem
-  VERSION = "0.1.4"
+  VERSION = '0.2.0'.freeze
 end

data/my_zipcode_gem.gemspec

@@ -21,14 +21,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('rails', '>= 3.0.0')
-  s.add_dependency('rubigen', '1.5.6')
-
-  s.add_development_dependency('sqlite3-ruby')
-  s.add_development_dependency('shoulda', '2.11.3')
-  s.add_development_dependency('rspec')
-  s.add_development_dependency('rspec-rails')
-  s.add_development_dependency('cucumber')
-  s.add_development_dependency('cucumber-rails')
-  s.add_development_dependency('pry') # For local debugging
-  s.add_development_dependency('midwire_common') # For rake release task
+  s.add_dependency('memoist', '~> 0.11.0')
 end

data/rails3_2.gemfile

@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+gemspec
+gem 'rails', '~> 3.2.0'
+
+# jquery-rails is used by the dummy application
+gem 'jquery-rails'
+gem 'sqlite3'
+gem 'mysql2'
+gem 'pg'
+
+group :test do
+  gem 'capybara', '~> 2.0.2'
+  gem 'guard-rspec'
+  gem 'guard-spork'
+  gem 'shoulda', '~> 3.5.0'
+  gem 'rspec'
+  gem 'rspec-rails', '~> 2.12.0'
+  gem 'cucumber'
+  gem 'cucumber-rails', '~> 1.3.0', require: false
+end

data/rails4_0.gemfile

@@ -0,0 +1,23 @@
+source 'https://rubygems.org'
+
+gemspec
+gem 'rails', '~> 4.0.0'
+
+gem 'protected_attributes'
+
+# jquery-rails is used by the dummy application
+gem 'jquery-rails'
+gem 'sqlite3'
+gem 'mysql2'
+gem 'pg'
+
+group :test do
+  gem 'capybara', '~> 2.0.2'
+  gem 'guard-rspec'
+  gem 'guard-spork'
+  gem 'shoulda', '~> 3.5.0'
+  gem 'rspec'
+  gem 'rspec-rails', '~> 2.12.0'
+  gem 'cucumber'
+  gem 'cucumber-rails', '~> 1.3.0', require: false
+end

data/rails4_1.gemfile

@@ -0,0 +1,23 @@
+source 'https://rubygems.org'
+
+gemspec
+gem 'rails', '~> 4.1.0'
+
+gem 'protected_attributes'
+
+# jquery-rails is used by the dummy application
+gem 'jquery-rails'
+gem 'sqlite3'
+gem 'mysql2'
+gem 'pg'
+
+group :test do
+  gem 'capybara', '~> 2.0.2'
+  gem 'guard-rspec'
+  gem 'guard-spork'
+  gem 'shoulda', '~> 3.5.0'
+  gem 'rspec'
+  gem 'rspec-rails', '~> 2.12.0'
+  gem 'cucumber'
+  gem 'cucumber-rails', '~> 1.3.0', require: false
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_zipcode_gem
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Blackburn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -26,131 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rubigen
+  name: memoist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
-- !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  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: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.11.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.11.3
-- !ruby/object:Gem::Dependency
-  name: 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
-    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: cucumber
-  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: cucumber-rails
-  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: pry
-  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: midwire_common
-  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'
+        version: 0.11.0
 description: A Ruby gem for looking up and manipulating US postal codes and geocodes.
 email:
 - chris [at] midwiretech [dot] com
@@ -160,6 +48,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.textile
@@ -178,6 +67,9 @@ files:
 - lib/generators/my_zipcode_gem/version.rb
 - lib/my_zipcode_gem.rb
 - my_zipcode_gem.gemspec
+- rails3_2.gemfile
+- rails4_0.gemfile
+- rails4_1.gemfile
 homepage: https://github.com/midwire/my_zipcode_gem
 licenses:
 - MIT
@@ -198,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: my_zipcode_gem
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby gem to handle all things zipcode.