ok fix the API more

admin/app/controllers/arses_controller.rb

@@ -8,7 +8,7 @@ class ArsesController < ApplicationController
       return
     end
 
-    @arses = Ars.all
+    @arses = JamRuby::Ars.all
     render :json => @arses
   end
 
@@ -18,7 +18,14 @@ class ArsesController < ApplicationController
       return
     end
 
-    @ars = Ars.find_by_id(params[:id])
+    begin
+      # Primary ID lookup
+      @ars = JamRuby::Ars.find_by_id(params[:id])
+      
+      # Explicit secondary lookups if primary ID fails
+      @ars ||= JamRuby::Ars.find_by_id_int(params[:id_int]) if params[:id_int]
+      @ars ||= JamRuby::Ars.find_by_name(params[:name]) if params[:name]
+
       if @ars.nil?
         render :json => {error: "Not Found"}, :status => 404
         return
@@ -36,10 +43,14 @@ class ArsesController < ApplicationController
       else
         render :json => @ars.errors, :status => :unprocessable_entity
       end
+    rescue => e
+      render :json => {error: e.message, backtrace: e.backtrace.first(5)}, :status => 500
+    end
   end
 
   # create or update a client_artifact row
   def get_or_create
+    begin
       name = params[:name]
       provider = params[:provider]
       active = params[:active]
@@ -48,17 +59,18 @@ class ArsesController < ApplicationController
       password = params[:password]
       topology = params[:topology]
       ars_id = params[:ars_id]
-    puts "TOPOLOGY #{topology}"
 
-    if ars_id
+      # Explicit field-based lookups
-      ars = Ars.find_by_id_int(ars_id)
+      ars = nil
-    end
+      ars = JamRuby::Ars.find_by_id_int(ars_id) if ars_id
+      ars ||= JamRuby::Ars.find_by_name(name) if name
+
       if ars.nil?
-      ars = Ars.new
+        ars = JamRuby::Ars.new
         ars.name = name
-      ars.id_int = ars_id if !ars_id.nil?
       end
 
+      ars.id_int = ars_id if !ars_id.nil?
       ars.provider = provider
       ars.active = active
       ars.ip = ip
@@ -72,21 +84,12 @@ class ArsesController < ApplicationController
         ars.longitude = topology['longitude']
         ars.subdivision = topology['subdivision']
       end
-    ars.save
+      ars.save!
 
       @ars = ars
-    unless @ars.errors.any?
-      if ars_id.nil?
-        ars.reload
-        ars_id = ars.id_int
-      end
-
-      @ars = Ars.find_by_id_int(ars_id)
       render :json => {id_int: @ars.id_int, id: @ars.id, name: @ars.name, provider: @ars.provider, active: @ars.active, ip: @ars.ip}, :status => :ok
-    else
+    rescue => e
-      response.status = :unprocessable_entity
+      render :json => {error: e.message, backtrace: e.backtrace.first(5)}, :status => 500
-      respond_with @ars
+    end
-    end
-
   end
 end

ruby/lib/jam_ruby/models/ars.rb

@@ -1,8 +1,7 @@
-
 module JamRuby
   class Ars < ActiveRecord::Base
 
-    attr_accessible :active, :name, :id_int, :ip,  as: :admin
+    attr_accessible :password, :username, :active, :beta, :name, :provider, :id_int, :ip, :port, :continent, :country, :city, :subdivision, :latitude, :longitude, as: :admin
 
     self.table_name = "arses"
     @@log = Logging.logger[Ars]