dewey 0.2.4 → 0.2.6

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.2.6 (November 3, 2010)
+  
+  * Downloaded files are automatically rewound
+
+## 0.2.5 (November 3, 2010)
+    
+  * Sheet (gid) support for spreadsheets
+  * Delegate authentication, more reliable and no need for eval + alias_method
+  * Fix spreadsheet calls not authenticating
+
 ## 0.2.4 (November 2, 2010)
   
   Additions:

data/lib/dewey/client_auth.rb

@@ -41,7 +41,20 @@ module Dewey
     end
     
     def token(service = nil)
-      @authentications[service || :writely]
+      service = guard(service)
+      authenticate!(service) unless authenticated?(service)
+      @authentications[service]
+    end
+
+    private
+
+    def guard(service)
+      case service
+      when nil           then :writely
+      when 'spreadsheet' then :wise
+      else
+        service.to_sym
+      end
     end
   end
 end

data/lib/dewey/core.rb

@@ -30,7 +30,7 @@ module Dewey
     def authenticate!
       @@authenticator.authenticate!
     end
-   
+
     # Queries the document list for a particular title. Titles can be either 
     # full or partial matches. Matches are returned as an array of ids.
     #
@@ -45,7 +45,7 @@ module Dewey
       headers  = base_headers(false)
       url      = "#{GOOGLE_FEED_URL}?title=#{title}"
       url     << "&title-exact=true" if options[:exact]
-      response = get_request(url, headers)
+      response = http_request(:get, url, headers)
       
       response.kind_of?(Net::HTTPOK) ? extract_ids(response.body) : []
     end
@@ -76,7 +76,7 @@ module Dewey
       # Rewind the file in the case of multiple uploads, or conversions
       file.rewind
   
-      response = post_request(GOOGLE_FEED_URL, file.read.to_s, headers)
+      response = http_request(:post, GOOGLE_FEED_URL, headers, file.read.to_s)
  
       if response.kind_of?(Net::HTTPCreated)
         extract_ids(response.body).first
@@ -85,6 +85,9 @@ module Dewey
       end
     end
 
+    # The same as `put`, except it will raise an exception if the request fails.
+    #
+    # @see put
     def put!(file, options = {})
       put(file, options) || raise(DeweyException, "Unable to put document")
     end
@@ -131,18 +134,20 @@ module Dewey
       unless format.empty?
         if Dewey::Validation.valid_export_format?(format, service)
           url << "&exportFormat=#{format}"
-          url << "&format=#{format}" if service == 'document'
+          url << "&format=#{format}"       if service == 'document'
+          url << "&gid=#{options[:sheet]}" if service == 'spreadsheet' && options[:sheet]
         else
           raise DeweyException, "Invalid format: #{format}" 
         end
       end
 
-      response = get_request(url, base_headers)
+      response = http_request(:get, url, base_headers(true, service))
       
       if response.kind_of?(Net::HTTPOK)
         file = Tempfile.new([id, format].join('.'))
         file.binmode
         file.write(response.body)
+        file.rewind
         file
       else
         nil
@@ -171,7 +176,7 @@ module Dewey
       url   = "#{GOOGLE_FEED_URL}/#{Dewey::Utils.escape(id)}"
       url << "?delete=true" unless trash
 
-      response = delete_request(url, headers)
+      response = http_request(:delete, url, headers)
   
       response.kind_of?(Net::HTTPOK)
     end
@@ -184,18 +189,6 @@ module Dewey
       delete(query, options) || raise(DeweyException, "Unable to delete document")
     end
 
-    [:search, :put, :get, :delete].each do |method|
-      aliased = "no_auto_authenticate_#{method.to_s}".to_sym 
-      alias_method aliased, method
-      
-      self.class_eval(%Q{
-        def #{method} *args
-          authenticate! unless authenticated?
-          #{aliased}(*args)
-        end
-      })
-    end
-
     # Convenience method for `put`, `get`, `delete`.
     #
     # @param [File] file The file that will be converted
@@ -219,17 +212,10 @@ module Dewey
     end
 
     protected
-   
-    def get_request(url, headers) #:nodoc:
-      http_request(:get, url, headers)
-    end
-
-    def post_request(url, data, headers) #:nodoc:
-      http_request(:post, url, headers, data)
-    end
 
-    def delete_request(url, headers) #:nodoc:
-      http_request(:delete, url, headers)
+    # Present for simplified testing
+    def authenticator #:nodoc:
+      @@authenticator
     end
 
     def http_request(method, url, headers, data = nil) #:nodoc:      
@@ -255,11 +241,11 @@ module Dewey
     #
     # @param [Boolean] form If true the Content-Type will be set accordingly
     # @return [Hash] Headers hash
-    def base_headers(form = true) #:nodoc:
+    def base_headers(form = true, service = nil) #:nodoc:
       base = {}
       base['GData-Version'] = '3.0'
       base['Content-Type']  = 'application/x-www-form-urlencoded'         if form
-      base['Authorization'] = "GoogleLogin auth=#{@@authenticator.token}" if authenticated?
+      base['Authorization'] = "GoogleLogin auth=#{authenticator.token(service)}"
   
       base
     end

data/lib/dewey/version.rb

@@ -1,3 +1,3 @@
 module Dewey
-  VERSION = '0.2.4'
+  VERSION = '0.2.6'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Parker Selbert
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -05:00
+date: 2010-11-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency