Floppy-amee 2.0.7 → 2.0.8

data/lib/amee/connection.rb

@@ -171,7 +171,7 @@ module AMEE
 
     def response_ok?(response)
       case response.code
-        when '200'
+        when '200', '201'
           return true
         when '403'
           raise AMEE::PermissionDenied.new("You do not have permission to perform the requested operation. AMEE Response: #{response.body}")
@@ -190,8 +190,8 @@ module AMEE
       begin
         response = send_request(request, format)
       end while !response_ok?(response)
-      # Return body of response
-      return response.body
+      # Return response
+      return response
     rescue SocketError
       raise AMEE::ConnectionFailed.new("Connection failed. Check server name or network connection.")
     ensure

data/lib/amee/data_category.rb

@@ -34,9 +34,9 @@ module AMEE
         if doc['children']['dataItems']['rows']
           doc['children']['dataItems']['rows'].each do |item|
             item_data = {}
-            item_data[:label] = item['label']
-            item_data[:path] = item['path']
-            item_data[:uid] = item['uid']
+            item.each_pair do |key, value|
+              item_data[key.to_sym] = value
+            end
             data[:items] << item_data
           end
         end
@@ -67,8 +67,12 @@ module AMEE
         REXML::XPath.each(doc, '/Resources/DataCategoryResource//Children/DataItems/DataItem') do |item|
           item_data = {}
           item_data[:uid] = item.attributes['uid'].to_s
-          item_data[:label] = item.elements['label'].text
-          item_data[:path] = item.elements['path'] ? item.elements['path'].text : item_data[:uid]
+          item.elements.each do |element|
+            item_data[element.name.to_sym] = element.text
+          end
+          if item_data[:path].nil?
+            item_data[:path] = item_data[:uid]
+          end
           data[:items] << item_data
         end
         # Create object
@@ -79,7 +83,7 @@ module AMEE
       
       def self.get(connection, path, items_per_page = 10)
         # Load data from path
-        response = connection.get(path, :itemsPerPage => items_per_page)
+        response = connection.get(path, :itemsPerPage => items_per_page).body
         # Parse data from response
         if response.is_json?
           cat = Category.from_json(response)
@@ -108,4 +112,4 @@ module AMEE
 
     end
   end
-end
+end

data/lib/amee/data_item.rb

@@ -92,7 +92,7 @@ module AMEE
       
       def self.get(connection, path, options = {})
         # Load data from path
-        response = connection.get(path, options)
+        response = connection.get(path, options).body
         # Parse data from response
         if response.is_json?
           item = Item.from_json(response)
@@ -108,7 +108,7 @@ module AMEE
       end
 
       def update(options = {})
-        connection.put(full_path, options)
+        response = connection.put(full_path, options).body
       rescue
         raise AMEE::BadData.new("Couldn't update DataItem. Check that your information is correct.")
       end

data/lib/amee/data_item_value.rb

@@ -71,7 +71,7 @@ module AMEE
 
       def self.get(connection, path)
         # Load data from path
-        response = connection.get(path)
+        response = connection.get(path).body
         # Parse data from response
         data = {}
         if response.is_json?
@@ -88,7 +88,7 @@ module AMEE
       end
 
       def save!
-        response = @connection.put(full_path, :value => value)        
+        response = @connection.put(full_path, :value => value).body
       end
 
     end

data/lib/amee/drill_down.rb

@@ -80,7 +80,7 @@ module AMEE
 
       def self.get(connection, path)
         # Load data from path
-        response = connection.get(path)
+        response = connection.get(path).body
         # Parse data from response
         if response.is_json?
           drill = DrillDown.from_json(response)

data/lib/amee/profile.rb

@@ -4,7 +4,7 @@ module AMEE
 
       def self.list(connection)
         # Load data from path
-        response = connection.get('/profiles')
+        response = connection.get('/profiles').body
         # Parse data from response
         profiles = []
         if response.is_json?
@@ -48,7 +48,7 @@ module AMEE
 
       def self.create(connection)
         # Create new profile
-        response = connection.post('/profiles', :profile => true)
+        response = connection.post('/profiles', :profile => true).body
         # Parse data from response
         if response.is_json?
           # Read JSON

data/lib/amee/profile_category.rb

@@ -425,7 +425,7 @@ module AMEE
           options[:duration] = "PT#{options[:duration] * 86400}S"
         end
         # Load data from path
-        response = connection.get(path, options)
+        response = connection.get(path, options).body
         return Category.parse(connection, response)
       rescue
         raise AMEE::BadData.new("Couldn't load ProfileCategory. Check that your URL is correct.")

data/lib/amee/profile_item.rb

@@ -228,7 +228,7 @@ module AMEE
           options[:duration] = "PT#{options[:duration] * 86400}S"
         end
         # Load data from path
-        response = connection.get(path, options)
+        response = connection.get(path, options).body
         return Item.parse(connection, response)
       rescue
         raise AMEE::BadData.new("Couldn't load ProfileItem. Check that your URL is correct.")
@@ -265,9 +265,9 @@ module AMEE
         options.merge! :dataItemUid => data_item_uid
         response = connection.post(path, options)
         if response['Location']
-          location = response['Location']
+          location = response['Location'].match("http://.*?(/.*)")[1]
         else
-          category = Category.parse(connection, response)
+          category = Category.parse(connection, response.body)
           location = category.full_path + "/" + category.items[0][:path]
         end
         if get_item == true
@@ -283,6 +283,10 @@ module AMEE
         raise AMEE::BadData.new("Couldn't create ProfileItem. Check that your information is correct.")
       end
 
+      def self.create_batch(category, items)
+        create_batch_without_category(category.connection, category.full_path, items)
+      end
+
       def self.create_batch_without_category(connection, category_path, items)
         if connection.format == :json
           post_data = ({:profileItems => items}).to_json
@@ -296,8 +300,18 @@ module AMEE
       end
 
       def self.update(connection, path, options = {})
+        # Do we want to automatically fetch the item afterwards?
+        get_item = options.delete(:get_item)
+        get_item = true if get_item.nil?
+        # Go
         response = connection.put(path, options)
-        return Item.parse(connection, response)
+        if get_item
+          if response.body.empty?
+            return Item.get(connection, path)
+          else
+            return Item.parse(connection, response.body)
+          end
+        end
       rescue
         raise AMEE::BadData.new("Couldn't update ProfileItem. Check that your information is correct.")
       end
@@ -306,6 +320,22 @@ module AMEE
         AMEE::Profile::Item.update(connection, full_path, options)
       end
 
+      def self.update_batch(category, items)
+        update_batch_without_category(category.connection, category.full_path, items)
+      end
+
+      def self.update_batch_without_category(connection, category_path, items)
+        if connection.format == :json
+          put_data = ({:profileItems => items}).to_json
+        else
+          put_data = ({:ProfileItems => items}).to_xml(:root => "ProfileCategory", :skip_types => true, :skip_nil => true)
+        end
+        # Post to category
+        response = connection.raw_put(category_path, put_data)
+        # Send back a category object containing all the created items
+        AMEE::Profile::Category.parse(connection, response)
+      end
+
       def self.delete(connection, path)
         connection.delete(path)
       rescue

data/lib/amee/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-amee
 version: !ruby/object:Gem::Version 
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-03-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency