scribd-carrierwave 0.1.2 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/scribd-carrierwave.rb +10 -2
 - data/lib/scribd-carrierwave/version.rb +1 -1
 - data/spec/scribd-carrierwave_spec.rb +58 -1
 - metadata +17 -23
 
    
        data/lib/scribd-carrierwave.rb
    CHANGED
    
    | 
         @@ -11,8 +11,9 @@ module ScribdCarrierWave 
     | 
|
| 
       11 
11 
     | 
    
         
             
                end
         
     | 
| 
       12 
12 
     | 
    
         | 
| 
       13 
13 
     | 
    
         
             
                def upload uploader
         
     | 
| 
      
 14 
     | 
    
         
            +
             
     | 
| 
       14 
15 
     | 
    
         
             
                  file_path = full_path(uploader)
         
     | 
| 
       15 
     | 
    
         
            -
                  args = { file: file_path, access: 'private' }
         
     | 
| 
      
 16 
     | 
    
         
            +
                  args = { file: file_path, access: ( uploader.class.public? ? 'public' : 'private' )}
         
     | 
| 
       16 
17 
     | 
    
         | 
| 
       17 
18 
     | 
    
         
             
                  type = File.extname(file_path)
         
     | 
| 
       18 
19 
     | 
    
         
             
                  if type
         
     | 
| 
         @@ -37,10 +38,17 @@ module ScribdCarrierWave 
     | 
|
| 
       37 
38 
     | 
    
         
             
                end
         
     | 
| 
       38 
39 
     | 
    
         | 
| 
       39 
40 
     | 
    
         
             
                module ClassMethods
         
     | 
| 
       40 
     | 
    
         
            -
             
     | 
| 
      
 41 
     | 
    
         
            +
             
     | 
| 
      
 42 
     | 
    
         
            +
                  def public?
         
     | 
| 
      
 43 
     | 
    
         
            +
                    @public
         
     | 
| 
      
 44 
     | 
    
         
            +
                  end
         
     | 
| 
      
 45 
     | 
    
         
            +
             
     | 
| 
      
 46 
     | 
    
         
            +
                  def has_ipaper(public = false)
         
     | 
| 
       41 
47 
     | 
    
         
             
                    include InstanceMethods
         
     | 
| 
       42 
48 
     | 
    
         
             
                    after :store, :upload_to_scribd
         
     | 
| 
       43 
49 
     | 
    
         
             
                    before :remove, :delete_from_scribd
         
     | 
| 
      
 50 
     | 
    
         
            +
             
     | 
| 
      
 51 
     | 
    
         
            +
                    @public = !!public
         
     | 
| 
       44 
52 
     | 
    
         
             
                  end
         
     | 
| 
       45 
53 
     | 
    
         
             
                end
         
     | 
| 
       46 
54 
     | 
    
         | 
| 
         @@ -1,17 +1,54 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            require File.join(File.dirname(__FILE__), %w[spec_helper])
         
     | 
| 
       2 
2 
     | 
    
         | 
| 
      
 3 
     | 
    
         
            +
            class MockUploader
         
     | 
| 
      
 4 
     | 
    
         
            +
            end
         
     | 
| 
      
 5 
     | 
    
         
            +
             
     | 
| 
      
 6 
     | 
    
         
            +
            class TestUploader
         
     | 
| 
      
 7 
     | 
    
         
            +
              include ScribdCarrierWave
         
     | 
| 
      
 8 
     | 
    
         
            +
             
     | 
| 
      
 9 
     | 
    
         
            +
              def self.after(*args); end
         
     | 
| 
      
 10 
     | 
    
         
            +
              def self.before(*args); end
         
     | 
| 
      
 11 
     | 
    
         
            +
            end
         
     | 
| 
      
 12 
     | 
    
         
            +
             
     | 
| 
       3 
13 
     | 
    
         
             
            describe ScribdCarrierWave do
         
     | 
| 
       4 
14 
     | 
    
         
             
              context "module methods" do
         
     | 
| 
       5 
15 
     | 
    
         
             
                before(:each) do
         
     | 
| 
       6 
     | 
    
         
            -
                  @uploader = mock 
     | 
| 
      
 16 
     | 
    
         
            +
                  @uploader = mock
         
     | 
| 
      
 17 
     | 
    
         
            +
                  @uploader.stubs(:class).returns(MockUploader)
         
     | 
| 
      
 18 
     | 
    
         
            +
                  MockUploader.stubs(:public?).returns(false)
         
     | 
| 
       7 
19 
     | 
    
         
             
                  @scribd_user_mock = mock
         
     | 
| 
       8 
20 
     | 
    
         
             
                  Scribd::User.stubs(:login).returns(@scribd_user_mock)
         
     | 
| 
       9 
21 
     | 
    
         
             
                end
         
     | 
| 
      
 22 
     | 
    
         
            +
             
     | 
| 
      
 23 
     | 
    
         
            +
                describe "class methods" do
         
     | 
| 
      
 24 
     | 
    
         
            +
                  it "responds to public?" do
         
     | 
| 
      
 25 
     | 
    
         
            +
                    TestUploader.should respond_to :public?
         
     | 
| 
      
 26 
     | 
    
         
            +
                  end
         
     | 
| 
      
 27 
     | 
    
         
            +
             
     | 
| 
      
 28 
     | 
    
         
            +
                  it "defaults to private" do
         
     | 
| 
      
 29 
     | 
    
         
            +
                    TestUploader.public?.should be_false
         
     | 
| 
      
 30 
     | 
    
         
            +
                  end
         
     | 
| 
      
 31 
     | 
    
         
            +
             
     | 
| 
      
 32 
     | 
    
         
            +
                  it "responds to has_ipaper" do
         
     | 
| 
      
 33 
     | 
    
         
            +
                    TestUploader.should respond_to :has_ipaper
         
     | 
| 
      
 34 
     | 
    
         
            +
                  end
         
     | 
| 
      
 35 
     | 
    
         
            +
             
     | 
| 
      
 36 
     | 
    
         
            +
                  it "sets public correctly" do
         
     | 
| 
      
 37 
     | 
    
         
            +
                    TestUploader.class_eval do
         
     | 
| 
      
 38 
     | 
    
         
            +
                      has_ipaper true
         
     | 
| 
      
 39 
     | 
    
         
            +
                    end
         
     | 
| 
      
 40 
     | 
    
         
            +
                    TestUploader.public?.should be_true
         
     | 
| 
      
 41 
     | 
    
         
            +
                  end
         
     | 
| 
      
 42 
     | 
    
         
            +
             
     | 
| 
      
 43 
     | 
    
         
            +
                end
         
     | 
| 
       10 
44 
     | 
    
         | 
| 
       11 
45 
     | 
    
         
             
                describe "upload" do
         
     | 
| 
       12 
46 
     | 
    
         
             
                  it "calls rscribd.upload with the correct arguments" do
         
     | 
| 
       13 
47 
     | 
    
         
             
                    @uploader.stubs(:url).returns('test_url')
         
     | 
| 
       14 
48 
     | 
    
         
             
                    @uploader.stubs(:root).returns('/root/path/')
         
     | 
| 
      
 49 
     | 
    
         
            +
                    uploader_class = mock
         
     | 
| 
      
 50 
     | 
    
         
            +
                    uploader_class.stubs(:public).returns(false)
         
     | 
| 
      
 51 
     | 
    
         
            +
                    @uploader.class.stubs(:class).returns(uploader_class)
         
     | 
| 
       15 
52 
     | 
    
         
             
                    @scribd_user_mock.expects(:upload).with(has_entries(file: '/root/path/test_url', access: 'private'))
         
     | 
| 
       16 
53 
     | 
    
         
             
                    ScribdCarrierWave::upload @uploader
         
     | 
| 
       17 
54 
     | 
    
         
             
                  end
         
     | 
| 
         @@ -21,6 +58,20 @@ describe ScribdCarrierWave do 
     | 
|
| 
       21 
58 
     | 
    
         
             
                    @scribd_user_mock.expects(:upload).with(has_entries(type: 'pdf'))
         
     | 
| 
       22 
59 
     | 
    
         
             
                    ScribdCarrierWave::upload @uploader
         
     | 
| 
       23 
60 
     | 
    
         
             
                  end
         
     | 
| 
      
 61 
     | 
    
         
            +
             
     | 
| 
      
 62 
     | 
    
         
            +
                  it "makes a private file if public? returns false" do
         
     | 
| 
      
 63 
     | 
    
         
            +
                    @uploader.stubs(:url).returns('http://whatever')
         
     | 
| 
      
 64 
     | 
    
         
            +
                    MockUploader.stubs(:public?).returns(false)
         
     | 
| 
      
 65 
     | 
    
         
            +
                    @scribd_user_mock.expects(:upload).with(has_entries(access: 'private'))
         
     | 
| 
      
 66 
     | 
    
         
            +
                    ScribdCarrierWave::upload @uploader
         
     | 
| 
      
 67 
     | 
    
         
            +
                  end
         
     | 
| 
      
 68 
     | 
    
         
            +
             
     | 
| 
      
 69 
     | 
    
         
            +
                  it "makes a public file if public? returns true" do
         
     | 
| 
      
 70 
     | 
    
         
            +
                    @uploader.stubs(:url).returns('http://whatever')
         
     | 
| 
      
 71 
     | 
    
         
            +
                    MockUploader.stubs(:public?).returns(true)
         
     | 
| 
      
 72 
     | 
    
         
            +
                    @scribd_user_mock.expects(:upload).with(has_entries(access: 'public'))
         
     | 
| 
      
 73 
     | 
    
         
            +
                    ScribdCarrierWave::upload @uploader
         
     | 
| 
      
 74 
     | 
    
         
            +
                  end
         
     | 
| 
       24 
75 
     | 
    
         
             
                end
         
     | 
| 
       25 
76 
     | 
    
         | 
| 
       26 
77 
     | 
    
         
             
                describe "destroy" do
         
     | 
| 
         @@ -47,6 +98,12 @@ describe ScribdCarrierWave do 
     | 
|
| 
       47 
98 
     | 
    
         
             
                  end
         
     | 
| 
       48 
99 
     | 
    
         
             
                end
         
     | 
| 
       49 
100 
     | 
    
         
             
              end
         
     | 
| 
      
 101 
     | 
    
         
            +
             
     | 
| 
      
 102 
     | 
    
         
            +
              context "class methods" do
         
     | 
| 
      
 103 
     | 
    
         
            +
                it "responds to has_ipaper" do
         
     | 
| 
      
 104 
     | 
    
         
            +
             
     | 
| 
      
 105 
     | 
    
         
            +
                end
         
     | 
| 
      
 106 
     | 
    
         
            +
              end
         
     | 
| 
       50 
107 
     | 
    
         | 
| 
       51 
108 
     | 
    
         
             
              context "instance methods" do
         
     | 
| 
       52 
109 
     | 
    
         
             
                before(:each) do
         
     | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: scribd-carrierwave
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 0.1. 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 0.1.3
         
     | 
| 
       5 
5 
     | 
    
         
             
              prerelease: 
         
     | 
| 
       6 
6 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       7 
7 
     | 
    
         
             
            authors:
         
     | 
| 
         @@ -9,11 +9,11 @@ authors: 
     | 
|
| 
       9 
9 
     | 
    
         
             
            autorequire: 
         
     | 
| 
       10 
10 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       11 
11 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       12 
     | 
    
         
            -
            date:  
     | 
| 
      
 12 
     | 
    
         
            +
            date: 2013-11-25 00:00:00.000000000Z
         
     | 
| 
       13 
13 
     | 
    
         
             
            dependencies:
         
     | 
| 
       14 
14 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       15 
15 
     | 
    
         
             
              name: rspec
         
     | 
| 
       16 
     | 
    
         
            -
              requirement: & 
     | 
| 
      
 16 
     | 
    
         
            +
              requirement: &70188514950280 !ruby/object:Gem::Requirement
         
     | 
| 
       17 
17 
     | 
    
         
             
                none: false
         
     | 
| 
       18 
18 
     | 
    
         
             
                requirements:
         
     | 
| 
       19 
19 
     | 
    
         
             
                - - ! '>='
         
     | 
| 
         @@ -21,10 +21,10 @@ dependencies: 
     | 
|
| 
       21 
21 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       22 
22 
     | 
    
         
             
              type: :development
         
     | 
| 
       23 
23 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       24 
     | 
    
         
            -
              version_requirements: * 
     | 
| 
      
 24 
     | 
    
         
            +
              version_requirements: *70188514950280
         
     | 
| 
       25 
25 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       26 
26 
     | 
    
         
             
              name: mocha
         
     | 
| 
       27 
     | 
    
         
            -
              requirement: & 
     | 
| 
      
 27 
     | 
    
         
            +
              requirement: &70188514949780 !ruby/object:Gem::Requirement
         
     | 
| 
       28 
28 
     | 
    
         
             
                none: false
         
     | 
| 
       29 
29 
     | 
    
         
             
                requirements:
         
     | 
| 
       30 
30 
     | 
    
         
             
                - - ~>
         
     | 
| 
         @@ -32,10 +32,10 @@ dependencies: 
     | 
|
| 
       32 
32 
     | 
    
         
             
                    version: 0.10.0
         
     | 
| 
       33 
33 
     | 
    
         
             
              type: :development
         
     | 
| 
       34 
34 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       35 
     | 
    
         
            -
              version_requirements: * 
     | 
| 
      
 35 
     | 
    
         
            +
              version_requirements: *70188514949780
         
     | 
| 
       36 
36 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       37 
37 
     | 
    
         
             
              name: cover_me
         
     | 
| 
       38 
     | 
    
         
            -
              requirement: & 
     | 
| 
      
 38 
     | 
    
         
            +
              requirement: &70188514949360 !ruby/object:Gem::Requirement
         
     | 
| 
       39 
39 
     | 
    
         
             
                none: false
         
     | 
| 
       40 
40 
     | 
    
         
             
                requirements:
         
     | 
| 
       41 
41 
     | 
    
         
             
                - - ! '>='
         
     | 
| 
         @@ -43,10 +43,10 @@ dependencies: 
     | 
|
| 
       43 
43 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       44 
44 
     | 
    
         
             
              type: :development
         
     | 
| 
       45 
45 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       46 
     | 
    
         
            -
              version_requirements: * 
     | 
| 
      
 46 
     | 
    
         
            +
              version_requirements: *70188514949360
         
     | 
| 
       47 
47 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       48 
48 
     | 
    
         
             
              name: rake
         
     | 
| 
       49 
     | 
    
         
            -
              requirement: & 
     | 
| 
      
 49 
     | 
    
         
            +
              requirement: &70188523331360 !ruby/object:Gem::Requirement
         
     | 
| 
       50 
50 
     | 
    
         
             
                none: false
         
     | 
| 
       51 
51 
     | 
    
         
             
                requirements:
         
     | 
| 
       52 
52 
     | 
    
         
             
                - - ! '>='
         
     | 
| 
         @@ -54,10 +54,10 @@ dependencies: 
     | 
|
| 
       54 
54 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       55 
55 
     | 
    
         
             
              type: :development
         
     | 
| 
       56 
56 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       57 
     | 
    
         
            -
              version_requirements: * 
     | 
| 
      
 57 
     | 
    
         
            +
              version_requirements: *70188523331360
         
     | 
| 
       58 
58 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       59 
59 
     | 
    
         
             
              name: rscribd
         
     | 
| 
       60 
     | 
    
         
            -
              requirement: & 
     | 
| 
      
 60 
     | 
    
         
            +
              requirement: &70188523330940 !ruby/object:Gem::Requirement
         
     | 
| 
       61 
61 
     | 
    
         
             
                none: false
         
     | 
| 
       62 
62 
     | 
    
         
             
                requirements:
         
     | 
| 
       63 
63 
     | 
    
         
             
                - - ! '>='
         
     | 
| 
         @@ -65,10 +65,10 @@ dependencies: 
     | 
|
| 
       65 
65 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       66 
66 
     | 
    
         
             
              type: :runtime
         
     | 
| 
       67 
67 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       68 
     | 
    
         
            -
              version_requirements: * 
     | 
| 
      
 68 
     | 
    
         
            +
              version_requirements: *70188523330940
         
     | 
| 
       69 
69 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       70 
70 
     | 
    
         
             
              name: carrierwave
         
     | 
| 
       71 
     | 
    
         
            -
              requirement: & 
     | 
| 
      
 71 
     | 
    
         
            +
              requirement: &70188523330520 !ruby/object:Gem::Requirement
         
     | 
| 
       72 
72 
     | 
    
         
             
                none: false
         
     | 
| 
       73 
73 
     | 
    
         
             
                requirements:
         
     | 
| 
       74 
74 
     | 
    
         
             
                - - ! '>='
         
     | 
| 
         @@ -76,10 +76,10 @@ dependencies: 
     | 
|
| 
       76 
76 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       77 
77 
     | 
    
         
             
              type: :runtime
         
     | 
| 
       78 
78 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       79 
     | 
    
         
            -
              version_requirements: * 
     | 
| 
      
 79 
     | 
    
         
            +
              version_requirements: *70188523330520
         
     | 
| 
       80 
80 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       81 
81 
     | 
    
         
             
              name: configatron
         
     | 
| 
       82 
     | 
    
         
            -
              requirement: & 
     | 
| 
      
 82 
     | 
    
         
            +
              requirement: &70188523330100 !ruby/object:Gem::Requirement
         
     | 
| 
       83 
83 
     | 
    
         
             
                none: false
         
     | 
| 
       84 
84 
     | 
    
         
             
                requirements:
         
     | 
| 
       85 
85 
     | 
    
         
             
                - - ! '>='
         
     | 
| 
         @@ -87,7 +87,7 @@ dependencies: 
     | 
|
| 
       87 
87 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       88 
88 
     | 
    
         
             
              type: :runtime
         
     | 
| 
       89 
89 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       90 
     | 
    
         
            -
              version_requirements: * 
     | 
| 
      
 90 
     | 
    
         
            +
              version_requirements: *70188523330100
         
     | 
| 
       91 
91 
     | 
    
         
             
            description: Allows you to have a CarrierWave uploader automatically upload to scribd
         
     | 
| 
       92 
92 
     | 
    
         
             
            email:
         
     | 
| 
       93 
93 
     | 
    
         
             
            - aubrey.c.rhodes@gmail.com
         
     | 
| 
         @@ -119,21 +119,15 @@ required_ruby_version: !ruby/object:Gem::Requirement 
     | 
|
| 
       119 
119 
     | 
    
         
             
              - - ! '>='
         
     | 
| 
       120 
120 
     | 
    
         
             
                - !ruby/object:Gem::Version
         
     | 
| 
       121 
121 
     | 
    
         
             
                  version: '0'
         
     | 
| 
       122 
     | 
    
         
            -
                  segments:
         
     | 
| 
       123 
     | 
    
         
            -
                  - 0
         
     | 
| 
       124 
     | 
    
         
            -
                  hash: 4475511991968313643
         
     | 
| 
       125 
122 
     | 
    
         
             
            required_rubygems_version: !ruby/object:Gem::Requirement
         
     | 
| 
       126 
123 
     | 
    
         
             
              none: false
         
     | 
| 
       127 
124 
     | 
    
         
             
              requirements:
         
     | 
| 
       128 
125 
     | 
    
         
             
              - - ! '>='
         
     | 
| 
       129 
126 
     | 
    
         
             
                - !ruby/object:Gem::Version
         
     | 
| 
       130 
127 
     | 
    
         
             
                  version: '0'
         
     | 
| 
       131 
     | 
    
         
            -
                  segments:
         
     | 
| 
       132 
     | 
    
         
            -
                  - 0
         
     | 
| 
       133 
     | 
    
         
            -
                  hash: 4475511991968313643
         
     | 
| 
       134 
128 
     | 
    
         
             
            requirements: []
         
     | 
| 
       135 
129 
     | 
    
         
             
            rubyforge_project: scribd-carrierwave
         
     | 
| 
       136 
     | 
    
         
            -
            rubygems_version: 1. 
     | 
| 
      
 130 
     | 
    
         
            +
            rubygems_version: 1.8.15
         
     | 
| 
       137 
131 
     | 
    
         
             
            signing_key: 
         
     | 
| 
       138 
132 
     | 
    
         
             
            specification_version: 3
         
     | 
| 
       139 
133 
     | 
    
         
             
            summary: Integration for rscirbd and carrierwave
         
     |