google_apps 0.3.10 → 0.3.11

data/lib/google_apps/atom/user.rb

@@ -4,7 +4,7 @@ module GoogleApps
       attr_reader :document
       
   		def initialize
-  			@document = Atom::XML::Document.new
+        new_doc
   			add_header
   		end
 
@@ -18,18 +18,16 @@ module GoogleApps
       #
       # new_user returns the full XML document.
   		def new_user(user_name, first, last, password, quota=nil)
-        new_doc
-        add_header
-  			@document.root << login_node(user_name, password)
-  			@document.root << quota_node(quota) if quota
-  			@document.root << name_node(first, last)
-
-        @document
+        set_values suspended: 'false', username: user_name, password: password, first_name: first, last_name: last, quota: quota
   		end
 
-      # new_doc re-initializes the XML document.
-      def new_doc
-        @document = Atom::XML::Document.new
+      # TODO: Document
+      def set_values(values = {})
+        @document.root << login_node(values[:suspended], values[:username], values[:password])
+        @document.root << quota_node(values[:quota]) if values[:quota]
+        @document.root << name_node(values[:first_name], values[:last_name]) if values[:first_name] and values[:last_name]
+
+        @document
       end
 
       # login_node adds an apps:login attribute to @document.
@@ -40,7 +38,7 @@ module GoogleApps
       # login_node 'username', 'password', suspended
       #
       # login_node returns an 'apps:login' LibXML::XML::Node
-  		def login_node(user_name, password, suspended="false")
+  		def old_login_node(user_name, password, suspended="false")
         suspended = "true" unless suspended == "false"
   			login = Atom::XML::Node.new('apps:login')
   			login['userName'] = user_name
@@ -52,13 +50,13 @@ module GoogleApps
   		end
 
       # TODO: This needs to be cleaned and documented.
-      def update_node(user_name = nil, password = nil, suspended = nil)
+      def login_node(suspended = "false", user_name = nil, password = nil)
         login = Atom::XML::Node.new('apps:login')
         login['userName'] = user_name unless user_name.nil?
-        login['password'] = password unless password.nil?
-        login['suspended'] = suspended unless suspended.nil?
+        login['password'] = OpenSSL::Digest::SHA1.hexdigest password unless password.nil?
+        login['hashFunctionName'] = Atom::HASH_FUNCTION unless password.nil?
+        login['suspended'] = suspended.to_s
 
-        @document.root << login
         login
       end
 
@@ -99,6 +97,11 @@ module GoogleApps
 
       private
 
+      # new_doc re-initializes the XML document.
+      def new_doc
+        @document = Atom::XML::Document.new
+      end
+
       def add_header
         @document.root = Atom::XML::Node.new('atom:entry')
 

data/lib/google_apps/transport.rb

@@ -39,9 +39,8 @@ module GoogleApps
 			set_headers :auth
 
 			@response = request(uri)
-			@response.body.split("\n").grep(/auth=(.*)/i)
 
-			@token = $1
+			set_auth_token
 
       @response
 		end
@@ -210,6 +209,8 @@ module GoogleApps
         self.send(:update, instance_variable_get("@#{$2}"), *args)
       when "get"
         self.send(:get, instance_variable_get("@#{$2}"), *args)
+      when "add"
+        self.send(:add, instance_variable_get("@#{$2}"), *args)
       else
       	super
       end
@@ -229,6 +230,15 @@ module GoogleApps
       "&Email=#{CGI::escape(account)}&Passwd=#{CGI::escape(pass)}&accountType=HOSTED&service=apps"
     end
 
+
+    # Grab the auth token from the response body
+    def set_auth_token
+      @response.body.split("\n").grep(/auth=(.*)/i)
+
+      @token = $1
+    end
+
+
 		def request(uri)
       # TODO: Clashes with @request reader
 			Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_apps
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies: []
 description: Library for interfacing with Google Apps' Domain and Application APIs
 email: