google_safe_browsing 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5b61271d81882c1bbaea1de9c42b0fcdfa7ae2b
-  data.tar.gz: 1ada1d0d3f7c6e6a4708c2d28a38e9e9e0a1a8a9
+  metadata.gz: d946ae1600f648b9fc8a7c0768e0b7705e24f223
+  data.tar.gz: c34af8e761bea301d64a65cfa078f1449713d7f1
 SHA512:
-  metadata.gz: fe03c531a15358f5098cff412c809533208161ac0a02a9f11469361a5c753733bc36302a78ee750da13a0706ee7a6cc350a65b0d94424385277db639b4d5692d
-  data.tar.gz: daf865df013d6d94d5ed184be4da95e41dcc52169ab74106cd98a43a61ac6d0b84c23b784cb56a365dbf0c0699f124422749bb9793affa8fa348081e5618a6af
+  metadata.gz: 05d832d303bb171aa3c0f4d71e9d23e3263e95ca74b976213f1b4c7e337ce67dfab6d64b860764c7f6fb3c06e99e57fd2b4fbc1f9b36085b40393a661f751d0f
+  data.tar.gz: 8ff8c417be266b6fb170ea84a5044f8295ea9693d692639f46de0c8b0b470095476cdd169fdceb2b4200d47301bdb5da51519d71e3f7781cafa0a4f765dbb379

data/README.md

@@ -5,6 +5,8 @@ into Rails 3 apps.
 
 [![Build
 Status](https://travis-ci.org/mobiledefense/google_safe_browsing.png)](https://travis-ci.org//mobiledefense/google_safe_browsing)
+[![Code
+Climate](https://codeclimate.com/github/mobiledefense/google_safe_browsing.png)](https://codeclimate.com/github/mobiledefense/google_safe_browsing)
 
 It includes:
 
@@ -55,7 +57,7 @@ You can run an update manually
 
     $ rake google_safe_browsing:update
 
-> Note: The full database is not guarenteed to be returned after a single update.
+> Note: The full database is not guaranteed 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.

data/lib/google_safe_browsing.rb

@@ -10,6 +10,7 @@ require  'google_safe_browsing/api_v2'
 require  'google_safe_browsing/binary_helper'
 require  'google_safe_browsing/canonicalize'
 require  'google_safe_browsing/chunk_helper'
+require  'google_safe_browsing/chunk_list'
 require  'google_safe_browsing/hash_helper'
 require  'google_safe_browsing/http_helper'
 require  'google_safe_browsing/invalid_mac_validation'
@@ -17,6 +18,7 @@ require  'google_safe_browsing/key_helper'
 require  'google_safe_browsing/response_helper'
 require  'google_safe_browsing/top_level_domain'
 
+require  'google_safe_browsing/shavar'
 require  'google_safe_browsing/add_shavar'
 require  'google_safe_browsing/sub_shavar'
 require  'google_safe_browsing/full_hash'
@@ -24,7 +26,6 @@ require  'google_safe_browsing/full_hash'
 require  'google_safe_browsing/rescheduler'
 
 module GoogleSafeBrowsing
-
   # Handles the configuration values for the module
   class Config
     attr_accessor :client, :app_ver, :p_ver, :host, :current_lists, :api_key,
@@ -35,8 +36,8 @@ module GoogleSafeBrowsing
       @app_ver        = VERSION
       @p_ver          = '2.2'
       @host           = 'http://safebrowsing.clients.google.com/safebrowsing'
-      @rekey_host    = 'https://sb-ssl.google.com/safebrowsing'
-      @current_lists  = [ 'googpub-phish-shavar', 'goog-malware-shavar' ]
+      @rekey_host     = 'https://sb-ssl.google.com/safebrowsing'
+      @current_lists  = ['googpub-phish-shavar', 'goog-malware-shavar']
       @mac_required   = true
     end
 
@@ -60,7 +61,6 @@ module GoogleSafeBrowsing
     Resque.enqueue(Rescheduler)
   end
 
-
   # Converts the official Google list name into the name to return
   #
   # @param (String) list the 'official' list name

data/lib/google_safe_browsing/add_shavar.rb

@@ -1,5 +1,7 @@
 module GoogleSafeBrowsing
   class AddShavar < ActiveRecord::Base
+    include Shavar
+
     self.table_name = 'gsb_add_shavars'
   end
 end

data/lib/google_safe_browsing/chunk_helper.rb

@@ -55,19 +55,5 @@ module GoogleSafeBrowsing
 
       num_strings.join(',')
     end
-
-    def self.chunklist_to_sql(chunk_list)
-      ret_array = []
-      chunk_list.split(',').each do |s|
-        if s.index('-')
-          range = s.split('-')
-          ret_array << "chunk_number between #{range[0]} and #{range[1]}"
-        else
-          ret_array << "chunk_number = #{s}"
-        end
-      end
-      ret_array.join(" or ")
-    end
-
   end
 end

data/lib/google_safe_browsing/chunk_list.rb

@@ -0,0 +1,20 @@
+module GoogleSafeBrowsing
+  class ChunkList
+    def initialize(raw_chunks)
+      @raw_chunk_list = raw_chunks
+    end
+
+    def to_a
+      list = []
+      @raw_chunk_list.split(',').each do |item|
+        if item.index('-')
+          range = item.split('-')
+          list += Array(range[0]..range[1])
+        else
+          list << item
+        end
+      end
+      list
+    end
+  end
+end

data/lib/google_safe_browsing/response_helper.rb

@@ -39,16 +39,16 @@ module GoogleSafeBrowsing
         when 'r'
           # reset (delete all data and try again)
         when 'ad'
-          # vals[1] is a CHUNKLIST number or range representing add chunks to delete
+          # vals[1] is a CHUNKLIST representing add chunks to delete
           # we can also delete the associated Shavar Hashes
           # we no longer have to report that we received these chunks
-          chunk_number_clause = ChunkHelper.chunklist_to_sql(vals[1])
-          AddShavar.delete_all([ "list = ? and (?)", current_list, chunk_number_clause ])
+          AddShavar.delete_chunks_from_list(current_list,
+                                            ChunkList.new(vals[1]))
         when 'sd'
-          # vals[1] is a CHUNKLIST number or range representing sub chunks to delete
+          # vals[1] is a CHUNKLIST representing sub chunks to delete
           # we no longer have to report that we received these chunks
-          chunk_number_clause = ChunkHelper.chunklist_to_sql(vals[1])
-          SubShavar.delete_all([ "list = ? and (?)", current_list, chunk_number_clause ])
+          SubShavar.delete_chunks_from_list(current_list,
+                                            ChunkList.new(vals[1]))
         end
       end
 

data/lib/google_safe_browsing/shavar.rb

@@ -0,0 +1,7 @@
+module GoogleSafeBrowsing
+  module Shavar
+    def self.delete_chunks_from_list(list, chunk_list)
+      self.class.where(list: list, chunk_number: chunk_list.to_a).delete_all
+    end
+  end
+end

data/lib/google_safe_browsing/sub_shavar.rb

@@ -1,6 +1,7 @@
 module GoogleSafeBrowsing
   class SubShavar < ActiveRecord::Base
+    include Shavar
+
     self.table_name = 'gsb_sub_shavars'
   end
 end
-

data/lib/google_safe_browsing/version.rb

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

metadata

@@ -1,111 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: google_safe_browsing
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Chris Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-ip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails 3 plugin using Google's Safe Browsing API for url lookup against
@@ -116,13 +130,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- APACHE-LICENSE
+- README.md
+- Rakefile
 - lib/generators/install_generator.rb
 - lib/generators/templates/create_google_safe_browsing_tables.rb
+- lib/google_safe_browsing.rb
 - lib/google_safe_browsing/add_shavar.rb
 - lib/google_safe_browsing/api_v2.rb
 - lib/google_safe_browsing/binary_helper.rb
 - lib/google_safe_browsing/canonicalize.rb
 - lib/google_safe_browsing/chunk_helper.rb
+- lib/google_safe_browsing/chunk_list.rb
 - lib/google_safe_browsing/effective_tld_names.dat.txt
 - lib/google_safe_browsing/full_hash.rb
 - lib/google_safe_browsing/google_safe_browsing_railtie.rb
@@ -132,14 +151,11 @@ files:
 - lib/google_safe_browsing/key_helper.rb
 - lib/google_safe_browsing/rescheduler.rb
 - lib/google_safe_browsing/response_helper.rb
+- lib/google_safe_browsing/shavar.rb
 - lib/google_safe_browsing/sub_shavar.rb
 - lib/google_safe_browsing/top_level_domain.rb
 - lib/google_safe_browsing/version.rb
-- lib/google_safe_browsing.rb
 - lib/tasks/google_safe_browsing_tasks.rake
-- APACHE-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/mobiledefense/google_safe_browsing
 licenses: []
 metadata: {}
@@ -149,17 +165,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails 3 plugin for Google's Safe Browsing API v2