Floppy-amee 0.3.0 → 0.3.1

data/README

@@ -35,11 +35,11 @@ this interface yet.
 
 == RAILS
 
-This gem can be used as a Rails plugin. You can either extract it into
+This gem can also be used as a Rails plugin. You can either extract it into
 vendor/plugins, or use the new-style config.gem command in environment.rb. For
 example:
 
-    config.gem "Floppy-amee", :lib => "amee", :source => "http://gems.github.com"
+    config.gem "Floppy-amee", :lib => "amee", :source => "http://gems.github.com", :version => '>= 0.3.0'
 
 The first time you run your app after installing the gem, a config/amee.yml file
 will be created. You should edit this file and add your AMEE username and

data/lib/amee/connection.rb

@@ -9,19 +9,14 @@ module AMEE
       @password = password
       @auth_token = nil
       @use_json_if_available = use_json_if_available
-      raise "Must specify both username and password for authenticated access" if (@username || @password) && !valid?
+      if (@username || @password) && !valid?
+       raise "Must specify both username and password for authenticated access"
+      end
       # Make connection to server
       @http = Net::HTTP.new(@server)
       #@http.set_debug_output($stdout)
-      @http.start
-    rescue SocketError
-      raise AMEE::ConnectionFailed.new("Connection failed. Check server name or network connection.")
     end
 
-    def finalize
-      @http.finish
-    end
-    
     def valid?
       !((@username || @password) ? (@username.nil? || @password.nil? || @server.nil?) : @server.nil?)
     end
@@ -35,46 +30,32 @@ module AMEE
     end
 
     def get(path)
-      response = nil
-      get = Net::HTTP::Get.new(path)
-      get['authToken'] = @auth_token
-      get['Accept'] = content_type
-      response = @http.request(get)
-      # Handle 404s
-      raise AMEE::NotFound.new("URL doesn't exist on server.") if response.code == '404'
-      # If request fails, authenticate and try again
-      if authentication_failed?(response)
-        authenticate
-        get['authToken'] = @auth_token
-        response = @http.request(get)
-      end
-      yield response.body if block_given?
-      response.body
+      # Send request
+      do_request(Net::HTTP::Get.new(path))
     end
 
     def post(path, data = {})
-      response = nil
+      # Create POST request
       post = Net::HTTP::Post.new(path)
-      post['authToken'] = @auth_token
-      post['Accept'] = content_type
-      # Add data params to body
       body = []
         data.each_pair do |key, value|
         body << "#{key}=#{value}"
       end
       post.body = body.join '&'
       # Send request
-      response = @http.request(post)
-      # Handle 404s
-      raise AMEE::NotFound.new("URL doesn't exist on server.") if response.code == '404'
-      # If request fails, authenticate and try again
-      if authentication_failed?(response)
-        authenticate
-        post['authToken'] = @auth_token
-        response = @http.request(post)
+      do_request(post)
+    end
+
+    def put(path, data = {})
+      # Create PUT request
+      put = Net::HTTP::Put.new(path)
+      body = []
+        data.each_pair do |key, value|
+        body << "#{key}=#{value}"
       end
-      yield response.body if block_given?
-      response.body
+      put.body = body.join '&'
+      # Send request
+      do_request(put)
     end
 
     def authenticate
@@ -87,7 +68,9 @@ module AMEE
       post['Accept'] = content_type
       response = @http.request(post)
       @auth_token = response['authToken']
-      raise AMEE::AuthFailed.new("Authentication failed. Please check your username and password.") unless authenticated?
+      unless authenticated?
+        raise AMEE::AuthFailed.new("Authentication failed. Please check your username and password.") 
+      end
     end
 
     protected
@@ -96,9 +79,47 @@ module AMEE
       (@use_json_if_available && defined?(JSON)) ? 'application/json' : 'application/xml'
     end
     
-    def authentication_failed?(response)
-      response.code == '401'
+    def response_ok?(response)
+      case response.code
+        when '200'
+          return true
+        when '403'
+          raise AMEE::PermissionDenied.new("You do not have permission to perform the requested operation")
+        when '401'
+          authenticate
+          return false
+        else
+          raise AMEE::UnknownError.new("An error occurred while talking to AMEE: HTTP response code #{response.code}")
+      end
+    end
+
+    def do_request(request)
+      # Open HTTP connection
+      @http.start
+      # Do request
+      begin
+        response = send_request(request)
+      end while !response_ok?(response)
+      # Return body of response
+      return response.body
+    rescue SocketError
+      raise AMEE::ConnectionFailed.new("Connection failed. Check server name or network connection.")
+    ensure
+      # Close HTTP connection
+      @http.finish if @http.started?
     end
         
+    def send_request(request)
+      request['authToken'] = @auth_token
+      request['Accept'] = content_type
+      response = @http.request(request)
+      # Handle 404s
+      if response.code == '404'
+        raise AMEE::NotFound.new("URL doesn't exist on server.") 
+      end
+      # Done
+      response
+    end
+
   end
 end

data/lib/amee/data_item.rb

@@ -95,10 +95,10 @@ module AMEE
         item.connection = connection
         # Done
         return item
-      rescue 
+      rescue
         raise AMEE::BadData.new("Couldn't load DataItem. Check that your URL is correct.")
       end
 
     end
   end
-end
+end

data/lib/amee/data_item_value.rb

@@ -21,6 +21,10 @@ module AMEE
         end
       end
 
+      def value=(val)
+        @value = val
+      end
+
       def from_profile?
         @from_profile
       end
@@ -79,10 +83,14 @@ module AMEE
         value.connection = connection
         # Done
         return value
-      rescue 
+      rescue
         raise AMEE::BadData.new("Couldn't load DataItemValue. Check that your URL is correct.")
       end
 
+      def save!
+        response = @connection.put(full_path, :value => value)        
+      end
+
     end
   end
 end

data/lib/amee/exceptions.rb

@@ -9,10 +9,16 @@ module AMEE
   class AuthRequired < Exception
   end
 
+  class PermissionDenied < Exception
+  end
+
   class ConnectionFailed < Exception
   end
   
   class NotFound < Exception
   end
   
+  class UnknownError < Exception
+  end
+  
 end

data/lib/amee/profile.rb

@@ -41,6 +41,8 @@ module AMEE
       end
       # Done
       return profiles
+    rescue
+      raise AMEE::BadData.new("Couldn't load Profile list.")
     end
 
     def self.create(connection)
@@ -78,12 +80,14 @@ module AMEE
         # Done
         return profile
       end
+    rescue
+      raise AMEE::BadData.new("Couldn't create Profile.")
     end
    
-    def delete
-      # Create new profile
-      response = connection.delete(full_path)
-    end
+#    def delete
+#      # Create new profile
+#      response = connection.delete(full_path)
+#    end
     
   end
-end
+end

data/lib/amee/shell.rb

@@ -5,11 +5,18 @@ module AMEE
       puts "AMEE shell - version #{AMEE::VERSION::STRING}"
       puts "--------------------------"
       puts "Commands:"
-      puts " ls         - display contents of current category."
-      puts " cd 'path'  - change category. Path must be a quoted string. You can use things like '/data', '..', or 'subcategory'."
-      puts " pwd        - display current category path."
-      puts " cat 'name' - display contents of data item called 'name' within the current category."
-      puts " amee_help  - display this help text."
+      puts " ls"
+      puts "            - display contents of current category."
+      puts " cd 'path'"
+      puts "            - change category. Path must be a quoted string. You can use things like '/data', '..', or 'subcategory'."
+      puts " pwd"
+      puts "            - display current category path."
+      puts " cat 'name'"
+      puts "            - display contents of data item called 'name' within the current category."
+      puts " set_value 'item_name', 'value_name', value"
+      puts "            - set the value 'value_name' inside 'item_name' to value."
+      puts " amee_help"
+      puts "            - display this help text."
     end
     
     def ls
@@ -51,10 +58,21 @@ module AMEE
       end
       nil
     end
-    
+
+    def set_value(item, name, value)
+      item = @@category.items.detect { |i| i[:path].match("^#{item}") }
+      fullpath = "#{@@category.full_path}/#{item[:path]}/#{name}"
+      itemval = AMEE::Data::ItemValue.get($connection, fullpath)
+      itemval.value = value
+      itemval.save!
+    end
+
   end
 end
 
+dir = File.dirname(__FILE__) + "/.."
+$LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
+
 require 'rubygems'
 require 'amee'
 include AMEE::Shell

data/lib/amee/version.rb

@@ -2,7 +2,7 @@ module AMEE
   
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 1
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-amee
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-22 00:00:00 -07:00
+date: 2008-08-29 00:00:00 -07:00
 default_executable: 
 dependencies: []