Floppy-amee 0.0.2 → 0.0.3

data/README

@@ -10,7 +10,7 @@ Homepage: http://github.com/Floppy/amee-ruby
 
 == INSTALLATION
 
-1) Enable gems from github, if you haven't already done so: 
+1) Enable gems from github, if you haven't already done so (rubygems >= 1.2): 
     > sudo gem sources -a http://gems.github.com
 
 2) Install gem
@@ -18,5 +18,5 @@ Homepage: http://github.com/Floppy/amee-ruby
 
 == USAGE
 
-Currently, in this first version, only reading data categories is supported. See 
-examples/view_data_category.rb for a simple usage example.
+Currently, you can only read data categories, items and itemvalues. See 
+examples/view_data_*.rb for simple usage examples.

data/lib/amee/connection.rb

@@ -32,6 +32,8 @@ module AMEE
         get['authToken'] = @auth_token
         get['Accept'] = 'application/xml'
         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
@@ -41,6 +43,8 @@ module AMEE
       end
       yield response.body if block_given?
       response.body
+    rescue SocketError
+      raise AMEE::ConnectionFailed.new("Connection failed. Check server name or network connection.")
     end
 
   protected
@@ -51,15 +55,20 @@ module AMEE
     
     def authenticate
       unless can_authenticate?        
-        raise "AMEE authentication required. Please provide your username and password."
+        raise AMEE::AuthRequired.new("Authentication required. Please provide your username and password.")
       end
       response = nil
       http = Net::HTTP.new(@server)
       http.start do
-        response = http.post("/auth", "username=#{@username}&password=#{@password}")
+        post = Net::HTTP::Post.new("/auth")
+        post.body = "username=#{@username}&password=#{@password}"
+        post['Accept'] = 'application/xml'
+        response = http.request(post)
         @auth_token = response['authToken']
-        raise "AMEE authentication failed. Please check your username and password." unless authenticated?
+        raise AMEE::AuthFailed.new("Authentication failed. Please check your username and password.") unless authenticated?
       end
+    rescue SocketError
+      raise AMEE::ConnectionFailed.new("Connection failed. Check server name or network connection.")
     end
     
   end

data/lib/amee/data_category.rb

@@ -46,6 +46,8 @@ module AMEE
         cat.connection = connection
         # Done
         return cat
+      rescue 
+        raise AMEE::BadData.new("Couldn't load DataCategory. Check that your URL is correct.")
       end
       
       def self.root(connection)

data/lib/amee/data_item.rb

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

data/lib/amee/data_item_value.rb

@@ -9,6 +9,28 @@ module AMEE
 
       attr_reader :value
       
+      def self.get(connection, path)
+        # Load data from path
+        response = connection.get(path)
+        # Parse data from response into hash
+        doc = REXML::Document.new(response)
+        data = {}
+        data[:uid] = REXML::XPath.first(doc, "/Resources/DataItemValueResource/ItemValue/@uid").to_s
+        data[:created] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataItemValueResource/ItemValue/@Created").to_s)
+        data[:modified] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataItemValueResource/ItemValue/@Modified").to_s)
+        data[:name] = REXML::XPath.first(doc, '/Resources/DataItemValueResource/ItemValue/Name').text
+        data[:path] = path
+        data[:value] = REXML::XPath.first(doc, '/Resources/DataItemValueResource/ItemValue/Value').text
+        # Create item object
+        item = ItemValue.new(data)
+        # Store connection in object for future use
+        item.connection = connection
+        # Done
+        return item
+      rescue 
+        raise AMEE::BadData.new("Couldn't load DataItemValue. Check that your URL is correct.")
+      end
+
     end
   end
 end

data/lib/amee.rb

@@ -1,4 +1,5 @@
 require 'rexml/document'
+require 'amee/exceptions'
 require 'amee/connection'
 require 'amee/object'
 require 'amee/data_category'
@@ -10,7 +11,7 @@ module AMEE
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
     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.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-10 00:00:00 -07:00
+date: 2008-07-11 00:00:00 -07:00
 default_executable: 
 dependencies: []