Bump puma from 5.6.2 to 5.6.4

[rails.git] / app / models / way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index ca6829df434cc699974896944d5586c1566ebc3a..b11c225ddb1cfd0a6fb604174d4e39354eab0276 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -22,15 +22,14 @@ class Way < ApplicationRecord
 
   include ConsistencyValidations
   include NotRedactable
-  include ObjectMetadata
 
   self.table_name = "current_ways"
 
   belongs_to :changeset
 
-  has_many :old_ways, -> { order(:version) }
+  has_many :old_ways, -> { order(:version) }, :inverse_of => :current_way
 
-  has_many :way_nodes, -> { order(:sequence_id) }
+  has_many :way_nodes, -> { order(:sequence_id) }, :inverse_of => :way
   has_many :nodes, :through => :way_nodes
 
   has_many :way_tags
@@ -42,8 +41,6 @@ class Way < ApplicationRecord
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }
-  validates :changeset_id, :presence => true,
-                           :numericality => { :only_integer => true }
   validates :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]
@@ -52,13 +49,13 @@ class Way < ApplicationRecord
   scope :invisible, -> { where(:visible => false) }
 
   # Read in xml as text and return it's Way object representation
-  def self.from_xml(xml, create = false)
+  def self.from_xml(xml, create: false)
     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse
     pt = doc.find_first("//osm/way")
 
     if pt
-      Way.from_xml_node(pt, create)
+      Way.from_xml_node(pt, :create => create)
     else
       raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.")
     end
@@ -66,7 +63,7 @@ class Way < ApplicationRecord
     raise OSM::APIBadXMLError.new("way", xml, e.message)
   end
 
-  def self.from_xml_node(pt, create = false)
+  def self.from_xml_node(pt, create: false)
     way = Way.new
 
     raise OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create || !pt["version"].nil?
@@ -113,7 +110,7 @@ class Way < ApplicationRecord
   end
 
   def tags
-    @tags ||= Hash[way_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= way_tags.to_h { |t| [t.k, t.v] }
   end
 
   attr_writer :nds, :tags
@@ -230,7 +227,7 @@ class Way < ApplicationRecord
   private
 
   def save_with_history!
-    t = Time.now.getutc
+    t = Time.now.utc
 
     self.version += 1
     self.timestamp = t