Merge with master

.gitignore

@@ -1,6 +1,9 @@
 log
+config/piwik.yml
 public/assets
 public/attachments
+public/export
 tmp
 .DS_Store
 *~
+doc

.mailmap

@@ -0,0 +1,6 @@
+Andrzej Zaborowski <balrogg@gmail.com> <andrew.zaborowski@intel.com>
+Andy Allan <andy@gravitystorm.co.uk> <gravitystorm@gmail.com> <github@gravitystorm.co.uk>
+Grant Slater <openstreetmap@firefishy.com> <github@firefishy.com>
+Harry Wood <git@harrywood.co.uk> <mail@harrywood.co.uk> <github@onlineanimals.co.uk>
+Kai Krueger <kakrueger@gmail.com> <kai@aiputerlx.(none)>
+Richard Fairhurst <richard@systemeD.net> <richard@systemed.net>

CONFIGURE.md

@@ -0,0 +1,117 @@
+# Configuration
+
+After [installing](INSTALL.md) this software, you may need to carry out some of these configuration steps, depending on your tasks.
+
+## Populating the database
+
+Your installation comes with no geographic data loaded. You can either create new data using one of the editors (Potlatch 2, iD, JOSM etc) or by loading an OSM extract.
+
+* Use this [yet-to-be-written script](https://github.com/openstreetmap/openstreetmap-website/issues/282)
+
+## Managing Users
+
+If you create a user by signing up to your local website, you need to confirm the user before you can log in, which normally happens by clicking a link sent via email. If don't want to set up your development box to send emails to public email addresses then you can create the user as normal and then confirm it manually through the Rails console:
+
+```
+$ bundle exec rails console
+>> user = User.find_by_display_name("My New User Name")
+=> #[ ... ]
+>> user.status = "active"
+=> "active"
+>> user.save!
+=> true
+>> quit
+```
+
+### Giving Administrator/Moderator Permissions
+
+To give administrator or moderator permissions:
+
+```
+$ bundle exec rails console
+>> user = User.find_by_display_name("My New User Name")
+=> #[ ... ]
+>> user.roles.create(:role => "administrator", :granter_id => user.id)
+=> #[ ... ]
+>> user.roles.create(:role => "moderator", :granter_id => user.id)
+=> #[ ... ]
+>> user.save!
+=> true
+>> quit
+```
+
+## OAuth Consumer Keys
+
+Three of the built-in applications communicate via the API, and therefore need OAuth consumer keys configured. These are:
+
+* Potlatch 2
+* iD
+* The website itself (for the Notes functionality)
+
+For example, to use the Potlatch 2 editor you need to register it as an OAuth application.
+
+Do the following:
+* Log into your Rails Port instance - e.g. http://localhost:3000
+* Click on your user name to go to your user page
+* Click on "my settings" on the user page
+* Click on "oauth settings" on the My settings page
+* Click on 'Register your application'.
+* Unless you have set up alternatives, use Name: "Local Potlatch" and URL: "http://localhost:3000"
+* Check the 'modify the map' box.
+* Everything else can be left with the default blank values.
+* Click the "Register" button
+* On the next page, copy the "consumer key"
+* Edit config/application.yml in your rails tree
+* Uncomment and change the "potlatch2_key" configuration value
+* Restart your rails server
+
+An example excerpt from application.yml:
+
+```
+# Default editor
+default_editor: "potlatch2"
+# OAuth consumer key for Potlatch 2
+potlatch2_key: "8lFmZPsagHV4l3rkAHq0hWY5vV3Ctl3oEFY1aXth"
+```
+
+Follow the same process for registering and configuring iD (`id_key`) and the website/Notes (`oauth_key`), or to save time, simply reuse the same consumer key for each.
+
+## Troubleshooting
+
+Rails has its own log.  To inspect the log, do this:
+
+```
+tail -f log/development.log
+```
+
+If you have more problems, please ask on the [rails-dev@openstreetmap.org mailing list](http://lists.openstreetmap.org/listinfo/rails-dev) or on the [#osm-dev IRC Channel](http://wiki.openstreetmap.org/wiki/IRC)
+
+## Maintaining your installation
+
+If your installation stops working for some reason:
+
+* Sometimes gem dependencies change. To update go to your rails_port directory and run ''bundle install'' as root.
+
+* The OSM database schema is changed periodically and you need to keep up with these improvements. Go to your rails_port directory and run:
+
+```
+bundle exec rake db:migrate
+```
+
+## Testing on the osm dev server
+
+For example, after developing a patch for the rails_port, you might want to demonstrate it to others or ask for comments and testing. To do this one can [set up an instance of the rails_port on the dev server in ones user directory](http://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications).
+
+# Contributing
+
+For information on contributing changes to the codes, see [CONTRIBUTING.md](CONTRIBUTING.md)
+
+# Production Deployment
+
+If you want to deploy The Rails Port for production use, you'll need to make a few changes.
+
+* It's not recommended to use `rails server` in production. Our recommended approach is to use [Phusion Passenger](https://www.phusionpassenger.com/).
+* Passenger will, by design, use the Production environment and therefore the production database - make sure it contains the appropriate data and user accounts.
+* Your production database will also need the extensions and functions installed - see [INSTALL.md](INSTALL.md)
+* The included version of the map call is quite slow and eats a lot of memory. You should consider using [CGIMap](https://github.com/zerebubuth/openstreetmap-cgimap) instead.
+* The included version of the GPX importer is slow and/or completely inoperable. You should consider using [the high-speed GPX importer](http://git.openstreetmap.org/gpx-import.git/).

CONTRIBUTING.md

@@ -0,0 +1,99 @@
+* http://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials.
+* http://rubyonrails.org/ - The homepage of Rails, also has links and tutorials
+
+## Coding style
+
+When writing code it is generally a good idea to try and match your
+formatting to that of any existing code in the same file, or to other
+similar files if you are writing new code. Consistency of layout is
+far more important that the layout itself as it makes reading code
+much easier.
+
+One golden rule of formatting -- please don't use tabs in your code
+as they will cause the file to be formatted differently for different
+people depending on how they have their editor configured.
+
+## Testing
+
+Having a good suite of tests is very important to the stability and
+maintainability of any code base. The tests in the Rails port code are
+by no means complete, but they are extensive, and must continue to be
+so with any new functionality which is written. Tests are also useful
+in giving others confidence in the code you've written, and can
+greatly speed up the process of merging in new code.
+
+When hacking, you should:
+
+* Write new tests to cover the new functionality you've added.
+* Where appropriate, modify existing tests to reflect new or changed
+functionality.
+* Never comment out or remove a test just because it doesn't pass.
+
+You can run the existing test suite with:
+
+```
+bundle exec rake test
+```
+
+You can generate test coverage stats with:
+
+```
+sudo gem install rcov
+rcov -x gems test/*/*.rb
+```
+
+The tests are automatically run on commit with the results shown at [http://cruise.openstreetmap.org/](http://cruise.openstreetmap.org/)
+
+## Comments
+
+Sometimes it's not apparent from the code itself what it does, or,
+more importantly, **why** it does that. Good comments help your fellow
+developers to read the code and satisfy themselves that it's doing the
+right thing.
+
+When hacking, you should:
+
+* Comment your code - don't go overboard, but explain the bits which
+might be difficult to understand what the code does, why it does it
+and why it should be the way it is.
+* Check existing comments to ensure that they are not misleading.
+
+## Code Documentation
+
+To generate the HTML documentation of the API/rails code, run the command
+
+```
+rake doc:app
+```
+
+## Committing
+
+When you submit patches, the project maintainer has to read them and
+understand them. This is difficult enough at the best of times, and
+misunderstanding patches can lead to them being more difficult to
+merge. To help with this, when submitting you should:
+
+* Split up large patches into smaller units of functionality.
+* Keep your commit messages relevant to the changes in each individual
+unit.
+
+When writing commit messages please try and stick to the same style as
+other commits, namely:
+
+* A one line summary, starting with a capital and with no full stop.
+* A blank line.
+* Full description, as proper sentences with capitals and full stops.
+
+For simple commits the one line summary is often enough and the body
+of the commit message can be left out.
+
+## Sending the patches
+
+If you have forked on GitHub then the best way to submit your patches is to
+push your changes back to GitHub and then send a "pull request" on GitHub.
+
+Otherwise you should either push your changes to a publicly visible git repository
+and send the details to the [rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev)
+list or generate patches with `git format-patch` and send them to the
+[rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) list.
+

Gemfile

@@ -1,41 +1,62 @@
-# Gem source to use
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.6'
+gem 'rails', '4.0.3'
 
 # Require things which have moved to gems in ruby 1.9
-gem 'bigdecimal', :platforms => :ruby_19
+gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
 
-# Require the postgres database driver
+# Require things which have moved to gems in ruby 2.0
+gem 'psych', :platforms => :ruby_20
+
+# Require json for multi_json
+gem 'json'
+
+# Use postgres as the database
 gem 'pg'
 
-# Load jquery support
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 4.0.0'
+
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.0.0'
+
+# Use jquery as the JavaScript library
 gem 'jquery-rails'
 
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+# gem 'jbuilder', '~> 1.2'
+gem 'jsonify-rails'
+
+# Use R2 for RTL conversion
+gem 'r2'
+
 # Load rails plugins
-gem 'rails-i18n', ">= 0.6.3"
+gem 'rails-i18n', "~> 4.0.0"
 gem 'dynamic_form'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
-gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin'
+gem 'oauth-plugin', '>= 0.5.1'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '>= 5.0.8'
-gem 'http_accept_language', '>= 1.0.2'
-gem 'paperclip', '~> 2.0'
+gem 'composite_primary_keys', '>= 6.0.1'
+gem 'http_accept_language', '~> 2.0.0'
+gem 'paperclip', '~> 4.0'
 gem 'deadlock_retry', '>= 1.2.0'
+gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.3', :require => 'i18n-js'
+gem 'rack-cors'
+gem 'actionpack-page_caching'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'
 
-# Browser detection support
-gem 'browser'
-
 # Markdown formatting support
 gem 'redcarpet'
 
 # Character conversion support for ruby 1.8
-gem 'iconv', :platforms => :ruby_18
+gem 'iconv', '= 0.1', :platforms => :ruby_18
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
@@ -47,22 +68,27 @@ gem 'htmlentities'
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 
-# Load httpclient for SOAP support for Quova GeoIP queries
+# Load httpclient and soap4r for SOAP support for Quova GeoIP queries
 gem 'httpclient'
+gem 'soap4r-ruby1.9'
 
-# Load memcache in case we are using it
-gem 'memcached', '>= 1.4.1'
+# Load memcache client in case we are using it
+gem 'dalli'
+gem 'kgio'
+
+# Gems useful for development
+group :development do
+  gem 'vendorer'
+end
 
 # Gems needed for running tests
 group :test do
   gem 'timecop'
-  gem 'minitest', :platforms => :ruby_19
+  gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20]
 end
 
-# Gems needed for compiling assets
-group :assets do
-  gem 'sass-rails', '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'uglifier', '>= 1.0.3'
-  gem 'therubyracer'
+# Needed in development as well so rake can see konacha tasks
+group :development, :test do
+  gem 'konacha'
+  gem 'poltergeist'
 end