Rails 6

Gemfile

@@ -9,17 +9,19 @@ gem 'active_record-acts_as', git: 'https://github.com/camsys/active_record-acts_
 
 # To use debugger
 # gem 'debugger'
-gem 'transam_core', git: 'https://github.com/camsys/transam_core', branch: :quarter4
+gem 'transam_core', git: 'https://github.com/nycdot/transam_core.git', branch: 'rails-6'
+# gem 'transam_core', path: "../transam_core"
 
 # needed for testing spatial mixins on transit models
-gem 'transam_transit', git: 'https://github.com/camsys/transam_transit', branch: :quarter4
+gem 'transam_transit', git: 'https://github.com/nycdot/transam_transit.git', branch: 'rails-6'
+# gem 'transam_transit', path: "../transam_transit"
 
 gem 'mysql2', "~> 0.5.1" # lock gem for dummy app
 gem "capybara", '2.6.2' # lock gem for old capybara behavior on hidden element xpath
 gem 'activerecord-mysql2rgeo-adapter', git: 'https://github.com/camsys/activerecord-mysql2rgeo-adapter', branch: 'master'
-gem "rgeo"
+gem "rgeo", '2.4.0'
 gem 'rgeo-geojson'
-gem 'rgeo-proj4'
+gem 'rgeo-proj4', '3.1.1'
 gem 'figaro' # need to add an application.yml because need API keys to test geocode libraries
 
 group :development, :test do

db/seeds.rb

@@ -1,8 +1,9 @@
 #encoding: utf-8
 
 # determine if we are using postgres or mysql
-is_mysql = (ActiveRecord::Base.configurations[Rails.env]['adapter'].include? 'mysql2')
-is_sqlite =  (ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'sqlite3')
+active_record_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'primary').configuration_hash
+is_mysql = (active_record_config[:adapter].include? 'mysql2')
+is_sqlite =  (active_record_config[:adapter] == 'sqlite3')
 
 #------------------------------------------------------------------------------
 #

lib/transam_spatial/transam_geo_locatable.rb

@@ -224,17 +224,21 @@ def update_geometry
         end
 
         # set nodes if used
-        if _use_nodes
+        if _use_nodes && parser.from_node.present?
           if self.from_node && (self.from_node != parser.from_node)
-            puts "node mismatch for #{order_number}! #{self.from_node} != #{parser.from_node}"
-          else
-            self.from_node = parser.from_node
+            Rails.logger.debug "node mismatch for #{order_number}! #{self.from_node} != #{parser.from_node}"
           end
+
+          self.from_node = parser.from_node
+        end
+
+        if _use_nodes && parser.to_node.present?
           if self.to_node && (self.to_node != parser.to_node)
             puts "node mismatch for #{order_number}! #{self.to_node} != #{parser.to_node}"
-          else
-            self.to_node = parser.to_node
+            Rails.logger.debug "node mismatch for #{order_number}! #{self.to_node} != #{parser.to_node}"
           end
+
+          self.to_node = parser.to_node
         end
       end
     end

transam_spatial.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
 
-  s.add_dependency 'rails', '~> 5.2'
+  s.add_dependency 'rails', '~> 6.1', '>= 6.1.7.3'
 
   s.add_dependency 'rails-data-migrations'
 
-  s.add_dependency "geocoder"
+  s.add_dependency "geocoder", '1.5.1'
 
   s.add_development_dependency "georuby", '~> 2.2.1'
   s.add_development_dependency "rspec-rails"
-  s.add_development_dependency "factory_bot_rails"
+  s.add_development_dependency "factory_bot_rails", '4.11.1'
   s.add_development_dependency "database_cleaner"
   s.add_development_dependency "mysql2"
   s.add_development_dependency "cucumber-rails"