octospy 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f92c47f612fc8f9e58b5a761d293a824df3c203
-  data.tar.gz: 1772944a5564aa76cf4af0171076f61065007a22
+  metadata.gz: 252859e967552eb8ea1fa9e917e5e8f5917f19c6
+  data.tar.gz: f52b4c00cae4a5a79857c53d6e6d560be9faccd7
 SHA512:
-  metadata.gz: ff507ac30bb08f0fdc1b2f63e612340743f86f36e87ef823971118df6ec58ab5e2cb15aeafcc0dedbb108ec1748ad236d4c47f4550750a9f09d58724065d8e00
-  data.tar.gz: 1d4e774052361c800b3aa9e0034f2bf391e82f7e75f6579be50445d93aea7d0959d87799c0267a4771c755a9c5137b3703c5009c3c85b179fe3c9fa0b655e5ef
+  metadata.gz: bf172d1c87dcf0ae4281c3ddc2b37e7835891d8b911cbea18e011254ffcd76dd13b7a95ab962d114dd931f0be0447f55d459820b5345d579d3506ae939818faa
+  data.tar.gz: 59bb2fd573cbf88ae892920be2cfd9607c8a699783659211e1c7d80b99b303d37401ecf01369e33906a37da36ea128accceb85ed5204d57278ddfda7b061ef76

data/lib/octospy/extensions/string.rb

@@ -1,5 +1,5 @@
 require 'string-irc'
-require 'octospy/shortener'
+require 'octospy/url'
 
 module Octospy
   module Extensions
@@ -22,14 +22,7 @@ module Octospy
       end
 
       def shorten_url
-        case
-        when self =~ /https?:\/\/(\w+\.)?github\.com/
-          Octospy::Shortener.shorten_by_github self
-        when self =~ /https?:\/\/.+/
-          Octospy::Shortener.shorten_by_google self
-        else
-          self
-        end
+        Octospy::Url.shorten self
       end
       alias_method :shorten, :shorten_url
     end

data/lib/octospy/url.rb

@@ -0,0 +1,46 @@
+require 'sawyer'
+
+module Octospy
+  module Url
+    class << self
+      def shorten(url)
+        case
+        when url =~ /https?:\/\/(\w+\.)?github\.com/
+          self.shorten_by_github url
+        when url =~ /https?:\/\/.+/
+          self.shorten_by_google url
+        else
+          url
+        end
+      end
+
+      def github_shortener_endpoint
+        'http://git.io/'
+      end
+
+      def shorten_by_github(url)
+        agent = Sawyer::Agent.new(self.github_shortener_endpoint)
+        response = agent.call(:post, '', "url=#{url}")
+        response.headers[:location]
+      rescue => e
+        puts e.message
+        url
+      end
+
+      def google_shortener_endpoint
+        'https://www.googleapis.com/urlshortener/v1/'
+      end
+
+      def shorten_by_google(url)
+        agent = Sawyer::Agent.new(self.google_shortener_endpoint) do |http|
+          http.headers['Content-Type'] = 'application/json'
+        end
+        response = agent.call(:post, 'url', longUrl: url)
+        response.data.attrs[:id]
+      rescue => e
+        puts e.message
+        url
+      end
+    end
+  end
+end

data/lib/octospy/version.rb

@@ -1,3 +1,3 @@
 module Octospy
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/octospy.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cinch', '~> 2.0'
   spec.add_dependency 'octokit', '~> 2.7'
   spec.add_dependency 'string-irc', '~> 0.3'
-  spec.add_dependency 'faraday', '~> 0.8.9'
-  spec.add_dependency 'faraday_middleware', '~> 0.9'
+  spec.add_dependency 'sawyer', '~> 0.5'
   spec.add_dependency 'dotenv', '~> 0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octospy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - linyows
@@ -81,33 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: sawyer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +145,7 @@ files:
 - lib/octospy/parser/wiki.rb
 - lib/octospy/recordable.rb
 - lib/octospy/recordable/channel.rb
-- lib/octospy/shortener.rb
+- lib/octospy/url.rb
 - lib/octospy/version.rb
 - lib/octospy/worker.rb
 - octospy.gemspec

data/lib/octospy/shortener.rb

@@ -1,48 +0,0 @@
-require 'faraday'
-require 'faraday_middleware'
-
-module Octospy
-  module Shortener
-    class << self
-      def github_shortener_endpoint
-        'http://git.io'
-      end
-
-      def shorten_by_github(url)
-        conn = Faraday.new(url: self.github_shortener_endpoint) do |f|
-          f.request  :url_encoded
-          f.adapter  Faraday.default_adapter
-        end
-
-        res = conn.post '/', { url: url }
-        res.headers && res.headers.key?('location') ? res.headers['location'] : url
-      rescue
-        url
-      end
-
-      def google_shortener_endpoint
-        'https://www.googleapis.com'
-      end
-
-      def shorten_by_google(url)
-        conn = Faraday.new(url: self.google_shortener_endpoint) do |f|
-          f.response :mashify
-          f.response :json
-          f.request  :url_encoded
-          f.request  :json
-          f.adapter  Faraday.default_adapter
-        end
-
-        res = conn.post do |req|
-          req.url '/urlshortener/v1/url'
-          req.headers['Content-Type'] = 'application/json'
-          req.body = "{ \"longUrl\": \"#{url}\" }"
-        end
-
-        res.body && res.body.respond_to?(:id) ? res.body.id : url
-      rescue
-        url
-      end
-    end
-  end
-end