paperclip-imgur 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8c575a6ffa5a32f1067c7b7c0794e271fdf745b
-  data.tar.gz: b814a0fe6cd45104444b7388beea1de45fdfdb3e
+  metadata.gz: d8877dbb4a1024efedb5aaf05ed464ba3afec1e5
+  data.tar.gz: e42b2eb47c205eb82c9d11fd94051da3dea856a8
 SHA512:
-  metadata.gz: 45af981e2c2652ac7e12abeda03b7fe4ce4c4624eb69585f3b066fcec6e3cbbf3fc7e9d9ef2cbc4d21696851597a399bb340a7c7b35fd7430ead51e197471056
-  data.tar.gz: 17abb68607dd4099b179d3d32940ad3ca8bf057e4524d2082d5eafd7b7f27130ee441459b060636cf9738e3ec9bb32e835d1f300ee7d698cbf29ab58d07f6f69
+  metadata.gz: 91805a6e3e48e39cd241229e705ec509858440696459d435cb8d95251c4760b7ee23e1896131e7026c06f013df00192eb6f88af23d22d3f78102d8ae8ab066da
+  data.tar.gz: 101fc71a146559fb2c6a533ab4b6b7bcd83fdc151bcf8e20f35c708f2ac7b196df6029fd44a74d91b7607587f558591c9606d2fab9aa7e3dc8b10f461966734c

data/.rspec

@@ -1 +1 @@
---color -fs
+--color

data/README.md

@@ -69,3 +69,10 @@ To delete an image, follow the usual Paperclip procedure:
 @user.avatar = nil
 @user.save
 ```
+
+## Testing
+
+Run specs with
+```bash
+rspec
+```

data/lib/paperclip/storage/imgur.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 require 'erb'
-require 'imgur'
+require 'imgurapi'
 
 module Paperclip
   module Storage
@@ -64,7 +64,7 @@ module Paperclip
 
         return @url_generator.for(size, {}) if image_id.nil? || image_id.empty? # Show Paperclip's default missing image path
 
-        ::Imgur::Image.new(id: image_id).url(size)
+        ::Imgurapi::Image.new(id: image_id).url(size)
       end
 
       # Returns the path of the attachment.
@@ -83,7 +83,7 @@ module Paperclip
       private
 
       def imgur_session
-        @imgur_session ||= ::Imgur::Session.instance(@imgur_credentials)
+        @imgur_session ||= ::Imgurapi::Session.instance(@imgur_credentials)
       end
 
       def parse_credentials(credentials = nil)
@@ -96,6 +96,8 @@ module Paperclip
                         YAML.load(ERB.new(File.read(credentials.path)).result)
                       when String, Pathname
                         YAML.load(ERB.new(File.read(credentials)).result)
+                      else
+                        credentials
                       end
 
         return credentials.stringify_keys if credentials.respond_to? :stringify_keys

data/paperclip-imgur.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'paperclip-imgur'
-  gem.version       = '0.1.1'
+  gem.version       = '0.1.2'
   gem.authors       = ['Daniel Cruz Horts']
   gem.description   = %q{Extends Paperclip with Imgur storage}
   gem.summary       = gem.description
@@ -16,5 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'imgurapi', '~> 2.0.2'
+  gem.add_dependency 'imgurapi', '~> 3.0.0'
+  gem.add_development_dependency 'byebug'
+  gem.add_development_dependency 'rspec'
 end

data/spec/paperclip/storage/imgur_spec.rb

@@ -12,84 +12,88 @@ class CreateUsers < ActiveRecord::Migration
 end
 
 describe Paperclip::Storage::Imgur do
-  before(:all) do
+  def set_options(options)
+    stub_const(
+      'User',
+      Class.new(ActiveRecord::Base) do
+        has_attached_file :avatar, {storage: :imgur}.merge(options)
+      end
+    )
+  end
+
+  before :all do
     ActiveRecord::Base.send(:include, Paperclip::Glue)
 
     FileUtils.rm_rf 'tmp'
     FileUtils.mkdir_p 'tmp'
     ActiveRecord::Base.establish_connection('sqlite3:///tmp/foo.sqlite3')
     CreateUsers.migrate(:up)
-
     Paperclip.options[:log] = false
   end
-  
-  describe '#parse_credentials' do
-    def set_options(options)
-      stub_const('User', Class.new(ActiveRecord::Base) {
-          has_attached_file :avatar, { :storage => :imgur }.merge(options)
-        })
-    end
 
+  after :all do
+    CreateUsers.migrate(:down)
+  end
+
+  describe '#parse_credentials' do
     it 'should complain when providing unsuitable credentials' do
-      set_options(:imgur_credentials => 1)
-      expect { User.new.avatar }.to raise_error
+      set_options(imgur_credentials: 1)
 
-      set_options(:imgur_credentials => {})
-      expect { User.new.avatar }.to raise_error
+      expect { User.new.avatar }.to raise_error ArgumentError
     end
-    
+
     it 'should accept a properly formed hash' do
-      set_options(:imgur_credentials => {:app_key => '1', :app_secret => '2', :access_token => '3', :access_token_secret => '4'})
+      set_options(imgur_credentials: {client_key: '1', client_secret: '2', access_token: '3', refresh_token: '4'})
+
       expect { User.new.avatar }.to_not raise_error
     end
 
     it 'should use config/imgur.yml under a Rails application if we left credentials blank' do
-      stub_const('Rails', Class.new {
+      stub_const(
+        'Rails',
+        Class.new {
           def self.env
             'testing'
           end
           def self.root
             Dir.pwd
           end
-        })
-
+        }
+      )
       set_options({})
+
       expect { User.new.avatar }.to_not raise_error
     end
-    
+
     it 'should accept a file path' do
-      set_options(:imgur_credentials => "#{Dir.pwd}/config/imgur.yml")
+      set_options(imgur_credentials: "#{Dir.pwd}/config/imgur.yml")
+
       expect { User.new.avatar }.to_not raise_error
     end
-    
+
     it 'should accept a file' do
-      set_options(:imgur_credentials => File.open("#{Dir.pwd}/config/imgur.yml", 'r'))
+      set_options(imgur_credentials: File.open("#{Dir.pwd}/config/imgur.yml", 'r'))
+
       expect { User.new.avatar }.to_not raise_error
     end
   end
-  
-  describe '#url' do
-    before(:each) do
-      stub_const('User', Class.new(ActiveRecord::Base) { has_attached_file :avatar, :storage => :imgur, :imgur_credentials => {:app_key => '1', :app_secret => '2', :access_token => '3', :access_token_secret => '4'} })
 
-      @imgur_hash = 'random_valid_hash'
-      @user = User.create(:avatar_file_name => @imgur_hash)
+  describe '#url' do
+    before do
+      User = Class.new(ActiveRecord::Base) { has_attached_file :avatar, storage: :imgur, imgur_credentials: {client_key: '1', client_secret: '2', access_token: '3', refresh_token: '4'} }
     end
 
     it "should return the missing image path if there's no image" do
-      User.new.avatar.url.should eq('/avatars/original/missing.png')
-      User.new.avatar.url(:random_size).should eq('/avatars/random_size/missing.png')
+      expect(User.new.avatar.url).to eq '/avatars/original/missing.png'
+      expect(User.new.avatar.url(:random_size)).to eq '/avatars/random_size/missing.png'
     end
 
     it "should return Imgur's image paths if there's an image" do
-      session = @user.avatar.instance_variable_get(:@imgur_session)
-      
-      @user.avatar.url.should eq(session.url(@imgur_hash))
-      @user.avatar.url(:random_size).should eq(session.url(@imgur_hash, :random_size))
-      @user.avatar.url(:small_square).should eq(session.url(@imgur_hash, :small_square))
-      @user.avatar.url(:large_thumbnail).should eq(session.url(@imgur_hash, :large_thumbnail))
+      user = User.create(avatar_file_name: 'random_valid_hash')
+
+      expect(user.avatar.url(:random_size)).to eq "http://i.imgur.com/random_valid_hash.jpg"
+      expect(user.avatar.url(:small_square)).to eq "http://i.imgur.com/random_valid_hashs.jpg"
+      expect(user.avatar.url(:large_thumbnail)).to eq "http://i.imgur.com/random_valid_hashl.jpg"
     end
-    
   end
-  
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-imgur
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Cruz Horts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: imgurapi
@@ -16,14 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extends Paperclip with Imgur storage
 email: 
 executables: []