Merge pull request #3 from kap0w/master

Fixed JSON bug and made a short explanation about API

Author: pglombardo

README.md

@@ -21,6 +21,26 @@ If you want to run the site on a different port, use the -p parameter.
 
     bundle exec rails server -p 80
 
+## API
+
+You can generate passwords through an API, if you want to automate creation, it is done by hitting the password action with a POST-request. In the development environment you can use this address: http://127.0.0.1:3000/passwords.json
+
+And you will have to send these POST variables:
+
+password[payload]: test 
+
+password[expire_after_days]: 60
+
+password[expire_after_views]: 1337
+
+You can test it in your browsers javascript console by going to the frontpage of Password Pusher and type:
+
+    $.post('http://127.0.0.1:3000/passwords.json',{ 'password[payload]': 'test', 'password[expire_after_days]': '60', 'password[expire_after_views]': '1337' }, function(data) { alert(data.url_token) } )
+
+Or do it with curl:
+
+    curl -d -X POST --data "password[payload]=payload&password[expire_after_days]=60&password[expire_after_views]=1337" http://127.0.0.1:3000/passwords.json
+
 ## Potential Quick Start Errors
 
 ### Command not found: bundle

app/controllers/passwords_controller.rb

@@ -105,7 +105,7 @@ def create
     respond_to do |format|
       if @password.save
         format.html { redirect_to "/p/#{@password.url_token}", :notice => "The password has been pushed." }
-        format.json { render :json => @password, :status => :created, :location => @password }
+        format.json { render :json => @password, :status => :created }
       else
         format.html { render :action => "new" }
         format.json { render :json => @password.errors, :status => :unprocessable_entity }

db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.