dewey 0.2.9 → 0.2.10

data/lib/dewey/core.rb

@@ -202,8 +202,8 @@ module Dewey
     # @see #get
     # @see #delete
     def convert(file, options = {})
-      id = put(file, options[:title])
-      converted = get(id, options[:format])
+      id = put(file, options)
+      converted = get(id, options)
 
       delete(id)
 

data/lib/dewey/version.rb

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

data/spec/core/convert_spec.rb

@@ -1,17 +1,28 @@
 require 'spec_helper'
 
-describe "Dewey.convert" do
-  before(:each) do
-    stub_dewey_auth
+describe Dewey, '#convert' do
+  let(:txt) { sample_file 'sample_document.txt' }
+  let(:doc) { sample_file 'sample_document.doc' }
 
-    @txt = sample_file 'sample_document.txt'
-    @doc = sample_file 'sample_document.doc'
+  before do
+    stub_dewey_auth
   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)
-    Dewey.should_receive(:delete).with('document:12345').and_return(true)
-    Dewey.convert(@txt, :title => 'sample', :format => :doc).should be(@doc)
+  it "puts, gets, and then deletes" do
+    # Put
+    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>")
+
+    # Get
+    stub_request(:get, "#{Dewey::GOOGLE_DOCUMENT_URL}?id=12345&exportFormat=doc&format=doc").
+      to_return(:body => doc)
+
+    # Delete
+    stub_request(:delete, "#{Dewey::GOOGLE_FEED_URL}/document:12345?delete=true")
+
+    returned = Dewey.convert(txt, :title => 'sample', :format => :doc)
+
+    returned.should be_instance_of(File)
+    returned.path.should match(/\.doc/)
   end
 end

data/spec/core/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe "Dewey.delete" do
-  before(:each) { stub_dewey_auth }
+describe Dewey, '#delete' do
+  before { stub_dewey_auth }
 
   it "deletes a resource from an id" do
     stub_request(:delete, "#{Dewey::GOOGLE_FEED_URL}/document:12345?delete=true")

data/spec/core/get_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe "Dewey.get" do
-  before(:each) { stub_dewey_auth }
+describe Dewey, '#get' do
+  before { stub_dewey_auth }
 
   it "raises with an invalid format" do
     lambda { Dewey.get('document:12345', :format => :psd) }.should raise_exception(Dewey::DeweyError)

data/spec/core/put_spec.rb

@@ -1,50 +1,40 @@
 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'
-    @spr = sample_file 'sample_spreadsheet.xls'
-    @bad = sample_file 'bad_mimetype'
-  end
-
-  after(:all) do
-    [@psd, @txt, @spr, @bad].map(&:close)
-  end
+describe Dewey, '#put' do
+  let(:bad) { sample_file 'bad_mimetype' }
+  let(:psd) { sample_file 'sample_drawing.psd' }
+  let(:spr) { sample_file 'sample_spreadsheet.xls' }
+  let(:txt) { sample_file 'sample_document.txt' }
 
-  it "should raise when uploading unsupported file types" do
-    lambda { Dewey.put(@psd) }.should raise_exception(Dewey::DeweyError)
-  end
+  before { stub_dewey_auth }
 
-  it "should raise when uploading a document with a bad mimetype" do
-    lambda { Dewey.put(@bad) }.should raise_exception(Dewey::DeweyError)
+  it "raises when uploading unsupported file types" do
+    lambda { Dewey.put(psd) }.should raise_exception(Dewey::DeweyError)
   end
 
-  it "should return nil on a failed request" do
+  it "returns nil on a failed request" do
     stub_request(:post, Dewey::GOOGLE_FEED_URL).to_return(:status => 300)
 
-    Dewey.put(@txt).should be_nil
+    Dewey.put(txt).should be_nil
   end
 
   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')
+    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')
+    Dewey.put(spr).should eq('spreadsheet:12345')
   end
 
   it "specifies an optional title in the header" do
     stub_request(:post, Dewey::GOOGLE_FEED_URL)
-    Dewey.put(@txt, :title => 'Secret')
+    Dewey.put(txt, :title => 'Secret')
 
     a_request(:post, Dewey::GOOGLE_FEED_URL).
       with(:headers => { 'Slug' => 'Secret' }).should have_been_made
@@ -53,19 +43,21 @@ describe 'Dewey.put' do
   it "specifies the filesize in the header" do
     stub_request(:post, Dewey::GOOGLE_FEED_URL)
 
-    Dewey.put(@txt)
+    Dewey.put(txt)
 
     a_request(:post, Dewey::GOOGLE_FEED_URL).
-      with(:headers => { 'Content-Length' => @txt.size }).should have_been_made
+      with(:headers => { 'Content-Length' => txt.size }).should have_been_made
   end
 end
 
-describe "Dewey.put!" do
-  before(:each) { stub_dewey_auth }
+describe Dewey, '#put' do
+  let(:txt) { sample_file 'sample_document.txt' }
+
+  before { stub_dewey_auth }
 
   it "raises an error on a failed request" do
-    txt = sample_file 'sample_document.txt'
     stub_request(:post, Dewey::GOOGLE_FEED_URL).to_return(:status => 300)
+
     lambda { Dewey.put!(txt) }.should raise_exception(Dewey::DeweyError)
   end
 end

data/spec/core/search_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Dewey.search" do
+describe Dewey, '#search' do
   before(:each) { stub_dewey_auth }
 
   it "can exactly match a single document" do

data/spec/mime_spec.rb

@@ -1,64 +1,55 @@
 require 'spec_helper'
 
 describe Dewey::Mime do
+  let(:csv)  { sample_file 'sample_spreadsheet.csv' }
+  let(:doc)  { sample_file 'sample_document.doc' }
+  let(:docx) { sample_file 'sample_document.docx' }
+  let(:nxt)  { sample_file 'sample_document' }
+  let(:pdf)  { sample_file 'sample_document.pdf' }
+  let(:png)  { sample_file 'sample_drawing.png' }
+  let(:ppt)  { sample_file 'sample_presentation.ppt' }
+  let(:rtf)  { sample_file 'sample_document.rtf' }
+  let(:xls)  { sample_file 'sample_spreadsheet.xls' }
 
   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')
+      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'
-
-      Dewey::Mime.mime_type(@png).should eq('image/png')
+      Dewey::Mime.mime_type(png).should eq('image/png')
     end
 
     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')
+      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')
+      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')
+      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')
+      Dewey::Mime.mime_type(nxt).should eq('application/msword')
     end
   end
 
   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')
+        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')
+        Dewey::Mime.extension(nxt).should eq('doc')
       end
     end
   end

data/spec/validation_spec.rb

@@ -1,7 +1,6 @@
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dewey
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-02 00:00:00.000000000 -05:00
+date: 2011-12-01 00:00:00.000000000 -06:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156571360 !ruby/object:Gem::Requirement
+  requirement: &2156551460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2156571360
+  version_requirements: *2156551460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156570320 !ruby/object:Gem::Requirement
+  requirement: &2156550560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156570320
+  version_requirements: *2156550560
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2156569560 !ruby/object:Gem::Requirement
+  requirement: &2156549380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.7.6
   type: :development
   prerelease: false
-  version_requirements: *2156569560
+  version_requirements: *2156549380
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156568900 !ruby/object:Gem::Requirement
+  requirement: &2156546480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156568900
+  version_requirements: *2156546480
 description: Light, simple Google Docs library for Ruby.
 email:
 - parker@sorentwo.com
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1290362203853795856
+      hash: 2270030557536834632
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1290362203853795856
+      hash: 2270030557536834632
 requirements: []
 rubyforge_project: dewey
 rubygems_version: 1.6.2