Floppy-amee 2.0.17 → 2.0.18

data/lib/amee/data_category.rb

@@ -43,7 +43,7 @@ module AMEE
         # Create object
         Category.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load DataCategory from JSON data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DataCategory from JSON data. Check that your URL is correct.\n#{json}")
       end
       
       def self.from_xml(xml)
@@ -78,7 +78,7 @@ module AMEE
         # Create object
         Category.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load DataCategory from XML data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DataCategory from XML data. Check that your URL is correct.\n#{xml}")
       end
       
       def self.get(connection, path, items_per_page = 10)
@@ -95,7 +95,7 @@ module AMEE
         # Done
         return cat
       rescue
-        raise AMEE::BadData.new("Couldn't load DataCategory. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DataCategory. Check that your URL is correct.\n#{response}")
       end
       
       def self.root(connection)

data/lib/amee/data_item.rb

@@ -59,7 +59,7 @@ module AMEE
         # Create object
         Item.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load DataItem from JSON. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DataItem from JSON. Check that your URL is correct.\n#{json}")
       end
       
       def self.from_xml(xml)
@@ -102,7 +102,7 @@ module AMEE
         # Create object
         Item.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load DataItem from XML. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DataItem from XML. Check that your URL is correct.\n#{xml}")
       end
 
       
@@ -120,7 +120,7 @@ module AMEE
         # Done
         return item
       rescue
-        raise AMEE::BadData.new("Couldn't load DataItem. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DataItem. Check that your URL is correct.\n#{response}")
       end
 
       def self.create_batch_without_category(connection, category_path, items, options = {})

data/lib/amee/data_item_value.rb

@@ -47,7 +47,7 @@ module AMEE
         # Create object
         ItemValue.new(data)
       rescue 
-        raise AMEE::BadData.new("Couldn't load DataItemValue from JSON. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DataItemValue from JSON. Check that your URL is correct.\n#{json}")
       end
       
       def self.from_xml(xml, path)
@@ -66,7 +66,7 @@ module AMEE
         # Create object
         ItemValue.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load DataItemValue from XML. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DataItemValue from XML. Check that your URL is correct.\n#{xml}")
       end
 
       def self.get(connection, path)
@@ -84,7 +84,7 @@ module AMEE
         # Done
         return value
       rescue
-        raise AMEE::BadData.new("Couldn't load DataItemValue. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DataItemValue. Check that your URL is correct.\n#{response}")
       end
 
       def save!

data/lib/amee/drill_down.rb

@@ -52,7 +52,7 @@ module AMEE
         # Create object
         DrillDown.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load DrillDown resource from JSON data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DrillDown resource from JSON data. Check that your URL is correct.\n#{json}")
       end
       
       def self.from_xml(xml)
@@ -75,7 +75,7 @@ module AMEE
         # Create object
         DrillDown.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load DrillDown resource from XML data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load DrillDown resource from XML data. Check that your URL is correct.\n#{xml}")
       end
 
       def self.get(connection, path)
@@ -94,7 +94,7 @@ module AMEE
         # Done
         return drill
       rescue
-        raise AMEE::BadData.new("Couldn't load DrillDown resource. Check that your URL is correct (#{path}).")
+        raise AMEE::BadData.new("Couldn't load DrillDown resource. Check that your URL is correct (#{path}).\n#{response}")
       end
       
     end

data/lib/amee/profile_category.rb

@@ -89,7 +89,7 @@ module AMEE
         return category_data
       end
 
-      def self.from_json(json)
+      def self.from_json(json, options)
         # Parse json
         doc = JSON.parse(json)
         data = {}
@@ -118,12 +118,12 @@ module AMEE
         raise AMEE::BadData.new("Couldn't load ProfileCategory from JSON data. Check that your URL is correct.")
       end
 
-      def self.from_v2_json(json)
+      def self.from_v2_json(json, options)
         # Parse json
         doc = JSON.parse(json)
         data = {}
         data[:profile_uid] = doc['profile']['uid']
-        #data[:profile_date] = DateTime.strptime(doc['profileDate'], "%Y%m")
+        data[:profile_date] = options[:start_date]
         data[:name] = doc['dataCategory']['name']
         data[:path] = doc['path']
         data[:total_amount] = doc['totalAmount']['value'].to_f rescue nil
@@ -146,7 +146,7 @@ module AMEE
       rescue
         raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 JSON data. Check that your URL is correct.")
       end
-
+            
       def self.parse_xml_profile_item(item)
         item_data = {}
         item_data[:values] = {}
@@ -175,6 +175,22 @@ module AMEE
         return item_data
       end
 
+      def self.from_v2_batch_json(json)
+        # Parse JSON
+        doc = JSON.parse(json)
+        data = {}
+        data[:profileItems] = []
+        doc['profileItems'].each do |child|
+          profile_item = {}
+          profile_item[:uri] = child['uri'].to_s
+          profile_item[:uid] = child['uid'].to_s
+          data[:profileItems] << profile_item
+        end
+        return data
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileCategory batch response from V2 JSON data. Check that your URL is correct.")
+      end
+      
       def self.parse_xml_profile_category(category)
         category_data = {}
         category_data[:name] = category.elements['DataCategory'].elements['Name'].text
@@ -200,7 +216,7 @@ module AMEE
         return category_data
       end
 
-      def self.from_xml(xml)
+      def self.from_xml(xml, options)
         # Parse XML
         doc = REXML::Document.new(xml)
         data = {}
@@ -280,12 +296,12 @@ module AMEE
         return item_data
       end
 
-      def self.from_v2_xml(xml)
+      def self.from_v2_xml(xml, options)
         # Parse XML
         doc = REXML::Document.new(xml)
         data = {}
         data[:profile_uid] = REXML::XPath.first(doc, "/Resources/ProfileCategoryResource/Profile/@uid").to_s
-        #data[:profile_date] = DateTime.strptime(REXML::XPath.first(doc, "/Resources/ProfileCategoryResource/ProfileDate").text, "%Y%m")
+        data[:profile_date] = options[:start_date]
         data[:name] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/DataCategory/Name').text
         data[:path] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/Path').text || ""
         data[:total_amount] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/TotalAmount').text.to_f rescue nil
@@ -314,12 +330,28 @@ module AMEE
         raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 XML data. Check that your URL is correct.")
       end
 
-      def self.from_v2_atom(response)
+      def self.from_v2_batch_xml(xml)
+        # Parse XML
+        doc = REXML::Document.new(xml)
+        data = {}
+        data[:profileItems] = []
+        REXML::XPath.each(doc, '/Resources/ProfileItems/ProfileItem') do |child|
+          profile_item = {}
+          profile_item[:uri] = child.attributes['uri'].to_s
+          profile_item[:uid] = child.attributes['uid'].to_s
+          data[:profileItems] << profile_item
+        end
+        return data
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileCategory batch response from V2 XML data. Check that your URL is correct.")
+      end
+      
+      def self.from_v2_atom(response, options)
         # Parse XML
         doc = REXML::Document.new(response)
         data = {}
         data[:profile_uid] = REXML::XPath.first(doc, "/feed/@xml:base").to_s.match("/profiles/(.*?)/")[1]
-#        data[:profile_date] = DateTime.strptime(REXML::XPath.first(doc, "/Resources/ProfileCategoryResource/ProfileDate").text, "%Y%m")
+        data[:profile_date] = options[:start_date]
         data[:name] = REXML::XPath.first(doc, '/feed/amee:name').text
         data[:path] = REXML::XPath.first(doc, "/feed/@xml:base").to_s.match("/profiles/.*?(/.*)")[1]
         data[:total_amount] = REXML::XPath.first(doc, '/feed/amee:totalAmount').text.to_f rescue nil
@@ -394,18 +426,18 @@ module AMEE
         return history.reverse
       end
 
-      def self.parse(connection, response)
+      def self.parse(connection, response, options)
         # Parse data from response
         if response.is_v2_json?
-          cat = Category.from_v2_json(response)
+          cat = Category.from_v2_json(response, options)
         elsif response.is_json?
-          cat = Category.from_json(response)
+          cat = Category.from_json(response, options)
         elsif response.is_v2_atom?
-          cat = Category.from_v2_atom(response)
+          cat = Category.from_v2_atom(response, options)
         elsif response.is_v2_xml?
-          cat = Category.from_v2_xml(response)
+          cat = Category.from_v2_xml(response, options)
         elsif response.is_xml?
-          cat = Category.from_xml(response)
+          cat = Category.from_xml(response, options)
         end
         # Store connection in object for future use
         cat.connection = connection
@@ -413,7 +445,16 @@ module AMEE
         return cat
       end
 
-
+      def self.parse_batch(connection, response)
+        if response.is_v2_json?
+          return Category.from_v2_batch_json(response)
+        elsif response.is_v2_xml?
+          return Category.from_v2_batch_xml(response)
+        else
+          return self.parse(connection, response)
+        end
+      end
+      
       def self.get(connection, path, options = {})
         unless options.is_a?(Hash)
           raise AMEE::ArgumentError.new("Third argument must be a hash of options!")
@@ -424,17 +465,15 @@ module AMEE
         elsif options[:start_date] && connection.version >= 2
           options[:startDate] = options[:start_date].xmlschema
         end
-        options.delete(:start_date)
         if options[:end_date] && connection.version >= 2
           options[:endDate] = options[:end_date].xmlschema
         end
-        options.delete(:end_date)
         if options[:duration] && connection.version >= 2
           options[:duration] = "PT#{options[:duration] * 86400}S"
         end
         # Load data from path
         response = connection.get(path, options).body
-        return Category.parse(connection, response)
+        return Category.parse(connection, response, options)
       rescue
         raise AMEE::BadData.new("Couldn't load ProfileCategory. Check that your URL is correct.")
       end

data/lib/amee/profile_item.rb

@@ -299,7 +299,7 @@ module AMEE
         response = connection.raw_post(category_path, post_data).body
         # Send back a category object containing all the created items
         unless response.empty?
-          return AMEE::Profile::Category.parse(connection, response)
+          return AMEE::Profile::Category.parse_batch(connection, response)
         else
           return true
         end

data/lib/amee/rails.rb

@@ -1,6 +1,13 @@
 module AMEE
   module Rails
 
+    def self.establish_connection(server, username, password)
+      # Connect
+      $amee = AMEE::Connection.new(server, username, password)
+      # Authenticate now to get it out of the way and to check settings
+      $amee.authenticate
+    end
+
     def self.included(base)
       base.extend ClassMethods
     end

data/lib/amee/version.rb

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

data/rails/init.rb

@@ -7,9 +7,7 @@ if File.exist?(amee_config)
   # Load config
   $AMEE_CONFIG = YAML.load_file(amee_config)[RAILS_ENV]
   # Create a global AMEE connection that we can use from anywhere in this app
-  $amee = AMEE::Connection.new($AMEE_CONFIG['server'], $AMEE_CONFIG['username'], $AMEE_CONFIG['password'])
-  # Authenticate now to get it out of the way and to check settings
-  $amee.authenticate
+  AMEE::Rails.establish_connection($AMEE_CONFIG['server'], $AMEE_CONFIG['username'], $AMEE_CONFIG['password'])
 else
   # Create an example AMEE config file and save it to config/amee.yml
   example_config = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-amee
 version: !ruby/object:Gem::Version 
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-07-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency