Floppy-amee 2.0.2 → 2.0.3

data/lib/amee.rb

@@ -1,4 +1,5 @@
 require 'rexml/document'
+require 'activesupport'
 
 # We don't NEED the JSON gem, but if it's available, use it.
 begin
@@ -40,9 +41,6 @@ require 'amee/profile_item'
 require 'amee/drill_down'
 
 class Date
-  def amee2schema
-    strftime("%Y-%m-%dT%H:%M+0000")
-  end
   def amee1_date
     strftime("%Y%m%d")
   end
@@ -52,9 +50,6 @@ class Date
 end
 
 class Time
-  def amee2schema
-    strftime("%Y-%m-%dT%H:%M+0000")
-  end
   def amee1_date
     strftime("%Y%m%d")
   end

data/lib/amee/profile_category.rb

@@ -307,18 +307,18 @@ module AMEE
         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[:name] = REXML::XPath.first(doc, '/feed/title').text
+        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
         data[:total_amount_unit] = REXML::XPath.first(doc, '/feed/amee:totalAmount/@unit').to_s rescue nil
         data[:children] = []
-#        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/ProfileCategories/DataCategory') do |child|
-#          category_data = {}
-#          category_data[:name] = child.elements['Name'].text
-#          category_data[:path] = child.elements['Path'].text
+        REXML::XPath.each(doc, '/feed/amee:categories/amee:category') do |child|
+          category_data = {}
+#          category_data[:path] = child.text
+          category_data[:path] = child.text
 #          category_data[:uid] = child.attributes['uid'].to_s
-#          data[:children] << category_data
-#        end
+          data[:children] << category_data
+        end
 #        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/Children/ProfileCategories/ProfileCategory') do |child|
 #          data[:children] << parse_xml_profile_category(child)
 #        end
@@ -409,11 +409,11 @@ module AMEE
         if options[:start_date] && connection.version < 2
           options[:profileDate] = options[:start_date].amee1_month 
         elsif options[:start_date] && connection.version >= 2
-          options[:startDate] = options[:start_date].amee2schema
+          options[:startDate] = options[:start_date].xmlschema
         end
         options.delete(:start_date)
         if options[:end_date] && connection.version >= 2
-          options[:endDate] = options[:end_date].amee2schema
+          options[:endDate] = options[:end_date].xmlschema
         end
         options.delete(:end_date)
         if options[:duration] && connection.version >= 2
@@ -425,7 +425,7 @@ module AMEE
       rescue
         raise AMEE::BadData.new("Couldn't load ProfileCategory. Check that your URL is correct.")
       end
-      
+
       def child(child_path)
         AMEE::Profile::Category.get(connection, "#{full_path}/#{child_path}")
       end

data/lib/amee/profile_item.rb

@@ -217,11 +217,11 @@ module AMEE
         if options[:start_date] && category.connection.version < 2
           options[:profileDate] = options[:start_date].amee1_month
         elsif options[:start_date] && category.connection.version >= 2
-          options[:startDate] = options[:start_date].amee2schema
+          options[:startDate] = options[:start_date].xmlschema
         end
         options.delete(:start_date)
         if options[:end_date] && category.connection.version >= 2
-          options[:endDate] = options[:end_date].amee2schema
+          options[:endDate] = options[:end_date].xmlschema
         end
         options.delete(:end_date)
         if options[:duration] && category.connection.version >= 2
@@ -230,8 +230,8 @@ module AMEE
         # Load data from path
         response = connection.get(path, options)
         return Item.parse(connection, response)
-      rescue
-        raise AMEE::BadData.new("Couldn't load ProfileItem. Check that your URL is correct.")
+#      rescue
+#        raise AMEE::BadData.new("Couldn't load ProfileItem. Check that your URL is correct.")
       end
 
       def self.create(category, data_item_uid, options = {})
@@ -239,6 +239,9 @@ module AMEE
       end
 
       def self.create_without_category(connection, path, data_item_uid, options = {})
+        # Do we want to automatically fetch the item afterwards?
+        get_item = options.delete(:get_item)
+        get_item = true if get_item.nil?
         # Store format if set
         format = options[:format]
         unless options.is_a?(Hash)
@@ -248,11 +251,11 @@ module AMEE
         if options[:start_date] && connection.version < 2
           options[:profileDate] = options[:start_date].amee1_month
         elsif options[:start_date] && connection.version >= 2
-          options[:startDate] = options[:start_date].amee2schema
+          options[:startDate] = options[:start_date].xmlschema
         end
         options.delete(:start_date)
         if options[:end_date] && connection.version >= 2
-          options[:endDate] = options[:end_date].amee2schema
+          options[:endDate] = options[:end_date].xmlschema
         end        
         options.delete(:end_date)
         if options[:duration] && connection.version >= 2
@@ -261,9 +264,20 @@ module AMEE
         # Send data to path
         options.merge! :dataItemUid => data_item_uid
         response = connection.post(path, options)
-        category = Category.parse(connection, response)
-        options.merge!(:format => format) if format
-        return category.item(options)
+        if response['Location']
+          location = response['Location']
+        else
+          category = Category.parse(connection, response)
+          item = category.items.find{ |x| x[:name] == options[:name] || x[:dataItemUid] == data_item_uid }
+          location = category.full_path + "/" + item[:path]
+        end
+        if get_item == true
+          options = {}
+          options[:format] = format if format
+          return AMEE::Profile::Item.get(connection, location, options)
+        else
+          return location
+        end
       rescue
         raise AMEE::BadData.new("Couldn't create ProfileItem. Check that your information is correct.")
       end

data/lib/amee/version.rb

@@ -3,7 +3,7 @@ module AMEE
   module VERSION #:nodoc:
     MAJOR = 2
     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: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - James Smith
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2009-02-26 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: james@floppy.org.uk
 executables: