Floppy-amee 2.0.5 → 2.0.6

data/lib/amee/connection.rb

@@ -36,6 +36,7 @@ module AMEE
     end
 
     def version
+      authenticate if @version.nil?
       @version
     end
 
@@ -81,6 +82,19 @@ module AMEE
       do_request(post, format)
     end
 
+    def raw_post(path, body, options = {})
+      # Allow format override
+      format = options.delete(:format) || @format
+      # Clear cache
+      clear_cache
+      # Create POST request
+      post = Net::HTTP::Post.new(path)
+      post['Content-type'] = options[:content_type] || content_type(format)
+      post.body = body
+      # Send request
+      do_request(post, format)
+    end
+
     def put(path, data = {})
       # Allow format override
       format = data.delete(:format) || @format
@@ -97,6 +111,19 @@ module AMEE
       do_request(put, format)
     end
 
+    def raw_put(path, body, options = {})
+      # Allow format override
+      format = options.delete(:format) || @format
+      # Clear cache
+      clear_cache
+      # Create PUT request
+      put = Net::HTTP::Put.new(path)
+      put['Content-type'] = options[:content_type] || content_type(format)
+      put.body = body
+      # Send request
+      do_request(put, format)
+    end
+
     def delete(path)
       clear_cache
       # Create DELETE request
@@ -184,6 +211,8 @@ module AMEE
       response
     end
 
+    public
+
     def clear_cache
       if @enable_caching
         $cache = {}

data/lib/amee/data_item.rb

@@ -7,6 +7,7 @@ module AMEE
         @choices = data[:choices]
         @label = data[:label]
         @item_definition = data[:item_definition]
+        @total_amount = data[:total_amount]
         super
       end
 
@@ -14,6 +15,7 @@ module AMEE
       attr_reader :choices
       attr_reader :label
       attr_reader :item_definition
+      attr_reader :total_amount
 
       def self.from_json(json)
         # Read JSON
@@ -26,6 +28,7 @@ module AMEE
         data[:path] = doc['path']
         data[:label] = doc['dataItem']['label']
         data[:item_definition] = doc['dataItem']['itemDefinition']['uid']
+        data[:total_amount] = doc['amountPerMonth']
         # Get values
         data[:values] = []
         doc['dataItem']['itemValues'].each do |value|
@@ -57,17 +60,18 @@ module AMEE
         data[:uid] = REXML::XPath.first(doc, "/Resources/DataItemResource/DataItem/@uid").to_s
         data[:created] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataItemResource/DataItem/@created").to_s)
         data[:modified] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataItemResource/DataItem/@modified").to_s)
-        data[:name] = REXML::XPath.first(doc, '/Resources/DataItemResource/DataItem/Name').text
-        data[:path] = REXML::XPath.first(doc, '/Resources/DataItemResource/Path').text
-        data[:label] = REXML::XPath.first(doc, '/Resources/DataItemResource/DataItem/Label').text
+        data[:name] = (REXML::XPath.first(doc, '/Resources/DataItemResource/DataItem/Name') || REXML::XPath.first(doc, '/Resources/DataItemResource/DataItem/name')).text
+        data[:path] = (REXML::XPath.first(doc, '/Resources/DataItemResource/Path') || REXML::XPath.first(doc, '/Resources/DataItemResource/DataItem/path')).text
+        data[:label] = (REXML::XPath.first(doc, '/Resources/DataItemResource/DataItem/Label') || REXML::XPath.first(doc, '/Resources/DataItemResource/DataItem/label')).text
         data[:item_definition] = REXML::XPath.first(doc, '/Resources/DataItemResource/DataItem/ItemDefinition/@uid').to_s
+        data[:total_amount] = REXML::XPath.first(doc, '/Resources/DataItemResource/AmountPerMonth').text.to_f
         # Get values
         data[:values] = []
         REXML::XPath.each(doc, '/Resources/DataItemResource/DataItem/ItemValues/ItemValue') do |value|
           value_data = {}
-          value_data[:name] = value.elements['Name'].text
-          value_data[:path] = value.elements['Path'].text
-          value_data[:value] = value.elements['Value'].text
+          value_data[:name] = (value.elements['Name'] || value.elements['name']).text
+          value_data[:path] = (value.elements['Path'] || value.elements['path']).text
+          value_data[:value] = (value.elements['Value'] || value.elements['value']).text
           value_data[:uid] = value.attributes['uid'].to_s
           data[:values] << value_data
         end
@@ -75,20 +79,20 @@ module AMEE
         data[:choices] = []
         REXML::XPath.each(doc, '/Resources/DataItemResource/Choices/Choices/Choice') do |choice|
           choice_data = {}
-          choice_data[:name] = choice.elements['Name'].text
-          choice_data[:value] = choice.elements['Value'].text || ""
+          choice_data[:name] = (choice.elements['Name']).text
+          choice_data[:value] = (choice.elements['Value']).text || ""
           data[:choices] << choice_data
         end
         # Create object
         Item.new(data)
-      rescue 
+      rescue
         raise AMEE::BadData.new("Couldn't load DataItem from XML. Check that your URL is correct.")
       end
 
       
-      def self.get(connection, path)
+      def self.get(connection, path, options = {})
         # Load data from path
-        response = connection.get(path)
+        response = connection.get(path, options)
         # Parse data from response
         if response.is_json?
           item = Item.from_json(response)

data/lib/amee/profile_category.rb

@@ -90,7 +90,7 @@ module AMEE
         doc = JSON.parse(json)
         data = {}
         data[:profile_uid] = doc['profile']['uid']
-        data[:profile_date] = DateTime.strptime(doc['profileDate'], "%Y%m")
+        data[:profile_date] = DateTime.strptime(doc['profileDate'], "%Y%m") rescue nil
         data[:name] = doc['dataCategory']['name']
         data[:path] = doc['path']
         data[:total_amount] = doc['totalAmountPerMonth']
@@ -152,6 +152,8 @@ module AMEE
           case key.downcase
             when 'dataitemlabel', 'dataitemuid', 'name', 'path'
               item_data[key.to_sym] = value
+            when 'dataitem'
+              item_data[:dataItemUid] = element.attributes['uid']
             when 'validfrom'
               item_data[:validFrom] = DateTime.strptime(value, "%Y%m%d")
             when 'end'
@@ -221,6 +223,9 @@ module AMEE
         REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/ProfileItem') do |item|
           data[:items] << parse_xml_profile_item(item)
         end
+        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/ProfileItems/ProfileItem') do |item|
+          data[:items] << parse_xml_profile_item(item)
+        end
         # Create object
         Category.new(data)
       rescue
@@ -295,6 +300,9 @@ module AMEE
         REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/ProfileItem') do |item|
           data[:items] << parse_v2_xml_profile_item(item)
         end
+        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/ProfileItems/ProfileItem') do |item|
+          data[:items] << parse_v2_xml_profile_item(item)
+        end
         # Create object
         Category.new(data)
       rescue

data/lib/amee/profile_item.rb

@@ -283,6 +283,18 @@ module AMEE
         raise AMEE::BadData.new("Couldn't create ProfileItem. Check that your information is correct.")
       end
 
+      def self.create_batch_without_category(connection, category_path, items)
+        if connection.format == :json
+          post_data = ({:profileItems => items}).to_json
+        else
+          post_data = ({:ProfileItems => items}).to_xml(:root => "ProfileCategory", :skip_types => true, :skip_nil => true)
+        end
+        # Post to category
+        response = connection.raw_post(category_path, post_data)
+        # Send back a category object containing all the created items
+        AMEE::Profile::Category.parse(connection, response)
+      end
+
       def self.update(connection, path, options = {})
         response = connection.put(path, options)
         return Item.parse(connection, response)

data/lib/amee/version.rb

@@ -3,7 +3,7 @@ module AMEE
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
     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.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency