link_shrink 0.0.6 → 0.0.7

data/.rspec

@@ -1,3 +1,3 @@
 --color
 --format documentation
---fail-fast
+--fail-fast

data/Changelog.md

@@ -1,5 +1,26 @@
 # LinkShrink Changelog
 
+## 0.0.7
+
+Released January 19, 2014 ([0.0.7](https://github.com/jonahoffline/link_shrink/tree/v0.0.7)).
+
+* Remove old features documentation and examples from README
+* Refactor LinkShrink, Request modules
+* Refactor LinkShrink::CLI class and update documentation
+* Remove json and qr_code options from CLI class
+* Remove charts, qr_codes and json options tests
+* Add error parameter to :response_options block in Owly Shrinker
+* Fix indentation in Owly spec
+* Add error_key and error for internal DSL in Shrinkers::Base
+* Remove rescue method from :shrink_url
+* Add Util module for helper methods
+* Update documentation for ::Shrinkers::Base class
+* Update documentation in Config module
+* Move shrinkers specs into its own shrinkers folder to mirror lib structure
+* Add a Bitdeli badge to README
+* Update development dependencies for `webmock`, `vcr` and `simplecov`
+* Update version to 0.0.7
+
 ## 0.0.6
 
 Released September 8, 2013 ([0.0.6](https://github.com/jonahoffline/link_shrink/tree/v0.0.6)).
@@ -64,4 +85,4 @@ Released July 16, 2013 ([0.0.2](https://github.com/jonahoffline/link_shrink/tree
 
 Released June 24, 2013 ([0.0.1](https://github.com/jonahoffline/link_shrink/tree/v0.0.1)).
 
-* Initial Release.
+* Initial Release.

data/README.md

@@ -11,14 +11,16 @@ A Ruby Gem and Command-Line Application for shrinking those long and nasty links
 * Owly
 * **More to come...**
 
-Installation
----------------------
+## Installation
+
 
     $ gem install link_shrink
 
 
-Setup
--------
+## Setup
+
+You can use any shrinker listed without worrying about the api key except for 'Owly'.
+Google let's you use its api without an api key, but providing one will generate metrics in their dashboard.
 
 ## Google
 Works best with a Google URL API key. You can sign-up for a free one at
@@ -39,14 +41,13 @@ Sign-up for a free API key at [Owly](http://ow.ly/).
 Set your apikey as an environment variable:
 
     $ export GOOGLE_URL_KEY='your_api_key_here'
-   
     
     $ export OWLY_URL_KEY='your_api_key_here'
 
-You could also save it in your ~/.bash_profile
+You could also save it in your `~/.bash_profile` or `~/.zshrc`
 
 
-## Usage ##
+## Usage
 
 Ruby:
 
@@ -56,18 +57,6 @@ require 'link_shrink'
 LinkShrink.shrink_url("http://www.ruby-lang.org")
 => "http://goo.gl/QuXj"
 
-LinkShrink.shrink_url("http://www.ruby-lang.org", { :json => true })
-=> "{\"kind\":\"urlshortener#url\",\"id\":\"http://goo.gl/MprR\",\"longUrl\":\"http://www.ruby-lang.org/\"}"
-
-LinkShrink.shrink_url("http://www.ruby-lang.org", { :qr_code => true })
-=> "http://goo.gl/QuXj.qr"
-
-LinkShrink.shrink_url("http://www.ruby-lang.org", { :qr_code => true, image_size: '200x200' })
-=> "http://chart.googleapis.com/chart?cht=qr&chs=200x200&choe=UTF-8&chld=H&chl=http://goo.gl/MprR"
-
-LinkShrink.shrink_url("http://www.ruby-lang.org", { json: true, qr_code: true, image_size: '300x300' })
-=> "{\"kind\":\"urlshortener#url\",\"id\":\"http://goo.gl/MprR\",\"longUrl\":\"http://www.ruby-lang.org/\",\"qr_code\":\"http://chart.googleapis.com/chart?cht=qr&chs=300x300&choe=UTF-8&chld=H&chl=http://goo.gl/MprR\"}"
-
 ```
 
 To change the default shrinker (Google API):
@@ -75,12 +64,12 @@ To change the default shrinker (Google API):
 
 ```ruby
 LinkShrink.configure do |c|
-  c.api = 'TinyUrl'
+  c.api = 'IsGd'
 end
 
 # or
 
-LinkShrink::Config.api = 'IsGd'
+LinkShrink::Config.api = 'TinyUrl'
 
 LinkShrink.shrink_url('http://www.google.com')
 => "http://tinyurl.com/1c2"
@@ -102,7 +91,7 @@ In your terminal:
     $ linkshrink --owly http://www.rubyrogues.com
     http://ow.ly/22rwSe
     
-### Command-Line Options ###
+### Command-Line Options
 
 Shrinkers:
 
@@ -111,12 +100,16 @@ Shrinkers:
   * -om --owly        - use Owly API
   * -g, --google      - use Google API (Default) 
 
-Format and additional options:
+Additional options:
 
-  * -j, --json        - return JSON response
-  * -q, --qrcode      - return QR Code
   * -h, --help        - show help message
 
+## Todo
+ * Batch list (with selected api or specified for operation)
+ * Save to file (html, text)
+ * Bitly Shrinker API
+ * Parallel HTTP Requests
+
 ## Author
   * [Jonah Ruiz](http://www.pixelhipsters.com)
 
@@ -126,4 +119,7 @@ Format and additional options:
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/jonahoffline/link_shrink/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/link_shrink.rb

@@ -1,5 +1,6 @@
 require 'link_shrink/version'
 require 'link_shrink/options'
+require 'link_shrink/util'
 require 'link_shrink/request'
 require 'link_shrink/json_parser'
 require 'link_shrink/shrinkers/base'
@@ -10,33 +11,17 @@ require 'link_shrink/shrinkers/owly'
 require 'link_shrink/config'
 
 # @author Jonah Ruiz <jonah@pixelhipsters.com>
-# Creates a short URL and QR codes
+# Creates a short URLs
 module LinkShrink
   extend self
   include LinkShrink::Request
-  # Returns a short URL or JSON response
-  #   example: shrink_url('http://www.wtf.com', { json: true, qr_code: true })
-  #   example: shrink_url('http://www.wtf.com', { qr_code: true })
+  # Returns a short URL
+  #   example: shrink_url('http://www.wtf.com')
   #
   # @param url [String] long URL to be shortened
-  # @param options [Hash] format to be returned
-  # @return [String] generated short URL or JSON response
-  def shrink_url(url, options = { json: false, qr_code: false })
-    process_request(url, options)
-  rescue
-    'Problem generating short URL. Try again.'
-  end
-
-  # Returns a QR code URL
-  #   example: generate_qr_code('http://www.wtf.com', { image_size: '300x300' })
-  #
-  # @param url [String] long URL to be shortened
-  # @param options [Hash] image_size: '300x300' for a custom size
-  # @return [String] QR code URL using default or custom size
-  def generate_qr_code(url, options = {})
-    new_url    = process_request(url, {})
-    image_size = options.fetch(:image_size, {})
-    Config.api.generate_chart_url(new_url, image_size)
+  # @return [String] generated short URL
+  def shrink_url(url)
+    process_request(url)
   end
 
   # Yield's to Config for options

data/lib/link_shrink/cli.rb

@@ -1,60 +1,60 @@
 require 'optparse'
+require 'ostruct'
 
 module LinkShrink
   # @author Jonah Ruiz <jonah@pixelhipsters.com>
   # A Simple class for the executable version of the gem
   class CLI
+    include LinkShrink::Util
 
+    # @!attribute [r] options
+    # @return [String] options for api settings
+    attr_reader :options
     # @param args [Array<String>] The command-line arguments
     def initialize(args)
-      @args = args
+      @args, @options = args, OpenStruct.new(default_options)
     end
 
-    # Configures the arguments for the command
-    # @param opts [OptionParser]
-    def set_options(opts)
-      %w(@json @qr_code @tiny_url)
-      @json        = false
-      @qr_code     = false
-      @tiny_url    = false
-      @google      = false
-      @is_gd       = false
-      @owly        = false
-      opts.version = LinkShrink::VERSION
-      opts.banner  = <<MSG
+    def banner
+      <<MSG
 Usage: link_shrink [OPTION] [URL]
 Description:
   LinkShrink, Turn long and nasty links into short urls.
 
 Options:
 MSG
-      opts.set_program_name 'LinkShrink'
-      opts.on_head('-t', '--tinyurl', 'use TinyURL') do
-        @tiny_url = :true
-      end
+    end
 
-      opts.on_head('-i', '--isgd', 'use Is.gd') do
-        @is_gd = :true
+    def default_options
+      apis = (available_shrinkers).reduce({}) do |opts, key|
+        opts[key] = false
+        opts
       end
 
-      opts.on_head('-o', '--owly', 'use Owly') do
-        @owly = :true
-      end
+      {}.merge({
+        api: apis.merge(Google: true),
+        banner: banner,
+        version: LinkShrink::VERSION
+      })
+    end
 
-      opts.on_head('-g', '--google', 'use Google (Default)') do
-        @google = :true
-      end
+    # Configures the arguments for the command
+    # @param opts [OptionParser]
+    def set_options(opts)
+      opts.version, opts.banner = options.version, options.banner
+      opts.set_program_name 'LinkShrink'
 
-      opts.on_head('-j', '--json', 'return JSON response') do
-        @json = :true
-      end
+      options.api.map do |k, v|
+        arg = k.to_s.downcase
 
-      opts.on_head('-q', '--qrcode', 'return QR Code') do
-        @qr_code = :true unless @tiny_url
+        opts.on_head("-#{arg[0]}", "--#{arg}", argument_text_for(k)) do
+          options.api[k] = true
+        end
       end
 
-      opts.on_tail('-v', '--version', 'display the version of LinkShrink and exit') do
-        puts opts.version
+      opts.on_tail('-v', '--version',
+                   'display the version of LinkShrink and exit') do
+        puts opts.ver
         exit
       end
 
@@ -64,6 +64,10 @@ MSG
       end
     end
 
+    def argument_text_for(option)
+      "use #{option}".concat option.eql?(:Google) ? ' (Default)' : ''
+    end
+
     # Parses the command-line arguments and runs the executable
     # @return [String] The short url or argument passed
     def parse
@@ -74,26 +78,18 @@ MSG
     end
 
     def process_url
-      api = select_api
-      LinkShrink.configure { |c| c.api = api }
-      LinkShrink.shrink_url(@args.last, { json: @json, qr_code: @qr_code })
+      LinkShrink.configure { |config| config.api = select_api }
+
+      LinkShrink.shrink_url(@args.last)
     end
 
     def url_present?
-      !!(@args.last =~ /^(http?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/)
+      regexp = /^(http?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/
+      !!(@args.last =~ regexp)
     end
 
     def select_api
-      case
-        when @tiny_url
-          'TinyUrl'
-        when @is_gd
-          'IsGd'
-        when @owly
-          'Owly'
-        else
-          'Google'
-      end
+      options.api.select { |_, v| v }.keys.last.to_s
     end
   end
 end

data/lib/link_shrink/config.rb

@@ -1,11 +1,11 @@
 module LinkShrink
+  # @author Jonah Ruiz <jonah@pixelhipsters.com>
+  # Configurable module for Shrinkers-related settings
   module Config
-    # @author Jonah Ruiz <jonah@pixelhipsters.com>
-    # Configurable module for integrating with other URL APIs
     extend self
 
-    # Returns and Sets API key to be used
-    # @param api_key [String] API key to be used
+    # @!attribute api_key
+    # @return [String] API key to be used
     attr_accessor :api_key
 
     # Sets API to be used
@@ -15,7 +15,7 @@ module LinkShrink
     end
 
     # Returns API used
-    # Unless an API is defined, it returns Google by default
+    #   Uses Google by default
     # @return [LinkShrink::Shrinkers::Google] instance
     def api
       @api || LinkShrink::Shrinkers::Google.new

data/lib/link_shrink/request.rb

@@ -10,51 +10,35 @@ module LinkShrink
 
     module_function
 
-    def process_request(url, options, shrinker = LinkShrink::Config.api)
-      parse(request(url, shrinker).body, options, shrinker)
+    def process_request(url, shrinker = LinkShrink::Config.api)
+      parse(request(url, shrinker).body, shrinker)
     end
 
-    def parse(response, options, shrinker)
+    def parse(response, shrinker)
       if shrinker.content_type.eql?('text/plain')
         response
       else
-        process_response(response, options, shrinker)
+        process_response(response, shrinker)
       end
+    rescue
+      "Error #{response}"
     end
 
     def process_parse_options(parsed_json, shrinker)
       if shrinker.collection_key && shrinker.url_key
-        parsed_json.fetch(shrinker.collection_key).fetch(shrinker.url_key)
+        parsed_json
+          .fetch(shrinker.collection_key)
+          .fetch(shrinker.url_key)
       else
         parsed_json.fetch(shrinker.url_key)
       end
+    rescue
+      parsed_json.fetch(shrinker.error_key) { 'Error parsing the request!'}
     end
 
-    def process_response(response, options, shrinker, json = JSONParser)
-      option      = Options.new(options)
+    def process_response(response, shrinker, json = JSONParser)
       parsed_json = json.parse_json(response)
-      plain       = process_parse_options(parsed_json, shrinker.class)
-
-      if option.json? && option.qr_code?
-        if option.image_size?
-          return parsed_json.merge(qr_code: shrinker.generate_chart_url(plain, options.fetch(:image_size))).to_json
-        end
-        return parsed_json.merge(qr_code: shrinker.generate_chart_url(plain)).to_json
-      end
-
-      case
-        when option.json?
-          json.cleanup_json(response)
-        when option.qr_code?
-          if option.image_size?
-            return shrinker.generate_chart_url(plain, options.fetch(:image_size))
-          end
-          shrinker.generate_chart_url(plain)
-        when option.image_size?
-          shrinker.generate_chart_url(plain, options.fetch(:image_size))
-        else
-          plain
-      end
+      process_parse_options(parsed_json, shrinker.class)
     end
 
     # Calls URL API

data/lib/link_shrink/shrinkers/base.rb

@@ -3,10 +3,31 @@ require 'uri'
 module LinkShrink
   module Shrinkers
     # @author Jonah Ruiz <jonah@pixelhipsters.com>
-    # an Abstract Base class for implementing other URL APIs
+    #   Base class for implementing other URL APIs
+    #
+    # @abstract Subclass and override methods as needed
+    # @example Implement a Shrinker class
+    #   class Shorty < Base
+    #
+    #    def base_url
+    #      'http://shorty.com/api/2.0/shorten'
+    #    end
+    #
+    #    def api_query_parameter
+    #      "?url=#{url}"
+    #    end
+    #
+    #    def api_url
+    #      base_url.concat api_query_parameter
+    #    end
+    #  end
     class Base
+
+      # @!attribute url
+      # @return [String] long url to shrink
       attr_reader :url
-      # Callback method that dynamically defines a sub_klass method for reference
+
+      # Callback method to define a sub_klass method for reference
       # @return [String] inherited class name
       def self.inherited(sub_klass)
         sub_klass.class_eval do
@@ -16,12 +37,18 @@ module LinkShrink
         end
       end
 
-      # URL base for API
+      # @overload base_url
+      #   URL base for API requests
+      # @raise [String] unless implemented on inheriting class
+      # @return [String] api base URL
       def base_url
         fail "#{__method__} not implemented"
       end
 
-      # URL query parameters
+      # @overload api_query_parameter
+      #   URL query parameters
+      # @raise [String] unless implemented on inheriting class
+      # @return [String] query parameters to be used in request
       def api_query_parameter
         fail "#{__method__} not implemented"
       end
@@ -54,16 +81,21 @@ module LinkShrink
       # @param new_url [String] url to be parsed
       # @return [String] parsed URL
       def sanitize_url(new_url)
-        URI.encode(!(new_url =~ /^(http?:\/\/)?/) ? "http://#{new_url}" : new_url)
+        URI.encode(
+          !(new_url =~ /^(http?:\/\/)?/) ? "http://#{new_url}" : new_url
+        )
       end
 
-      # Returns HTTP method to be used in request
+      # @overload http_method
+      #   Returns HTTP method to be used in request
+      #     override +:get+ with +:post+
       # @return [Symbol] http method
       def http_method
         :get
       end
 
-      # Returns Content-Type to be used in Request headers
+      # @overload content_type
+      #   Returns Content-Type to be used in Request headers
       # @return [String] content-type
       def content_type
         'application/json'
@@ -86,8 +118,9 @@ module LinkShrink
       end
 
       # Handles DSL definition of response structure to be parsed (JSON)
+      # @!group ShrinkerDSL
       class << self
-        attr_accessor :collection_key, :url_key
+        attr_accessor :collection_key, :url_key, :error_key
 
         # Helper method that yields into the other response structure methods
         def response_options(&block)
@@ -101,11 +134,19 @@ module LinkShrink
         end
 
         # Defines url_key in response
-        # @param new_url_key [String] url_key
-        def short_url(new_url_key)
-          self.url_key = new_url_key
+        # @param short_url_key [String] url_key
+        def short_url(short_url_key)
+          self.url_key = short_url_key
+        end
+
+        # Defines error_key in response
+        # @param new_error_key [String] error_key
+        def error(new_error_key = 'error')
+          self.error_key = new_error_key
         end
       end
+      # @!endgroup
+
     end
   end
 end

data/lib/link_shrink/shrinkers/google.rb

@@ -28,16 +28,6 @@ module LinkShrink
         { 'longUrl' => url }.to_json
       end
 
-      # Generates QR code URL
-      # @return [String] QR code url with '150x150' or custom image size
-      def generate_chart_url(new_url, image_size = {})
-        return "#{new_url}.qr" if image_size.empty?
-
-        chart_url = 'http://chart.googleapis.com/chart'
-        params    = "?cht=qr&chs=#{image_size}&choe=UTF-8&chld=H&chl=#{new_url}"
-        chart_url.concat(params)
-      end
-
       # Returns HTTP method to be used in request
       # @return [Symbol] post http method
       def http_method

data/lib/link_shrink/shrinkers/owly.rb

@@ -9,6 +9,7 @@ module LinkShrink
       response_options do
         collection 'results'
         short_url  'shortUrl'
+        error
       end
 
       # Returns URL base for API

data/lib/link_shrink/util.rb

@@ -0,0 +1,13 @@
+module LinkShrink
+  # @author Jonah Ruiz <jonah@pixelhipsters.com>
+  # Provides utility methods
+  module Util
+    module_function
+
+    # Returns list of Url Shrinkers
+    # @return [Array<String>] Url shrinker classes
+    def available_shrinkers
+      LinkShrink::Shrinkers.constants - [:Base]
+    end
+  end
+end

data/lib/link_shrink/version.rb

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

data/link_shrink.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rspec', '~> 2.14.1'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'simplecov', '~> 0.7.1'
+  spec.add_development_dependency 'simplecov', '~> 0.8.2'
   spec.add_development_dependency 'simplecov-gem-adapter', '~> 1.0.1'
   spec.add_development_dependency 'coveralls', '~> 0.6.7'
-  spec.add_development_dependency 'webmock', '~> 1.13.0'
-  spec.add_development_dependency 'vcr', '~> 2.5.0'
+  spec.add_development_dependency 'webmock', '~> 1.17.1'
+  spec.add_development_dependency 'vcr', '~> 2.8.0'
 end

data/spec/link_shrink/link_shrink_spec.rb

@@ -3,92 +3,14 @@ require 'spec_helper'
 describe LinkShrink do
   include_examples 'shared_examples'
 
+  before :all do
+    LinkShrink.configure { |c| c.api = 'Google' }
+  end
+
   describe '.shrink_url', :vcr => 'google_url' do
     it 'creates a short url' do
       expect(link_shrink.shrink_url(url)).to eq(short_url)
     end
-
-    context 'when called with additional options' do
-      context 'json option' do
-        it 'returns JSON when set to true' do
-          expect(link_shrink.shrink_url(url, { :json => true }))
-          .to eq(json_response)
-        end
-
-        it 'returns default response when set to false' do
-          expect(link_shrink.shrink_url(url, { json: false }))
-          .to eq(short_url)
-        end
-      end
-
-      context 'qr_code option' do
-        it 'returns QR code when set to true' do
-          expect(link_shrink.shrink_url(url, { qr_code: true }))
-          .to eq(qrcode_url)
-        end
-
-        it 'returns default response when set to false' do
-          expect(link_shrink.shrink_url(url, { qr_code: false }))
-          .to eq(short_url)
-        end
-      end
-
-      it 'returns default response when called with empty hash' do
-        expect(link_shrink.shrink_url(url, {})).to eq(short_url)
-      end
-    end
-
-    context 'when called with json and qr_code options' do
-      it 'returns qr_code in JSON' do
-        expect(link_shrink.shrink_url(url, { :json => true, :qr_code => true }))
-        .to eq(json_qr_code)
-      end
-    end
-
-    context 'when called with image_size: 200x200' do
-      it 'returns QR code link with custom size' do
-        expect(link_shrink.shrink_url(url, {:qr_code => true, :image_size => "200x200"}))
-        .to eq(chart_url)
-      end
-    end
-
-    context 'when called with no qr_code and image_size: 200x200' do
-      it 'returns QR code link with custom size' do
-        expect(link_shrink.shrink_url(url, {:image_size => "200x200"}))
-        .to eq(chart_url)
-      end
-    end
-
-    context 'when called with json, qr_code and image_size: 300x300' do
-      let(:options) { { json: true, qr_code: true, image_size: "300x300" } }
-
-      it 'returns QR code in JSON with custom size' do
-        expect(link_shrink.shrink_url(url, options))
-        .to eq(json_qr_code_custom)
-      end
-    end
-
-    context 'when API is down' do
-      it 'raises rescue exception' do
-        link_shrink.stub(:request).and_return(nil)
-
-        expect(link_shrink.shrink_url('www.google.com'))
-        .to eq('Problem generating short URL. Try again.')
-      end
-    end
-  end
-
-  describe '.generate_qr_code' do
-    it 'creates a QR code' do
-      expect(link_shrink.generate_qr_code(url)).to eq(qrcode_url)
-    end
-
-    context 'when called with image_size: 200x200' do
-      it 'returns QR code with custom size' do
-        expect(link_shrink.generate_qr_code(url, { image_size: "200x200" }))
-        .to eq(chart_url)
-      end
-    end
   end
 
   describe '.configure' do
@@ -98,7 +20,9 @@ describe LinkShrink do
       end
 
       it 'sets API Shrinker' do
-        link_shrink.should_receive(:configure).and_yield(LinkShrink::Config)
+        link_shrink.should_receive(:configure)
+          .and_yield(LinkShrink::Config)
+
         link_shrink.configure { |config| api = 'TinyURL' }
       end
     end

data/spec/link_shrink/request_spec.rb

@@ -7,48 +7,6 @@ describe LinkShrink::Request do
   end
 
   let(:shrinker) { LinkShrink::Config.api }
-  let(:json_default) {{ :json => false }}
-
-  describe '.process_request' do
-    it 'calls request and returns short link' do
-      expect(link_shrink.process_request(url, json_default, shrinker))
-      .to eq(short_url)
-    end
-
-    context 'when called with qr_code true, image_size 300x300' do
-      it 'returns QR code with custom size' do
-        options = { json: true, qr_code: true, image_size: '300x300' }
-        expect(link_shrink.process_request(url, options))
-        .to eq(json_qr_code_custom)
-      end
-    end
-  end
-
-  describe '.process_response' do
-    context 'when called with json true' do
-      it 'returns json' do
-        response = link_shrink.request(url, shrinker).body
-        expect(link_shrink.process_response(response, {json: true}, shrinker))
-        .to eq(json_response)
-      end
-    end
-
-    context 'when called with json false or no options' do
-      it 'returns link' do
-        response = link_shrink.request(url, shrinker).body
-        expect(link_shrink.process_response(response, json_default, shrinker))
-        .to eq(short_url)
-      end
-    end
-
-    context 'when called with qr_code true' do
-      it 'returns QR code' do
-        response = link_shrink.request(url, shrinker).body
-        expect(link_shrink.process_response(response, { qr_code: true }, shrinker))
-        .to eq(qrcode_url)
-      end
-    end
-  end
 
   describe '.request' do
     it 'is a Typhoeus::Request instance' do
@@ -63,7 +21,7 @@ describe LinkShrink::Request do
         LinkShrink.configure { |c| c.api = 'TinyUrl' }
         response = link_shrink.request(url, shrinker).body
 
-        expect(link_shrink.parse(response, {json: false}, shrinker))
+        expect(link_shrink.parse(response, shrinker))
         .to eq('http://tinyurl.com/1c2')
         LinkShrink.configure { |c| c.api = 'Google' }
       end

data/spec/link_shrink/{google_spec.rb → shrinkers/google_spec.rb}

@@ -27,22 +27,6 @@ describe LinkShrink::Shrinkers::Google do
     end
   end
 
-  describe '#generate_chart_url' do
-    let(:chart_url) { "http://chart.googleapis.com/chart?cht=qr&chs=300x300&choe=UTF-8&chld=H&chl=http://goo.gl/fbsS" }
-
-    it 'returns a QR code' do
-      expect(link_shrink.generate_chart_url(short_url))
-      .to eq(qrcode_url)
-    end
-
-    context 'when called with optional image_size argument' do
-      it 'returns a QR code with custom image size' do
-        expect(link_shrink.generate_chart_url(short_url, '300x300'))
-        .to eq(chart_url)
-      end
-    end
-  end
-
   describe '#body_parameters' do
     it 'returns body parameters for API request' do
       link_shrink.stub(:url).and_return('http://www.google.com')

data/spec/link_shrink/{owly_spec.rb → shrinkers/owly_spec.rb}

@@ -65,7 +65,7 @@ describe LinkShrink::Shrinkers::Owly do
     it 'returns correct shortUrl' do
       LinkShrink.configure { |config| config.api = 'Owly' }
       expect(LinkShrink.shrink_url('www.google.com'))
-      .to eq('http://ow.ly/22rqvf')
+        .to eq('http://ow.ly/22rqvf')
     end
   end
 end

data/spec/link_shrink/{shrinker_base_spec.rb → shrinkers/shrinker_base_spec.rb}

@@ -114,9 +114,16 @@ describe LinkShrink::Shrinkers::Base do
       expect(link_shrink.class.collection_key).to eq(nil)
     end
   end
+
   describe '#url_key' do
     it 'returns key used to extract data from response' do
       expect(link_shrink.class.url_key).to eq(nil)
     end
   end
+
+  describe '#error_key' do
+    it 'returns key used to extract data from response' do
+      expect(link_shrink.class.error_key).to eq(nil)
+    end
+  end
 end

data/spec/shared_examples.rb

@@ -12,11 +12,7 @@ shared_context 'shared_examples' do
   let(:link_shrink) { described_class }
   let(:url) { 'http://www.google.com' }
   let(:short_url) { "http://goo.gl/fbsS" }
-  let(:qrcode_url) { 'http://goo.gl/fbsS.qr' }
 
   let(:json_response) { fixture('response.json') }
-  let(:json_qr_code) { fixture('response_qr_code.json') }
-  let(:json_qr_code_custom) { fixture('response_qr_code_custom.json') }
   let(:parsed_json) { { "kind" => "urlshortener#url", "id" => "http://goo.gl/fbsS", "longUrl" => "http://www.google.com/" } }
-  let(:chart_url) { "http://chart.googleapis.com/chart?cht=qr&chs=200x200&choe=UTF-8&chld=H&chl=http://goo.gl/fbsS" }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: link_shrink
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.17.1
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
 description: Shrink those long and nasty links into a shorter URL
 email:
 - jonah@pixelhipsters.com
@@ -186,21 +186,22 @@ files:
 - lib/link_shrink/shrinkers/isgd.rb
 - lib/link_shrink/shrinkers/owly.rb
 - lib/link_shrink/shrinkers/tinyurl.rb
+- lib/link_shrink/util.rb
 - lib/link_shrink/version.rb
 - link_shrink.gemspec
 - spec/fixtures/response.json
 - spec/fixtures/response_qr_code.json
 - spec/fixtures/response_qr_code_custom.json
 - spec/link_shrink/config_spec.rb
-- spec/link_shrink/google_spec.rb
-- spec/link_shrink/isgd_spec.rb
 - spec/link_shrink/json_parser_spec.rb
 - spec/link_shrink/link_shrink_spec.rb
 - spec/link_shrink/options_spec.rb
-- spec/link_shrink/owly_spec.rb
 - spec/link_shrink/request_spec.rb
-- spec/link_shrink/shrinker_base_spec.rb
-- spec/link_shrink/tiny_url_spec.rb
+- spec/link_shrink/shrinkers/google_spec.rb
+- spec/link_shrink/shrinkers/isgd_spec.rb
+- spec/link_shrink/shrinkers/owly_spec.rb
+- spec/link_shrink/shrinkers/shrinker_base_spec.rb
+- spec/link_shrink/shrinkers/tiny_url_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/LinkShrink/_shrink_url/creates_a_short_url.yml
@@ -234,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2671621547158005072
+      hash: -4473325036172331892
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -246,15 +247,15 @@ test_files:
 - spec/fixtures/response_qr_code.json
 - spec/fixtures/response_qr_code_custom.json
 - spec/link_shrink/config_spec.rb
-- spec/link_shrink/google_spec.rb
-- spec/link_shrink/isgd_spec.rb
 - spec/link_shrink/json_parser_spec.rb
 - spec/link_shrink/link_shrink_spec.rb
 - spec/link_shrink/options_spec.rb
-- spec/link_shrink/owly_spec.rb
 - spec/link_shrink/request_spec.rb
-- spec/link_shrink/shrinker_base_spec.rb
-- spec/link_shrink/tiny_url_spec.rb
+- spec/link_shrink/shrinkers/google_spec.rb
+- spec/link_shrink/shrinkers/isgd_spec.rb
+- spec/link_shrink/shrinkers/owly_spec.rb
+- spec/link_shrink/shrinkers/shrinker_base_spec.rb
+- spec/link_shrink/shrinkers/tiny_url_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/LinkShrink/_shrink_url/creates_a_short_url.yml