dewey 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.2.4 (November 2, 2010)
+  
+  Additions:
+    
+    - Support downloading drawings
+    - Support downloading presentations
+    - Drawing mime support and validation
+    - put! method to raise on failed requests
+
+  Changes:
+
+    - Add support for new style export options (exportFormat & format)
+
+  Bugfixes:
+  
+    - Fix search results pulling the feed id and not just the entry id
+    - Fix entries pulling the feed along with the resource id
+    - Remove calls to blank?
+
 ## 0.2.3 (October 30, 2010)
 
   Additions:

data/README.md

@@ -1,21 +1,23 @@
     :::::::::  :::::::::: :::       ::: :::::::::: :::   ::: 
     :+:    :+: :+:        :+:       :+: :+:        :+:   :+: 
-    +:+    +:+ +:+        +:+       +:+ +:+         +:+ +:+  
-    +#+    +:+ +#++:++#   +#+  +:+  +#+ +#++:++#     +#++:   
-    +#+    +#+ +#+        +#+ +#+#+ +#+ +#+           +#+    
-    #+#    #+# #+#         #+#+# #+#+#  #+#           #+#    
+    +:+    +:+ +:+        +:+       +:+ +:+         +:+ +:+
+    +#+    +:+ +#++:++#   +#+  +:+  +#+ +#++:++#     +#++:
+    +#+    +#+ +#+        +#+ +#+#+ +#+ +#+           +#+
+    #+#    #+# #+#         #+#+# #+#+#  #+#           #+#
     #########  ##########   ###   ###   ##########    ###
 
-Dewey allows you to simply upload, download and delete files from your Google
-Docs account.
 
-Let Google do all of the hard work of converting your documents!
+# Light, simple Google Docs library for Ruby.
+
+Dewey focuses on the simple cases of authorizing, searching, and managing the
+files on a Google Docs account. Really, it stemmed from the need to use Docs
+great document conversion services.
 
 ## Note
 
 Dewey is in alpha. It is not recommended you use this in production code.
 
-## Authorization
+## Authentication
 
 You can configure Dewey to connect with either ClientLogin or OAuth. If you choose
 OAuth you'll only have to authenticate the first time you connect and subsequent
@@ -23,11 +25,11 @@ connections will use the saved token.
 
 ClientLogin
 
-    Dewey.authorization :client, :email => 'example@gmail.com', :password => 'password'
-    
+    Dewey.authentication :client, :email => 'example@gmail.com', :password => 'password'
+
 OAuth
 
-    Dewey.authorization :oauth, :idontknowwhatgoeshereyet
+    Dewey.authentication :oauth, :idontknowwhatgoeshereyet
 
 ## File Operations
 

data/lib/dewey.rb

@@ -3,9 +3,11 @@ module Dewey
   GOOGLE_SPRD_URL  = "https://spreadsheets.google.com"
   GOOGLE_LOGIN_URL = "https://www.google.com/accounts/ClientLogin"
   
-  GOOGLE_FEED_URL        = GOOGLE_DOCS_URL + "/feeds/default/private/full"
-  GOOGLE_DOCUMENT_URL    = GOOGLE_DOCS_URL + "/feeds/download/documents/Export"
-  GOOGLE_SPREADSHEET_URL = GOOGLE_SPRD_URL + "/feeds/download/spreadsheets/Export"
+  GOOGLE_FEED_URL         = GOOGLE_DOCS_URL + "/feeds/default/private/full"
+  GOOGLE_DOCUMENT_URL     = GOOGLE_DOCS_URL + "/feeds/download/documents/Export"
+  GOOGLE_DRAWING_URL      = GOOGLE_DOCS_URL + "/feeds/download/drawings/Export"
+  GOOGLE_PRESENTATION_URL = GOOGLE_DOCS_URL + "/feeds/download/presentations/Export"
+  GOOGLE_SPREADSHEET_URL  = GOOGLE_SPRD_URL + "/feeds/download/spreadsheets/Export"
   
   class DeweyException < Exception; end
   class DeweyAuthorizationException < Exception; end
@@ -17,4 +19,4 @@ require 'dewey/https'
 require 'dewey/mime'
 require 'dewey/utils'
 require 'dewey/validation'
-require 'dewey/version'
+require 'dewey/version'

data/lib/dewey/core.rb

@@ -58,7 +58,7 @@ module Dewey
     # @option options [Symbol] :title An alternative title, to be used instead
     #                                 of the filename
     # 
-    # @return [String, Boolean] The id if upload was successful, false otherwise
+    # @return [String, nil] The id if upload was successful, nil otherwise
     def put(file, options = {})
       extension = File.extname(file.path).sub('.', '')
       basename  = File.basename(file.path, ".#{extension}")
@@ -81,10 +81,14 @@ module Dewey
       if response.kind_of?(Net::HTTPCreated)
         extract_ids(response.body).first
       else
-        false
+        nil
       end
     end
 
+    def put!(file, options = {})
+      put(file, options) || raise(DeweyException, "Unable to put document")
+    end
+
     # Download a file. You may optionally specify a format for export.
     #
     # @param [String] query    A resource id or title, `document:12345` or
@@ -111,14 +115,23 @@ module Dewey
       when 'document'
         url << GOOGLE_DOCUMENT_URL
         url << "?docID=#{id}"
+      when 'drawing'
+        url << GOOGLE_DRAWING_URL
+        url << "?docID=#{id}"
+      when 'presentation'
+        url << GOOGLE_PRESENTATION_URL
+        url << "?docID=#{id}"
       when 'spreadsheet'
         url << GOOGLE_SPREADSHEET_URL
         url << "?key=#{id}"
+      else
+        raise DeweyException, "Invalid service: #{service}"
       end
 
-      unless format.blank?
+      unless format.empty?
         if Dewey::Validation.valid_export_format?(format, service)
-          url << "&exportFormat=#{format}" unless format.blank?
+          url << "&exportFormat=#{format}"
+          url << "&format=#{format}" if service == 'document'
         else
           raise DeweyException, "Invalid format: #{format}" 
         end
@@ -257,12 +270,12 @@ module Dewey
     # @return [Array]  Array of document ids
     def extract_ids(response) #:nodoc:
       xml = REXML::Document.new(response)
-      xml.elements.collect('//id') { |e| e.text.gsub('%3A', ':') }.reject(&:blank?)
+      xml.elements.collect('//entry//id') { |e| e.text.split('/').last.gsub('%3A', ':') }
     end
 
     # Is the string an id or a search query?
     def is_id?(string)
-      string.match(/^(doc|spr|pres).+:.+$/)
+      string.match(/^[a-z]+:.+$/)
     end
   end
 end

data/lib/dewey/mime.rb

@@ -11,6 +11,12 @@ module Dewey
     :sxw  => 'application/vnd.sun.xml.writer',
     :txt  => 'text/plain'
   }
+
+  DRAWING_MIMETYPES = {
+    :jpeg => 'image/jpeg',
+    :png  => 'image/png',
+    :svg  => 'image/svg+xml'
+  }
   
   PRESENTATION_MIMETYPES = {
     :pps => 'application/vnd.ms-powerpoint',
@@ -36,13 +42,16 @@ module Dewey
       when /csv/  then SPREADSHEET_MIMETYPES[:csv]
       when /doc$/ then DOCUMENT_MIMETYPES[:doc]
       when /docx/ then DOCUMENT_MIMETYPES[:docx]
+      when /jpeg/ then DRAWING_MIMETYPES[:jpeg]
       when /htm/  then DOCUMENT_MIMETYPES[:html]
       when /ods/  then SPREADSHEET_MIMETYPES[:ods]
       when /odt/  then DOCUMENT_MIMETYPES[:odt]
       when /pdf/  then DOCUMENT_MIMETYPES[:pdf]
+      when /png/  then DRAWING_MIMETYPES[:png]
       when /pps/  then PRESENTATION_MIMETYPES[:pps]
       when /ppt/  then PRESENTATION_MIMETYPES[:ppt]
       when /rtf/  then DOCUMENT_MIMETYPES[:rtf]
+      when /svg/  then DRAWING_MIMETYPES[:svg]
       when /sxw/  then DOCUMENT_MIMETYPES[:sxw]
       when /tab/  then SPREADSHEET_MIMETYPES[:tab]
       when /tsv/  then SPREADSHEET_MIMETYPES[:tsv]
@@ -66,6 +75,7 @@ module Dewey
     
     def self.guess_service(mime_type)
       services = { :document     => DOCUMENT_MIMETYPES,
+                   :drawing      => DRAWING_MIMETYPES,
                    :presentation => PRESENTATION_MIMETYPES,
                    :spreadsheet  => SPREADSHEET_MIMETYPES }
       
@@ -76,4 +86,4 @@ module Dewey
       nil
     end
   end
-end
+end

data/lib/dewey/validation.rb

@@ -1,6 +1,7 @@
 module Dewey
   
   DOCUMENT_EXPORT_FORMATS     = [:txt, :odt, :pdf, :html, :rtf, :doc, :png, :zip]
+  DRAWING_EXPORT_FORMATS      = [:jpeg, :pdf, :png, :svg]
   PRESENTATION_EXPORT_FORMATS = [:swf, :pdf, :png, :ppt]
   SPREADSHEET_EXPORT_FORMATS  = [:xls, :csv, :pdf, :ods, :tsv, :html]
   
@@ -24,6 +25,7 @@ module Dewey
 
         case service
         when :document     then Dewey::DOCUMENT_MIMETYPES.has_key?(format)
+        when :drawing      then Dewey::DRAWING_MIMETYPES.has_key?(format)
         when :presentation then Dewey::PRESENTATION_MIMETYPES.has_key?(format)
         when :spreadsheet  then Dewey::SPREADSHEET_MIMETYPES.has_key?(format)
         else
@@ -46,6 +48,7 @@ module Dewey
 
         case service
         when :document     then Dewey::DOCUMENT_EXPORT_FORMATS.include?(format)
+        when :drawing      then Dewey::DRAWING_EXPORT_FORMATS.include?(format)
         when :presentation then Dewey::PRESENTATION_EXPORT_FORMATS.include?(format)
         when :spreadsheet  then Dewey::SPREADSHEET_EXPORT_FORMATS.include?(format)
         else

data/lib/dewey/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Parker Selbert
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -05:00
+date: 2010-11-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-description: Dewey is a no-frills tool for utilizing Google Docs ability to convert documents between formats
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: Light, simple Google Docs library for Ruby.
 email: 
 - parker@sorentwo.com
 executables: []
@@ -83,6 +96,6 @@ rubyforge_project: dewey
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Google Docs fueled document conversion
+summary: Simple Google Docs library.
 test_files: []