google_safe_browsing 0.5.1 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f5b61271d81882c1bbaea1de9c42b0fcdfa7ae2b
+  data.tar.gz: 1ada1d0d3f7c6e6a4708c2d28a38e9e9e0a1a8a9
+SHA512:
+  metadata.gz: fe03c531a15358f5098cff412c809533208161ac0a02a9f11469361a5c753733bc36302a78ee750da13a0706ee7a6cc350a65b0d94424385277db639b4d5692d
+  data.tar.gz: daf865df013d6d94d5ed184be4da95e41dcc52169ab74106cd98a43a61ac6d0b84c23b784cb56a365dbf0c0699f124422749bb9793affa8fa348081e5618a6af

data/README.md

@@ -3,6 +3,9 @@
 This gem allows easy Google Safe Browsing APIv2 usage with optional integration
 into Rails 3 apps.
 
+[![Build
+Status](https://travis-ci.org/mobiledefense/google_safe_browsing.png)](https://travis-ci.org//mobiledefense/google_safe_browsing)
+
 It includes:
 
 * a migration generator for database schema
@@ -36,7 +39,8 @@ Then, generate the migration and run it
 
 
 Add your Google Safe Browsing API key to congif/application.rb
-You can get a key from the [Google Safe Browsing website](http://code.google.com/apis/safebrowsing/key_signup.html)
+You can get a key from the [Google
+Safe Browsing website](http://code.google.com/apis/safebrowsing/key_signup.html)
 
     #config/application.rb
 
@@ -51,10 +55,15 @@ You can run an update manually
 
     $ rake google_safe_browsing:update
 
-Or, if you have [Resque](https://github.com/defunkt/resque) and 
-[Resque Scheduler](https://github.com/bvandenbos/resque-scheduler) set up, you can 
-run an update and automatically schedule another update based on the 'next polling 
-interval' parameter from the API
+> Note: The full database is not guarenteed to be returned after a single update.
+  In fact, you aren't likely to have the full database even after several
+  updates. You will know that you have the full database when an update does
+  not return any new Add or Sub Shavars.
+
+Or, if you have [Resque](https://github.com/defunkt/resque) and
+[Resque Scheduler](https://github.com/bvandenbos/resque-scheduler) set up, you
+can run an update and automatically schedule another update based on the 'next
+polling interval' parameter from the API
 
     $ rake google_safe_browsing:update_and_reschedule
 
@@ -64,19 +73,55 @@ To programatically run an update in your app
 
     GoogleSafeBrowsing::APIv2.update
 
-Note: This can take a while, especially when first seeding your database. I wouldn't recommend
-calling this in a controller for a normal page request.
+Note: This can take a while, especially when first seeding your database. I
+wouldn't recommend calling this in a controller for a normal page request.
 
 To check a url for badness
 
     GoogleSafeBrowsing::APIv2.lookup('http://bad.url.address.here.com.edu/forProfit')
 
-The url string parameter does not have to be any specific format or Canonicalization the Google
-Safe Browsing gem will handle all of that for you. Please report any errors from a weirdly formatted 
-url though. I most likely have missed some cases.
+The url string parameter does not have to be any specific format or
+Canonicalization the Google Safe Browsing gem will handle all of that for you.
+Please report any errors from a weirdly formatted url though. I most likely
+have missed some cases.
+
+The `lookup` method returns a string ( either 'malware' or 'phishing' ) for
+the name of the black list which the url appears on, or `nil` if the url is
+not on Google's list.
+
+----------------
+
+## Contributing
+
+We've already had some [great
+contributers](https://github.com/mobiledefense/google_safe_browsing/graphs/contributors).
+If you'd like to join us, we'd love to have you. When contributing please
+
+1. [Fork](https://github.com/mobiledefense/google_safe_browsing/fork) the repo
+1. Start a topic branch.
+1. Write awesome code!
+   1. Please break your commits into logical units.
+   1. Please add specs when necessary.
+1. Open a [Pull
+   Request](https://github.com/mobiledefense/google_safe_browsing/pulls)
+1. Make sure [Travis
+   CI](https://travis-ci.org/mobiledefense/google_safe_browsing)
+   builds the PR successfully.
+1. See your awesomeness merged in!
+
+### Running specs
+
+We use [Rspec](http://rspec.info/) for unit testing. You can run the specs with
+the following command:
+
+    bundle exec rake
+
+Or individual specs/files:
+
+    bundle exec rspec spec/chunk_helper_spec.rb:10
+
 
-The `lookup` method returns a string ( either 'malware' or 'phishing' ) for the name of the black list
-which the url appears on, or `nil` if the url is not on Google's list.
+Thanks for helping us make browsing safer!
 
 ----------------
 

data/lib/google_safe_browsing/chunk_helper.rb

@@ -13,12 +13,16 @@ module GoogleSafeBrowsing
         action_strings = []
 
 
-        nums = GoogleSafeBrowsing::AddShavar.select('distinct chunk_number').where(:list => list).
-          order(:chunk_number).collect{|c| c.chunk_number }
+        nums = GoogleSafeBrowsing::AddShavar.where(list: list)
+                                            .order(:chunk_number)
+                                            .select('distinct chunk_number')
+                                            .map(&:chunk_number)
         action_strings << "a:#{squish_number_list(nums)}" if nums.any?
 
-        nums = GoogleSafeBrowsing::SubShavar.select('distinct chunk_number').where(:list => list).
-          order(:chunk_number).uniq.collect{|c| c.chunk_number }
+        nums = GoogleSafeBrowsing::SubShavar.where(list: list)
+                                            .order(:chunk_number)
+                                            .select('distinct chunk_number')
+                                            .map(&:chunk_number)
         action_strings << "s:#{squish_number_list(nums)}" if nums.any?
 
         ret += "#{action_strings.join(':')}#{":mac" if GoogleSafeBrowsing.config.have_keys?}\n"

data/lib/google_safe_browsing/full_hash.rb

@@ -1,5 +1,16 @@
 module GoogleSafeBrowsing
   class FullHash < ActiveRecord::Base
     self.table_name = 'gsb_full_hashes'
+
+    def self.delete_subbed
+      sub_join = <<-SQL
+        INNER JOIN gsb_sub_shavars
+        ON gsb_sub_shavars.add_chunk_number = gsb_full_hashes.add_chunk_number
+        AND gsb_sub_shavars.list = gsb_full_hashes.list
+      SQL
+
+      hash_ids = joins(sub_join).pluck("distinct #{self.table_name}.id")
+      where(id: hash_ids).delete_all
+    end
   end
 end

data/lib/google_safe_browsing/response_helper.rb

@@ -157,13 +157,7 @@ module GoogleSafeBrowsing
         SQL
       end
 
-      FullHash.connection.execute <<-SQL
-        DELETE FROM gsb_full_hashes
-        USING gsb_full_hashes
-        INNER JOIN  gsb_sub_shavars ON
-        gsb_sub_shavars.add_chunk_number = gsb_full_hashes.add_chunk_number
-        AND gsb_sub_shavars.list = gsb_full_hashes.list;
-        SQL
+      FullHash.delete_subbed
 
       @add_shavar_values = []
       @sub_shavar_values = []

data/lib/google_safe_browsing/version.rb

@@ -1,3 +1,3 @@
 module GoogleSafeBrowsing
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: google_safe_browsing
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-ip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails 3 plugin using Google's Safe Browsing API for url lookup against
@@ -157,32 +142,25 @@ files:
 - README.md
 homepage: https://github.com/mobiledefense/google_safe_browsing
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4601497305607067111
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4601497305607067111
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails 3 plugin for Google's Safe Browsing API v2
 test_files: []