Floppy-amee 2.0.15 → 2.0.16

data/lib/amee.rb

@@ -40,6 +40,8 @@ require 'amee/profile_category'
 require 'amee/profile_item'
 require 'amee/profile_item_value'
 require 'amee/drill_down'
+require 'amee/pager'
+require 'amee/item_definition'
 
 class Date
   def amee1_date

data/lib/amee/item_definition.rb

@@ -0,0 +1,65 @@
+module AMEE
+  module Admin
+    class ItemDefinition < AMEE::Object
+
+      def initialize(data = {})
+        @name = data[:name]
+        super
+      end
+
+      attr_reader :name
+
+      def self.from_json(json)
+        # Read JSON
+        doc = JSON.parse(json)
+        data = {}
+        data[:uid] = doc['itemDefinition']['uid']
+        data[:created] = DateTime.parse(doc['itemDefinition']['created'])
+        data[:modified] = DateTime.parse(doc['itemDefinition']['modified'])
+        data[:name] = doc['itemDefinition']['name']
+        # Create object
+        ItemDefinition.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ItemDefinition from JSON. Check that your URL is correct.")
+      end
+      
+      def self.from_xml(xml)
+        # Parse data from response into hash
+        doc = REXML::Document.new(xml)
+        data = {}
+        data[:uid] = REXML::XPath.first(doc, "/Resources/ItemDefinitionResource/ItemDefinition/@uid").to_s
+        data[:created] = DateTime.parse(REXML::XPath.first(doc, "/Resources/ItemDefinitionResource/ItemDefinition/@created").to_s)
+        data[:modified] = DateTime.parse(REXML::XPath.first(doc, "/Resources/ItemDefinitionResource/ItemDefinition/@modified").to_s)
+        data[:name] = REXML::XPath.first(doc, '/Resources/ItemDefinitionResource/ItemDefinition/Name').text
+        # Create object
+        ItemDefinition.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ItemDefinition from XML. Check that your URL is correct.")
+      end
+
+      def self.get(connection, path, options = {})
+        # Load data from path
+        response = connection.get(path, options).body
+        # Parse data from response
+        if response.is_json?
+          item_definition = ItemDefinition.from_json(response)
+        else
+          item_definition = ItemDefinition.from_xml(response)
+        end
+        # Store connection in object for future use
+        item_definition.connection = connection
+        # Done
+        return item_definition
+      rescue
+        raise AMEE::BadData.new("Couldn't load ItemDefinition. Check that your URL is correct.")
+      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.")
+      end
+
+    end
+  end
+end

data/lib/amee/pager.rb

@@ -0,0 +1,59 @@
+module AMEE
+  class Pager
+
+    def initialize(data)
+      @start = data[:start]
+      @from = data[:from]
+      @to = data[:to]
+      @items = data[:items]
+      @current_page = data[:current_page]
+      @requested_page = data[:requested_page]
+      @next_page = data[:next_page]
+      @previous_page = data[:previous_page]
+      @last_page = data[:last_page]
+      @items_per_page = data[:items_per_page]
+      @items_found = data[:items_found]
+    end
+
+    attr_reader :start
+    attr_reader :from
+    attr_reader :to
+    attr_reader :items
+    attr_reader :current_page
+    attr_reader :requested_page
+    attr_reader :next_page
+    attr_reader :previous_page
+    attr_reader :last_page
+    attr_reader :items_per_page
+    attr_reader :items_found
+
+    def self.from_xml(node)
+      return Pager.new({:start => node.elements["Start"].text.to_i,
+                        :from => node.elements["From"].text.to_i,
+                        :to => node.elements["To"].text.to_i,
+                        :items => node.elements["Items"].text.to_i,
+                        :current_page => node.elements["CurrentPage"].text.to_i,
+                        :requested_page => node.elements["RequestedPage"].text.to_i,
+                        :next_page => node.elements["NextPage"].text.to_i,
+                        :previous_page => node.elements["PreviousPage"].text.to_i,
+                        :last_page => node.elements["LastPage"].text.to_i,
+                        :items_per_page => node.elements["ItemsPerPage"].text.to_i,
+                        :items_found => node.elements["ItemsFound"].text.to_i})
+    end
+
+    def self.from_json(node)
+      return Pager.new({:start => node["start"],
+                        :from => node["from"],
+                        :to => node["to"],
+                        :items => node["items"],
+                        :current_page => node["currentPage"],
+                        :requested_page => node["requestedPage"],
+                        :next_page => node["nextPage"],
+                        :previous_page => node["previousPage"],
+                        :last_page => node["lastPage"],
+                        :items_per_page => node["itemsPerPage"],
+                        :items_found => node["itemsFound"]})
+    end
+
+  end
+end

data/lib/amee/profile.rb

@@ -1,15 +1,15 @@
 module AMEE
   module Profile
-    class Profile < AMEE::Profile::Object
-
-      def self.list(connection)
+    class ProfileList < Array
+      
+      def initialize(connection, options = {})
         # Load data from path
-        response = connection.get('/profiles').body
+        response = connection.get('/profiles', options).body
         # Parse data from response
-        profiles = []
         if response.is_json?
           # Read JSON
           doc = JSON.parse(response)
+          @pager = AMEE::Pager.from_json(doc['pager'])
           doc['profiles'].each do |p|
             data = {}
             data[:uid] = p['uid']
@@ -20,11 +20,12 @@ module AMEE
             # Create profile
             profile = Profile.new(data)
             # Store in array
-            profiles << profile
+            self << profile
           end
         else
           # Read XML
           doc = REXML::Document.new(response)
+          @pager = AMEE::Pager.from_xml(REXML::XPath.first(doc, '/Resources/ProfilesResource/Pager'))
           REXML::XPath.each(doc, '/Resources/ProfilesResource/Profiles/Profile') do |p|
             data = {}
             data[:uid] = p.attributes['uid'].to_s
@@ -37,14 +38,23 @@ module AMEE
             # Store connection in profile object
             profile.connection = connection
             # Store in array
-            profiles << profile
+            self << profile
           end
         end
-        # Done
-        return profiles
       rescue
         raise AMEE::BadData.new("Couldn't load Profile list.")
       end
+      
+      attr_reader :pager
+      
+    end
+
+    class Profile < AMEE::Profile::Object
+
+      # backwards compatibility
+      def self.list(connection)
+        ProfileList.new(connection)
+      end
 
       def self.create(connection)
         # Create new profile

data/lib/amee/profile_item.rb

@@ -283,15 +283,17 @@ module AMEE
         raise AMEE::BadData.new("Couldn't create ProfileItem. Check that your information is correct.")
       end
 
-      def self.create_batch(category, items)
+      def self.create_batch(category, items, options = {})
         create_batch_without_category(category.connection, category.full_path, items)
       end
 
-      def self.create_batch_without_category(connection, category_path, items)
+      def self.create_batch_without_category(connection, category_path, items, options = {})
         if connection.format == :json
-          post_data = ({:profileItems => items}).to_json
+          options.merge! :profileItems => items
+          post_data = options.to_json
         else
-          post_data = ({:ProfileItems => items}).to_xml(:root => "ProfileCategory", :skip_types => true, :skip_nil => true)
+        options.merge!({:ProfileItems => items})
+        post_data = options.to_xml(:root => "ProfileCategory", :skip_types => true, :skip_nil => true)
         end
         # Post to category
         response = connection.raw_post(category_path, post_data).body

data/lib/amee/version.rb

@@ -3,7 +3,7 @@ module AMEE
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 15
+    TINY  = 16
     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.15
+  version: 2.0.16
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -07:00
+date: 2009-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,8 @@ files:
 - lib/amee/shell.rb
 - lib/amee/drill_down.rb
 - lib/amee/rails.rb
+- lib/amee/pager.rb
+- lib/amee/item_definition.rb
 - bin/ameesh
 - examples/list_profiles.rb
 - examples/create_profile.rb