skinny_jeans 0.6.0 → 0.6.1

data/README.rdoc

@@ -27,7 +27,7 @@ http://img696.imageshack.us/img696/75/skinnys3.jpg
 
 
 == USAGE
-  sj = SkinnyJeans::execute(logfile_path = "access.log", sqlite_skinny_jeans = "sqlite_skinny_jeans.db", path_regexp = /\s\/posts\/(.*)\sHTTP/, date_regexp = /\[(\d.*\d)\]/)
+  sj = SkinnyJeans::LogParser::execute(logfile_path = "access.log", sqlite_skinny_jeans = "sqlite_skinny_jeans.db", path_regexp = /\s\/posts\/(.*)\sHTTP/, date_regexp = /\[(\d.*\d)\]/)
   sj.pageview.where("date = '2010-10-01' and path = 'my-first-post'")
   => #<SkinnyJeans::Pageview id: 1, date: "2010-10-01", path: "my-first-post", pageview_count: 3>
 1.  NOTE: for now **you have to monkey patch the SkinnyJeans#parse_string_as_date**

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/skinny_jeans/string_parser.rb

@@ -59,7 +59,10 @@ module SkinnyJeans
 
     # find all URLs in a string that are at beginning or end of string or are tokenized by spaces
     def all_urls
-      @all_urls ||= string_value.split(/\s+/).reject { |_string| !_string.match(/^['"]?https?:['"]?/) }.collect { |url| url.gsub(/["']/,'') }
+      # tokenize a string by space
+        # find strings starting with http with optional enclosing quotes
+        # remove those quotes from any matches
+      @all_urls ||= string_value.split(/\s+/).reject { |_string| !_string.match(/^['"]?https?:['"]?/) }.collect { |url| url.gsub(/\A["']/,'') }.collect { |url| url.gsub(/["']\z/,'') }
       @all_urls.empty? ? nil : @all_urls
     end
 

data/skinny_jeans.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{skinny_jeans}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Otto"]

data/test/skinny_jeans_string_parser_test.rb

@@ -59,6 +59,13 @@ class SkinnyJeans::StringParserTest < Test::Unit::TestCase
     assert_equal "dv6 coupon", SkinnyJeans::StringParser.return_param_from_valid_url_or_path("http://www.google.com/url?sa=t&source=web&cd=1&sqi=2&ved=0CCAQFjAA&url=http%3A%2F%2Fdealzon.com%2Fdeals%2Fhp-dv6-laptop&rct=j&q=dv6%20coupon&ei=xyT7TO7kEYGKlwfT9tSPDA&usg=AFQjCNGFVL4PvZ59hbxkCFVdmHMayEe3UQ&sig2=7pnUG3YTE8sHONsIqLl1sg","q")
     
     assert_equal "dv6 coupon", SkinnyJeans::StringParser.return_param_from_valid_url_or_path("http://www.google.com/url?sa=t&source=web&cd=1&sqi=2&ved=0CCAQFjAA&url=http%3A%2F%2Fdealzon.com%2Fdeals%2Fhp-dv6-laptop&rct=j&q=dv6%20coupon%20&ei=xyT7TO7kEYGKlwfT9tSPDA&usg=AFQjCNGFVL4PvZ59hbxkCFVdmHMayEe3UQ&sig2=7pnUG3YTE8sHONsIqLl1sg","q")
+    
+  end
+
+  def test_extract_search_query
+    
+    assert_equal "\"dealzon\"", SkinnyJeans::StringParser.extract_search_query("http://www.google.com/search?client=safari&rls=en&q=%22dealzon%22&ie=UTF-8&oe=UTF-8")
+    assert_equal "\'dealzon\'", SkinnyJeans::StringParser.extract_search_query("http://www.google.com/search?client=safari&rls=en&q='dealzon'&ie=UTF-8&oe=UTF-8")
   end
 
 end

data/test/skinny_jeans_test.rb

@@ -11,8 +11,8 @@ class SkinnyJeansTest < Test::Unit::TestCase
     # db_path = "./skinny_jeans_test.db"
     FileUtils.rm(db_path) if File.exists?(db_path)
     _logfile_path = File.expand_path(File.dirname(__FILE__) + "/small_access_log.log")
-    sj=SkinnyJeans::LogParser.new(_logfile_path, sqlite_skinny_jeans = db_path, path_regexp = /\s\/deals\/(.*)\sHTTP/, date_regexp = /\[(\d.*\d)\]/)
-    sj.execute
+    sj=SkinnyJeans::LogParser.execute(_logfile_path, sqlite_skinny_jeans = db_path, path_regexp = /\s\/deals\/(.*)\sHTTP/, date_regexp = /\[(\d.*\d)\]/)
+    # sj.execute
     assert_equal 20, sj.pageview.count
     assert_equal 2, sj.pageview.find_by_path("flip-video").pageview_count
     assert_equal 2, sj.pageview.find_by_path("delonghi-hhp1500-safeheat-mica-panel-radiator-heater-with-thermostat-control").pageview_count

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: skinny_jeans
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Jonathan Otto