<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,15 +1,18 @@
 class Api::LinksController &lt; Api::BaseController
   def create
-    respond_to do |format|
-      format.xml do
-        @link = Link.find_or_create_by_website_url( params[:link][:website_url] )
-        @link.ip_address = request.remote_ip if @link.new_record?      
-        if @link.save
-          render :xml =&gt; @link.to_api_xml
-        else
-          render :xml =&gt; xml_error_response( &quot;Unable to generate a RubyURL for you&quot; )
-        end
+    @link = Link.find_or_create_by_website_url( params[:link][:website_url] )
+    @link.ip_address = request.remote_ip if @link.new_record?      
+
+    if @link.save        
+      respond_to do |format|
+        format.xml { render :xml =&gt; @link.to_api_xml }
+        format.json { render :json =&gt; @link.to_api_json }        
       end
+    else
+      respond_to do |format|
+        format.xml { render :xml =&gt; xml_error_response( &quot;Unable to generate a RubyURL for you&quot; ) }
+        format.json { render :json =&gt; &quot;Unable to generate a RubyURL for you&quot;.to_json }
+      end  
     end
   end
 end</diff>
      <filename>app/controllers/api/links_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -29,6 +29,10 @@ class Link &lt; ActiveRecord::Base
     end
   end
   
+  def to_api_json
+    self.to_json( :only =&gt; [ :website_url, :permalink ] )
+  end
+  
   private
   
     def generate_token</diff>
      <filename>app/models/link.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e7554251c7b4e0ab4b235c064d086aff92a047c8</id>
    </parent>
  </parents>
  <author>
    <name>Robby Russell</name>
    <login>robbyrussell</login>
    <email>robby@planetargon.com</email>
  </author>
  <url>http://github.com/robbyrussell/rubyurl/commit/36bcd0716a0a86fdaaf352d7760653b886877f2e</url>
  <id>36bcd0716a0a86fdaaf352d7760653b886877f2e</id>
  <committed-date>2008-09-01T18:10:23-07:00</committed-date>
  <authored-date>2008-09-01T18:10:23-07:00</authored-date>
  <message>Adding support for JSON in the API</message>
  <tree>c9b038c24cd0d744e788436b429e03880637e0bb</tree>
  <committer>
    <name>Robby Russell</name>
    <login>robbyrussell</login>
    <email>robby@planetargon.com</email>
  </committer>
</commit>
