imgurapi 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c69afc57eef5284296e36c8b5836e69011b015fc
-  data.tar.gz: 7fb7e32ee6c569746ef56d29f80dadaead0ea1e1
+  metadata.gz: 6d77b29707bea1234b6841d315a016b0b16f955d
+  data.tar.gz: d6b760ffe9a4619495f1856ded2260c14a6309ac
 SHA512:
-  metadata.gz: e6977d3bb8ef0296b2ff178507b6f669fb0914dd47948bc6c95d9a7a590622fa4ec7ab297d4c8b2eca0604f73255b86c38e232e0d945560028a8ead62870443b
-  data.tar.gz: caed10efce8328a7ba2109ead917bb18af4045b503cbcaf45f06dcf68559e5130d12708039fe5c7604511c5deb8c6c926f68ee16485da15e76f817f1dda0508b
+  metadata.gz: 6b234a644136409006effbc608543020632d2a9065f208f284fd2d5199f98829b47186470ed920c80b0ef95e59063e538e7c6f5083bd67916dff509befb1ebb7
+  data.tar.gz: c6b19d8891c344136ad0de716e39efb4310933dfd94cde38265b7e557227bb8227d64d7fcab81fac0cf49c5fa3ef3f21c4fe1109c87391b6a566e7d9e8403a7b

data/README.md

@@ -47,13 +47,13 @@ refresh_token: REFRESH_TOKEN
 
 Create a session object to communicate to Imgur.
 ```ruby
-imgur_session = Imgur::Session.new(client_id: 'CLIENT_ID', client_secret: 'CLIENT_SECRET', refresh_token: 'REFRESH_TOKEN')
+imgur_session = Imgurapi::Session.new(client_id: 'CLIENT_ID', client_secret: 'CLIENT_SECRET', refresh_token: 'REFRESH_TOKEN')
 ```
 
 Your account:
 ```ruby
 account = imgur_session.account.account
-=> #<Imgur::Account:0x007fd399b6b678 @id=123, @url="my_account", @bio=nil, @reputation=7, @created=1352279501, @pro_expiration=false>
+=> #<Imgurapi::Account:0x007fd399b6b678 @id=123, @url="my_account", @bio=nil, @reputation=7, @created=1352279501, @pro_expiration=false>
 ```
 
 How many images you have:
@@ -66,7 +66,7 @@ Upload your first image. Argument can be either a String or a File:
 image = imgur_session.image.image.upload('portrait.jpg')
 ```
 
-image is now an instance of Imgur::Image, a convenient way to manage all the attributes of your image (at least more convenient than a multilevel dictionary):
+image is now an instance of Imgurapi::Image, a convenient way to manage all the attributes of your image (at least more convenient than a multilevel dictionary):
 ```ruby
 name = nil
 title = nil

data/Rakefile

@@ -1,7 +1,6 @@
+#!/usr/bin/env rake
 require 'bundler/gem_tasks'
 
-load 'imgur/tasks/tasks.rake'
+Bundler.setup
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
-task :default => :spec
+load 'imgurapi/tasks/tasks.rake'

data/lib/{imgur → imgurapi}/api/account.rb

@@ -1,16 +1,16 @@
-module Imgur
+module Imgurapi
   module Api
     class Account < Base
 
       # https://api.imgur.com/endpoints/account#account
       def account
-        Imgur::Account.new communication.call(:get, 'account/me')
+        Imgurapi::Account.new communication.call(:get, 'account/me')
       end
 
       # https://api.imgur.com/endpoints/account#images
       def images(page = 0)
         communication.call(:get, "account/me/images/#{page}").map do |image|
-          Imgur::Image.new image
+          Imgurapi::Image.new image
         end
       end
 

data/lib/{imgur → imgurapi}/api/base.rb

@@ -1,4 +1,4 @@
-module Imgur
+module Imgurapi
   module Api
     Base = Struct.new(:session) do
 

data/lib/{imgur → imgurapi}/api/image.rb

@@ -1,4 +1,4 @@
-module Imgur
+module Imgurapi
   module Api
     class Image < Base
 
@@ -6,7 +6,7 @@ module Imgur
       def image(id)
         raise 'Please provide a valid image identificator' if id.nil? or !id.kind_of? String or id == '' or !!(id =~ /[^\w]/)
 
-        Imgur::Image.new communication.call(:get, "image/#{id}")
+        Imgurapi::Image.new communication.call(:get, "image/#{id}")
       end
 
       # https://api.imgur.com/endpoints/image#image-upload
@@ -19,12 +19,12 @@ module Imgur
           raise 'Must provide a File or file path'
         end
 
-        Imgur::Image.new communication.call(:post, 'image', image: Base64.encode64(file.read))
+        Imgurapi::Image.new communication.call(:post, 'image', image: Base64.encode64(file.read))
       end
 
       # https://api.imgur.com/endpoints/image#image-delete
       def image_delete(id)
-        if id.kind_of? Imgur::Image
+        if id.kind_of? Imgurapi::Image
           id = id.id
         end
 

data/lib/{imgur → imgurapi}/communication.rb

@@ -1,4 +1,4 @@
-module Imgur
+module Imgurapi
   Communication = Struct.new(:session) do
 
     API_VERSION = 3

data/lib/{imgur → imgurapi}/models/account.rb

@@ -1,3 +1,3 @@
-module Imgur
+module Imgurapi
   class Account < Base; end
 end

data/lib/{imgur → imgurapi}/models/base.rb

@@ -1,4 +1,4 @@
-module Imgur
+module Imgurapi
   class Base
     def initialize(hsh = {})
       hsh.each do |k, v|

data/lib/{imgur → imgurapi}/models/image.rb

@@ -1,4 +1,4 @@
-module Imgur
+module Imgurapi
   class Image < Base
 
     IMAGE_URL = 'http://i.imgur.com/'
@@ -9,7 +9,7 @@ module Imgur
     end
 
     # Provides the download URL in case you know a valid imgur hash and don't want to make a network trip with .find
-    # Just in case you don't need the full Imgur::Image object
+    # Just in case you don't need the full Imgurapi::Image object
     def url(size)
       size = case size
              when :small_square, :small, :s

data/lib/{imgur → imgurapi}/session.rb

@@ -1,4 +1,4 @@
-module Imgur
+module Imgurapi
   class Session
     HOST = 'https://api.imgur.com'
 
@@ -21,7 +21,7 @@ module Imgur
 
     %w(Account Image).each do |clazz|
       define_method clazz.downcase do
-        Imgur::Api.const_get(clazz).new(self)
+        Imgurapi::Api.const_get(clazz).new(self)
       end
     end
 

data/lib/{imgur → imgurapi}/tasks/railtie.rb

@@ -1,8 +1,8 @@
-module Imgur
+module Imgurapi
   module Tasks
     class Railtie < Rails::Railtie
       rake_tasks do
-        load 'imgur/tasks/tasks.rake'
+        load 'imgurapi/tasks/tasks.rake'
       end
     end
   end

data/lib/imgurapi/tasks/rake.rb

@@ -0,0 +1,37 @@
+require 'imgurapi/session'
+
+module Imgurapi
+
+  module Rake
+    extend self
+
+    AUTHORIZE_ENDPOINT = '/oauth2/authorize'
+    TOKEN_ENDPOINT = '/oauth2/token'
+
+    def authorize(client_id, client_secret)
+      puts "\nVisit this URL: #{Imgurapi::Session::HOST}#{AUTHORIZE_ENDPOINT}?client_id=#{client_id}&response_type=pin"
+      print 'And after you approved the authorization please enter your verification code: '
+
+      pin = STDIN.gets.strip
+
+      begin
+        response = Faraday.new(Imgurapi::Session::HOST).post(TOKEN_ENDPOINT, pin: pin, client_id: client_id, client_secret: client_secret, grant_type: 'pin')
+
+        raise "HTTP #{response.status}" if response.status != 200
+        credentials = JSON.parse response.body
+      rescue => e
+        puts "Authorization failed: #{e.message}\nPlease try again."
+        exit
+      end
+
+      puts <<-MESSAGE
+
+Authorization was successful. Use these credentials to initialize the library:
+
+access_token: #{credentials['access_token']}
+refresh_secret: #{credentials['refresh_token']}
+
+MESSAGE
+    end
+  end
+end

data/lib/{imgur → imgurapi}/tasks/tasks.rake

@@ -1,5 +1,4 @@
-require 'imgur' # We need HOST to be available
-require 'imgur/tasks/rake'
+require 'imgurapi/tasks/rake'
 
 namespace :imgur do
   desc 'Obtain your Imgur tokens'
@@ -9,6 +8,6 @@ namespace :imgur do
       exit
     end
 
-    Imgur::Rake.authorize(ENV['CLIENT_ID'], ENV['CLIENT_SECRET'])
+    Imgurapi::Rake.authorize(ENV['CLIENT_ID'], ENV['CLIENT_SECRET'])
   end
 end

data/lib/imgurapi/version.rb

@@ -0,0 +1,5 @@
+module Imgurapi
+
+  VERSION = '3.0.0'
+
+end

data/lib/imgurapi.rb

@@ -0,0 +1,23 @@
+# Gem dependencies
+require 'faraday'
+require 'json'
+require 'base64'
+
+# Some nice extensions to base classes
+require 'imgurapi/extensions/array'
+require 'imgurapi/extensions/hash'
+require 'imgurapi/extensions/string'
+
+# This gem real code
+require 'imgurapi/version'
+require 'imgurapi/api/base'
+require 'imgurapi/api/account'
+require 'imgurapi/api/image'
+require 'imgurapi/communication'
+require 'imgurapi/session'
+require 'imgurapi/models/base'
+require 'imgurapi/models/account'
+require 'imgurapi/models/image'
+
+# Rails integration
+require 'imgurapi/tasks/railtie' if defined? Rails

data/spec/imgur/session_spec.rb

@@ -1,20 +1,20 @@
 require_relative '../spec_helper'
 require 'imgur'
 
-describe Imgur::Session do
+describe Imgurapiapi::Session do
 
   context 'incorrect credentials' do
-    it { expect { Imgur::Session.new }.to raise_error }
-    it { expect { Imgur::Session.new(random_key: nil) }.to raise_error }
-    it { expect { Imgur::Session.new(client_id: nil, random_key: nil) }.to raise_error }
-    it { expect { Imgur::Session.new({}) }.to raise_error }
+    it { expect { Imgurapi::Session.new }.to raise_error }
+    it { expect { Imgurapi::Session.new(random_key: nil) }.to raise_error }
+    it { expect { Imgurapi::Session.new(client_id: nil, random_key: nil) }.to raise_error }
+    it { expect { Imgurapi::Session.new({}) }.to raise_error }
   end
 
   context 'correct credentials' do
     it do
       expect(
-        Imgur::Session.new(client_id: 'ID', client_secret: 'SECRET', refresh_token: 'TOKEN')
-      ).to be_an_instance_of Imgur::Session
+        Imgurapi::Session.new(client_id: 'ID', client_secret: 'SECRET', refresh_token: 'TOKEN')
+      ).to be_an_instance_of Imgurapi::Session
     end
   end
 end

data/spec/imgur_spec.rb

@@ -1,28 +1,28 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'imgur'
 
-describe Imgur do
+describe Imgurapi do
 
   describe 'placeholder classes' do
 
     it 'should create an Image with the fields provided' do
-      image = Imgur::Image.new
-      image.should be_an_instance_of Imgur::Image
+      image = Imgurapi::Image.new
+      image.should be_an_instance_of Imgurapi::Image
 
       fields = {:a => 1, :b => 2}
-      image = Imgur::Image.new(fields)
-      image.should be_an_instance_of Imgur::Image
+      image = Imgurapi::Image.new(fields)
+      image.should be_an_instance_of Imgurapi::Image
       image.a.should eq(1)
       image.b.should eq(2)
     end
 
     it 'should create a Link with the fields provided' do
-      links = Imgur::Links.new
-      links.should be_an_instance_of Imgur::Links
+      links = Imgurapi::Links.new
+      links.should be_an_instance_of Imgurapi::Links
 
       fields = {:a => 1, :b => 2}
-      links = Imgur::Links.new(fields)
-      links.should be_an_instance_of Imgur::Links
+      links = Imgurapi::Links.new(fields)
+      links.should be_an_instance_of Imgurapi::Links
       links.a.should eq(1)
       links.b.should eq(2)
     end
@@ -48,7 +48,7 @@ describe Imgur do
 
     before(:all) do
       credentials = read_credentials_file
-      @session = Imgur::Session.new(credentials)
+      @session = Imgurapi::Session.new(credentials)
     end
 
     it 'should parse_message' do
@@ -84,8 +84,8 @@ describe Imgur do
       @session.send(:compose_image, {:images => {}}).should eq(nil)
 
       from_hash = {:images => {:image => {}, :links => {}}}
-      @session.send(:compose_image, from_hash).should be_an_instance_of Imgur::Image
-      @session.send(:compose_image, from_hash).links.should be_an_instance_of Imgur::Links
+      @session.send(:compose_image, from_hash).should be_an_instance_of Imgurapi::Image
+      @session.send(:compose_image, from_hash).links.should be_an_instance_of Imgurapi::Links
     end
 
   end
@@ -94,7 +94,7 @@ describe Imgur do
 
     before(:all) do
       credentials = read_credentials_file
-      @session = Imgur::Session.new(credentials)
+      @session = Imgurapi::Session.new(credentials)
       @upload_path, @upload_file = my_sample_image
     end
 
@@ -111,10 +111,10 @@ describe Imgur do
       expect { @session.upload(:not_the_expected_object) }.to raise_error
 
       @@image_by_path = @session.upload(@upload_path) #FIXME I know this is horrible, but I need to share the same image between tests http://brentlavelle.wordpress.com/2011/04/04/rspec-and-instance-variables/
-      @@image_by_path.should be_an_instance_of Imgur::Image
+      @@image_by_path.should be_an_instance_of Imgurapi::Image
 
       @@image_by_file = @session.upload(@upload_file)
-      @@image_by_file.should be_an_instance_of Imgur::Image
+      @@image_by_file.should be_an_instance_of Imgurapi::Image
     end
 
     it 'should retrieve the image' do
@@ -125,7 +125,7 @@ describe Imgur do
       image.should be_nil
 
       image = @session.find(@@image_by_path.hash)
-      image.should be_an_instance_of Imgur::Image
+      image.should be_an_instance_of Imgurapi::Image
 
       image.hash.should eq(@@image_by_path.hash)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imgurapi
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 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: faraday
@@ -61,22 +61,22 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/imgur.rb
-- lib/imgur/api/account.rb
-- lib/imgur/api/base.rb
-- lib/imgur/api/image.rb
-- lib/imgur/communication.rb
-- lib/imgur/extensions/array.rb
-- lib/imgur/extensions/hash.rb
-- lib/imgur/extensions/string.rb
-- lib/imgur/models/account.rb
-- lib/imgur/models/base.rb
-- lib/imgur/models/image.rb
-- lib/imgur/session.rb
-- lib/imgur/tasks/railtie.rb
-- lib/imgur/tasks/rake.rb
-- lib/imgur/tasks/tasks.rake
-- lib/imgur/version.rb
+- lib/imgurapi.rb
+- lib/imgurapi/api/account.rb
+- lib/imgurapi/api/base.rb
+- lib/imgurapi/api/image.rb
+- lib/imgurapi/communication.rb
+- lib/imgurapi/extensions/array.rb
+- lib/imgurapi/extensions/hash.rb
+- lib/imgurapi/extensions/string.rb
+- lib/imgurapi/models/account.rb
+- lib/imgurapi/models/base.rb
+- lib/imgurapi/models/image.rb
+- lib/imgurapi/session.rb
+- lib/imgurapi/tasks/railtie.rb
+- lib/imgurapi/tasks/rake.rb
+- lib/imgurapi/tasks/tasks.rake
+- lib/imgurapi/version.rb
 - spec/imgur/session_spec.rb
 - spec/imgur_spec.rb
 - spec/spec_helper.rb

data/lib/imgur/tasks/rake.rb

@@ -1,36 +0,0 @@
-module Imgur
-
-  module Rake
-    extend self
-
-    AUTHORIZE_ENDPOINT = '/oauth2/authorize'
-    TOKEN_ENDPOINT = '/oauth2/token'
-
-    def authorize(client_id, client_secret)
-      connection = Faraday.new(HOST)
-
-      puts "\nVisit this URL: #{HOST}#{AUTHORIZE_ENDPOINT}?client_id=#{client_id}&response_type=pin"
-      print 'And after you approved the authorization please enter your verification code: '
-
-      pin = STDIN.gets.strip
-
-      begin
-        response = JSON.parse connection.post(TOKEN_ENDPOINT, pin: pin, client_id: client_id, client_secret: client_secret, grant_type: 'pin').body
-      rescue
-        puts "Authorization failed.\nPlease try again."
-        exit
-      end
-
-      puts <<-MESSAGE
-
-Authorization was successful. Use these credentials to initialize the library:
-
-access_token: #{response['access_token']}
-refresh_secret: #{response['refresh_token']}
-
-        MESSAGE
-    end
-
-  end
-
-end

data/lib/imgur/version.rb

@@ -1,5 +0,0 @@
-module Imgur
-
-  VERSION = '2.0.2'
-
-end

data/lib/imgur.rb

@@ -1,20 +0,0 @@
-# Gem dependencies
-require 'faraday'
-require 'json'
-require 'base64'
-
-# Some nice extensions to base classes
-require 'imgur/extensions/array'
-require 'imgur/extensions/hash'
-require 'imgur/extensions/string'
-
-# This gem real code
-require 'imgur/version'
-require 'imgur/api/base'
-require 'imgur/api/account'
-require 'imgur/api/image'
-require 'imgur/communication'
-require 'imgur/session'
-require 'imgur/models/base'
-require 'imgur/models/account'
-require 'imgur/models/image'