amee 2.3.1 → 2.4.0

data/lib/amee/collection.rb

@@ -2,11 +2,12 @@ module AMEE
   class Collection < Array
     include ParseHelper
     attr_reader :pager,:connection,:doc,:json,:response
-    def initialize(connection, options = {})
+    def initialize(connection, options = {}, &block)
       # Load data from path
       @options=options
       @max=options.delete :resultMax
       @connection=connection
+      @filter = block
       # Parse data from response     
       each_page do
         parse_page
@@ -29,7 +30,8 @@ module AMEE
         REXML::XPath.each(doc, xmlcollectorpath) do |p|
           obj=klass.new(parse_xml(p))
           obj.connection = connection
-          self << obj
+          x= @filter ? @filter.call(obj) : obj
+          self << x if x
           break if @max&&length>=@max
         end
       end

data/lib/amee/data_category.rb

@@ -68,8 +68,8 @@ module AMEE
         data[:uid] = x '@uid'
         data[:created] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@created").to_s)
         data[:modified] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@modified").to_s)
-        data[:name] = REXML::XPath.first(doc, '/Resources/DataCategoryResource/DataCategory/?ame').text
-        data[:path] = REXML::XPath.first(doc, '/Resources/DataCategoryResource//?ath').text || ""
+        data[:name] = (REXML::XPath.first(doc, '/Resources/DataCategoryResource/DataCategory/Name') || REXML::XPath.first(doc, '/Resources/DataCategoryResource/DataCategory/name')).text
+        data[:path] = (REXML::XPath.first(doc, '/Resources/DataCategoryResource/Path') || REXML::XPath.first(doc, '/Resources/DataCategoryResource/DataCategory/path')).text || ""
         data[:pager] = AMEE::Pager.from_xml(REXML::XPath.first(doc, '//Pager'))
         itemdefattrib=REXML::XPath.first(doc, '/Resources/DataCategoryResource//ItemDefinition/@uid')
         data[:itemdef] = itemdefattrib ? itemdefattrib.to_s : nil

data/lib/amee/version.rb

@@ -2,8 +2,8 @@ module AMEE
   
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 3
-    TINY  = 1
+    MINOR = 4
+    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: 1
+  hash: 31
   prerelease: false
   segments: 
   - 2
-  - 3
-  - 1
-  version: 2.3.1
+  - 4
+  - 0
+  version: 2.4.0
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +01:00
+date: 2010-10-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency