google_apps 0.4.9.9 → 0.5

data/lib/google_apps/atom/atom.rb

@@ -21,27 +21,6 @@ module GoogleApps
       openSearch: 'http://a9.com/-/spec/opensearchrss/1.0/'
     }
 
-    MAPS = {
-      user: {
-        userName: :login,
-        suspended: :suspended,
-        familyName: :last_name,
-        givenName: :first_name,
-        limit: :quota,
-        password: :password
-      },
-      nickname: {
-        name: :nickname,
-        userName: :user
-      },
-      group: {
-        groupId: :id,
-        groupName: :name,
-        emailPermission: :permission,
-        description: :description
-      }
-    }
-
     CATEGORY = {
       user: [['scheme', 'http://schemas.google.com/g/2005#kind'], ['term', 'http://schemas.google.com/apps/2006#user']],
       nickname: [['scheme', 'http://schemas.google.com/g/2005#kind'], ['term', 'http://schemas.google.com/apps/2006#nickname']]
@@ -50,13 +29,21 @@ module GoogleApps
 
     ENTRY_TAG = ["<atom:entry xmlns:atom=\"#{NAMESPACES[:atom]}\" xmlns:apps=\"#{NAMESPACES[:apps]}\" xmlns:gd=\"#{NAMESPACES[:gd]}\">", '</atom:entry>']
 
-    DOCUMENTS = %w(user export group group_member message_attributes public_key feed nickname)
 
-    # The idea is to make document distribution more dynamic.
-    # Might be pointless but it's here for now.
-    DOCUMENTS.each do |doc|
-      eval "def #{doc}(*args)\n  #{doc.camel_up}.new *args\nend" # Needs __file__ and __line__
-      module_function doc.to_sym
+
+    # 
+    # Adds a Module Function that creates a corresponding document.
+    # This allows for a centralized location for document creation.
+    # 
+    # @param [String] type
+    # 
+    # @visibility public
+    # @return 
+    def add_doc_dispatcher(type)
+      eval "def #{type}(*args)\n  #{type.camel_up}.new *args\nend" # Needs __file__ and __line__
+      module_function type.to_sym
     end
+
+    module_function :add_doc_dispatcher
   end
 end

data/lib/google_apps/atom/document.rb

@@ -1,6 +1,73 @@
 module GoogleApps
   module Atom
-    module Document
+    class Document
+      include Node
+
+      @types = []
+
+      #
+      # @param [String] doc
+      # @param [Hash] map
+      #
+      # @visibility public
+      # @return
+      def initialize(doc, map = {})
+        @doc = doc.nil? ? new_empty_doc : parse(doc)
+        @map = map
+      end
+
+
+      #
+      # Document keeps track of all it's subclasses.  This makes
+      # it easy to look up the document types supported by the
+      # library.
+      #
+      # @param [Constant] subclass
+      #
+      # @visibility public
+      # @return
+      def self.inherited(subclass)
+        self.add_type subclass
+        Atom.add_doc_dispatcher self.sub_to_meth(subclass)
+      end
+
+
+      #
+      # Change subclass constant into a valid method name.
+      #
+      # @param [Constant] subclass should be a class name
+      #
+      # @visibility public
+      # @return
+      def self.sub_to_meth(subclass)
+        subclass.to_s.split('::').last.scan(/[A-Z][a-z0-9]+/).map(&:downcase).join('_')
+      end
+
+
+      #
+      # Accessor for the Document types array.  This array is a
+      # list of all subclasses of GoogleApps::Atom::Document
+      #
+      # @visibility public
+      # @return
+      def self.types
+        @types
+      end
+
+
+      #
+      # Adds a subclass to the @types array.
+      #
+      # @param [Constant] type
+      #
+      # @visibility public
+      # @return
+      def self.add_type(type)
+        # TODO:  Need to convert from const to symbol before adding
+        @types << type
+      end
+
+
       # parse takes xml, either a document or a string
       # and returns a parsed document.  Since libxml-ruby
       # doesn't build a parse tree dynamically this
@@ -38,19 +105,37 @@ module GoogleApps
       end
 
 
-      # find_values searches @document and assigns any values
+      # find_values searches @doc and assigns any values
       # to their corresponding instance variables.  This is
       # useful when we've been given a string of XML and need
       # internal consistency in the object.
       #
       # find_values
       def find_values
-        map_key = self.class.to_s.split(':').last.downcase.to_sym
-        map = Atom::MAPS[map_key]
+        @doc.root.each do |entry|
+          intersect = @map.keys & entry.attributes.to_h.keys.map(&:to_sym)
+          set_instances(intersect, entry) unless intersect.empty?
+        end
+      end
+
 
-        @document.root.each do |entry|
-          intersect = map.keys & entry.attributes.to_h.keys.map(&:to_sym)
-          set_instances(intersect, entry, map) unless intersect.empty?
+      # find_and_update updates the values for the specified
+      # attributes on the node specified by the given xpath
+      # value.  It is ill behaved and will change any
+      # matching attributes in any node returned using the
+      # given xpath.
+      #
+      # find_and_update takes an xpath value and a hash of
+      # attribute names with current and new value pairs.
+      #
+      # find_and_update '/apps:nickname', name: ['Bob', 'Tom']
+      def find_and_update(xpath, attributes)
+        @doc.find(xpath).each do |node|
+          if node_match?(node, attributes)
+            attributes.each_key do |attrib|
+              node.attributes[attrib.to_s] = attributes[attrib][1]
+            end
+          end
         end
       end
 
@@ -66,27 +151,23 @@ module GoogleApps
       #
       # @visibility public
       # @return
-      def set_instances(intersect, node, map)
+      def set_instances(intersect, node)
         intersect.each do |attribute|
-          instance_variable_set "@#{map[attribute]}", check_value(node.attributes[attribute])
+          instance_variable_set "@#{@map[attribute]}", check_value(node.attributes[attribute])
         end
       end
 
 
       #
-
       #  Sets instance variables for property list type documents.
       #
       # @visibility public
       # @return
       def attrs_from_props
-        map_key = self.class.to_s.split(':').last.downcase.to_sym
-        map = Atom::MAPS[map_key]
-
-        @document.find('//apps:property').each do |entry|
+        @doc.find('//apps:property').each do |entry|
           prop_name = entry.attributes['name'].to_sym
-          if map.keys.include?(prop_name)
-            instance_variable_set "@#{map[prop_name]}", check_value(entry.attributes['value'])
+          if @map.keys.include?(prop_name)
+            instance_variable_set "@#{@map[prop_name]}", check_value(entry.attributes['value'])
           end
         end
       end
@@ -100,11 +181,11 @@ module GoogleApps
       # build_root returns an atom:entry node with an
       # apps:category element appropriate for the document
       # type.
-      def build_root
+      def build_root(type)
         root = create_node(type: 'atom:entry')
 
-        add_namespaces root, determine_namespaces
-        root << create_node(type: 'apps:category', attrs: Atom::CATEGORY[type_to_sym]) if Atom::CATEGORY[type_to_sym]
+        add_namespaces root, determine_namespaces(type)
+        root << create_node(type: 'apps:category', attrs: Atom::CATEGORY[type.to_sym]) if Atom::CATEGORY[type.to_sym]
 
         root
       end
@@ -138,10 +219,10 @@ module GoogleApps
       # determine_namespaces
       #
       # determine_namespaces returns a hash
-      def determine_namespaces
+      def determine_namespaces(type)
         ns = { atom: Atom::NAMESPACES[:atom], apps: Atom::NAMESPACES[:apps] }
 
-        case type_to_s
+        case type.to_s
           when 'group', 'groupmember'
             ns[:gd] = Atom::NAMESPACES[:gd]
         end
@@ -159,10 +240,19 @@ module GoogleApps
       # @visibility public
       # @return
       def delete_node(xpath, attrs)
-        @document.find(xpath).each do |node|
+        @doc.find(xpath).each do |node|
           node.remove! if node_match?(node, attrs)
         end
       end
+
+
+      # Prints the contents of @doc
+      #
+      # @visibility public
+      # @return
+      def to_s
+        @doc.to_s
+      end
     end
   end
 end

data/lib/google_apps/atom/export.rb

@@ -1,20 +1,17 @@
 module GoogleApps
   module Atom
-    class Export
-      include Atom::Node
-      include Atom::Document
-
+    class Export < Document
       HEADER = 'HEADER_ONLY'
       FULL = 'FULL_MESSAGE'
 
       def initialize(xml = nil)
-        @document = Atom::XML::Document.new
-        @document.root = build_root
+        super(xml)
+        @doc.root = build_root(:export) unless xml
       end
 
-      # to_s returns @document as a string.
+      # to_s returns @doc as a string.
       def to_s
-        @document.to_s
+        @doc.to_s
       end
       
       # start_date specifies a start date for the extract.  
@@ -29,7 +26,7 @@ module GoogleApps
       #
       # start_date '2012-01-01 00:00'
       #
-      # start_date returns @document.root
+      # start_date returns @doc.root
       def start_date(date)
         add_prop('beginDate', date)
       end
@@ -46,7 +43,7 @@ module GoogleApps
       #
       # end_date '2012-01-01 08:30'
       #
-      # end_date returns @document.root
+      # end_date returns @doc.root
       def end_date(date)
         add_prop('endDate', date)
       end
@@ -57,7 +54,7 @@ module GoogleApps
       #
       # include_deleted
       #
-      # include_deleted returns @document.root
+      # include_deleted returns @doc.root
       def include_deleted
         add_prop('includeDeleted', 'true')
       end
@@ -69,7 +66,7 @@ module GoogleApps
       #
       # query 'from: Bob'
       #
-      # query returns @document.root
+      # query returns @doc.root
       def query(query_string)
         add_prop('searchQuery', query_string)
       end
@@ -80,7 +77,7 @@ module GoogleApps
       #
       # content 'HEADER_ONLY'
       #
-      # content returns @document.root
+      # content returns @doc.root
       def content(type)
         add_prop('packageContent', type)
       end
@@ -92,10 +89,10 @@ module GoogleApps
       # a mailbox extract as specified by the GoogleApps
       # Email Audit API.
       def set_header
-        @document.root = Atom::XML::Node.new 'atom:entry'
+        @doc.root = Atom::XML::Node.new 'atom:entry'
 
-        Atom::XML::Namespace.new(@document.root, 'atom', 'http://www.w3.org/2005/Atom')
-        Atom::XML::Namespace.new(@document.root, 'apps', 'http://schemas.google.com/apps/2006')
+        Atom::XML::Namespace.new(@doc.root, 'atom', 'http://www.w3.org/2005/Atom')
+        Atom::XML::Namespace.new(@doc.root, 'apps', 'http://schemas.google.com/apps/2006')
       end
 
       # add_prop adds an element of the type: apps:property
@@ -105,7 +102,7 @@ module GoogleApps
         prop['name'] = name
         prop['value'] = value
 
-        @document.root << prop
+        @doc.root << prop
       end
     end
   end

data/lib/google_apps/atom/feed.rb

@@ -1,28 +1,27 @@
 module GoogleApps
   module Atom
-    class Feed
+    class Feed < Document
       # TODO: Google's feed responses are inconsistent.  Will need special fun time, assholes.
-
-      include Atom::Node
-      include Atom::Document
-
-      attr_reader :xml, :items, :next_page
+      attr_reader :doc, :items, :next_page
 
       # TODO: Figure out how to handle Group Members.  The regex below
       # doesn't work in that case as group members also have group in
       # the id url.
-      TYPE_MATCH = /<id.*(user|group.*member|nickname|group).*?<\/id/
+      TYPE_MATCH = /\/(user|nickname|group|member)/
 
 
       def initialize(xml)
-        type = xml.match(TYPE_MATCH).captures[0]
-        type.sub!(/\//, '_')
+        id_element = xml.scan(/<id.*?\/id/).first
+        matches = id_element.scan(TYPE_MATCH).flatten
+        type = matches.join '_'
 
-        @xml = parse(xml)
-        @items = entries_from document: @xml, type: type, entry_tag: 'entry'
+        super(xml)
+
+        @items = entries_from document: @doc, type: type, entry_tag: 'entry'
       end
 
-      # TODO: Need to make sure this works for feeds other than user.
+
+      # TODO:  There is no reason not to document.  Especially with complicated methods.
       def entries_from(properties)
         type = properties[:type].to_sym
 
@@ -36,6 +35,7 @@ module GoogleApps
       end
 
 
+      # TODO:  Obvious but still needs documentation.
       def set_next_page(node)
         @next_page = node.attributes[:href]
       end

data/lib/google_apps/atom/group.rb

@@ -1,21 +1,18 @@
 module GoogleApps
   module Atom
-    class Group
-      include Atom::Node
-      include Atom::Document
-
+    class Group < Document
       attr_accessor :id, :name, :description, :permissions
 
-      #ATTRIBUTES = %w(id name description perms).map(&:to_sym)
+      MAP = {
+        groupId: :id,
+        groupName: :name,
+        emailPermission: :permission,
+        description: :description
+      }
 
       def initialize(xml = nil)
-        if xml
-          @document = parse(xml)
-          attrs_from_props
-        else
-          @document = Atom::XML::Document.new
-          @document.root = build_root
-        end
+        super(xml, MAP)
+        xml ? attrs_from_props : @doc.root = build_root(:group)
       end
 
       # new_group populates the Group XML document with
@@ -27,7 +24,7 @@ module GoogleApps
       # new_group id: 'ID', name: 'Name', description: 'Group Description',
       #           perms: 'emailPermissions'
       #
-      # new_group returns @document.root
+      # new_group returns @doc.root
       def new_group(group_data)
         [:id, :name].each { |attr| raise(ArgumentError, "Missing or Invalid Parameter(s)") unless group_data.key?(attr) }
         set_values group_data
@@ -35,26 +32,26 @@ module GoogleApps
 
 
       # set_values will add the specified group attributes
-      # to @document.  set_values accepts a hash with any of
+      # to @doc.  set_values accepts a hash with any of
       # the following keys:  id:, name:, description:, perms:
       #
       # set_values id: 'blah', description: 'Unexciting and uninspired'
       #
-      # set_values returns @document.root
+      # set_values returns @doc.root
       def set_values(group_values)
         group_values.keys.each do |key|
           prop = Atom::XML::Node.new('apps:property')
           prop_name(prop, key)
           prop.attributes['value'] = group_values[key]
-          @document.root << prop
+          @doc.root << prop
         end
 
-        @document.root
+        @doc.root
       end
 
 
       def change_value(name, old_value, new_value)
-        find_and_update @document, '//apps:property', { name => [old_value, new_value] }
+        find_and_update '//apps:property', { name => [old_value, new_value] }
       end
 
       # TODO:  This needs to check all attributes of the element
@@ -62,7 +59,7 @@ module GoogleApps
         @id ? change_value(:value, @id, value) : set_values(id: value)
 
         @id = value
-        @document = parse(@document)
+        @doc = parse(@doc)
       end
 
 
@@ -70,7 +67,7 @@ module GoogleApps
         @name ? change_value(:value, @name, value) : set_values(name: value)
 
         @name = value
-        @document = parse(@document)
+        @doc = parse(@doc)
       end
 
 
@@ -78,7 +75,7 @@ module GoogleApps
         @permissions ? change_value(:value, @permissions, value) : set_values(perms: value)
 
         @permissions = value
-        @document = parse(@document)
+        @doc = parse(@doc)
       end
 
 
@@ -86,13 +83,13 @@ module GoogleApps
         @description ? change_value(:value, @description, value) : set_values(description: value)
 
         @description = value
-        @document = parse(@document)
+        @doc = parse(@doc)
       end
 
 
-      # to_s returns @document as a String.
+      # to_s returns @doc as a String.
       def to_s
-        @document.to_s
+        @doc.to_s
       end
 
       private

data/lib/google_apps/atom/group_member.rb

@@ -1,19 +1,11 @@
 module GoogleApps
   module Atom
-    class GroupMember
-      include Atom::Node
-      include Atom::Document
-
+    class GroupMember < Document
       attr_accessor :member, :type
 
       def initialize(xml = nil)
-        if xml
-          @document = parse(xml)
-          populate_self
-        else
-          @document = Atom::XML::Document.new
-          @document.root = build_root
-        end
+        super(xml)
+        xml ? populate_self : @doc.root = build_root(:groupmember)
       end
 
 
@@ -27,7 +19,7 @@ module GoogleApps
       def member=(member)
         @member.nil? ? add_node('memberId', member) : change_node('memberId', member)
 
-        @document = parse(@document)
+        @doc = parse(@doc)
         @member = member
       end
 
@@ -35,38 +27,38 @@ module GoogleApps
       def type=(type)
         @type.nil? ? add_node('memberType', type) : change_node('memberType', type)
 
-        @document = parse(@document)
+        @doc = parse(@doc)
         @type = type
       end
       
 
-      # to_s returns @document as a string.
+      # to_s returns @doc as a string.
       def to_s
-        @document.to_s
+        @doc.to_s
       end
 
 
       private
 
-      # 
-      # @param [] type
-      # @param [] value
-      # 
-      # @visibility private
+      # 
+      # @param [] type
+      # @param [] value
+      # 
+      # @visibility private
       # @return 
       def add_node(type, value)
-        @document.root << create_node(type: 'apps:property', attrs: [['name', type], ['value', value]])
+        @doc.root << create_node(type: 'apps:property', attrs: [['name', type], ['value', value]])
       end
 
 
       def change_node(type, value)
-        @document.find('//apps:property').each do |node|
+        @doc.find('//apps:property').each do |node|
           node.attributes['value'] = value if node.attributes['name'] == type
         end
       end
 
       # change_member changes the value attribute of the
-      # apps:property element in @document to the value
+      # apps:property element in @doc to the value
       # of the provided argument.  It also sets @member
       # to the provided argument.
       #
@@ -76,7 +68,7 @@ module GoogleApps
       def change_member(member)
         # This really should use find but I can't figure out how to
         # get the XPath to work with this document.
-        @document.root.each do |node|
+        @doc.root.each do |node|
           node.attributes['value'] = member if node.attributes['value'] == @member
         end
 
@@ -84,12 +76,12 @@ module GoogleApps
       end
 
 
-      # 
-      # 
-      # @visibility private
+      # 
+      # 
+      # @visibility private
       # @return 
       def populate_self
-        @document.find('//apps:property').each do |node|
+        @doc.find('//apps:property').each do |node|
           @member = node.attributes['value'] if node.attributes['name'] == 'memberId'
           @type = node.attributes['value'] if node.attributes['name'] == 'memberType'
         end

data/lib/google_apps/atom/group_owner.rb

@@ -0,0 +1,41 @@
+module GoogleApps
+  module Atom
+    class GroupOwner < Document
+      attr_reader :address
+
+      def initialize(xml = nil)
+        super(xml)
+        xml ? attrs_from_props : @doc.root = build_root(:group)
+      end
+
+
+      #
+      # @param [String] address email address of the owner object.
+      #
+      # @visibility public
+      # @return
+      def add_address(address)
+        add_prop_node('email', address)
+        @doc = parse @doc
+      end
+
+
+      def update_address(address)
+        find_and_update '//apps:property', { name: ['email', 'email'], value: [@address, address] }
+        @doc = parse @doc
+      end
+
+
+      #
+      # @param [String] value Email address for the owner object
+      #
+      # @visibility public
+      # @return
+      def address=(value)
+        @address ? update_address(value) : add_address(value)
+
+        @address = value
+      end
+    end
+  end
+end

data/lib/google_apps/atom/message_attributes.rb

@@ -1,20 +1,24 @@
 module GoogleApps
   module Atom
-    class MessageAttributes
-      include Document
-      include Node
-
+    class MessageAttributes < Document
       attr_reader :labels
       attr_accessor :property
 
+      DRAFT = 'IS_DRAFT'
+      INBOX = 'IS_INBOX'
+      SENT = 'IS_SENT'
+      TRASH = 'IS_TRASH'
+      STARRED = 'IS_STARRED'
+      UNREAD = 'IS_UNREAD'
+
       def initialize(xml = nil)
+        super(xml)
+        
         if xml
-          @document = parse(xml)
           find_labels
           get_item_property
         else
           @labels = []
-          @document = Atom::XML::Document.new
           set_header
         end
       end
@@ -23,8 +27,8 @@ module GoogleApps
         property = Atom::XML::Node.new 'apps:mailItemProperty'
         property['value'] = prop
 
-        @document.root << property
-        @document = parse(@document)
+        @doc.root << property
+        @doc = parse(@doc)
       end
 
       def property=(value)
@@ -35,9 +39,9 @@ module GoogleApps
         label = Atom::XML::Node.new 'apps:label'
         label['labelName'] = name
 
-        @document.root << label
+        @doc.root << label
         @labels << name
-        @document = parse(@document)
+        @doc = parse(@doc)
       end
 
       def <<(value)
@@ -50,19 +54,19 @@ module GoogleApps
       end
 
       def to_s
-        @document.to_s
+        @doc.to_s
       end
 
       private
 
       def set_header
-        @document.root = Atom::XML::Node.new 'atom:entry' # API Docs show just entry here
+        @doc.root = Atom::XML::Node.new 'atom:entry' # API Docs show just entry here
 
-        Atom::XML::Namespace.new(@document.root, 'atom', 'http://www.w3.org/2005/Atom') # API Docs show this as just xmlns
-        Atom::XML::Namespace.new(@document.root, 'apps', 'http://schemas.google.com/apps/2006')
+        Atom::XML::Namespace.new(@doc.root, 'atom', 'http://www.w3.org/2005/Atom') # API Docs show this as just xmlns
+        Atom::XML::Namespace.new(@doc.root, 'apps', 'http://schemas.google.com/apps/2006')
 
-        @document.root << category
-        @document.root << content
+        @doc.root << category
+        @doc.root << content
       end
 
       def category
@@ -82,11 +86,11 @@ module GoogleApps
       end
 
       def find_labels
-        @labels = @document.find('//apps:label').inject([]) { |labels, entry| labels << entry.attributes['labelName']; labels }
+        @labels = @doc.find('//apps:label').inject([]) { |labels, entry| labels << entry.attributes['labelName']; labels }
       end
 
       def get_item_property
-        @property = @document.find('//apps:mailItemProperty').first.attributes['value']
+        @property = @doc.find('//apps:mailItemProperty').first.attributes['value']
       end
     end
   end

data/lib/google_apps/atom/nickname.rb

@@ -1,16 +1,16 @@
 module GoogleApps
   module Atom
-    class Nickname
-      include Atom::Node
-      include Atom::Document
+    class Nickname < Document
+      attr_reader :nickname, :user, :doc
 
-      attr_reader :nickname, :user, :document
-
-      ELEMENTS = { nick: ['apps:nickname', 'name'], user: ['apps:login', 'userName'] }
+      MAP = {
+        name: :nickname,
+        userName: :user
+      }
 
       def initialize(xml = nil)
-        @document = Atom::XML::Document.new
-        @document.root = build_root
+        super(xml, MAP)
+        @doc.root = build_root(:nickname) unless xml
       end
 
       # nickname= sets the nickname value on the object and in the
@@ -20,7 +20,7 @@ module GoogleApps
       #
       # nickname= returns the new nickname value
       def nickname=(nick)
-        @nickname ? find_and_update(@document, '//apps:nickname', name: [@nickname, nick]) : create('nickname', nick)
+        @nickname ? find_and_update('//apps:nickname', name: [@nickname, nick]) : create('nickname', nick)
 
         @nickname = nick
       end
@@ -34,7 +34,7 @@ module GoogleApps
       #
       # user= returns the new username value
       def user=(username)
-        @user ? find_and_update(@document, '//apps:login', userName: [@user, username]) : create('login', username)
+        @user ? find_and_update('//apps:login', userName: [@user, username]) : create('login', username)
 
         @user = username
       end
@@ -42,7 +42,7 @@ module GoogleApps
 
       # to_s returns the underlying XML document as a string.
       def to_s
-        @document.to_s
+        @doc.to_s
       end
 
 
@@ -50,7 +50,7 @@ module GoogleApps
       private
 
 
-      # create adds the specified node to @document.  It takes
+      # create adds the specified node to @doc.  It takes
       # a type and a value as arguments.
       #
       # create 'nickname', 'Bob'
@@ -59,12 +59,12 @@ module GoogleApps
       def create(type, value)
         case type
         when 'nickname'
-          @document.root << create_node(type: 'apps:nickname', attrs: [['name', value]])
+          @doc.root << create_node(type: 'apps:nickname', attrs: [['name', value]])
         when 'login'
-          @document.root << create_node(type: 'apps:login', attrs: [['userName', value]])
+          @doc.root << create_node(type: 'apps:login', attrs: [['userName', value]])
         end
 
-        @document = parse @document
+        @doc = parse @doc
       end
     end
   end

data/lib/google_apps/atom/node.rb

@@ -20,6 +20,19 @@ module GoogleApps
       end
 
 
+      #
+      # @param [String] name the value for the name attribute
+      # @param [String] value the value for the value attribute
+      #
+      # @visibility public
+      # @return
+      def add_prop_node(name, value, node = nil)
+        node ||= @doc.root
+
+        node << create_node({type: 'apps:property', attrs: [['name', name], ['value', value]]})
+      end
+
+
       # add_namespaces adds the specified namespaces to the
       # specified node.  namespaces should be a hash of name,
       # value pairs.
@@ -52,33 +65,11 @@ module GoogleApps
       end
 
 
-      # update_node updates the values for the specified
-      # attributes on the node specified by the given xpath
-      # value.  It is ill behaved and will change any
-      # matching attributes in any node returned using the
-      # given xpath.
-      #
-      # update_node takes a document (must be parsed), an
-      # xpath value and a hash of attribute names with
-      # current and new value pairs.
-      #
-      # update_node document, '/apps:nickname', name: ['Bob', 'Tom']
-      def find_and_update(document, xpath, attributes)
-        document.find(xpath).each do |node|
-          if node_match?(node, attributes)
-            attributes.each_key do |attrib|
-              node.attributes[attrib.to_s] = attributes[attrib][1]
-            end
-          end
-        end
-      end
-
-
       # node_match? checks that each value for each specified
       # attribute matches the specified value.
       def node_match?(node, attributes)
         attributes.keys.inject(true) do |result, key|
-          result and node.attributes[key.to_s] == attributes[key][0]
+          result and node.attributes[key].to_s == attributes[key][0]
         end
       end
 

data/lib/google_apps/atom/public_key.rb

@@ -1,14 +1,11 @@
 module GoogleApps
   module Atom
-    class PublicKey
-      include Atom::Node
-      include Atom::Document
-
-      attr_reader :document
+    class PublicKey < Document
+      attr_reader :doc
 
       def initialize
-        @document = Atom::XML::Document.new
-        @document.root = build_root
+        super(nil)
+        @doc.root = build_root :publickey
       end
       
       # new_key adds the actual key to the PublicKey
@@ -16,18 +13,18 @@ module GoogleApps
       #
       # new_key 'key'
       #
-      # new_key returns @document.root
+      # new_key returns @doc.root
       def new_key(key)
         property = Atom::XML::Node.new('apps:property')
         property['name'] = 'publicKey'
         property['value'] = Base64.encode64 key
 
-        @document.root << property
+        @doc.root << property
       end
 
-      # to_s returns @document as a String
+      # to_s returns @doc as a String
       def to_s
-        @document.to_s
+        @doc.to_s
       end
     end
   end

data/lib/google_apps/atom/user.rb

@@ -2,19 +2,25 @@ module GoogleApps
 	module Atom
     # TODO: Move User attribute map to user class
     # TODO: Update attribute map to include @ for instance variables
-  	class User
-      include Atom::Node
-      include Atom::Document
-
-      attr_reader :document, :login, :suspended, :first_name, :last_name, :quota, :password
+  	class User < Document
+      attr_reader :doc, :login, :suspended, :first_name, :last_name, :quota, :password
+
+      MAP = {
+        userName: :login,
+        suspended: :suspended,
+        familyName: :last_name,
+        givenName: :first_name,
+        limit: :quota,
+        password: :password
+      }
 
   		def initialize(xml = nil)
         if xml
-          @document = parse(xml)
+          super(xml, MAP)
           find_values
         else
-          @document = new_empty_doc
-  			  @document.root = build_root
+          super(nil, MAP)
+  			  @doc.root = build_root :user
         end
   		end
 
@@ -34,15 +40,15 @@ module GoogleApps
       # add_node creates the specified node in the user document.  It
       # takes a type/name and an array of attribute, value pairs as
       # arguments.  It also parses the new document and saves the
-      # copy in @document
+      # copy in @doc
       #
       # add_node 'apps:login', [['userName', 'Zanzabar']]
       #
       # add_node returns a parsed copy of the new document.
-      def add_node(type, attrs) # TODO: Should take a target argument rather than only appending to @document.root
-        @document.root << create_node(type: type, attrs: attrs)
+      def add_node(type, attrs) # TODO: Should take a target argument rather than only appending to @doc.root
+        @doc.root << create_node(type: type, attrs: attrs)
 
-        @document = parse @document
+        @doc = parse @doc
       end
 
 
@@ -51,13 +57,13 @@ module GoogleApps
       #
       # update_node 'apps:login', :userName, true
       def update_node(type, attribute, value)
-        find_and_update @document, "//#{type}", { attribute => [instance_variable_get("@#{Atom::MAPS[:user][attribute]}").to_s, value.to_s]}
+        find_and_update "//#{type}", { attribute => [instance_variable_get("@#{MAP[attribute]}").to_s, value.to_s]}
       end
 
 
       # TODO: Move this method.
       def node(name)
-        @document.find_first("//#{name}")
+        @doc.find_first("//#{name}")
       end
 
 
@@ -152,9 +158,9 @@ module GoogleApps
       end
 
 
-      # to_s returns @document as a string
+      # to_s returns @doc as a string
       def to_s
-        @document.to_s
+        @doc.to_s
       end
 
 
@@ -162,7 +168,7 @@ module GoogleApps
 
       # new_doc re-initializes the XML document.
       def new_doc
-        @document = Atom::XML::Document.new
+        @doc = Atom::XML::Document.new
       end
   	end
   end

data/lib/google_apps/document_handler.rb

@@ -1,11 +1,12 @@
 module GoogleApps
   class DocumentHandler
+    # TODO: Should get type list from Document Parent class, not format namespace.
     attr_accessor :format
 
     def initialize(args)
       set_format args[:format]
     end
-    
+
 
     # create_doc creates a document of the specified format
     # from the given string.
@@ -51,11 +52,16 @@ module GoogleApps
     def look_up_doc_types
       case @format
       when :atom, :xml
-        Atom::DOCUMENTS
+        Atom::Document.types.inject([]) { |types, subclass| types | [sub_to_meth(subclass)] }
       end
     end
 
 
+    def sub_to_meth(subclass) # TODO: This shouldn't be both here and in GoogleApps::Atom::Document
+      subclass.to_s.split('::').last.scan(/[A-Z][a-z0-9]+/).map(&:downcase).join('_')
+    end
+
+
     # set_format Sets @format and @documents
     def set_format(format)
       @format = format

data/lib/google_apps/transport.rb

@@ -63,8 +63,8 @@ module GoogleApps
     # the HTTP response object on failure.
     def request_export(username, document)
       result = add(@export + "/#{username}", :export_response, document)
-      
-      result.find('//apps:property').inject(nil) do |request_id, node| 
+
+      result.find('//apps:property').inject(nil) do |request_id, node|
         node.attributes['name'] == 'requestId' ? node.attributes['value'].to_i : request_id
       end
     end
@@ -188,23 +188,26 @@ module GoogleApps
 
       fetch_feed(page, limit, :feed)
 
-      #@response
+      #@response
       return_all
     end
 
 
     # Retrieves the members of the requested group.
-    # 
+    #
     # @param [String] group_id the Group ID in the Google Apps Environment
-    # 
+    #
     # @visibility public
-    # @return 
+    # @return
     def get_members_of(group_id, options = {})
       options[:extra] = "/#{group_id}/member"
       get_all :groups, options
     end
 
 
+    # TODO:  Refactor add tos.
+
+
     # add_member_to adds a member to a group in the domain.
     # It takes a group_id and a GoogleApps::Atom::GroupMember
     # document as arguments.
@@ -217,6 +220,18 @@ module GoogleApps
     end
 
 
+    #
+    # @param [String] group_id The ID for the group being modified
+    # @param [GoogleApps::Atom::GroupOwner] document The XML document with the owner address
+    #
+    # @visibility public
+    # @return
+    def add_owner_to(group_id, document)
+      add(@group + "/#{group_id}/owner", nil, document)
+    end
+
+    # TODO: Refactor delete froms.
+
     # delete_member_from removes a member from a group in the
     # domain.  It takes a group_id and member_id as arguments.
     #
@@ -228,6 +243,17 @@ module GoogleApps
     end
 
 
+    #
+    # @param [String] group_id Email address of group
+    # @param [String] owner_id Email address of owner to remove
+    #
+    # @visibility public
+    # @return
+    def delete_owner_from(group_id, owner_id)
+      delete(@group + "/#{group_id}/owner", owner_id)
+    end
+
+
     # get_nicknames_for retrieves all the nicknames associated
     # with the requested user.  It takes the username as a string.
     #
@@ -386,11 +412,12 @@ module GoogleApps
       SUCCESS_CODES.include?(@response.code.to_i)
     end
 
-
-    # 
+
+    #
+
     # Takes all the items in each feed and puts them into one array.
-    # 
-    # @visibility private
+    #
+    # @visibility private
     # @return Array of Documents
     def return_all
       @feeds.inject([]) do |results, feed|

data/lib/google_apps.rb

@@ -11,4 +11,5 @@ require 'google_apps/atom/public_key'
 require 'google_apps/atom/export'
 require 'google_apps/atom/message_attributes'
 require 'google_apps/atom/group_member'
-require 'google_apps/atom/nickname'
+require 'google_apps/atom/nickname'
+require 'google_apps/atom/group_owner'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_apps
 version: !ruby/object:Gem::Version
-  version: 0.4.9.9
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -40,6 +40,7 @@ files:
 - lib/google_apps/atom/feed.rb
 - lib/google_apps/atom/group.rb
 - lib/google_apps/atom/group_member.rb
+- lib/google_apps/atom/group_owner.rb
 - lib/google_apps/atom/message_attributes.rb
 - lib/google_apps/atom/nickname.rb
 - lib/google_apps/atom/node.rb