link_shrink 0.0.3 → 0.0.4

data/Changelog.md

@@ -1,5 +1,13 @@
 # LinkShrink Changelog
 
+## 0.0.4
+
+Released September 6, 2013 ([0.0.4](https://github.com/jonahoffline/link_shrink/tree/v0.0.4)).
+
+* Refactor complex method in Request module (#process_response).
+* Update version to 0.0.4
+* Add coveralls badge.
+
 ## 0.0.3
 
 Released September 6, 2013 ([0.0.3](https://github.com/jonahoffline/link_shrink/tree/v0.0.3)).

data/README.md

@@ -1,5 +1,5 @@
-LinkShrink [![Build Status](https://travis-ci.org/jonahoffline/link_shrink.png?branch=master)](https://travis-ci.org/jonahoffline/link_shrink) [![Gem Version](https://badge.fury.io/rb/link_shrink.png)](http://badge.fury.io/rb/link_shrink) [![Dependency Status](https://gemnasium.com/jonahoffline/link_shrink.png)](https://gemnasium.com/jonahoffline/link_shrink) [![Code Climate](https://codeclimate.com/github/jonahoffline/link_shrink.png)](https://codeclimate.com/github/jonahoffline/link_shrink)
-=================
+# LinkShrink 
+[![Build Status](https://travis-ci.org/jonahoffline/link_shrink.png?branch=master)](https://travis-ci.org/jonahoffline/link_shrink) [![Gem Version](https://badge.fury.io/rb/link_shrink.png)](http://badge.fury.io/rb/link_shrink) [![Dependency Status](https://gemnasium.com/jonahoffline/link_shrink.png)](https://gemnasium.com/jonahoffline/link_shrink) [![Coverage Status](https://coveralls.io/repos/jonahoffline/link_shrink/badge.png?branch=master)](https://coveralls.io/r/jonahoffline/link_shrink?branch=master) [![Code Climate](https://codeclimate.com/github/jonahoffline/link_shrink.png)](https://codeclimate.com/github/jonahoffline/link_shrink)
 
 A Ruby Gem and Command-Line Application for shrinking those long and nasty links into a shorter URL
 
@@ -68,7 +68,6 @@ LinkShrink::Config.api = 'TinyUrl'
 LinkShrink.shrink_url('http://www.google.com')
 => "http://tinyurl.com/1c2"
 
-
 ```
 
 

data/lib/link_shrink/request.rb

@@ -11,11 +11,18 @@ module LinkShrink
     module_function
 
     def process_request(url, options, shrinker = LinkShrink::Config.api)
-      process_response(request(url, shrinker).body, options, shrinker)
+      parse(request(url, shrinker).body, options, shrinker)
+    end
+
+    def parse(response, options, shrinker)
+      if shrinker.content_type.eql?('text/plain')
+        response
+      else
+        process_response(response, options, shrinker)
+      end
     end
 
     def process_response(response, options, shrinker, json = JSONParser)
-      return response if shrinker.content_type.eql?('text/plain')
       option      = Options.new(options)
       parsed_json = json.parse_json(response)
       plain       = parsed_json['id']
@@ -45,12 +52,12 @@ module LinkShrink
     # Calls URL API
     # @see LinkShrink::Shrinkers::Base#api_url
     # @see LinkShrink::Shrinkers::Base#body_parameters
-    def request(url, shrinker)
-      shrinker.url = url
+    def request(new_url, shrinker)
+      shrinker.url = new_url
       Typhoeus::Request.new(
         shrinker.api_url,
         method:  shrinker.http_method,
-        body:    shrinker.body_parameters(url),
+        body:    shrinker.body_parameters(shrinker.url),
         headers: { 'Content-Type' => shrinker.content_type }
       ).run
     end

data/lib/link_shrink/version.rb

@@ -1,3 +1,3 @@
 module LinkShrink
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/link_shrink/json_parser_spec.rb

@@ -18,4 +18,14 @@ describe LinkShrink::JSONParser do
       .to eq('{"kind":"urlshortener#url","id":"http://goo.gl/fbsS","longUrl":"http://www.google.com/"}')
     end
   end
+
+  describe '.included' do
+    it 'extends self' do
+      dummy_class = Class.new do
+        include LinkShrink::JSONParser
+      end
+
+      expect(dummy_class.included_modules).to include(LinkShrink::JSONParser)
+    end
+  end
 end

data/spec/link_shrink/request_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe LinkShrink::Request do
   include_examples 'shared_examples'
+  before :each do
+    LinkShrink.configure { |c| c.api = 'Google'}
+  end
+
   let(:shrinker) { LinkShrink::Config.api }
   let(:json_default) {{ :json => false }}
 
@@ -52,4 +56,16 @@ describe LinkShrink::Request do
       .to be_kind_of(Typhoeus::Response)
     end
   end
+
+  describe '#parse' do
+    context 'when response is text/plain' do
+      it 'returns response' do
+        LinkShrink.configure { |c| c.api = 'TinyUrl'}
+        response = link_shrink.request(url, shrinker).body
+
+        expect(link_shrink.parse(response, {json: false}, shrinker))
+        .to eq('http://tinyurl.com/1c2')
+      end
+    end
+  end
 end

data/spec/vcr_cassettes/LinkShrink/_shrink_url/creates_a_short_url.yml

@@ -131,4 +131,37 @@ http_interactions:
         \ ],\n  \"code\": 400,\n  \"message\": \"Bad Request\"\n }\n}\n"
     http_version: 
   recorded_at: Fri, 06 Sep 2013 08:25:30 GMT
+- request:
+    method: get
+    uri: http://tinyurl.com/api-create.php?url=http://www.google.com
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Typhoeus - https://github.com/typhoeus/typhoeus
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - PHP/5.4.13
+      Content-Type:
+      - text/plain
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Fri, 06 Sep 2013 11:31:45 GMT
+      Server:
+      - TinyURL/1.6
+    body:
+      encoding: US-ASCII
+      string: http://tinyurl.com/1c2
+    http_version: 
+  recorded_at: Fri, 06 Sep 2013 11:31:47 GMT
 recorded_with: VCR 2.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: link_shrink
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -388181440517617826
+      hash: 1243110028426905467
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25