From: Shaun McDonald Date: Wed, 8 Oct 2008 15:42:42 +0000 (+0000) Subject: Fix the data config, so that the development database is not the same as the test... X-Git-Tag: live~7569^2~289 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e1b205913c9afd6b41684add7308cef4613112e2?hp=2347761266d8848dcdc42f9e5d9ef380fa04b89a Fix the data config, so that the development database is not the same as the test database. Make a good stab at getting the creates and updates for relations working, adding some new error exceptions. Some code indentation cleanup. --- diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index bfd1031f0..8e8c8446d 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -36,7 +36,7 @@ class NodeController < ApplicationController def read begin node = Node.find(params[:id]) - if node.visible + if node.visible? response.headers['Last-Modified'] = node.timestamp.rfc822 render :text => node.to_xml.to_s, :content_type => "text/xml" else diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index c49ecd4d7..b38d90c02 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -15,11 +15,11 @@ class RelationController < ApplicationController if !relation.preconditions_ok? render :text => "", :status => :precondition_failed else - relation.version = 0 - relation.user_id = @user.id + relation.version = 0 + #relation.user_id = @user.id relation.save_with_history! - render :text => relation.id.to_s, :content_type => "text/plain" + render :text => relation.id.to_s, :content_type => "text/plain" end else render :nothing => true, :status => :bad_request @@ -51,7 +51,7 @@ class RelationController < ApplicationController new_relation = Relation.from_xml(request.raw_post) if new_relation and new_relation.id == relation.id - relation.update_from new_relation, user + relation.update_from new_relation, @user render :text => relation.version.to_s, :content_type => "text/plain" else render :nothing => true, :status => :bad_request diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 7e2216f0e..934d75e39 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -13,6 +13,7 @@ class Changeset < ActiveRecord::Base has_many :old_relations validates_presence_of :user_id, :created_at, :open + validates_inclusion_of :open, :in => [ true, false ] # Use a method like this, so that we can easily change how we # determine whether a changeset is open, without breaking code in at diff --git a/app/models/node.rb b/app/models/node.rb index 2f3001a49..d152be6d3 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -4,7 +4,7 @@ class Node < ActiveRecord::Base include GeoRecord set_table_name 'current_nodes' - + validates_presence_of :changeset_id, :timestamp validates_inclusion_of :visible, :in => [ true, false ] validates_numericality_of :latitude, :longitude @@ -172,7 +172,9 @@ class Node < ActiveRecord::Base el1['id'] = self.id.to_s el1['lat'] = self.lat.to_s el1['lon'] = self.lon.to_s - + el1['version'] = self.version.to_s + el1['changeset'] = self.changeset_id.to_s + user_display_name_cache = {} if user_display_name_cache.nil? if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id) diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index 9dca97a27..428177755 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -6,7 +6,7 @@ class OldRelation < ActiveRecord::Base def self.from_relation(relation) old_relation = OldRelation.new old_relation.visible = relation.visible - old_relation.user_id = relation.user_id + old_relation.changeset_id = relation.changeset_id old_relation.timestamp = relation.timestamp old_relation.id = relation.id old_relation.version = relation.version @@ -93,6 +93,7 @@ class OldRelation < ActiveRecord::Base el1['timestamp'] = self.timestamp.xmlschema el1['user'] = self.user.display_name if self.user.data_public? el1['version'] = self.version.to_s + el1['changeset'] = self.changeset_id.to_s self.old_members.each do |member| e = XML::Node.new 'member' diff --git a/app/models/relation.rb b/app/models/relation.rb index bb8f2d003..658cf06f3 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -35,13 +35,14 @@ class Relation < ActiveRecord::Base end relation.version = pt['version'] + relation.changeset_id = pt['changeset'] if create relation.timestamp = Time.now relation.visible = true else if pt['timestamp'] - relation.timestamp = Time.parse(pt['timestamp']) + relation.timestamp = Time.parse(pt['timestamp']) end end @@ -68,18 +69,19 @@ class Relation < ActiveRecord::Base el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema el1['version'] = self.version.to_s + el1['changeset'] = self.changeset_id.to_s user_display_name_cache = {} if user_display_name_cache.nil? - if user_display_name_cache and user_display_name_cache.key?(self.user_id) + if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id) # use the cache if available elsif self.user.data_public? - user_display_name_cache[self.user_id] = self.user.display_name + user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name else - user_display_name_cache[self.user_id] = nil + user_display_name_cache[self.changeset.user_id] = nil end - el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil? + el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil? self.relation_members.each do |member| p=0 @@ -218,13 +220,14 @@ class Relation < ActiveRecord::Base def delete_with_history(user) if self.visible if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", self.id ]) - raise OSM::APIPreconditionFailedError.new + raise OSM::APIPreconditionFailedError.new else - self.user_id = user.id - self.tags = [] - self.members = [] - self.visible = false - save_with_history! + #self.user_id = user.id + # FIXME we need to deal with changeset here, which is probably already dealt with + self.tags = [] + self.members = [] + self.visible = false + save_with_history! end else raise OSM::APIAlreadyDeletedError.new @@ -236,8 +239,14 @@ class Relation < ActiveRecord::Base raise OSM::APIPreconditionFailedError.new elsif new_relation.version != version raise OSM::APIVersionMismatchError.new(new_relation.version, version) + elsif new_relation.changeset.user_id != user.id + raise OSM::APIUserChangesetMismatchError.new + elsif not new_relation.changeset.open? + raise OSM::APIChangesetAlreadyClosedError.new else - self.user_id = user.id + # FIXME need to deal with changeset etc + #self.user_id = user.id + self.changeset = new_relation.changeset self.tags = new_relation.tags self.members = new_relation.members self.visible = true diff --git a/app/models/way.rb b/app/models/way.rb index 7c6e9d06b..9ddb603a8 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -85,6 +85,7 @@ class Way < ActiveRecord::Base el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema el1['version'] = self.version.to_s + el1['changeset'] = self.changeset_id.to_s user_display_name_cache = {} if user_display_name_cache.nil? diff --git a/config/database.yml b/config/database.yml index a80e11b70..fe47e11aa 100644 --- a/config/database.yml +++ b/config/database.yml @@ -12,12 +12,9 @@ # http://dev.mysql.com/doc/refman/5.0/en/old-client.html development: adapter: mysql - #database: openstreetmap - #username: openstreetmap - #password: openstreetmap - database: osm_test - username: osm_test - password: osm_test + database: openstreetmap + username: openstreetmap + password: openstreetmap host: localhost # Warning: The database defined as 'test' will be erased and diff --git a/lib/osm.rb b/lib/osm.rb index a64aa8c48..3ddf10f98 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -33,6 +33,20 @@ module OSM end end + # Raised when the user logged in isn't the same as the changeset + class APIUserChangesetMismatchError < APIError + def render_opts + { :text => "The user doesn't own that changeset", :status => :conflict } + end + end + + # Raised when the changeset provided is already closed + class APIChangesetAlreadyClosedError < APIError + def render_opts + { :text => "The supplied changeset has already been closed", :status => :conflict } + end + end + # Raised when the provided version is not equal to the latest in the db. class APIVersionMismatchError < APIError def initialize(provided, latest)