Floppy-amee 0.4.25 → 0.4.26

data/examples/create_profile_item.rb

@@ -25,5 +25,9 @@ connection = AMEE::Connection.new(options[:server], options[:username], options[
 # Create a new profile item
 category = AMEE::Profile::Category.get(connection, ARGV[0])
 puts "loaded category #{category.name}"
-AMEE::Profile::Item.create(category, ARGV[1])
-puts "created item in #{category.name} OK"
+item = AMEE::Profile::Item.create(category, ARGV[1])
+if item
+  puts "created item in #{category.name} OK"
+else
+  puts "error creating item in #{category.name}"
+end

data/lib/amee/connection.rb

@@ -18,8 +18,17 @@ module AMEE
       end
       # Make connection to server
       @http = Net::HTTP.new(@server)
+      @http.read_timeout = 5
       @http.set_debug_output($stdout) if enable_debug
     end
+    
+    def timeout
+      @http.read_timeout
+    end
+    
+    def timeout=(t)
+      @http.read_timeout = t
+    end
 
     def valid?
       !((@username || @password) ? (@username.nil? || @password.nil? || @server.nil?) : @server.nil?)

data/lib/amee/profile.rb

@@ -86,8 +86,11 @@ module AMEE
       end
 
       def self.delete(connection, uid)
-        # Delete profile
+        # Deleting profiles takes a while... up the timeout to 60 seconds temporarily
+        t = connection.timeout
+        connection.timeout = 60
         connection.delete("/profiles/#{uid}")
+        connection.timeout = t
       end
 
     end

data/lib/amee/profile_category.rb

@@ -25,36 +25,40 @@ module AMEE
         data[:path] = doc['path']
         data[:total_amount_per_month] = doc['totalAmountPerMonth']
         data[:children] = []
-        doc['children']['dataCategories'].each do |child|
-          category_data = {}
-          category_data[:name] = child['name']
-          category_data[:path] = child['path']
-          category_data[:uid] = child['uid']
-          data[:children] << category_data
+        if doc['children'] && doc['children']['dataCategories']
+          doc['children']['dataCategories'].each do |child|
+            category_data = {}
+            category_data[:name] = child['name']
+            category_data[:path] = child['path']
+            category_data[:uid] = child['uid']
+            data[:children] << category_data
+          end
         end
         data[:items] = []
-        if doc['children']['profileItems']['rows']
-          doc['children']['profileItems']['rows'].each do |item|
-            item_data = {}
-            item_data[:values] = {}
-            item.each_pair do |key, value|
-              case key
-                when 'dataItemLabel', 'dataItemUid', 'name', 'path', 'uid'
-                  item_data[key.to_sym] = value
-                when 'created', 'modified', 'label' # ignore these
-                  nil 
-                when 'validFrom'
-                  item_data[:validFrom] = DateTime.strptime(value, "%Y%m%d")
-                when 'end'
-                  item_data[:end] = (value == "true")
-                when 'amountPerMonth'
-                  item_data[:amountPerMonth] = value.to_f
-                else
-                  item_data[:values][key.to_sym] = value
-              end
+        profile_items = []
+        profile_items.concat doc['children']['profileItems']['rows'] rescue nil
+        profile_items << doc['profileItem'] unless doc['profileItem'].nil?
+        profile_items.each do |item|
+          item_data = {}
+          item_data[:values] = {}
+          item.each_pair do |key, value|
+            case key
+              when 'dataItemLabel', 'dataItemUid', 'name', 'path', 'uid'
+                item_data[key.to_sym] = value
+              when 'created', 'modified', 'label' # ignore these
+                nil
+              when 'validFrom'
+                item_data[:validFrom] = DateTime.strptime(value, "%Y%m%d")
+              when 'end'
+                item_data[:end] = (value == "true")
+              when 'amountPerMonth'
+                item_data[:amountPerMonth] = value.to_f
+              else
+                item_data[:values][key.to_sym] = value
             end
-            data[:items] << item_data
           end
+          item_data[:path] ||= item_data[:uid] # Fill in path if not retrieved from response
+          data[:items] << item_data
         end
         # Create object
         Category.new(data)
@@ -80,26 +84,27 @@ module AMEE
           data[:children] << category_data
         end
         data[:items] = []
-        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/Children/ProfileItems/ProfileItem') do |item|
+        REXML::XPath.each(doc, '//ProfileItem') do |item|
           item_data = {}
           item_data[:values] = {}
           item.elements.each do |element|
             key = element.name
             value = element.text
-            case key
-              when 'dataItemLabel', 'dataItemUid', 'name', 'path'
+            case key.downcase
+              when 'dataitemlabel', 'dataitemuid', 'name', 'path'
                 item_data[key.to_sym] = value
-              when 'validFrom'
+              when 'validfrom'
                 item_data[:validFrom] = DateTime.strptime(value, "%Y%m%d")
               when 'end'
                 item_data[:end] = (value == "true")
-              when 'amountPerMonth'
+              when 'amountpermonth'
                 item_data[:amountPerMonth] = value.to_f
               else
                 item_data[:values][key.to_sym] = value
             end
           end
           item_data[:uid] = item.attributes['uid'].to_s
+          item_data[:path] ||= item_data[:uid] # Fill in path if not retrieved from response
           data[:items] << item_data
         end
         # Create object
@@ -133,9 +138,7 @@ module AMEE
         return history.reverse
       end
 
-      def self.get(connection, path, for_date = Date.today, items_per_page = 10)
-        # Load data from path
-        response = connection.get(path, :profileDate => for_date.strftime("%Y%m"), :itemsPerPage => items_per_page)
+      def self.parse(connection, response)
         # Parse data from response
         if response.is_json?
           cat = Category.from_json(response)
@@ -146,6 +149,13 @@ module AMEE
         cat.connection = connection
         # Done
         return cat
+      end
+
+
+      def self.get(connection, path, for_date = Date.today, items_per_page = 10)
+        # Load data from path
+        response = connection.get(path, :profileDate => for_date.strftime("%Y%m"), :itemsPerPage => items_per_page)
+        return Category.parse(connection, response)
       rescue
         raise AMEE::BadData.new("Couldn't load ProfileCategory. Check that your URL is correct.")
       end

data/lib/amee/profile_item.rb

@@ -103,9 +103,10 @@ module AMEE
         # Send data to path
         options.merge! :dataItemUid => data_item_uid
         response = profile.connection.post(profile.full_path, options)
-        return Item.parse(profile.connection, response)
-      rescue
-        raise AMEE::BadData.new("Couldn't create ProfileItem. Check that your information is correct.")
+        category = Category.parse(profile.connection, response)
+        return category.item(options)
+      #rescue
+      #  raise AMEE::BadData.new("Couldn't create ProfileItem. Check that your information is correct.")
       end
 
       def update(options = {})

data/lib/amee/version.rb

@@ -3,7 +3,7 @@ module AMEE
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 25
+    TINY  = 26
     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.4.25
+  version: 0.4.26
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-23 00:00:00 -08:00
+date: 2009-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: []