skinny_jeans 0.6.5 → 0.7.0

data/.gitignore

@@ -0,0 +1,5 @@
+*.db
+*.gz
+*.log
+pkg
+.DS*

data/Rakefile

@@ -10,6 +10,7 @@ begin
     s.authors = ["Jonathan Otto"]
     s.add_dependency 'sqlite3-ruby', '>= 1.2.4'
     s.add_dependency 'activerecord', '>= 2.3.8'
+    s.add_dependency 'spinner', '>= 1.0.0'
   end
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.7.0

data/lib/skinny_jeans/log_parser.rb

@@ -77,28 +77,37 @@ module SkinnyJeans
       realtime = Benchmark.realtime do
 
         hash_of_dates.each do |date, hash_of_paths|
-          puts "on date #{date.inspect} with #{hash_of_paths.keys.size} keys"
-          hash_of_paths.keys.each_with_index do |path, index|
-            # puts "path is #{path}, #{index.to_f/hash_of_paths.keys.size.to_f}"
-            pv = Pageview.find_or_create_by_date_and_path(date, path)
-            pv.pageview_count ||= 0
-            pv.pageview_count += hash_of_paths[path]
-            pv.save!
-            persisted += 1
+
+          Spinner::with_spinner(:count=>hash_of_paths.keys.size, :message=>"Inserting rows into database for pageviews #{date}...") do |spin|
+            hash_of_paths.keys.each_with_index do |path, index|
+              # puts "path is #{path}, #{index.to_f/hash_of_paths.keys.size.to_f}"
+              pv = Pageview.find_or_create_by_date_and_path(date, path)
+              pv.pageview_count ||= 0
+              pv.pageview_count += hash_of_paths[path]
+              pv.save!
+              persisted += 1
+              spin.call
+            end
           end
+          puts "completed pageviews date #{date.inspect} with #{hash_of_paths.keys.size} keys"
+
         end
-# puts "now doing osk"
+
         hash_of_dates_for_keywords.each do |date, hash_of_paths|
-          hash_of_paths.keys.each do |path|
-            hash_of_paths[path].keys.each do |keyword|
-              pvk = PageviewKeyword.find_or_create_by_date_and_path_and_keyword(date, path, keyword)
-              pvk.keyword = keyword.to_s[0..254]
-              pvk.pageview_count ||= 0
-              pvk.pageview_count += hash_of_paths[path][keyword]
-              pvk.save!
-              persisted_pageview_keywords += 1
+          Spinner::with_spinner(:count=>hash_of_paths.keys.size, :message=>"Inserting rows into database for pageview_keywords #{date}...") do |spin|
+            hash_of_paths.keys.each do |path|
+              hash_of_paths[path].keys.each do |keyword|
+                pvk = PageviewKeyword.find_or_create_by_date_and_path_and_keyword(date, path, keyword)
+                pvk.keyword = keyword.to_s[0..254]
+                pvk.pageview_count ||= 0
+                pvk.pageview_count += hash_of_paths[path][keyword]
+                pvk.save!
+                persisted_pageview_keywords += 1
+              end
+              spin.call
             end
           end
+          puts "completed pageview_keywords date #{date.inspect} with #{hash_of_paths.keys.size} keys"
         end
 
       end

data/lib/skinny_jeans.rb

@@ -7,6 +7,7 @@ require 'cgi'
 require 'rubygems'
 require 'active_record'
 require 'sqlite3'
+require 'spinner'
 require File.expand_path(File.dirname(__FILE__) + "/skinny_jeans/string_parser")
 require File.expand_path(File.dirname(__FILE__) + "/skinny_jeans/log_parser")
 # require 'home_run'

data/skinny_jeans.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{skinny_jeans}
-  s.version = "0.6.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Otto"]
-  s.date = %q{2011-01-07}
+  s.date = %q{2011-03-16}
   s.description = %q{Fast webserver log parser for persisting daily pageviews per path to sqlite}
   s.email = %q{jonathan.otto@gmail.com}
   s.extra_rdoc_files = [
@@ -44,13 +44,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
       s.add_runtime_dependency(%q<activerecord>, [">= 2.3.8"])
+      s.add_runtime_dependency(%q<spinner>, [">= 1.0.0"])
     else
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
       s.add_dependency(%q<activerecord>, [">= 2.3.8"])
+      s.add_dependency(%q<spinner>, [">= 1.0.0"])
     end
   else
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
     s.add_dependency(%q<activerecord>, [">= 2.3.8"])
+    s.add_dependency(%q<spinner>, [">= 1.0.0"])
   end
 end
 

data/test/skinny_jeans_test.rb

@@ -8,7 +8,10 @@ class SkinnyJeansTest < Test::Unit::TestCase
 
   def test_will_work
     db_path = File.expand_path(File.dirname(__FILE__) + "/more_sample_data/skinny_jeans_deal_show.db")
-    _logfile_path = File.expand_path(File.dirname(__FILE__) + "/more_sample_data/broken_access_big.log")
+    FileUtils.rm(db_path) if File.exists?(db_path)
+    # _logfile_path = File.expand_path(File.dirname(__FILE__) + "/more_sample_data/broken_access_big.log")
+        _logfile_path = File.expand_path("/Users/jonathanotto/dznbak/access.log.1")
+    
     puts db_path.inspect
     sj=SkinnyJeans::LogParser.execute(_logfile_path, sqlite_skinny_jeans = db_path, path_regexp = /\s\/deals\/(.*)\sHTTP/, date_regexp = /\[(\d.*\d)\]/)
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: skinny_jeans
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 5
-  version: 0.6.5
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Jonathan Otto
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -05:00
+date: 2011-03-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 2
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
@@ -47,6 +50,22 @@ dependencies:
         version: 2.3.8
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: spinner
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id003
 description: Fast webserver log parser for persisting daily pageviews per path to sqlite
 email: jonathan.otto@gmail.com
 executables: []
@@ -57,6 +76,7 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
+- .gitignore
 - README.rdoc
 - Rakefile
 - TODO
@@ -72,8 +92,8 @@ homepage: http://github.com/jotto/skinny_jeans
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,6 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -89,6 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"