referer-parser 0.1.1 → 0.2.0

data/lib/referer-parser/referer.rb

@@ -53,13 +53,13 @@ module RefererParser
       uri = if raw_url.is_a? String
               begin
                 URI.parse(raw_url)
-              rescue error
-                raise InvalidUriError.new("Cannot parse String #{raw_url} into URI", error)
+              rescue => error
+                raise InvalidUriError, error.message
               end
             elsif raw_url.is_a? URI
               raw_url
             else
-              raise InvalidUriError "'#{raw_url}' must be a String or URI"
+              raise InvalidUriError, "'#{raw_url}' must be a String or URI"
             end
 
       unless %w( http https ).include?(uri.scheme)
@@ -74,6 +74,7 @@ module RefererParser
     # Returns a 'tuple' of the parameter found plus
     # the keywords.
     def self.extract_search(uri, possible_parameters)
+      param = nil
 
       # Only get keywords if there's a query string to extract them from...
       if uri.query
@@ -82,12 +83,17 @@ module RefererParser
         # Try each possible keyword parameter with the querystring until one returns a result
         possible_parameters.each do | pp |
           if parameters.has_key?(pp)
-            return [pp, parameters[pp].first] # Silently swallow a second or third value in the array
+            param = pp
+            parameters[pp].each do |result|
+              unless result == ""
+                return [pp, result] # return first value not eql ""
+              end
+            end
           end
         end
       end
 
-      return [nil, []] # No parameter or keywords to return
+      return [param, []] # No parameter or keywords to return
     end
   
     # Constructor. Takes the `referer_url`

data/lib/referer-parser/version.rb

@@ -15,5 +15,5 @@
 
 module RefererParser
 	NAME = "referer-parser"
-	VERSION = "0.1.1"
+	VERSION = "0.2.0"
 end

data/spec/referer-spec.rb

@@ -21,6 +21,7 @@ describe RefererParser::Referer do
   GOOGLE_COM_REFERER   = 'http://www.google.com/search?q=gateway+oracle+cards+denise+linn&hl=en&client=safari&tbo=d&biw=768&bih=900&source=lnms&tbm=isch&ei=t9fTT_TFEYb28gTtg9HZAw&sa=X&oi=mode_link&ct=mode&cd=2&sqi=2&ved=0CEUQ_AUoAQ'
   GOOGLE_CO_UK_REFERER = 'http://www.google.co.uk/search?hl=en&client=safari&q=psychic+bazaar&oq=psychic+bazaa&aq=0&aqi=g1&aql=&gs_l=mobile-gws-serp.1.0.0.61498.64599.0.66559.12.9.1.1.2.2.2407.10525.6-2j0j1j3.6.0...0.0.DiYO_7K_ndg&mvs=0'
   FACEBOOK_COM_REFERER = 'http://www.facebook.com/l.php?u=http%3A%2F%2Fpsy.bz%2FLtPadV&h=MAQHYFyRRAQFzmokHhn3w4LGWVzjs7YwZGejw7Up5TqNHIw'
+  TRUNCATED_REFERER = 'http://googleads.g.doubleclick.net/pagead/ads?client=ca-pub-9108147844898389&output=html&h=60&slotname=1720218904&w=468&lmt=1368485108&flash=11.7.700.169&url=http%3A%2F%2Fwww.bsaving.com%2Fprintable-online-target-coupons%3Futm_source%3Dbsaving_new_Email%2'
 
   it "Should be initializable with an external referers.yml" do
     external_referer = File.join(File.dirname(__FILE__), '..', 'data', 'referers.yml') # Using the bundled referers.yml in fact
@@ -68,4 +69,24 @@ describe RefererParser::Referer do
     r.uri.host.should eql "www.google.com"
   end
 
+  it "Should return the better result when the referer contains two or more parameters" do
+    referer_contains_two_params = "http://search.tiscali.it/?tiscalitype=web&collection=web&q=&key=hello"
+    r = RefererParser::Referer.new(referer_contains_two_params)
+    r.search_term.should eql "hello"
+    r.search_parameter.should eql "key"
+  end
+
+  it "Should return the better result when the referer contains same parameters" do
+    referer_contains_two_params = "http://search.tiscali.it/?tiscalitype=web&collection=web&key=&key=hello"
+    r = RefererParser::Referer.new(referer_contains_two_params)
+    r.search_term.should eql "hello"
+    r.search_parameter.should eql "key"
+  end
+
+  it "should raise InvalidUriError on a truncated Uri" do
+    expect{
+      r = RefererParser::Referer.new(TRUNCATED_REFERER)
+    }.to raise_error(RefererParser::InvalidUriError)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: referer-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec