itrigga-net_helper 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/itrigga/net_helper.rb

@@ -151,17 +151,17 @@ module Itrigga
   
     # uses the url shortener service defined for this site
     # by default will use bit.ly
-    def shorten_url(raw_url,attempts = 0)
+    def shorten_url(opts={})
+      opts[:attempts] ||= 0
+      return opts[:url] if opts[:attempts] > 3
     
-      return raw_url if attempts > 3
-    
-      url = self.format_url_shortener_api_url(raw_url)
+      api_url = self.format_url_shortener_api_url(opts[:url], opts[:config])
     
       begin
-        response = NetHelper.get :url => url
+        response = NetHelper.get :url => api_url
       rescue Exception => e
         sleep 10 unless defined?(RAILS_ENV) && RAILS_ENV == "test"
-        return shorten_url(raw_url,attempts+1)
+        return shorten_url(:url=>opts[:url], :attempts=>opts[:attempts]+1)
       end
     
       data =  JSON.parse(response).recursive_symbolize_keys!
@@ -172,7 +172,7 @@ module Itrigga
       else # theres been a problem, try again if we have tries left
       
         sleep 10 unless defined?(RAILS_ENV) && RAILS_ENV == "test"
-        return shorten_url(raw_url,attempts+1)
+        return shorten_url(:url=>opts[:url], :attempts=>opts[:attempts]+1)
       
       end
     

data/spec/net_helper_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'trigga/core_ext'
 
 describe "Itrigga::NetHelper" do
   before(:each) do
@@ -370,23 +369,23 @@ describe "Itrigga::NetHelper" do
     end
     
     describe "with valid input" do
-      it "should call format_url_shortener_api_url" do
-        Itrigga::NetHelper.should_receive(:format_url_shortener_api_url).with(@raw_url)
-        Itrigga::NetHelper.shorten_url(@raw_url)
+      it "should call format_url_shortener_api_url with the given url and config" do
+        Itrigga::NetHelper.should_receive(:format_url_shortener_api_url).with(@raw_url, {:blart=>'flange'})
+        Itrigga::NetHelper.shorten_url(:url=>@raw_url, :config=>{:blart=>'flange'})
       end
       
       it "should return a short url" do
-        Itrigga::NetHelper.shorten_url(@raw_url).should == @shortened_url
+        Itrigga::NetHelper.shorten_url(:url=>@raw_url).should == @shortened_url
       end
       
       it "should return raw_url on web request timesout" do        
         Itrigga::NetHelper.stub!(:get).and_raise(Exception)
-        Itrigga::NetHelper.shorten_url(@raw_url).should == @raw_url
+        Itrigga::NetHelper.shorten_url(:url=>@raw_url).should == @raw_url
       end
       
       it "should return raw url for anything other than a status 200" do
         Itrigga::NetHelper.stub!(:get).and_return("{\"status_code\":500,\"data\":{\"url\":\"#{@shortened_url}\"}}")
-        Itrigga::NetHelper.shorten_url(@raw_url).should == @raw_url
+        Itrigga::NetHelper.shorten_url(:url=>@raw_url).should == @raw_url
       end
       
     end

data/spec/spec_helper.rb

@@ -12,6 +12,8 @@ require 'rspec'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'itrigga/core_ext'
 require 'itrigga/net_helper'
 
 RSpec.configure do |config|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-net_helper
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Al Davidson