Rails 5.2 support

app/helpers/subdivision_select/subdivisions_helper.rb

@@ -14,7 +14,7 @@ def self.get_subdivisions(alpha2)
         end
 
       Hash[
-        SubdivisionSelect.options.priority_subdivisions.fetch(alpha2.to_sym, []).map do |sd_code|
+        SubdivisionSelect.options.priority_subdivisions.fetch(alpha2&.to_sym, []).map do |sd_code|
           [sd_code, subdivision_hash.delete(sd_code)]
         end
       ].merge(subdivision_hash)

lib/subdivision_select/configuration.rb

@@ -1,13 +1,12 @@
 module SubdivisionSelect
-  class << self
-    attr_accessor :options
-  end
-
   def self.configure
-    self.options ||= Configuration.new
     yield(options)
   end
 
+  def self.options
+    @options ||= Configuration.new
+  end
+
   class Configuration
     attr_accessor :priority_subdivisions
 

lib/subdivision_select/tag_helper.rb

@@ -3,7 +3,7 @@ module SubdivisionSelect
   module TagHelper
     def subdivision_option_tags
       option_tags_options = {
-        selected: @options.fetch(:selected) { value(@object) },
+        selected: @options.fetch(:selected) { value },
         disabled: @options[:disabled]
       }
 

spec/controllers/subdivision_select/subdivisions_controller_spec.rb

@@ -6,14 +6,14 @@ module SubdivisionSelect
 
     describe "GET #get" do
       it "returns http success in JSON, when correct param supplied" do
-        get :get, country_code: "IE"
-        expect(response).to have_http_status(:success)
+        get :get, params: { country_code: "IE" }
+        expect(response).to be_successful
         expect(response.content_type).to eq("application/json")
       end
 
       it "returns http success in JSON, w/o correct param supplied" do
         get :get
-        expect(response).to have_http_status(:success)
+        expect(response).to be_successful
         expect(response.content_type).to eq("application/json")
       end
 

spec/dummy/spec/controllers/addresses_demo_controller_spec.rb

@@ -4,21 +4,21 @@
   describe "GET #index" do
     it "returns http success" do
       get :index
-      expect(response).to have_http_status(:success)
+      expect(response).to be_successful
     end
   end
 
   describe "GET #tags" do
     it "returns http success" do
       get :tags
-      expect(response).to have_http_status(:success)
+      expect(response).to be_successful
     end
   end
 
   describe "PATCH #update" do
     it "returns http success" do
       @address = create(:address)
-      patch :update, id: @address.id, address: { subdivision: "D", country: "IE" }
+      patch :update, params: { id: @address.id, address: { subdivision: "D", country: "IE" } }
       expect(assigns(:address).country).to eq("IE")
       expect(assigns(:address).subdivision).to eq("D")
     end

spec/dummy/spec/features/select_boxes_spec.rb

@@ -1,4 +1,5 @@
 require "rails_helper"
+
 feature "select boxes via FormBuilder and FormTagHelper" do
   before(:each) do
     @address = create(:mass_address)

spec/rails_helper.rb

@@ -6,6 +6,8 @@
 require "capybara/rails"
 require "capybara/rspec"
 require "factory_girl_rails"
+require "rails-controller-testing"
+Rails::Controller::Testing.install
 
 require "capybara/poltergeist"
 Capybara.javascript_driver = :poltergeist

subdivision_select.gemspec

@@ -21,14 +21,15 @@ Gem::Specification.new do |s|
   ]
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency "rails", ">= 4.1"
-  s.add_dependency "country_select", "~> 2.0"
-  s.add_dependency "countries", "~> 1.1"
+  s.add_dependency "rails", ">= 5.1"
+  s.add_dependency "country_select", "~> 3.1"
+  s.add_dependency "countries", "~> 2.1"
   s.add_dependency "jquery-rails", ">= 3.0"
 
   s.add_development_dependency "sqlite3", "~> 1.3" # Not used but we need an AR adapter
 
-  s.add_development_dependency "rspec-rails", "~> 3.2"
+  s.add_development_dependency "rspec-rails", "~> 3.7"
+  s.add_development_dependency "rails-controller-testing"
   s.add_development_dependency "factory_girl_rails", "~> 4.5"
   s.add_development_dependency "database_cleaner"