stats_combiner 0.0.2 → 0.0.3

data/VERSION

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

data/lib/stats_combiner/filterer.rb

@@ -66,40 +66,45 @@ module StatsCombiner
         :prefix => nil
       }.merge!(datum)
       
-      filters.each do |filter|
-      
-        # set prefixes where they match title regexes
-        # /\| TPMDC/ => http://tpmdc
-        if (filter[:rule][:prefix] && filter[:rule][:title_regex]) && datum[:title].match(filter[:rule][:title_regex])
-            datum[:prefix] = filter[:rule][:prefix]
-        end
-        
-        # modify path => '?q=new_suffix'
-        # append to path with regex replacement variables => '\1&new_suffix'
-        if (filter[:rule][:suffix] && filter[:rule][:path_regex]) && datum[:path].match(filter[:rule][:path_regex])
-              datum[:path].gsub!(filter[:rule][:path_regex],filter[:rule][:suffix])
-        end
+        filters.each do |filter|
+          
+          #skip filters if datum has already been nil'd
+          if not (datum[:title].nil? || datum[:path].nil?)
         
-        # apply title mods
-        # modify_title => true /==> 
-        # modify_title => "DC Central"
-        # title_regex => /| TPMDC/,  modify_title => '\1 Central' ==> TPMDC Central
-        if filter[:rule][:modify_title]
-          filter[:rule][:modify_title] = '' unless filter[:rule][:modify_title].is_a?(String)
-          datum[:title].gsub!(filter[:rule][:title_regex], filter[:rule][:modify_title])
-          datum[:title].strip!
-        end
+            # set prefixes where they match title regexes
+            # /\| TPMDC/ => http://tpmdc
+            if (filter[:rule][:prefix] && filter[:rule][:title_regex]) && datum[:title].match(filter[:rule][:title_regex])
+                datum[:prefix] = filter[:rule][:prefix]
+            end
+            
+            # modify path => '?q=new_suffix'
+            # append to path with regex replacement variables => '\1&new_suffix'
+            if (filter[:rule][:suffix] && filter[:rule][:path_regex]) && datum[:path].match(filter[:rule][:path_regex])
+                  datum[:path].gsub!(filter[:rule][:path_regex],filter[:rule][:suffix])
+            end
+            
+            # apply title mods
+            # modify_title => true /==> 
+            # modify_title => "DC Central"
+            # title_regex => /| TPMDC/,  modify_title => '\1 Central' ==> TPMDC Central
+            if filter[:rule][:modify_title]
+              filter[:rule][:modify_title] = '' unless filter[:rule][:modify_title].is_a?(String)
+              datum[:title].gsub!(filter[:rule][:title_regex], filter[:rule][:modify_title])
+              datum[:title].strip!
+            end
+            
+            # apply excludes. 
+            # this should take out the whole record if it matches a path or title regex
+            if filter[:rule][:exclude] && ((filter[:rule][:path_regex].is_a?(Regexp) && datum[:path].match(filter[:rule][:path_regex])) || (filter[:rule][:title_regex].is_a?(Regexp) && datum[:title].match(filter[:rule][:title_regex])))        
+                # nil out datum.
+                # StatsCombiner::Combiner will sweep away the nils later
+                datum[:title] = datum[:path] = datum[:prefix] = nil
+            end
         
-        # apply excludes. 
-        # this should take out the whole record if it matches a path or title regex
-        if filter[:rule][:exclude] && ((filter[:rule][:path_regex].is_a?(Regexp) && datum[:path].match(filter[:rule][:path_regex])) || (filter[:rule][:title_regex].is_a?(Regexp) && datum[:title].match(filter[:rule][:title_regex])))        
-            # nil out datum.
-            # StatsCombiner::Combiner will sweep away the nils later
-            datum[:title] = datum[:path] = datum[:prefix] = nil
+          end
+      
         end
       
-      end
-    
       datum
      
     end

data/spec/stats_combiner_spec.rb

@@ -179,9 +179,11 @@ describe "basic Filterer filtering" do
     result = StatsCombiner::Filterer.apply_filters!(@f.filters,datum)
     result[:title].should be_nil
     result[:path].should be_nil
-   
-    @f.filters.clear
-    
+     
+  end
+  
+  it 'should not nil out data when path or title regexes are unmatched' do
+  
     #now, let's look for invalid data. run a regex against a nonmatch
     @f.add :path_regex => /(\/$|\/index.php$)/, :exclude => true
     
@@ -204,6 +206,26 @@ describe "basic Filterer filtering" do
     
   end
   
+  it 'should handle multiple exclude rules by avoiding putting nils through filters twice' do
+  
+    @f.add :path_regex => /(\/$|\/index.php$)/, :exclude => true
+    @f.add :path_regex => /talk\/blogs/, :exclude => true
+    
+    datum_1 = {:visitors=>3090, :created_at=>nil, :path=>"/", :id=>1, :title=>"Talking Points Memo | Breaking News and Analysis"}
+    
+    result_1 = StatsCombiner::Filterer.apply_filters!(@f.filters,datum_1)
+    result_1[:title].should be_nil
+    result_1[:path].should be_nil
+    
+    
+    datum_2 = {:visitors=>6, :created_at=>nil, :path=>"/talk/blogs/a/m/americandad/2010/03/an-open-letter-to-conservative.php/", :id=>31, :title=>"An open letter to conservatives | AmericanDad's Blog"}
+    
+    result_2 = StatsCombiner::Filterer.apply_filters!(@f.filters,datum_2)
+    result_2[:title].should be_nil
+    result_2[:path].should be_nil  
+  
+  end
+  
 end
 
 # best way to do this (without prying open the Class) might be 

data/stats_combiner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stats_combiner}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Al Shaw"]
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tpm/stats_combiner}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{StatsCombiner creates most-viewed story widgets from the Chartbeat API}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<chartbeat>, [">= 0"])
       s.add_runtime_dependency(%q<sequel>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: stats_combiner
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Al Shaw
@@ -22,11 +21,9 @@ dependencies:
   name: chartbeat
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -36,11 +33,9 @@ dependencies:
   name: sequel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -50,11 +45,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,11 +57,9 @@ dependencies:
   name: fakeweb
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -78,11 +69,9 @@ dependencies:
   name: timecop
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -92,11 +81,9 @@ dependencies:
   name: hpricot
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -132,27 +119,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: StatsCombiner creates most-viewed story widgets from the Chartbeat API