Floppy-amee 2.0.18 → 2.0.19

data/lib/amee/data_category.rb

@@ -153,7 +153,7 @@ module AMEE
           return location
         end
       rescue
-        raise AMEE::BadData.new("Couldn't create DataCategory. Check that your information is correct.")
+        raise AMEE::BadData.new("Couldn't create DataCategory. Check that your information is correct.\n#{response}")
       end
 
      def self.delete(connection, path)

data/lib/amee/data_item.rb

@@ -186,13 +186,13 @@ module AMEE
 #          return location
 #        end
       rescue
-        raise AMEE::BadData.new("Couldn't create DataItem. Check that your information is correct.")
+        raise AMEE::BadData.new("Couldn't create DataItem. Check that your information is correct.\n#{response}")
       end
 
       def update(options = {})
         response = connection.put(full_path, options).body
       rescue
-        raise AMEE::BadData.new("Couldn't update DataItem. Check that your information is correct.")
+        raise AMEE::BadData.new("Couldn't update DataItem. Check that your information is correct.\n#{response}")
       end
 
       def value(name_or_path_or_uid)

data/lib/amee/item_definition.rb

@@ -37,7 +37,7 @@ module AMEE
           end
         end
       rescue
-        raise AMEE::BadData.new("Couldn't load ItemDefinition list.")
+        raise AMEE::BadData.new("Couldn't load ItemDefinition list.\n#{response}")
       end
 
       attr_reader :pager
@@ -81,7 +81,7 @@ module AMEE
         # Create object
         ItemDefinition.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ItemDefinition from JSON. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ItemDefinition from JSON. Check that your URL is correct.\n#{json}")
       end
 
       def self.from_xml(xml, is_list = true)
@@ -96,7 +96,7 @@ module AMEE
         # Create object
         ItemDefinition.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ItemDefinition from XML. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ItemDefinition from XML. Check that your URL is correct.\n#{xml}")
       end
 
       def self.get(connection, path, options = {})
@@ -107,13 +107,13 @@ module AMEE
         # Done
         return item_definition
       rescue
-        raise AMEE::BadData.new("Couldn't load ItemDefinition. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ItemDefinition. Check that your URL is correct.\n#{response}")
       end
 
       def update(options = {})
         response = connection.put(full_path, options).body
       rescue
-        raise AMEE::BadData.new("Couldn't update ItemDefinition. Check that your information is correct.")
+        raise AMEE::BadData.new("Couldn't update ItemDefinition. Check that your information is correct.\n#{response}")
       end
 
       def self.create(connection, options = {})
@@ -127,7 +127,7 @@ module AMEE
         # Get the ItemDefinition again
         return ItemDefinition.get(connection, "/definitions/itemDefinitions/" + item_definition.uid)
       rescue
-        raise AMEE::BadData.new("Couldn't create ItemDefinition. Check that your information is correct.")
+        raise AMEE::BadData.new("Couldn't create ItemDefinition. Check that your information is correct.\n#{response}")
       end
 
       def self.delete(connection, item_definition)

data/lib/amee/profile.rb

@@ -42,7 +42,7 @@ module AMEE
           end
         end
       rescue
-        raise AMEE::BadData.new("Couldn't load Profile list.")
+        raise AMEE::BadData.new("Couldn't load Profile list.\n#{response}")
       end
       
       attr_reader :pager
@@ -92,7 +92,7 @@ module AMEE
           return profile
         end
       rescue
-        raise AMEE::BadData.new("Couldn't create Profile.")
+        raise AMEE::BadData.new("Couldn't create Profile.\n#{response}")
       end
 
       def self.delete(connection, uid)

data/lib/amee/profile_category.rb

@@ -115,7 +115,7 @@ module AMEE
         # Create object
         Category.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory from JSON data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from JSON data. Check that your URL is correct.\n#{json}")
       end
 
       def self.from_v2_json(json, options)
@@ -144,7 +144,7 @@ module AMEE
         # Create object
         Category.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 JSON data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 JSON data. Check that your URL is correct.\n#{json}")
       end
             
       def self.parse_xml_profile_item(item)
@@ -188,7 +188,7 @@ module AMEE
         end
         return data
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory batch response from V2 JSON data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileCategory batch response from V2 JSON data. Check that your URL is correct.\n#{json}")
       end
       
       def self.parse_xml_profile_category(category)
@@ -251,7 +251,7 @@ module AMEE
         # Create object
         Category.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory from XML data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from XML data. Check that your URL is correct.\n#{xml}")
       end
 
       def self.parse_v2_xml_profile_item(item)
@@ -327,7 +327,7 @@ module AMEE
         # Create object
         Category.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 XML data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 XML data. Check that your URL is correct.\n#{xml}")
       end
 
       def self.from_v2_batch_xml(xml)
@@ -343,7 +343,7 @@ module AMEE
         end
         return data
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory batch response from V2 XML data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileCategory batch response from V2 XML data. Check that your URL is correct.\n#{xml}")
       end
       
       def self.from_v2_atom(response, options)
@@ -398,7 +398,7 @@ module AMEE
         # Create object
         Category.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 Atom data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 Atom data. Check that your URL is correct.\n#{response}")
       end
 
       def self.get_history(connection, path, num_months, end_date = Date.today, items_per_page = 10)
@@ -451,7 +451,7 @@ module AMEE
         elsif response.is_v2_xml?
           return Category.from_v2_batch_xml(response)
         else
-          return self.parse(connection, response)
+          return self.parse(connection, response, nil)
         end
       end
       
@@ -475,7 +475,7 @@ module AMEE
         response = connection.get(path, options).body
         return Category.parse(connection, response, options)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileCategory. Check that your URL is correct.\n#{response}")
       end
 
       def child(child_path)

data/lib/amee/profile_item.rb

@@ -58,7 +58,7 @@ module AMEE
         # Create object
         Item.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileItem from JSON data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileItem from JSON data. Check that your URL is correct.\n#{json}")
       end
 
       def self.from_v2_json(json)
@@ -90,7 +90,7 @@ module AMEE
         # Create object
         Item.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileItem from V2 JSON data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileItem from V2 JSON data. Check that your URL is correct.\n#{json}")
       end
 
       def self.from_xml(xml)
@@ -123,7 +123,7 @@ module AMEE
         # Create object
         Item.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileItem from XML data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileItem from XML data. Check that your URL is correct.\n#{xml}")
       end
 
       def self.from_v2_xml(xml)
@@ -158,7 +158,7 @@ module AMEE
         # Create object
         Item.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileItem from V2 XML data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileItem from V2 XML data. Check that your URL is correct.\n#{xml}")
       end
 
       def self.from_v2_atom(response)
@@ -187,7 +187,7 @@ module AMEE
         # Create object
         Item.new(data)
       rescue
-        raise AMEE::BadData.new("Couldn't load ProfileItem from V2 ATOM data. Check that your URL is correct.")
+        raise AMEE::BadData.new("Couldn't load ProfileItem from V2 ATOM data. Check that your URL is correct.\n#{response}")
       end
 
       def self.parse(connection, response)
@@ -231,7 +231,7 @@ module AMEE
         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.")
+        raise AMEE::BadData.new("Couldn't load ProfileItem. Check that your URL is correct.\n#{response}")
       end
 
       def self.create(category, data_item_uid, options = {})
@@ -253,11 +253,9 @@ 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
@@ -267,7 +265,7 @@ module AMEE
         if response['Location']
           location = response['Location'].match("http://.*?(/.*)")[1]
         else
-          category = Category.parse(connection, response.body)
+          category = Category.parse(connection, response.body, nil)
           location = category.full_path + "/" + category.items[0][:path]
         end
         if get_item == true
@@ -280,7 +278,7 @@ module AMEE
           return location
         end
       rescue
-        raise AMEE::BadData.new("Couldn't create ProfileItem. Check that your information is correct.")
+        raise AMEE::BadData.new("Couldn't create ProfileItem. Check that your information is correct.\n#{response}")
       end
 
       def self.create_batch(category, items, options = {})
@@ -309,6 +307,20 @@ module AMEE
         # Do we want to automatically fetch the item afterwards?
         get_item = options.delete(:get_item)
         get_item = true if get_item.nil?
+        # Set dates
+        if options[:start_date] && connection.version < 2
+          options[:validFrom] = options[:start_date].amee1_date
+        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
         # Go
         response = connection.put(path, options)
         if get_item
@@ -319,7 +331,7 @@ module AMEE
           end
         end
       rescue
-        raise AMEE::BadData.new("Couldn't update ProfileItem. Check that your information is correct.")
+        raise AMEE::BadData.new("Couldn't update ProfileItem. Check that your information is correct.\n#{response}")
       end
 
       def update(options = {})
@@ -340,7 +352,7 @@ module AMEE
         response = connection.raw_put(category_path, put_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(connection, response, nil)
         else
           return true
         end

data/lib/amee/profile_item_value.rb

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

data/lib/amee/version.rb

@@ -3,7 +3,7 @@ module AMEE
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 18
+    TINY  = 19
     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.18
+  version: 2.0.19
 platform: ruby
 authors: 
 - James Smith