amee 2.4.0 → 2.5.0

data/CHANGELOG

@@ -1,5 +1,16 @@
 = Changelog
 
+== 2.5.0
+ * Use ActiveSupport::Cache for caching
+ * Add ability to specify cache and debug options in amee.yml for Rails projects.
+ * Uses Nokogiri for some XML parsing for big speed improvements. More to come.
+
+== 2.4.0
+ * Collection objects support filter blocks.
+
+== 2.3.1
+ * Remove required environment UID in AMEE::Admin classes.
+
 == 2.3.0
  * Remove misleading ItemValueDefinition#type function. Use profile?, data? and
    drill? separately instead.

data/README

@@ -15,6 +15,12 @@ Documentation: http://docs.github.com/Floppy/amee-ruby
 1) Install gem
     > sudo gem install amee
 
+== REQUIREMENTS
+
+'Nokogiri' is used for XML parsing, and requires libxml2. See
+http://nokogiri.org/tutorials/installing_nokogiri.html for instructions if you
+have problems installing.
+
 == IMPORTANT CHANGES when upgrading to 2.2.0 and above
 
 SSL connections are now supported, and are used BY DEFAULT.If you do not want to
@@ -86,11 +92,20 @@ AMEE when your model is saved.
 
 == CACHING
 
-The AMEE::Connection object implements an optional cache for GET requests. This is
-currently a very simple implementation which caches the result of all GET requests
-until a POST, PUT, or DELETE is executed, at which point the cache is cleared. To
-enable caching, set the enable_caching parameter of AMEE::Connection.new to true.
-Caching is disabled by default.
+The AMEE::Connection object implements an optional cache for GET requests.
+
+This uses ActiveSupport::Cache, and supports any ActiveSupport::Cache::Store
+caching method except for MemCacheStore (which doesn't provide required features).
+
+All GET requests are cached. POST, PUT, or DELETEs will clear the cache for any
+path that matches the affected URL. #expire, #expire_matching, and #expire_all
+functions are available for manual cache management. Also, all AMEE objects have
+and #expire-cache function to clear them and their descendants from the cache.
+
+To enable caching, pass ':cache => :memory_store' to AMEE::Connection.new, or add
+'cache: memory_store' to your amee.yml if using Rails. If you want to use the
+same caching configuration as your Rails app, you can add 'cache: rails' to 
+amee.yml instead. Caching is disabled by default.
 
 == UPGRADING TO VERSION > 2
 

data/lib/amee.rb

@@ -1,4 +1,5 @@
 require 'rexml/document'
+require 'nokogiri'
 require 'active_support'
 require 'log4r'
 

data/lib/amee/collection.rb

@@ -25,9 +25,9 @@ module AMEE
           break if @max&&length>=@max
         end
       else
-        REXML::XPath.first(doc,xmlcollectorpath.split('/')[1...-1].join('/')) or
-          raise AMEE::BadData.new("Couldn't load #{self.class.name}.\n#{response}")
-        REXML::XPath.each(doc, xmlcollectorpath) do |p|
+        doc.xpath(xmlcollectorpath.split('/')[1...-1].join('/')).first or
+          raise AMEE::BadData.new("Couldn't load #{self.class.name}. parp\n#{response}")
+        doc.xpath(xmlcollectorpath).each do |p|
           obj=klass.new(parse_xml(p))
           obj.connection = connection
           x= @filter ? @filter.call(obj) : obj
@@ -44,7 +44,7 @@ module AMEE
         @json = true
         @doc = JSON.parse(@response)
       else
-        @doc = REXML::Document.new(@response)
+        @doc = load_xml_doc(@response)
       end
     end
 
@@ -55,7 +55,7 @@ module AMEE
         if json
           @pager = AMEE::Pager.from_json(doc['pager'])
         else
-          @pager = AMEE::Pager.from_xml(REXML::XPath.first(doc, '/Resources//Pager'))
+          @pager = AMEE::Pager.from_xml(doc.xpath('/Resources//Pager').first)
         end
         break if @max && length>=@max
       end while @pager && @pager.next! #pager is nil if no pager in response,

data/lib/amee/connection.rb

@@ -21,9 +21,26 @@ module AMEE
       if !valid?
        raise "You must supply connection details - server, username and password are all required!"
       end
-      @enable_caching = options[:enable_caching]
-      if @enable_caching
-        $cache ||= {}
+      # Handle old option
+      if options[:enable_caching]
+        Kernel.warn '[DEPRECATED] :enable_caching => true is deprecated. Use :cache => :memory_store instead'
+        options[:cache] ||= :memory_store
+      end
+      # Create cache store
+      if options[:cache] &&
+        (options[:cache_store].is_a?(ActiveSupport::Cache::MemCacheStore) ||
+         options[:cache].to_sym == :mem_cache_store)         
+        raise 'ActiveSupport::Cache::MemCacheStore is not supported, as it doesn\'t allow regexp expiry'
+      end
+      if options[:cache_store].is_a?(ActiveSupport::Cache::Store)
+        # Allows assignment of the entire cache store in Rails apps
+        @cache = options[:cache_store]
+      elsif options[:cache]
+        if options[:cache_options]
+          @cache = ActiveSupport::Cache.lookup_store(options[:cache].to_sym, options[:cache_options])
+        else
+          @cache = ActiveSupport::Cache.lookup_store(options[:cache].to_sym)
+        end
       end
       # Make connection to server
       @http = Net::HTTP.new(@server, @port)
@@ -77,18 +94,15 @@ module AMEE
       if params.size > 0
         path += "?#{params.join('&')}"
       end
-      # Send request
-      return $cache[path] if @enable_caching and $cache[path]
-      response = do_request(Net::HTTP::Get.new(path), format)
-      $cache[path] = response if @enable_caching
-      return response
+      # Send request      
+      cache(path) { do_request(Net::HTTP::Get.new(path), format) }
     end
 
     def post(path, data = {})
       # Allow format override
       format = data.delete(:format) || @format
       # Clear cache
-      clear_cache
+      expire_matching "#{raw_path(path)}.*"
       # Create POST request
       post = Net::HTTP::Post.new(path)
       body = []
@@ -104,7 +118,7 @@ module AMEE
       # Allow format override
       format = options.delete(:format) || @format
       # Clear cache
-      clear_cache
+      expire_matching "#{raw_path(path)}.*"
       # Create POST request
       post = Net::HTTP::Post.new(path)
       post['Content-type'] = options[:content_type] || content_type(format)
@@ -117,7 +131,7 @@ module AMEE
       # Allow format override
       format = data.delete(:format) || @format
       # Clear cache
-      clear_cache
+      expire_matching "#{parent_path(path)}.*"
       # Create PUT request
       put = Net::HTTP::Put.new(path)
       body = []
@@ -133,7 +147,7 @@ module AMEE
       # Allow format override
       format = options.delete(:format) || @format
       # Clear cache
-      clear_cache
+      expire_matching "#{parent_path(path)}.*"
       # Create PUT request
       put = Net::HTTP::Put.new(path)
       put['Content-type'] = options[:content_type] || content_type(format)
@@ -143,7 +157,7 @@ module AMEE
     end
 
     def delete(path)
-      clear_cache
+      expire_matching "#{parent_path(path)}.*"
       # Create DELETE request
       delete = Net::HTTP::Delete.new(path)
       # Send request
@@ -242,12 +256,45 @@ module AMEE
       response
     end
 
+    def cache(path, &block)
+      key = cache_key(path)
+      if @cache && @cache.exist?(key)
+        puts "CACHE HIT on #{key}" if @debug
+        return @cache.read(key)
+      end
+      puts "CACHE MISS on #{key}" if @debug
+      data = block.call
+      @cache.write(key, data) if @cache
+      return data
+    end
+
+    def parent_path(path)
+      path.split('/')[0..-2].join('/')
+    end
+
+    def raw_path(path)
+      path.split(/[;?]/)[0]
+    end
+
+    def cache_key(path)
+      # We have to make sure cache keys don't get too long for the filesystem,
+      # so we cut them off if they're too long and add a digest for uniqueness.
+      newpath = (path.length < 255) ? path : path.first(192)+Digest::MD5.hexdigest(path)
+      (@server+newpath)
+    end
+
     public
 
-    def clear_cache
-      if @enable_caching
-        $cache = {}
-      end
+    def expire(path, options = nil)
+      @cache.delete(cache_key(path), options) if @cache
+    end
+
+    def expire_matching(matcher, options = nil)
+      @cache.delete_matched(Regexp.new(cache_key(matcher)), options) if @cache
+    end
+
+    def expire_all
+      @cache.clear if @cache
     end
 
   end

data/lib/amee/data_item_value.rb

@@ -69,24 +69,29 @@ module AMEE
         raise AMEE::BadData.new("Couldn't load DataItemValue from JSON. Check that your URL is correct.\n#{json}")
       end
 
+      def self.xmlpathpreamble
+        "descendant-or-self::ItemValue/"
+      end
+
       def self.from_xml(xml, path)
         # Read XML
-        doc = xml.is_a?(String) ? REXML::Document.new(xml) : xml
+        @doc = xml.is_a?(String) ? load_xml_doc(xml) : xml
         data = {}
-        if REXML::XPath.match(doc,"descendant-or-self::ItemValue").length>1
+        if @doc.xpath("descendant-or-self::ItemValue").length>1
           raise AMEE::BadData.new("Couldn't load DataItemValue from XML. This is an item value history.\n#{xml}")
         end
+        raise if @doc.xpath("descendant-or-self::ItemValue").length==0
         begin
-          data[:uid] = REXML::XPath.first(doc, "descendant-or-self::ItemValue/@uid").to_s
-          data[:created] = DateTime.parse(REXML::XPath.first(doc, "descendant-or-self::ItemValue/@Created").to_s) rescue nil
-          data[:modified] = DateTime.parse(REXML::XPath.first(doc, "descendant-or-self::ItemValue/@Modified").to_s) rescue nil
-          data[:name] = REXML::XPath.first(doc, 'descendant-or-self::ItemValue/Name').text
+          data[:uid] = x "@uid"
+          data[:created] = DateTime.parse(x "@Created") rescue nil
+          data[:modified] = DateTime.parse(x "@Modified") rescue nil
+          data[:name] = x 'Name'
           data[:path] = path.gsub(/^\/data/, '')
-          data[:value] = REXML::XPath.first(doc, 'descendant-or-self::ItemValue/Value').text
-          data[:type] = REXML::XPath.first(doc, 'descendant-or-self::ItemValue/ItemValueDefinition/ValueDefinition/ValueType').text
+          data[:value] = x 'Value'
+          data[:type] = x 'ItemValueDefinition/ValueDefinition/ValueType'
           data[:from_profile] =  false
           data[:from_data] = true
-          data[:start_date] = DateTime.parse(REXML::XPath.first(doc, "descendant-or-self::ItemValue/StartDate").text) rescue nil
+          data[:start_date] = DateTime.parse(x "StartDate") rescue nil
           # Create object
           ItemValue.new(data)
         rescue

data/lib/amee/data_item_value_history.rb

@@ -3,6 +3,7 @@ require 'set'
 module AMEE
   module Data
     class ItemValueHistory
+      extend ParseHelper
 
       def initialize(data = {})
         @type = data ? data[:type] : nil
@@ -84,8 +85,8 @@ module AMEE
         # Read XML
         data = {}
         data[:path] = path.gsub(/^\/data/, '')
-        doc = REXML::Document.new(xml)
-        valuedocs=REXML::XPath.match(doc, '//ItemValue')
+        doc = load_xml_doc(xml)
+        valuedocs=doc.xpath('//ItemValue')
         raise  if valuedocs.length==0
         data[:values] = valuedocs.map do |xml_item_value|
           ItemValue.from_xml(xml_item_value,path)

data/lib/amee/drill_down.rb

@@ -8,6 +8,7 @@ module AMEE
         @choices = data ? data[:choices] : []
         @choice_name = data[:choice_name]
         @selections = data ? data[:selections] : []
+        raise AMEE::ArgumentError.new('No choice_name specified') if @choice_name.nil?
         super
       end
 
@@ -51,30 +52,26 @@ module AMEE
         data[:selections] = selections
         # Create object
         DrillDown.new(data)
-      rescue
+      rescue Exception
         raise AMEE::BadData.new("Couldn't load DrillDown resource from JSON data. Check that your URL is correct.\n#{json}")
       end
-      
+
+      def self.xmlpathpreamble
+        '/Resources/DrillDownResource/'
+      end
+
       def self.from_xml(xml)
         # Parse XML
-        doc = REXML::Document.new(xml)
+        @doc = load_xml_doc(xml)
         data = {}
-        data[:choice_name] = REXML::XPath.first(doc, "/Resources/DrillDownResource/Choices/?ame").text
-        choices = []
-        REXML::XPath.each(doc, "/Resources/DrillDownResource/Choices//Choice") do |c|
-          choices << (c.elements['Value'] || c.elements['value']).text
-        end
-        data[:choices] = choices
-        selections = {}
-        REXML::XPath.each(doc, "/Resources/DrillDownResource/Selections/Choice") do |c|
-          name = (c.elements['Name'] || c.elements['name']).text
-          value = (c.elements['Value'] || c.elements['value']).text
-          selections[name] = value
-        end
-        data[:selections] = selections
+        data[:choice_name] = x('Choices/Name') || x('Choices/name')
+        data[:choices] = [x('Choices/Choices/Choice/Value') || x('Choices/Choice/value')].flatten
+        names = x('Selections/Choice/Name') || x('Selections/Choice/name')
+        values = x('Selections/Choice/Value') || x('Selections/Choice/value')
+        data[:selections] = names && values ? Hash[*(names.zip(values)).flatten] : {}
         # Create object
         DrillDown.new(data)
-      rescue
+      rescue Exception
         raise AMEE::BadData.new("Couldn't load DrillDown resource from XML data. Check that your URL is correct.\n#{xml}")
       end
 
@@ -93,7 +90,7 @@ module AMEE
         drill.connection = connection
         # Done
         return drill
-      rescue
+      rescue Exception
         raise AMEE::BadData.new("Couldn't load DrillDown resource. Check that your URL is correct (#{path}).\n#{response}")
       end
       

data/lib/amee/item_definition.rb

@@ -147,6 +147,10 @@ module AMEE
         raise AMEE::BadData.new("Couldn't delete ProfileItem. Check that your information is correct.")
       end
 
+      def full_path
+        "/definitions/itemDefinitions/#{@uid}"
+      end
+
     end
   end
 end

data/lib/amee/item_value_definition.rb

@@ -229,6 +229,10 @@ module AMEE
         #        raise AMEE::BadData.new("Couldn't delete ItemValueDefinition. Check that your information is correct.")
       end
 
+      def full_path
+        "/definitions/itemDefinitions/#{itemdefuid}/itemValueDefinitions/#{uid}"
+      end
+
     end
 
   end

data/lib/amee/object.rb

@@ -18,5 +18,9 @@ module AMEE
     attr_reader :path
     attr_reader :name
 
+    def expire_cache
+      @connection.expire_matching(full_path+'.*')
+    end
+
   end
 end

data/lib/amee/pager.rb

@@ -1,5 +1,6 @@
 module AMEE
   class Pager
+    extend ParseHelper
 
     def initialize(data)
       @start = data[:start]
@@ -29,17 +30,17 @@ module AMEE
 
     def self.from_xml(node)
       return nil if node.nil? || node.elements.empty?
-      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})
+      return Pager.new({:start => x("Start", :doc => node).to_i,
+                        :from => x("From", :doc => node).to_i,
+                        :to => x("To", :doc => node).to_i,
+                        :items => x("Items", :doc => node).to_i,
+                        :current_page => x("CurrentPage", :doc => node).to_i,
+                        :requested_page => x("RequestedPage", :doc => node).to_i,
+                        :next_page => x("NextPage", :doc => node).to_i,
+                        :previous_page => x("PreviousPage", :doc => node).to_i,
+                        :last_page => x("LastPage", :doc => node).to_i,
+                        :items_per_page => x("ItemsPerPage", :doc => node).to_i,
+                        :items_found => x("ItemsFound", :doc => node).to_i})
     end
 
     def self.from_json(node)

data/lib/amee/parse_helper.rb

@@ -2,7 +2,11 @@ module ParseHelper
   def x(xpath,options = {})
     doc = options[:doc] || @doc
     preamble = options[:meta] == true ? metaxmlpathpreamble : xmlpathpreamble
-    nodes=REXML::XPath.match(doc,"#{preamble}#{xpath}")
+    if doc.is_a?(Nokogiri::XML::Node)
+      nodes = doc.xpath("#{preamble}#{xpath}")
+    else
+      nodes=REXML::XPath.match(doc,"#{preamble}#{xpath}")
+    end
     if nodes.length==1
       if nodes.first.respond_to?(:text)
         return nodes.first.text
@@ -24,6 +28,11 @@ module ParseHelper
   def xmlpathpreamble
     ''
   end
+  def load_xml_doc(xml)
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    doc
+  end
   private :x
 
 end

data/lib/amee/profile.rb

@@ -1,6 +1,7 @@
 module AMEE
   module Profile
     class ProfileList < Array
+      include ParseHelper
       
       def initialize(connection, options = {})
         # Load data from path
@@ -24,15 +25,17 @@ module AMEE
           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|
+          @doc = load_xml_doc(response)
+          @pager = AMEE::Pager.from_xml(@doc.xpath('/Resources/ProfilesResource/Pager').first)
+          @doc.xpath('/Resources/ProfilesResource/Profiles/Profile').each do |p|
             data = {}
-            data[:uid] = p.attributes['uid'].to_s
-            data[:created] = DateTime.parse(p.attributes['created'].to_s)
-            data[:modified] = DateTime.parse(p.attributes['modified'].to_s)
-            data[:name] = p.elements['Name'].text || data[:uid]
-            data[:path] = "/#{p.elements['Path'].text || data[:uid]}"
+            data[:uid] = x '@uid', :doc => p
+            data[:created] = DateTime.parse(x "@created", :doc => p)
+            data[:modified] = DateTime.parse(x "@modified", :doc => p)
+            data[:name] = x('Name', :doc => p)
+            data[:name] = data[:uid] if data[:name].blank?
+            data[:path] = x('Path', :doc => p)
+            data[:path] = "/#{data[:uid]}" if data[:path].blank?
             # Create profile
             profile = Profile.new(data)
             # Store connection in profile object
@@ -56,6 +59,10 @@ module AMEE
         ProfileList.new(connection)
       end
 
+      def self.xmlpathpreamble
+        '/Resources/ProfilesResource/Profile/'
+      end
+
       def self.create(connection)
         # Create new profile
         response = connection.post('/profiles', :profile => true).body
@@ -69,21 +76,22 @@ module AMEE
           data[:created] = DateTime.parse(p['created'])
           data[:modified] = DateTime.parse(p['modified'])
           data[:name] = p['name']
-          data[:path] = p['path']
+          data[:path] = "/#{p['path']}"
           # Create profile
           profile = Profile.new(data)
           # Done
           return profile
         else
           # Read XML
-          doc = REXML::Document.new(response)
-          p = REXML::XPath.first(doc, '/Resources/ProfilesResource/Profile')
+          @doc = load_xml_doc(response)
           data = {}
-          data[:uid] = p.attributes['uid'].to_s
-          data[:created] = DateTime.parse(p.attributes['created'].to_s)
-          data[:modified] = DateTime.parse(p.attributes['modified'].to_s)
-          data[:name] = p.elements['Name'].text || data[:uid]
-          data[:path] = p.elements['Path'].text || data[:uid]
+          data[:uid] = x '@uid'
+          data[:created] = DateTime.parse(x '@created')
+          data[:modified] = DateTime.parse(x '@modified')
+          data[:name] = x 'Name'
+          data[:name] = data[:uid] if data[:name].blank?
+          data[:path] = x 'Path'
+          data[:path] = "/#{data[:uid]}" if data[:path].blank?
           # Create profile
           profile = Profile.new(data)
           # Store connection in profile object

data/lib/amee/profile_item.rb

@@ -151,28 +151,32 @@ module AMEE
         raise AMEE::BadData.new("Couldn't load ProfileItem from XML data. Check that your URL is correct.\n#{xml}")
       end
 
+      def self.xmlpathpreamble
+        "/Resources/ProfileItemResource/"
+      end
+
       def self.from_v2_xml(xml)
         # Parse XML
-        doc = REXML::Document.new(xml)
+        @doc = load_xml_doc(xml)
         data = {}
-        data[:profile_uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/Profile/@uid").to_s
-        data[:data_item_uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/DataItem/@uid").to_s
-        data[:uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/@uid").to_s
-        data[:name] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/Name').text
-        data[:path] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/Path').text || ""
-        data[:total_amount] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/Amount').text.to_f rescue nil
-        data[:total_amount_unit] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/Amount/@unit').to_s rescue nil
-        data[:start_date] = DateTime.parse(REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/StartDate").text)
-        data[:end_date] = DateTime.parse(REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/EndDate").text) rescue nil
+        data[:profile_uid] = x 'Profile/@uid'
+        data[:data_item_uid] = x 'DataItem/@uid'
+        data[:uid] = x 'ProfileItem/@uid'
+        data[:name] = x 'ProfileItem/Name'
+        data[:path] = x('Path') || ""
+        data[:total_amount] = x('ProfileItem/Amount').to_f rescue nil
+        data[:total_amount_unit] = x 'ProfileItem/Amount/@unit' rescue nil
+        data[:start_date] = DateTime.parse(x 'ProfileItem/StartDate')
+        data[:end_date] = DateTime.parse(x 'ProfileItem/EndDate') rescue nil
         data[:values] = []
-        REXML::XPath.each(doc, '/Resources/ProfileItemResource/ProfileItem/ItemValues/ItemValue') do |item|
+        @doc.xpath("#{xmlpathpreamble}ProfileItem/ItemValues/ItemValue").each do |item|
           value_data = {}
           item.elements.each do |element|
             key = element.name
             value = element.text
             case key
               when 'Name', 'Path', 'Value', 'Unit'
-                value_data[key.downcase.to_sym] = value
+                value_data[key.downcase.to_sym] = value.blank? ? nil : value
               when 'PerUnit'
                 value_data[:per_unit] = value
             end
@@ -180,7 +184,7 @@ module AMEE
           value_data[:uid] = item.attributes['uid'].to_s
           data[:values] << value_data
         end
-        data[:amounts] = REXML::XPath.each(doc, '/Resources/ProfileItemResource/ProfileItem/Amounts/Amount').map do |item|
+        data[:amounts] = @doc.xpath('/Resources/ProfileItemResource/ProfileItem/Amounts/Amount').map do |item|
           x = {
             :type => item.attribute('type').value,
             :value => item.text.to_f,
@@ -190,7 +194,7 @@ module AMEE
           x[:default] = (item.attribute('default').value == 'true') if item.attribute('default')
           x
         end
-        data[:notes] = REXML::XPath.each(doc, '/Resources/ProfileItemResource/ProfileItem/Amounts/Note').map do |item|
+        data[:notes] = @doc.xpath('/Resources/ProfileItemResource/ProfileItem/Amounts/Note').map do |item|
           {
             :type => item.attribute('type').value,
             :value => item.text,

data/lib/amee/rails.rb

@@ -12,6 +12,13 @@ module AMEE
           if $AMEE_CONFIG['ssl'] == false
             options.merge! :ssl => false
           end
+          if $AMEE_CONFIG['cache'] == 'rails'
+            # Pass in the rails cache store
+            options[:cache_store] = ActionController::Base.cache_store
+          else
+            options[:cache] ||= $AMEE_CONFIG['cache'] if $AMEE_CONFIG['cache'].present?
+          end
+          options[:enable_debug]   ||= $AMEE_CONFIG['debug'] if $AMEE_CONFIG['debug'].present?
           @connection = self.connect($AMEE_CONFIG['server'], $AMEE_CONFIG['username'], $AMEE_CONFIG['password'], options)
           # Also store as $amee for backwards compatibility, though this is now deprecated
           $amee = @connection

data/lib/amee/user.rb

@@ -15,7 +15,6 @@ module AMEE
         @email = data[:email]
         @status = data[:status]
         @api_version  = data[:api_version].to_f rescue nil
-        @environment_uid = data[:environment_uid]
         super
       end
 
@@ -36,7 +35,6 @@ module AMEE
         # Read JSON
         doc = JSON.parse(json)
         data = {}
-        data[:environment_uid] = doc['user']['environment']['uid']
         data[:uid] = doc['user']['uid']
         data[:created] = DateTime.parse(doc['user']['created'])
         data[:modified] = DateTime.parse(doc['user']['modified'])
@@ -55,7 +53,6 @@ module AMEE
         # Parse data from response into hash
         doc = REXML::Document.new(xml)
         data = {}
-        data[:environment_uid] = REXML::XPath.first(doc, "//Environment/@uid").to_s
         data[:uid] = REXML::XPath.first(doc, "//User/@uid").to_s
         data[:created] = DateTime.parse(REXML::XPath.first(doc, "//User/@created").to_s)
         data[:modified] = DateTime.parse(REXML::XPath.first(doc, "//User/@modified").to_s)
@@ -104,8 +101,7 @@ module AMEE
       end
 
       def full_path
-        prefix = @environment_uid ? "/environments/#{@environment_uid}" : "/admin"
-        "#{prefix}/users/#{uid}"
+        "/admin/users/#{uid}"
       end
 
     end

data/lib/amee/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 2
-  - 4
+  - 5
   - 0
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +01:00
+date: 2010-11-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,23 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 113
+        segments: 
+        - 1
+        - 4
+        - 3
+        - 1
+        version: 1.4.3.1
+  type: :runtime
+  version_requirements: *id005
 description: 
 email: james@floppy.org.uk
 executables: