tinyurl_shortener 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3bf569ac9a271b49b3ad04884fd06f0464d8df
-  data.tar.gz: c2b4cb12bf1ea73533ad7128a620ef60c195ce35
+  metadata.gz: 83b7a36fa39b4799db6b15b074ec7d2de79a408d
+  data.tar.gz: d410df74d204508f6c70e253613a1bb4c2c6949c
 SHA512:
-  metadata.gz: 0852bf041f5a6aa67c52c4f0d1a8534bc6449eeb38efa21c9f5e7fd692d5aa4734111192431851f652ac8a1638873b70dded9ed33e95696b63ff14667f708399
-  data.tar.gz: 760dcf6577ada04f3712c0eecfa3af23051b755a0cfc7b0c52a005b6def152c58894dab827a6ad369f829f57b3e290226b989dfb4fd1695faaa6bc0c8a8485b7
+  metadata.gz: ae40a0a8e3cf6cbfc6ec59c21da53cebd9df4567f31fc7d00e565fb85896f26bc7bbfbbaa353e884c71b7db3e455c0b13149f341b4a10cc6584e9cbd65a54ec8
+  data.tar.gz: b4565e97776d557de75d3c0b1156b2a5878a8522c2669538c0007a5fb0b617ffb264d7d02449c527e22c0802edbf6415da5da0cd7e019d2e38f517132270959b

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
-gem "rest-client", "~> 2.0.0.rc1", :require => "rest_client"
+gem "rest-client", ">= 1.7.0", :require => "rest_client"

data/README.md

@@ -31,3 +31,4 @@ TinyurlShortener.expand("http://tinyurl.com/oybhnsm")
 ## Changes
 
 * 1.0.1 - fix issue of detecting url redirection when expanding tinyurl
+* 1.0.2 - relax rest-client dependency

data/Rakefile

@@ -1,2 +1,5 @@
 require "bundler/gem_tasks"
 
+task :test do
+  system "bundle exec rspec spec/tinyurl_shortener_spec.rb"
+end

data/lib/tinyurl_shortener/version.rb

@@ -1,3 +1,3 @@
 class TinyurlShortener
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/tinyurl_shortener.rb

@@ -9,19 +9,20 @@ class TinyurlShortener
   end
 
   def self.expand(short_url)
-    response = RestClient.get(short_url)
 
     # there are some ways that tinyurl redirects
     #   * using 301 location redirection
     #   * using content refresh redirection
     #
     #   when we cannot detect the redirecting way, use current url for results
-    if response.history.first && response.history.first.headers
-      response.history.first.headers[:location]
-    elsif ! (match = response.body.response.body.scan(/content=\\"1; url=(.*?)\\"/)).empty?
-      match.last.first
-    else
-      response.request.url
+    RestClient.get(short_url) do |response, request, result, &block|
+      if [301, 302, 307].include? response.code
+        return response.headers[:location]
+      elsif ! (match = response.body.scan(/content="1; url=(.*?)"/)).empty?
+        return match.last.first
+      else
+        response.request.url
+      end
     end
   end
 end

data/tinyurl_shortener.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 2.11"
 
-  spec.add_dependency "rest-client", "~> 2.0.0.rc1"
+  spec.add_dependency "rest-client", ">= 1.7", "< 2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinyurl_shortener
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - hrs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,22 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: '2'
 description: 'URL shortener and expander with tinyurl.com service. '
 email:
 - hrs113355@gmail.com