dewey 0.2.8 → 0.2.9

data/.gitignore

@@ -1,6 +1,7 @@
 Gemfile.lock
 *.gem
 .bundle
+vendor/*
 .yardoc/*
 doc/*
 TODO

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.2.9 (October 2, 2011)
+
+  * Better support for files without an extension (Cory Schires)
+  * Don't fail when `docx` has a mime type of `application/zip` (Cory Schires)
+
+## 0.2.8 (April 19, 2011)
+
+  * Remove x-www-form-urlencoded header for compatiblity with latest API
+
 ## 0.2.7 (December 12, 2010)
 
   * Documents, Drawings and Presentations are actually downloadable again. The
@@ -6,19 +15,19 @@
   * Minor internal improvements
 
 ## 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:
-    
+
     - Support downloading drawings
     - Support downloading presentations
     - Drawing mime support and validation
@@ -29,7 +38,7 @@
     - 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?
@@ -37,13 +46,13 @@
 ## 0.2.3 (October 30, 2010)
 
   Additions:
-  
+
     - #delete and #delete! accept an optional :trash option to send a resource
       to the trash, rather than being fully deleted.
     - #get and #elete by title. Handles exact matches only.
-  
+
   Bugfixes:
-    
+
     - Not setting the :format option on #get no longers raises
 
 ## 0.2.2 (October 27, 2010)
@@ -70,28 +79,28 @@ Bugfixes:
 ## 0.2.0 (October 20, 2010)
 
 Additions:
-  
+
   - Class-wide authentication. You only have to set up authentication once and
     then utilize that in all successive calls.
   - All file operations are stateless (Dewey.put, Dewey.get, etc)
   - Store multiple authorizations simultaneously.
-  
+
 Changes:
 
   - Convert API change. Format is required, not an option.
   - No longer supports upload or download, instead use put or get.
 
 ## 0.1.4 (October 19, 2010)
-  
+
 Additions:
-  
+
   - Handle bad mimetypes.
   - Modular validation
   - Removed service option, needless.
   - Automatic implicit authorization, removes need to call authorize! manually.
 
 Bugfixes:
-  
+
   - Prevent peer certificate warnings in 1.9
   - Fixed id extraction regex that prevented resources with dashes or underscores
     from being pulled.
@@ -111,7 +120,7 @@ Features:
 Bugfixes:
 
   - Handle files with no extension
-  
+
 ---
 ## 0.1.1 (June 28, 2010)
 

data/dewey.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'dewey'
 
   s.add_development_dependency 'rake',    '~> 0.8.7'
-  s.add_development_dependency 'rspec',   '~> 2.3.0'
-  s.add_development_dependency 'webmock', '~> 1.4.0'
-  s.add_development_dependency 'yard',    '~> 0.6.8'
+  s.add_development_dependency 'rspec',   '~> 2.6.0'
+  s.add_development_dependency 'webmock', '~> 1.7.6'
+  s.add_development_dependency 'yard',    '~> 0.7.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")

data/lib/dewey.rb

@@ -2,13 +2,13 @@ module Dewey
   GOOGLE_DOCS_URL  = "https://docs.google.com"
   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_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 DeweyError < StandardError; end
   class DeweyAuthorizationError < StandardError; end
 end

data/lib/dewey/client_auth.rb

@@ -2,7 +2,7 @@ module Dewey
   class ClientAuth
     attr_reader :authentications
 
-    def initialize(email, password) 
+    def initialize(email, password)
       @email          = email
       @password       = password
       @authentications = {}
@@ -12,10 +12,10 @@ module Dewey
       if service
         @authentications.has_key?(service)
       else
-        @authentications.any? 
+        @authentications.any?
       end
     end
-    
+
     def authenticate!(service = nil)
       service ||= :writely
 
@@ -39,7 +39,7 @@ module Dewey
         raise DeweyError, "Unexpected response: #{response}"
       end
     end
-    
+
     def token(service = nil)
       service = guard(service)
       authenticate!(service) unless authenticated?(service)

data/lib/dewey/core.rb

@@ -5,7 +5,7 @@ require 'tempfile'
 
 module Dewey
   class << self
-    
+
     # Set the authentication strategy. You can currently only use ClientAuth,
     # but you must provide +email+ and +password+ options. You must set up
     # authentication before using any file operations.
@@ -16,14 +16,14 @@ module Dewey
         @@authenticator = Dewey::ClientAuth.new(options[:email], options[:password])
       end
     end
-    
+
     # Report whether Dewey has both an authentication strategy selected, and has
     # been authenticated. Delegates to the chosen authenticator.
     #
     def authenticated?
       !@@authenticator.nil? && @@authenticator.authenticated?
     end
-    
+
     # Tell the authentication strategy to authenticate. Not necessary though, as
     # any file operation will authenticate automatically.
     #
@@ -31,7 +31,7 @@ module Dewey
       @@authenticator.authenticate!
     end
 
-    # Queries the document list for a particular title. Titles can be either 
+    # Queries the document list for a particular title. Titles can be either
     # full or partial matches. Matches are returned as an array of ids.
     #
     # @param [String] query   The title to be matched
@@ -46,7 +46,7 @@ module Dewey
       url      = "#{GOOGLE_FEED_URL}?title=#{title}"
       url     << "&title-exact=true" if options[:exact]
       response = http_request(:get, url, headers)
-      
+
       response.kind_of?(Net::HTTPOK) ? extract_ids(response.body) : []
     end
 
@@ -57,27 +57,27 @@ module Dewey
     # @param [Hash] options Options for uploading the file
     # @option options [Symbol] :title An alternative title, to be used instead
     #                                 of the filename
-    # 
+    #
     # @return [String, nil] The id if upload was successful, nil otherwise
     def put(file, options = {})
-      extension = File.extname(file.path).sub('.', '')
+      extension = Dewey::Mime.extension(file)
       basename  = File.basename(file.path, ".#{extension}")
       mimetype  = Dewey::Mime.mime_type(file)
       service   = Dewey::Mime.guess_service(mimetype)
       title     = options[:title] || basename
-  
+
       raise DeweyError, "Invalid file type: #{extension}" unless Dewey::Validation.valid_upload_format?(extension, service)
-  
+
       headers = base_headers
       headers['Content-Length'] = File.size?(file).to_s
       headers['Slug']           = Dewey::Utils.slug(title)
       headers['Content-Type']   = mimetype unless mimetype =~ /Can't expand summary_info/
-  
+
       # Rewind the file in the case of multiple uploads, or conversions
       file.rewind
-  
+
       response = http_request(:post, GOOGLE_FEED_URL, headers, file.read.to_s)
- 
+
       if response.kind_of?(Net::HTTPCreated)
         extract_ids(response.body).first
       else
@@ -98,7 +98,7 @@ module Dewey
     #                          `My Document` for example
     # @param [Hash]   options  Options for downloading the document
     # @option options [Symbol] :format The output format
-    # 
+    #
     # @return [Tempfile, nil] The downloaded file, otherwise `nil` if the file
     #                         couldn't be found.
     #
@@ -137,12 +137,12 @@ module Dewey
           url << "&format=#{format}"       if service == 'document'
           url << "&gid=#{options[:sheet]}" if service == 'spreadsheet' && options[:sheet]
         else
-          raise DeweyError, "Invalid format: #{format}" 
+          raise DeweyError, "Invalid format: #{format}"
         end
       end
 
       response = http_request(:get, url, base_headers(service))
-      
+
       if response.kind_of?(Net::HTTPOK)
         file = Tempfile.new([id, format].join('.')).binmode
         file.write(response.body)
@@ -154,7 +154,7 @@ module Dewey
     end
 
     # Deletes a document. The default behavior is to delete the document
-    # permanently, rather than trashing it. 
+    # permanently, rather than trashing it.
     #
     # @param [String] query    A resource id or title. If a title is provided
     #                          a search will be performed automatically.
@@ -166,23 +166,23 @@ module Dewey
     def delete(query, options = {})
 
       # We use 'If-Match' => '*' to make sure we delete regardless of others
-      headers = base_headers.merge({'If-Match' => '*'}) 
+      headers = base_headers.merge({'If-Match' => '*'})
       trash   = options.delete(:trash) || false
       id      = (is_id?(query)) ? query : search(query, :exact => true).first
-      
+
       return false if id.nil?
 
       url   = "#{GOOGLE_FEED_URL}/#{URI.escape(id)}"
       url << "?delete=true" unless trash
 
       response = http_request(:delete, url, headers)
-  
+
       response.kind_of?(Net::HTTPOK)
     end
-    
+
     # The same as delete, except that it will raise `Dewey::DeweyError` if
     # the request fails.
-    # 
+    #
     # @see #delete
     def delete!(query, options = {})
       delete(query, options) || raise(DeweyError, "Unable to delete document")
@@ -204,9 +204,9 @@ module Dewey
     def convert(file, options = {})
       id = put(file, options[:title])
       converted = get(id, options[:format])
-  
+
       delete(id)
-  
+
       converted
     end
 
@@ -218,7 +218,7 @@ module Dewey
     end
 
     # Perform the actual request heavy lifting
-    def http_request(method, url, headers, data = nil) #:nodoc:      
+    def http_request(method, url, headers, data = nil) #:nodoc:
       url = URI.parse(url) if url.kind_of? String
 
       connection = (url.scheme == 'https') ? Net::HTTPS.new(url.host, url.port) : Net::HTTP.new(url.host, url.port)
@@ -243,7 +243,7 @@ module Dewey
       base = {}
       base['GData-Version'] = '3.0'
       base['Authorization'] = "GoogleLogin auth=#{authenticator.token(service)}"
-  
+
       base
     end
 

data/lib/dewey/mime.rb

@@ -1,8 +1,8 @@
 module Dewey
-  
+
   DOCUMENT_MIMETYPES = {
-    :doc  => 'application/msword',
-    :docx => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    :doc  => ['application/msword', 'application/vnd.ms-office'],
+    :docx => ['application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/x-docx', 'application/zip'],
     :htm  => 'text/html',
     :html => 'text/html',
     :odt  => 'application/vnd.oasis.opendocument.text',
@@ -17,12 +17,12 @@ module Dewey
     :png  => 'image/png',
     :svg  => 'image/svg+xml'
   }
-  
+
   PRESENTATION_MIMETYPES = {
     :pps => 'application/vnd.ms-powerpoint',
     :ppt => 'application/vnd.ms-powerpoint'
   }
-  
+
   SPREADSHEET_MIMETYPES = {
     :csv  => 'text/csv',
     :ods  => 'application/x-vnd.oasis.opendocument.spreadsheet',
@@ -31,14 +31,24 @@ module Dewey
     :xls  => 'application/vnd.ms-excel',
     :xlsx => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
   }
-  
+
   class Mime
+    # Determine file extension by parsing the filename. When the filename has no extension,
+    # then instead examine the file's mime type and intuit the extension.
+    def self.extension(file)
+      extension = File.extname(file.path).sub('.', '')
+      if extension.nil? || extension == ''
+        mime_type = (`file --mime-type #{file.path}`).split(':').last.strip
+        extension = mime_type_to_extension_mapping[mime_type]
+      end
+      extension.to_s.downcase
+    end
+
     # Attempts to provide a mime_type that Google Docs finds acceptable. Certain
     # types, when gathered from +file+ require extra coercion and will be handled
     # automatically.
     def self.mime_type(file)
-      type = (file.path.match(/\.(\w+)/)[1] rescue '').downcase
-      case type
+      type = case extension(file)
       when /csv/  then SPREADSHEET_MIMETYPES[:csv]
       when /doc$/ then DOCUMENT_MIMETYPES[:doc]
       when /docx/ then DOCUMENT_MIMETYPES[:docx]
@@ -58,31 +68,49 @@ module Dewey
       when /txt/  then DOCUMENT_MIMETYPES[:txt]
       when /xls$/ then SPREADSHEET_MIMETYPES[:xls]
       when /xlsx/ then SPREADSHEET_MIMETYPES[:xlsx]
-      else
-        Mime.coerce((`file --mime-type #{file.path}`).split(':').last.strip) rescue "application/#{type}"
       end
+      type.is_a?(Array) ? type.first : type
     end
     
-    # Attempt to take mime types that are known to be guessed incorrectly and
-    # cast them to one that Google Docs will accept.
-    def self.coerce(mime_type)
-      case mime_type
-      when /vnd.ms-office/       then 'application/msword'
-      when /x-docx/              then 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-      else mime_type
+    # Merges then inverts all the mime type constants to make a new hash with mime types as keys
+    # and the corresponding file extensions as values. For example this:
+    # 
+    #   :doc  => ['application/msword', 'application/vnd.ms-office'],
+    #   
+    # Becomes:
+    # 
+    #   'application/msword' => :doc, 
+    #   'application/vnd.ms-office' => :doc
+    # 
+    # This is useful for intuiting file extensions based on mime types, which is handy when the
+    # filename doesn't have an extension (e.g. when doing post-processing with paperclip).
+    # 
+    def self.mime_type_to_extension_mapping
+      doc_types = [DOCUMENT_MIMETYPES, DRAWING_MIMETYPES, PRESENTATION_MIMETYPES, SPREADSHEET_MIMETYPES]
+      extensions = {}
+      mime_types = {}
+      doc_types.each { |doc_type| extensions.merge!(doc_type) }
+
+      extensions.each do |extension, mime|
+        if mime.is_a?(Array)
+          mime.each { |m| mime_types[m] = extension }
+        else
+          mime_types[mime] = extension
+        end
       end
+      mime_types
     end
-    
+
     def self.guess_service(mime_type)
       services = { :document     => DOCUMENT_MIMETYPES,
                    :drawing      => DRAWING_MIMETYPES,
                    :presentation => PRESENTATION_MIMETYPES,
                    :spreadsheet  => SPREADSHEET_MIMETYPES }
-      
+
       services.each_key do |service|
-        return service if services[service].has_value?(mime_type)
+        return service if services[service].values.flatten.include?(mime_type)
       end
-      
+
       nil
     end
   end

data/lib/dewey/validation.rb

@@ -1,14 +1,14 @@
 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]
-  
+
   # Utility methods to check that a format is accepted for a particular service
   #
   class Validation
-    
+
     class << self
       # Determine wether or not a format is available for download.
       #
@@ -44,7 +44,7 @@ module Dewey
       # @raise [DeweyError] Raised when an unknown service is given
       def valid_export_format?(format, service = nil)
         format  = format.to_sym
-        service = default_service(service) 
+        service = default_service(service)
 
         case service
         when :document     then Dewey::DOCUMENT_EXPORT_FORMATS.include?(format)

data/lib/dewey/version.rb

@@ -1,3 +1,3 @@
 module Dewey
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

data/spec/client_auth_spec.rb

@@ -12,24 +12,24 @@ describe Dewey::ClientAuth do
     stub_http_request(:post, Dewey::GOOGLE_LOGIN_URL).
       with(:body => 'accountType=HOSTED_OR_GOOGLE&Email=example&Passwd=password&service=writely').
       to_return(:body => '=12345')
-   
+
     subject.authenticate!.should be_true
     subject.authentications.should have_key(:writely)
 
     WebMock.should have_requested(:post, Dewey::GOOGLE_LOGIN_URL).with(:body => /.*service=writely.*/)
   end
-  
+
   it "authenticates for wise" do
     stub_http_request(:post, Dewey::GOOGLE_LOGIN_URL).
       with(:body => 'accountType=HOSTED_OR_GOOGLE&Email=example&Passwd=password&service=wise').
       to_return(:body => '=12345')
-    
+
     subject.authenticate!(:wise)
     subject.authentications.should have_key(:wise)
-    
+
     WebMock.should have_requested(:post, Dewey::GOOGLE_LOGIN_URL).with(:body => /.*service=wise.*/)
   end
-  
+
   it "returns false if authorization fails" do
     stub_http_request(:post, Dewey::GOOGLE_LOGIN_URL).to_return(:status => 403)
 
@@ -48,11 +48,11 @@ describe Dewey::ClientAuth do
 
     subject.authenticated?.should be_true
   end
-  
+
   it "can scope authentication to writely" do
     stub_http_request(:post, Dewey::GOOGLE_LOGIN_URL).to_return(:body => '=12345')
-    
-    subject.authenticate!(:writely) 
+
+    subject.authenticate!(:writely)
     subject.authenticated?(:writely).should be_true
   end
 
@@ -61,11 +61,11 @@ describe Dewey::ClientAuth do
     subject.authenticate!(:wise)
     subject.authenticated?(:wise).should be_true
   end
-  
+
   it "provides authentication tokens" do
     stub_http_request(:post, Dewey::GOOGLE_LOGIN_URL).to_return(:body => '=12345')
     subject.authenticate!(:writely)
-    
+
     subject.token(:writely).should eq('12345')
   end
 
@@ -81,6 +81,6 @@ describe Dewey::ClientAuth do
 
   it "will correctly map spreadsheets to wise" do
     stub_http_request(:post, Dewey::GOOGLE_LOGIN_URL).to_return(:body => '=12345')
-    subject.token('spreadsheets').should eq('12345') 
+    subject.token('spreadsheets').should eq('12345')
   end
 end

data/spec/core/convert_spec.rb

@@ -7,7 +7,7 @@ describe "Dewey.convert" do
     @txt = sample_file 'sample_document.txt'
     @doc = sample_file 'sample_document.doc'
   end
-  
+
   it "should put, get, and delete" do
     Dewey.should_receive(:put).with(@txt, 'sample').and_return('document:12345')
     Dewey.should_receive(:get).with('document:12345', :doc).and_return(@doc)

data/spec/core/get_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Dewey.get" do 
+describe "Dewey.get" do
   before(:each) { stub_dewey_auth }
 
   it "raises with an invalid format" do
@@ -28,14 +28,14 @@ describe "Dewey.get" do
   it "downloads a document by id" do
     stub_request(:get, "#{Dewey::GOOGLE_DOCUMENT_URL}?id=12345").
       to_return(:body => sample_file('sample_document.txt'))
-    
+
     Dewey.get('document:12345').should_not be_nil
   end
-  
+
   it "sets the export format when format is provided" do
     stub_request(:get, "#{Dewey::GOOGLE_DOCUMENT_URL}?id=12345&exportFormat=doc&format=doc").
       to_return(:body => sample_file('sample_document.doc'))
-    
+
     Dewey.get('document:12345', :format => :doc).should_not be_nil
   end
 
@@ -53,7 +53,7 @@ describe "Dewey.get" do
 
     Dewey.get('My Document').should_not be_nil
   end
-  
+
   it "returns nil when the title can't be found" do
     Dewey.should_receive(:search).with('My Document', { :exact => true }).and_return([])
 
@@ -77,7 +77,7 @@ describe "Dewey.get" do
   it "is able to download a spreadsheet" do
     stub_request(:get, "#{Dewey::GOOGLE_SPREADSHEET_URL}?key=12345").
       to_return(:body => sample_file('sample_spreadsheet.csv'))
-    
+
     Dewey.get('spreadsheet:12345').should_not be_nil
   end
 
@@ -91,7 +91,7 @@ describe "Dewey.get" do
   it "should not download a full spreadsheet sheet" do
     stub_request(:get, "#{Dewey::GOOGLE_SPREADSHEET_URL}?key=12345").
       to_return(:body => sample_file('sample_spreadsheet.xls'))
-    
+
     Dewey.get('spreadsheet:12345', :sheet => 1).should_not be_nil
   end
 

data/spec/core/put_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Dewey.put' do
   before(:each) { stub_dewey_auth }
-  
+
   before(:all) do
     @psd = sample_file 'sample_drawing.psd'
     @txt = sample_file 'sample_document.txt'
@@ -17,7 +17,7 @@ describe 'Dewey.put' do
   it "should raise when uploading unsupported file types" do
     lambda { Dewey.put(@psd) }.should raise_exception(Dewey::DeweyError)
   end
-  
+
   it "should raise when uploading a document with a bad mimetype" do
     lambda { Dewey.put(@bad) }.should raise_exception(Dewey::DeweyError)
   end
@@ -31,14 +31,14 @@ describe 'Dewey.put' do
   it "get a resource id after putting a document" do
     stub_request(:post, Dewey::GOOGLE_FEED_URL).
       to_return(:status => 201, :body => "<feed><entry><id>https://docs.google.com/feeds/id/document:12345</id></entry></feed>")
-    
+
     Dewey.put(@txt).should eq('document:12345')
   end
-  
+
   it "get a resource id after putting a spreadsheet" do
     stub_request(:post, Dewey::GOOGLE_FEED_URL).
       to_return(:status => 201, :body => "<feed><entry><id>https://docs.google.com/feeds/id/spreadsheet:12345</id></entry></feed>")
-      
+
     Dewey.put(@spr).should eq('spreadsheet:12345')
   end
 

data/spec/core/search_spec.rb

@@ -6,21 +6,21 @@ describe "Dewey.search" do
   it "can exactly match a single document" do
     stub_request(:get, "#{Dewey::GOOGLE_FEED_URL}?title=HR+Handbook&title-exact=true").
       to_return(:body => '<feed><id>https://docs.google.com/feeds/default/private/full</id><entry><id>document:12345</id></entry></feed>')
-    
+
     Dewey.search('HR Handbook', :exact => true).should eq(['document:12345'])
   end
 
   it "can partially match a single document" do
     stub_request(:get, "#{Dewey::GOOGLE_FEED_URL}?title=Spec+101").
       to_return(:body => '<feed><entry><id>document:12345</id></entry></feed>')
-    
+
     Dewey.search('Spec 101').should eq(['document:12345'])
   end
-  
+
   it "can partially match multiple document" do
     stub_request(:get, "#{Dewey::GOOGLE_FEED_URL}?title=notes").
       to_return(:body => '<feed><entry><id>document:123</id></entry><entry><id>document:456</id></entry></feed>')
-    
+
     Dewey.search('notes').should eq(['document:123', 'document:456'])
   end
 end

data/spec/core_spec.rb

@@ -4,7 +4,7 @@ describe Dewey do
   describe "Establishing Authentication" do
     it "connects lazily" do
       Dewey.authentication :client, :email => 'example', :password => 'password'
-      Dewey.authenticated?.should be_false 
+      Dewey.authenticated?.should be_false
     end
   end
 end

data/spec/mime_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
 describe Dewey::Mime do
-    
+
   describe "Interpreting mime types from files" do
     it "should provide the correct document mime type" do
       @doc = sample_file 'sample_document.doc'
       @pdf = sample_file 'sample_document.pdf'
       @rtf = sample_file 'sample_document.rtf'
-      
+
       Dewey::Mime.mime_type(@doc).should eq('application/msword')
       Dewey::Mime.mime_type(@pdf).should eq('application/pdf')
       Dewey::Mime.mime_type(@rtf).should eq('application/rtf')
     end
-    
+
     it "should provide the correct drawing mime type" do
       @png = sample_file 'sample_drawing.png'
 
@@ -21,38 +21,55 @@ describe Dewey::Mime do
 
     it "should provide the correct presentation mime type" do
       @ppt = sample_file 'sample_presentation.ppt'
-      
+
       Dewey::Mime.mime_type(@ppt).should eq('application/vnd.ms-powerpoint')
     end
-    
+
     it "should provide the correct spreadsheet mime type" do
       @xls = sample_file 'sample_spreadsheet.xls'
       @csv = sample_file 'sample_spreadsheet.csv'
-      
+
       Dewey::Mime.mime_type(@xls).should eq('application/vnd.ms-excel')
       Dewey::Mime.mime_type(@csv).should eq('text/csv')
     end
-    
+
     it "should coerce problematic mime types" do
       @docx = sample_file 'sample_document.docx'
-      
+
       Dewey::Mime.mime_type(@docx).should eq('application/vnd.openxmlformats-officedocument.wordprocessingml.document')
     end
-    
+
     it "should correctly guess from a file without an extension" do
       @noext = sample_file 'sample_document'
-      
+
       Dewey::Mime.mime_type(@noext).should eq('application/msword')
     end
   end
-  
-  describe "Guessing the service from a mime type" do    
+
+  describe "Determining file extesion from files" do
+    context "when the filename has an extension" do
+      it "should pull the extension off the filename" do
+        @docx = sample_file 'sample_document.docx'
+
+        Dewey::Mime.extension(@docx).should eq('docx')
+      end
+    end
+    context "when the filename does not have an extension" do
+      it "should pull the extension off the filename" do
+        @docx = sample_file 'sample_document'
+
+        Dewey::Mime.extension(@docx).should eq('doc')
+      end
+    end
+  end
+
+  describe "Guessing the service from a mime type" do
     it "should correctly guess service when given a known type" do
       Dewey::Mime.guess_service('application/msword').should eq(:document)
       Dewey::Mime.guess_service('application/vnd.ms-powerpoint').should eq(:presentation)
       Dewey::Mime.guess_service('application/x-vnd.oasis.opendocument.spreadsheet').should eq(:spreadsheet)
     end
-    
+
     it "should return nil for an unknown type" do
       Dewey::Mime.guess_service('bad/example').should be_nil
     end

data/spec/validation_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Dewey::Validation do
-  
+
   it "should return true for valid upload formats" do
     Dewey::Validation.valid_upload_format?(:txt, :document).should be_true
     Dewey::Validation.valid_upload_format?(:svg, :drawing).should be_true

metadata

@@ -1,72 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dewey
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.9
   prerelease: 
-  version: 0.2.8
 platform: ruby
-authors: 
+authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-19 00:00:00 -05:00
+date: 2011-10-02 00:00:00.000000000 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156571360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156571360
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156570320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.3.0
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156570320
+- !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2156569560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.4.0
+      - !ruby/object:Gem::Version
+        version: 1.7.6
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156569560
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2156568900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.8
+      - !ruby/object:Gem::Version
+        version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *2156568900
 description: Light, simple Google Docs library for Ruby.
-email: 
+email:
 - parker@sorentwo.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - CHANGELOG.md
@@ -111,36 +107,32 @@ files:
 has_rdoc: true
 homepage: http://github.com/sorentwo/dewey
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3186217541912544096
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1290362203853795856
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3186217541912544096
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1290362203853795856
 requirements: []
-
 rubyforge_project: dewey
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple Google Docs library.
 test_files: []
-