google_apps 0.4.9.1 → 0.4.9.2

data/lib/google_apps/atom/document.rb

@@ -49,9 +49,10 @@ module GoogleApps
         map = Atom::MAPS[map_key]
 
         @document.root.each do |entry|
-          unless entry.name.match 'gd' or entry.name.match 'atom' or entry.name.match 'openSearch'
-            entry.attributes.each do |attribute|
-              instance_variable_set "@#{map[attribute.name.to_sym]}", check_value(attribute.value)
+          intersect = map.keys & entry.attributes.to_h.keys.map(&:to_sym)
+          unless intersect.empty?
+            intersect.each do |attribute|
+              instance_variable_set "@#{map[attribute]}", check_value(entry.attributes[attribute])
             end
           end
         end
@@ -112,7 +113,7 @@ module GoogleApps
             ns[:gd] = Atom::NAMESPACES[:gd]
         end
 
-        ns          
+        ns
       end
     end
   end

data/lib/google_apps/atom/message_attributes.rb

@@ -1,13 +1,22 @@
 module GoogleApps
   module Atom
     class MessageAttributes
+      include Document
+      include Node
+
       attr_reader :labels
       attr_accessor :property
 
-      def initialize
-        @labels = []
-        @document = Atom::XML::Document.new
-        set_header
+      def initialize(xml = nil)
+        if xml
+          @document = parse(xml)
+          find_labels
+          get_item_property
+        else
+          @labels = []
+          @document = Atom::XML::Document.new
+          set_header
+        end
       end
 
       def add_property(prop)
@@ -69,6 +78,14 @@ module GoogleApps
 
         header
       end
+
+      def find_labels
+        @labels = @document.find('//apps:label').inject([]) { |labels, entry| labels << entry.attributes['labelName']; labels }
+      end
+
+      def get_item_property
+        @property = @document.find('//apps:mailItemProperty').first.attributes['value']
+      end
     end
   end
 end

data/lib/google_apps/transport.rb

@@ -15,13 +15,16 @@ module GoogleApps
     }
 
     def initialize(domain, targets = {})
+      @feeds_root = 'https://apps-apis.google.com/a/feeds'
       @auth = targets[:auth] || "https://www.google.com/accounts/ClientLogin"
-      @user = targets[:user] || "https://apps-apis.google.com/a/feeds/#{domain}/user/2.0"
-      @pubkey = targets[:pubkey] || "https://apps-apis.google.com/a/feeds/compliance/audit/publickey/#{domain}"
-      @migration = targets[:migration] || "https://apps-apis.google.com/a/feeds/migration/2.0/#{domain}"
-      @group = targets[:group] || "https://apps-apis.google.com/a/feeds/group/2.0/#{domain}"
-      @nickname = targets[:nickname] || "https://apps-apis.google.com/a/feeds/#{domain}/nickname/2.0"
-      @export = targets[:export] || "https://apps-apis.google.com/a/feeds/compliance/audit/mail/export/#{domain}"
+      @user = targets[:user] || "#{@feeds_root}/#{domain}/user/2.0"
+      @pubkey = targets[:pubkey] || "#{@feeds_root}/compliance/audit/publickey/#{domain}"
+      @migration = targets[:migration] || "#{@feeds_root}/migration/2.0/#{domain}"
+      @group = targets[:group] || "#{@feeds_root}/group/2.0/#{domain}"
+      @nickname = targets[:nickname] || "#{@feeds_root}/#{domain}/nickname/2.0"
+      @audit = "#{@feeds_root}/compliance/audit/mail"
+      @export = targets[:export] || "#{@audit}/export/#{domain}"
+      @monitor = targets[:monitor] || "#{@audit}/monitor/#{domain}"
       @domain = domain
       @requester = AppsRequest || targets[:requester]
       @doc_handler = DocumentHandler.new format: (targets[:format] || :atom)
@@ -61,8 +64,9 @@ module GoogleApps
     def request_export(username, document)
       result = add(@export + "/#{username}", :export_response, document)
       
-      get_values(result, 'apps:property', ['name', 'requestId'], 'value')[0].to_i
-      #success_response? ? get_values('apps:property', ['name', 'requestId'], 'value')[0].to_i : @response
+      result.find('//apps:property').inject(nil) do |request_id, node| 
+        node.attributes['name'] == 'requestId' ? node.attributes['value'].to_i : request_id
+      end
     end
 
 
@@ -182,7 +186,7 @@ module GoogleApps
       options[:limit] ? limit = options[:limit] : limit = 1000000
       options[:start] ? get(instance_variable_get("@#{type}") + "?#{start_query(type)}=#{options[:start]}", :feed) : get(instance_variable_get("@#{type}"), :feed)
 
-      fetch_feed(page, limit)
+      fetch_feed(page, limit, :feed)
 
       @response
     end
@@ -379,20 +383,20 @@ module GoogleApps
 
 
     # get_next_page retrieves the next page in the response.
-    def get_next_page
-      get @feeds.last.next_page
+    def get_next_page(type)
+      get @feeds.last.next_page, type
       add_feed
     end
 
 
     # fetch_feed retrieves the remaining pages in the request.
     # It takes a page and a limit as arguments.
-    def fetch_feed(page, limit)
+    def fetch_feed(page, limit, type)
       add_feed
       page += 1
 
       while (@feeds.last.next_page) and (page * PAGE_SIZE[:user] < limit)
-        get_next_page
+        get_next_page type
         page += 1
       end
     end
@@ -421,16 +425,6 @@ module GoogleApps
       @feeds << GoogleApps::Atom.feed(@response.body)
     end
 
-    # get_values returns an array of all the value attributes
-    # on elements matching the given key_attrib pair on the
-    # specified element type.
-    def get_values(document, element, key_attrib, value = 'value')
-      document.find('//' + element).inject([]) do |values, element|
-        values << element.attributes[value] if element.attributes[key_attrib[0]].match key_attrib[1]
-        values
-      end
-    end
-
 
     def headers(category)
       case category

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_apps
 version: !ruby/object:Gem::Version
-  version: 0.4.9.1
+  version: 0.4.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby