class Changeset < ActiveRecord::Base
- require 'xml/libxml'
+ require "xml/libxml"
belongs_to :user, :counter_cache => true
has_many :old_relations
has_many :comments, -> { where(:visible => true).order(:created_at) }, :class_name => "ChangesetComment"
- has_and_belongs_to_many :subscribers, :class_name => 'User', :join_table => 'changesets_subscribers', :association_foreign_key => 'subscriber_id'
-
- validates_presence_of :id, :on => :update
- validates_presence_of :user_id, :created_at, :closed_at, :num_changes
- validates_uniqueness_of :id
- validates_numericality_of :id, :on => :update, :integer_only => true
- validates_numericality_of :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true, :integer_only => true
- validates_numericality_of :user_id, :integer_only => true
- validates_numericality_of :num_changes, :integer_only => true, :greater_than_or_equal_to => 0
+ has_and_belongs_to_many :subscribers, :class_name => "User", :join_table => "changesets_subscribers", :association_foreign_key => "subscriber_id"
+
+ validates :id, :uniqueness => true, :presence => { :on => :update },
+ :numericality => { :on => :update, :integer_only => true }
+ validates :user_id, :presence => true,
+ :numericality => { :integer_only => true }
+ validates :num_changes, :presence => true,
+ :numericality => { :integer_only => true,
+ :greater_than_or_equal_to => 0 }
+ validates :created_at, :closed_at, :presence => true
+ validates :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true,
+ :numericality => { :integer_only => true }
before_save :update_closed_at
p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
doc = p.parse
- doc.find('//osm/changeset').each do |pt|
+ doc.find("//osm/changeset").each do |pt|
return Changeset.from_xml_node(pt, create)
end
- fail OSM::APIBadXMLError.new("changeset", xml, "XML doesn't contain an osm/changeset element.")
+ raise OSM::APIBadXMLError.new("changeset", xml, "XML doesn't contain an osm/changeset element.")
rescue LibXML::XML::Error, ArgumentError => ex
raise OSM::APIBadXMLError.new("changeset", xml, ex.message)
end
cs.num_changes = 0
end
- pt.find('tag').each do |tag|
- fail OSM::APIBadXMLError.new("changeset", pt, "tag is missing key") if tag['k'].nil?
- fail OSM::APIBadXMLError.new("changeset", pt, "tag is missing value") if tag['v'].nil?
- cs.add_tag_keyval(tag['k'], tag['v'])
+ pt.find("tag").each do |tag|
+ raise OSM::APIBadXMLError.new("changeset", pt, "tag is missing key") if tag["k"].nil?
+ raise OSM::APIBadXMLError.new("changeset", pt, "tag is missing value") if tag["v"].nil?
+ cs.add_tag_keyval(tag["k"], tag["v"])
end
cs
self.num_changes += elements
end
- def tags_as_hash
- tags
- end
-
def tags
unless @tags
@tags = {}
# duplicate tags are now forbidden, so we can't allow values
# in the hash to be overwritten.
- fail OSM::APIDuplicateTagsError.new("changeset", id, k) if @tags.include? k
+ raise OSM::APIDuplicateTagsError.new("changeset", id, k) if @tags.include? k
@tags[k] = v
end
# do the changeset update and the changeset tags update in the
# same transaction to ensure consistency.
Changeset.transaction do
- self.save!
+ save!
tags = self.tags
ChangesetTag.delete_all(:changeset_id => id)
# that would make it more than 24h long, in which case clip to
# 24h, as this has been decided is a reasonable time limit.
def update_closed_at
- if self.is_open?
- if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
- self.closed_at = created_at + MAX_TIME_OPEN
- else
- self.closed_at = Time.now.getutc + IDLE_TIMEOUT
- end
+ if is_open?
+ self.closed_at = if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
+ created_at + MAX_TIME_OPEN
+ else
+ Time.now.getutc + IDLE_TIMEOUT
+ end
end
end
end
def to_xml_node(user_display_name_cache = nil, include_discussion = false)
- el1 = XML::Node.new 'changeset'
- el1['id'] = id.to_s
+ el1 = XML::Node.new "changeset"
+ el1["id"] = id.to_s
user_display_name_cache = {} if user_display_name_cache.nil?
user_display_name_cache[user_id] = nil
end
- el1['user'] = user_display_name_cache[user_id] unless user_display_name_cache[user_id].nil?
- el1['uid'] = user_id.to_s if user.data_public?
+ el1["user"] = user_display_name_cache[user_id] unless user_display_name_cache[user_id].nil?
+ el1["uid"] = user_id.to_s if user.data_public?
tags.each do |k, v|
- el2 = XML::Node.new('tag')
- el2['k'] = k.to_s
- el2['v'] = v.to_s
+ el2 = XML::Node.new("tag")
+ el2["k"] = k.to_s
+ el2["v"] = v.to_s
el1 << el2
end
- el1['created_at'] = created_at.xmlschema
- el1['closed_at'] = closed_at.xmlschema unless is_open?
- el1['open'] = is_open?.to_s
+ el1["created_at"] = created_at.xmlschema
+ el1["closed_at"] = closed_at.xmlschema unless is_open?
+ el1["open"] = is_open?.to_s
- bbox.to_unscaled.add_bounds_to(el1, '_') if bbox.complete?
+ bbox.to_unscaled.add_bounds_to(el1, "_") if bbox.complete?
- el1['comments_count'] = comments.count.to_s
+ el1["comments_count"] = comments.count.to_s
if include_discussion
- el2 = XML::Node.new('discussion')
+ el2 = XML::Node.new("discussion")
comments.includes(:author).each do |comment|
- el3 = XML::Node.new('comment')
- el3['date'] = comment.created_at.xmlschema
- el3['uid'] = comment.author.id.to_s if comment.author.data_public?
- el3['user'] = comment.author.display_name.to_s if comment.author.data_public?
- el4 = XML::Node.new('text')
+ el3 = XML::Node.new("comment")
+ el3["date"] = comment.created_at.xmlschema
+ el3["uid"] = comment.author.id.to_s if comment.author.data_public?
+ el3["user"] = comment.author.display_name.to_s if comment.author.data_public?
+ el4 = XML::Node.new("text")
el4.content = comment.body.to_s
el3 << el4
el2 << el3
# bounding box, only the tags of the changeset.
def update_from(other, user)
# ensure that only the user who opened the changeset may modify it.
- fail OSM::APIUserChangesetMismatchError.new unless user.id == user_id
+ raise OSM::APIUserChangesetMismatchError.new unless user.id == user_id
# can't change a closed changeset
- fail OSM::APIChangesetAlreadyClosedError.new(self) unless is_open?
+ raise OSM::APIChangesetAlreadyClosedError.new(self) unless is_open?
# copy the other's tags
self.tags = other.tags
projects / rails.git / blobdiff