google_apps 0.4.9.2 → 0.4.9.9

data/lib/google_apps.rb

@@ -9,7 +9,6 @@ require 'google_apps/atom/user'
 require 'google_apps/atom/group'
 require 'google_apps/atom/public_key'
 require 'google_apps/atom/export'
-require 'google_apps/atom/message'
 require 'google_apps/atom/message_attributes'
 require 'google_apps/atom/group_member'
 require 'google_apps/atom/nickname'

data/lib/google_apps/atom/atom.rb

@@ -33,6 +33,12 @@ module GoogleApps
       nickname: {
         name: :nickname,
         userName: :user
+      },
+      group: {
+        groupId: :id,
+        groupName: :name,
+        emailPermission: :permission,
+        description: :description
       }
     }
 

data/lib/google_apps/atom/document.rb

@@ -44,16 +44,49 @@ module GoogleApps
       # internal consistency in the object.
       #
       # find_values
-      def find_values # Moved from User and Group, causing segfault but only at odd times
+      def find_values
         map_key = self.class.to_s.split(':').last.downcase.to_sym
         map = Atom::MAPS[map_key]
 
         @document.root.each do |entry|
           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
+          set_instances(intersect, entry, map) unless intersect.empty?
+        end
+      end
+
+
+      # Sets instance variables in the current object based on
+      # values found in the XML document and the mapping specified
+      # in GoogleApps::Atom::MAPS
+
+      #
+      # @param [Array] intersect
+      # @param [LibXML::XML::Node] node
+      # @param [Hash] map
+      #
+      # @visibility public
+      # @return
+      def set_instances(intersect, node, map)
+        intersect.each do |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|
+          prop_name = entry.attributes['name'].to_sym
+          if map.keys.include?(prop_name)
+            instance_variable_set "@#{map[prop_name]}", check_value(entry.attributes['value'])
           end
         end
       end
@@ -115,6 +148,21 @@ module GoogleApps
 
         ns
       end
+
+
+      #
+      # Delete a node from the document
+      #
+      # @param [String] xpath is a node identifier in Xpath format
+      # @param [Array] attrs is an array of attr, value pairs
+      #
+      # @visibility public
+      # @return
+      def delete_node(xpath, attrs)
+        @document.find(xpath).each do |node|
+          node.remove! if node_match?(node, attrs)
+        end
+      end
     end
   end
 end

data/lib/google_apps/atom/feed.rb

@@ -8,12 +8,18 @@ module GoogleApps
 
       attr_reader :xml, :items, :next_page
 
-      TYPE_MATCH = /<id.*(user|group|nickname).*?<\/id/
-      #TYPE_MATCH = /term.*?\#(\w*?)/
+      # 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/
+
 
       def initialize(xml)
+        type = xml.match(TYPE_MATCH).captures[0]
+        type.sub!(/\//, '_')
+
         @xml = parse(xml)
-        @items = entries_from document: @xml, type: @xml.to_s.match(TYPE_MATCH).captures[0], entry_tag: 'entry'
+        @items = entries_from document: @xml, type: type, entry_tag: 'entry'
       end
 
       # TODO: Need to make sure this works for feeds other than user.
@@ -74,7 +80,7 @@ module GoogleApps
       #
       # add_category returns the modified content_array
       def add_category(content_array, type)
-        content_array.unshift(create_node(type: 'atom:category', attrs: Atom::CATEGORY[type.to_sym]).to_s)
+        content_array.unshift(create_node(type: 'atom:category', attrs: Atom::CATEGORY[type.to_sym]).to_s) if Atom::CATEGORY[type.to_sym]
       end
 
 

data/lib/google_apps/atom/group.rb

@@ -11,6 +11,7 @@ module GoogleApps
       def initialize(xml = nil)
         if xml
           @document = parse(xml)
+          attrs_from_props
         else
           @document = Atom::XML::Document.new
           @document.root = build_root
@@ -97,18 +98,6 @@ module GoogleApps
       private
 
 
-      def check_value(value)
-        case value
-          when 'true'
-            true
-          when 'false'
-            false
-          else
-            value
-        end
-      end
-
-
       # prop_name takes a LibXML::XML::Node object and
       # sets the name attribute based on the provided
       # key.

data/lib/google_apps/atom/group_member.rb

@@ -4,11 +4,16 @@ module GoogleApps
       include Atom::Node
       include Atom::Document
 
-      attr_accessor :member
+      attr_accessor :member, :type
 
-      def initialize
-        @document = Atom::XML::Document.new
-        @document.root = build_root
+      def initialize(xml = nil)
+        if xml
+          @document = parse(xml)
+          populate_self
+        else
+          @document = Atom::XML::Document.new
+          @document.root = build_root
+        end
       end
 
 
@@ -20,10 +25,21 @@ module GoogleApps
       #
       # member= returns the value of @member
       def member=(member)
-        @member.nil? ? set_member(member) : change_member(member)
+        @member.nil? ? add_node('memberId', member) : change_node('memberId', member)
+
+        @document = parse(@document)
+        @member = member
       end
 
 
+      def type=(type)
+        @type.nil? ? add_node('memberType', type) : change_node('memberType', type)
+
+        @document = parse(@document)
+        @type = type
+      end
+      
+
       # to_s returns @document as a string.
       def to_s
         @document.to_s
@@ -32,20 +48,23 @@ module GoogleApps
 
       private
 
-      # set_member adds a memberId property element to
-      # the XML document and sets @member to the given
-      # value.
-      #
-      # set_member 'test_user@cnm.edu'
-      #
-      # set_member returns the value of @member
-      def set_member(member)
-        @document.root << create_node(type: 'apps:property', attrs: [['name', 'memberId'], ['value', member]])
-
-        @member = member
+      # 
+      # @param [] type
+      # @param [] value
+      # 
+      # @visibility private
+      # @return 
+      def add_node(type, value)
+        @document.root << create_node(type: 'apps:property', attrs: [['name', type], ['value', value]])
       end
 
 
+      def change_node(type, value)
+        @document.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
       # of the provided argument.  It also sets @member
@@ -64,10 +83,16 @@ module GoogleApps
         @member = member
       end
 
-      # parse_doc parses the current @document so that it can
-      # be searched with find.
-      def parse_doc(document = @document)
-        Atom::XML::Parser.document(document).parse
+
+      # 
+      # 
+      # @visibility private
+      # @return 
+      def populate_self
+        @document.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
       end
     end
   end

data/lib/google_apps/atom/message_attributes.rb

@@ -24,6 +24,7 @@ module GoogleApps
         property['value'] = prop
 
         @document.root << property
+        @document = parse(@document)
       end
 
       def property=(value)
@@ -36,6 +37,7 @@ module GoogleApps
 
         @document.root << label
         @labels << name
+        @document = parse(@document)
       end
 
       def <<(value)
@@ -44,7 +46,7 @@ module GoogleApps
 
       def remove_label(value)
         @labels.delete(value)
-        # Need a way to remove a node from the document.
+        delete_node('//apps:label', labelName: [value])
       end
 
       def to_s

data/lib/google_apps/atom/node.rb

@@ -104,6 +104,25 @@ module GoogleApps
           values
         end
       end
+
+
+      # Returns true if "true" and false if "false"
+
+      #
+      # @param [String] value
+      #
+      # @visibility public
+      # @return
+      def check_value(value)
+        case value
+          when 'true'
+            true
+          when 'false'
+            false
+          else
+            value
+        end
+      end
     end
   end
 end

data/lib/google_apps/atom/user.rb

@@ -164,18 +164,6 @@ module GoogleApps
       def new_doc
         @document = Atom::XML::Document.new
       end
-
-
-      def check_value(value)
-        case value
-          when 'true'
-            true
-          when 'false'
-            false
-          else
-            value
-        end
-      end
   	end
   end
 end

data/lib/google_apps/transport.rb

@@ -184,11 +184,24 @@ module GoogleApps
       type = normalize_type type
 
       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)
+      options[:start] ? get(instance_variable_get("@#{type}") + "#{options[:extra]}" + "?#{start_query(type)}=#{options[:start]}", :feed) : get(instance_variable_get("@#{type}") + "#{options[:extra]}", :feed)
 
       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 
+    def get_members_of(group_id, options = {})
+      options[:extra] = "/#{group_id}/member"
+      get_all :groups, options
     end
 
 
@@ -373,6 +386,18 @@ 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
+    # @return Array of Documents
+    def return_all
+      @feeds.inject([]) do |results, feed|
+        results | feed.items
+      end
+    end
+
 
     # Grab the auth token from the response body
     def set_auth_token

metadata

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

data/lib/google_apps/atom/message.rb

@@ -1,21 +0,0 @@
-module GoogleApps
-  module Atom
-    class Message
-      def initialize
-        @document = Atom::XML::Document.new
-      end
-      
-      def from(filename)
-        message = File.read(filename)
-        @document.root = Atom::XML::Node.new('apps:rfc822Msg', message)
-        Atom::XML::Namespace.new(@document.root, 'apps', 'http://schemas.google.com/apps/2006')
-
-        @document
-      end
-
-      def to_s
-        @document.to_s
-      end
-    end
-  end
-end