fixed ^M and moved base.rb to be client.rb

git-svn-id: http://gdata-ruby.rubyforge.org/svn@14 3d76ca7b-2e8e-4910-8bb0-bc18f4d68cdf

Author: dion

Manifest.txt

@@ -8,7 +8,7 @@ bin/bloggerpost
 bin/gspreadsheet
 bin/removeenclosure
 lib/gdata.rb
-lib/gdata/base.rb
+lib/gdata/client.rb
 lib/gdata/blogger.rb
 lib/gdata/spreadsheet.rb
 test/test_gdata.rb

lib/gdata/blogger.rb

@@ -1,42 +1,42 @@
-require 'gdata/base'
+require 'gdata/client'
 require 'builder'
-require 'hpricot'
-require 'rexml/document'
+require 'hpricot'
+require 'rexml/document'
 
 module GData
 
   class Blogger < GData::Client
-    attr_reader :blog_id, :entry_id, :user_id, :blogs
-    attr_writer :blog_id, :entry_id
-    # Default initialization method.  The blog ID and the entry ID may 
+    attr_reader :blog_id, :entry_id, :user_id, :blogs
+    attr_writer :blog_id, :entry_id
+    # Default initialization method.  The blog ID and the entry ID may 
     # or may not be known ahead of time.
     def initialize(blog_id=nil, entry_id=nil)
       @blog_id = blog_id
       @entry_id = entry_id
       super 'blogger', 'gdata-ruby', 'www.blogger.com'
-    end
-    
-    # Pull down a list of the user's blogs.  This allows the use of muliple blogs
-    # per user.  The @blogs Array will store the available blogs by internal hash.
-    # 
-    def retrieve_blog_list
-      # retrieve the user's list of blogs from 
-      blog_feed = get('/feeds/default/blogs')
-      @blog_list = REXML::Document.new(blog_feed[1]).root
-      @blogs = Array.new
-      @blog_list.elements.each('entry'){|entry| @blogs.push({entry.elements['title'].get_text.to_s => entry.elements['id'].get_text.to_s.split(/blog-/).last})}
-      # By default, set the first blog to @blog_id
-      @blog_id = @blogs[0].values.to_s
-      @blogs
-    end
-    # retrieves the user$ ID from the blog_list feed.
-    def get_user_id
-      # Because someone might call this method without the blog_list called,
-      # we wouldn't have data to pull from.  So let's call that method.
-      self.blog_list
-      uid = @blog_list.elements['id'].get_text.to_s.split(/-|\:/)
-      @user_id = uid[uid.index("user")+1].delete(".blogs") 
-    end
+    end
+    
+    # Pull down a list of the user's blogs.  This allows the use of muliple blogs
+    # per user.  The @blogs Array will store the available blogs by internal hash.
+    # 
+    def retrieve_blog_list
+      # retrieve the user's list of blogs from 
+      blog_feed = get('/feeds/default/blogs')
+      @blog_list = REXML::Document.new(blog_feed[1]).root
+      @blogs = Array.new
+      @blog_list.elements.each('entry'){|entry| @blogs.push({entry.elements['title'].get_text.to_s => entry.elements['id'].get_text.to_s.split(/blog-/).last})}
+      # By default, set the first blog to @blog_id
+      @blog_id = @blogs[0].values.to_s
+      @blogs
+    end
+    # retrieves the user$ ID from the blog_list feed.
+    def get_user_id
+      # Because someone might call this method without the blog_list called,
+      # we wouldn't have data to pull from.  So let's call that method.
+      self.blog_list
+      uid = @blog_list.elements['id'].get_text.to_s.split(/-|\:/)
+      @user_id = uid[uid.index("user")+1].delete(".blogs") 
+    end
 
     def feed
       request "/feeds/#{@blog_id}/posts/default"

lib/gdata/base.rb lib/gdata/client.rb

@@ -1,8 +1,8 @@
-require 'gdata/base'
+require 'gdata/client'
 
 module GData
 
-  class Spreadsheet < GData::Base
+  class Spreadsheet < GData::Client
 
     def initialize(spreadsheet_id)
       @spreadsheet_id = spreadsheet_id