update gems and add version constraints to gemfile

msimonborg · May 8, 2017 · feffb08 · feffb08
1 parent d26efa0
commit feffb08
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 75 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,38 +1,40 @@
 # frozen_string_literal: true
 
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 ruby '2.4.1'
 
 gem 'activerecord', '~> 5.1.0', require: 'active_record'
-gem 'bcrypt'
-gem 'httparty'
-gem 'pyr', '~> 0.1.0'
-gem 'rack-flash3'
-gem 'rake'
-gem 'require_all'
-gem 'sinatra'
-gem 'sinatra-activerecord', require: 'sinatra/activerecord'
-gem 'tux'
+gem 'bcrypt', '~> 3.1.0', '>= 3.1.11'
+gem 'pyr', '~> 0.3.0', '>= 0.3.6'
+gem 'rack-flash3', '~> 1.0.0', '>= 1.0.5'
+gem 'rake', '~> 12.0.0'
+gem 'require_all', '~> 1.4.0'
+gem 'sinatra', '~> 2.0.0'
+gem 'sinatra-activerecord',
+    '~> 2.0.0',
+    '>= 2.0.13',
+    require: 'sinatra/activerecord'
+gem 'tux', '~> 0.3.0'
 
 group :development, :test do
   gem 'coveralls', '~> 0.8.0', require: false
   gem 'pry', '~> 0.10.4'
   gem 'rubocop', '~> 0.48.0', '>= 0.48.1'
-  gem 'shotgun'
+  gem 'shotgun', '~> 0.9.0', '>= 0.9.2'
   gem 'simplecov', '~> 0.14.0', require: false
-  gem 'sqlite3', platform: %i[ruby mswin mingw]
-  gem 'thin'
+  gem 'sqlite3', '~> 1.3.0', '>= 1.3.13', platform: %i[ruby mswin mingw]
+  gem 'thin', '~> 1.7.0'
 end
 
 group :test do
-  gem 'capybara'
-  gem 'database_cleaner', git: 'https://github.com/bmabey/database_cleaner.git'
-  gem 'rack-test'
-  gem 'rspec'
+  gem 'capybara', '~> 2.14.0'
+  gem 'database_cleaner', '~> 1.6.0', git: 'https://github.com/bmabey/database_cleaner.git'
+  gem 'rack-test', '~> 0.6.0', '>= 0.6.3'
+  gem 'rspec', '~> 3.6.0'
 end
 
 group :production do
-  gem 'pg'
-  gem 'puma'
+  gem 'pg', '~> 0.20.0'
+  gem 'puma', '~> 3.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,11 +1,11 @@
 GIT
   remote: https://github.com/bmabey/database_cleaner.git
-  revision: 98d6a84158cbe8e99a22bda7aee8ed84914a158c
+  revision: afc45492e0495b8317abe5b4605130d8b832d46e
   specs:
-    database_cleaner (1.5.3)
+    database_cleaner (1.6.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (5.1.0)
       activesupport (= 5.1.0)
@@ -18,13 +18,13 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     arel (8.0.0)
     ast (2.3.0)
     bcrypt (3.1.11)
     bond (0.5.1)
-    capybara (2.12.1)
+    capybara (2.14.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -42,39 +42,44 @@ GEM
     daemons (1.2.4)
     diff-lcs (1.3)
     docile (1.1.5)
-    eventmachine (1.2.2)
-    httparty (0.14.0)
-      multi_xml (>= 0.5.2)
+    eventmachine (1.2.3)
+    faraday (0.12.1)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.11.0.1)
+      faraday (>= 0.7.4, < 1.0)
     i18n (0.8.1)
     json (2.1.0)
-    lazy_record (0.3.0)
-      activesupport
+    lazy_record (0.6.2)
+      activesupport (~> 5.0)
+      scoped_attr_accessor (~> 1.0, >= 1.0.3)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    multi_xml (0.6.0)
-    nokogiri (1.7.0.1)
+    multipart-post (2.0.0)
+    mustermann (1.0.0)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.19.0)
+    pg (0.20.0)
     powerpack (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
-    puma (3.7.1)
-    pyr (0.1.0)
-      httparty (~> 0.14.0)
-      lazy_record (~> 0.3.0)
-    rack (1.6.5)
+    puma (3.8.2)
+    pyr (0.3.6)
+      faraday (~> 0.12.0)
+      faraday_middleware (~> 0.11.0)
+      lazy_record (~> 0.6.2)
+    rack (2.0.2)
     rack-flash3 (1.0.5)
       rack
-    rack-protection (1.5.3)
+    rack-protection (2.0.0)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -90,38 +95,40 @@ GEM
       rack (>= 1.0)
       rack-test (~> 0.6.2)
       ripl (>= 0.7.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rubocop (0.48.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
+    scoped_attr_accessor (1.0.3)
     shotgun (0.9.2)
       rack (>= 1.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-activerecord (2.0.12)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
+    sinatra-activerecord (2.0.13)
       activerecord (>= 3.2)
       sinatra (>= 1.0)
     slop (3.6.0)
@@ -134,7 +141,7 @@ GEM
       rack (>= 1, < 3)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.6)
+    tilt (2.0.7)
     tins (1.13.2)
     tux (0.3.0)
       ripl (>= 0.3.5)
@@ -152,28 +159,27 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 5.1.0)
-  bcrypt
-  capybara
+  bcrypt (~> 3.1.0, >= 3.1.11)
+  capybara (~> 2.14.0)
   coveralls (~> 0.8.0)
-  database_cleaner!
-  httparty
-  pg
+  database_cleaner (~> 1.6.0)!
+  pg (~> 0.20.0)
   pry (~> 0.10.4)
-  puma
-  pyr (~> 0.1.0)
-  rack-flash3
-  rack-test
-  rake
-  require_all
-  rspec
+  puma (~> 3.0)
+  pyr (~> 0.3.0, >= 0.3.6)
+  rack-flash3 (~> 1.0.0, >= 1.0.5)
+  rack-test (~> 0.6.0, >= 0.6.3)
+  rake (~> 12.0.0)
+  require_all (~> 1.4.0)
+  rspec (~> 3.6.0)
   rubocop (~> 0.48.0, >= 0.48.1)
-  shotgun
+  shotgun (~> 0.9.0, >= 0.9.2)
   simplecov (~> 0.14.0)
-  sinatra
-  sinatra-activerecord
-  sqlite3
-  thin
-  tux
+  sinatra (~> 2.0.0)
+  sinatra-activerecord (~> 2.0.0, >= 2.0.13)
+  sqlite3 (~> 1.3.0, >= 1.3.13)
+  thin (~> 1.7.0)
+  tux (~> 0.3.0)
 
 RUBY VERSION
    ruby 2.4.1p111

diff --git a/app/models/concerns/api_findable.rb b/app/models/concerns/api_findable.rb
@@ -28,11 +28,11 @@ def update_rep_social_data(rep)
   end
 
   def update_rep_political_data(rep)
-    self.district             = rep.district['code'] if rep.district
+    self.district             = rep.district.code if rep.district
     self.official_full        = rep.official_full
     self.honorific_prefix     = rep.role
     self.party_identification = rep.party
-    self.state                = rep.state['name']
+    self.state                = rep.state.name
     self.photo                = rep.photo
   end
 

diff --git a/db/development.sqlite b/db/development.sqlite
diff --git a/db/test.sqlite b/db/test.sqlite