google_safe_browsing 0.3.5 → 0.3.6

data/lib/google_safe_browsing/canonicalize.rb

@@ -71,7 +71,7 @@ module GoogleSafeBrowsing
       cart_prod(host_strings, path_strings)
     end
 
-    private
+   # private
 
       # Generates the path permutations from the raw path string
       #
@@ -103,9 +103,9 @@ module GoogleSafeBrowsing
         path_strings.compact!
         path_strings.uniq!
 
-        if params
+        unless params.blank?
           path_strings | path_strings.map do |p|
-            if p[-1..-1] == '/'
+            if p[-1] == '/'
               p
             else
               "#{p}?#{params}"
@@ -181,7 +181,11 @@ module GoogleSafeBrowsing
 
         host.downcase!
 
-        host = IP::V4.new(host).to_s if host =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
+        if host =~ /^\d+$/
+          host = IP::V4.new(host.to_i).to_addr
+        elsif host =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
+          host = IP.new(host).to_addr 
+        end
 
         host
       end

data/lib/google_safe_browsing/chunk_helper.rb

@@ -1,7 +1,7 @@
 module GoogleSafeBrowsing
   class ChunkHelper
-    def self.build_chunk_list(list=nil)
-      lists = if list
+    def self.build_chunk_list(*list)
+      lists = if list.any?
                 list.to_a
               else
                 GoogleSafeBrowsing.config.current_lists

data/lib/google_safe_browsing/version.rb

@@ -1,3 +1,3 @@
 module GoogleSafeBrowsing
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/lib/google_safe_browsing.rb

@@ -4,20 +4,22 @@ require 'active_record'
 
 require 'google_safe_browsing/google_safe_browsing_railtie' if defined?(Rails)
 
-require File.dirname(__FILE__) + '/google_safe_browsing/api_v2'
-require File.dirname(__FILE__) + '/google_safe_browsing/binary_helper'
-require File.dirname(__FILE__) + '/google_safe_browsing/canonicalize'
-require File.dirname(__FILE__) + '/google_safe_browsing/chunk_helper'
-require File.dirname(__FILE__) + '/google_safe_browsing/hash_helper'
-require File.dirname(__FILE__) + '/google_safe_browsing/http_helper'
-require File.dirname(__FILE__) + '/google_safe_browsing/response_helper'
-require File.dirname(__FILE__) + '/google_safe_browsing/top_level_domain'
+#require  'google_safe_browsing/version'
 
-require File.dirname(__FILE__) + '/google_safe_browsing/add_shavar'
-require File.dirname(__FILE__) + '/google_safe_browsing/sub_shavar'
-require File.dirname(__FILE__) + '/google_safe_browsing/full_hash'
+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/hash_helper'
+require  'google_safe_browsing/http_helper'
+require  'google_safe_browsing/response_helper'
+require  'google_safe_browsing/top_level_domain'
 
-require File.dirname(__FILE__) + '/google_safe_browsing/rescheduler'
+require  'google_safe_browsing/add_shavar'
+require  'google_safe_browsing/sub_shavar'
+require  'google_safe_browsing/full_hash'
+
+require  'google_safe_browsing/rescheduler'
 
 module GoogleSafeBrowsing
 

metadata

@@ -1,115 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: google_safe_browsing
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.3.6
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 5
-  version: 0.3.5
 platform: ruby
-authors: 
+authors:
 - Chris Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: ruby-ip
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activerecord
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: generator_spec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id006
-description: Rails 3 plugin using Google's Safe Browsing API for url lookup against Malware and Phishing blacklists. Implementation includes storing and updating locally stored shavar lists and url lookup methods.
+  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
+  Malware and Phishing blacklists. Implementation includes storing and updating locally
+  stored shavar lists and url lookup methods.
 email: chris@chrismar035.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/generators/install_generator.rb
 - lib/generators/templates/create_google_safe_browsing_tables.rb
 - lib/google_safe_browsing/add_shavar.rb
@@ -134,36 +139,32 @@ files:
 - README.mkd
 homepage: https://github.com/mobiledefense/mobiledefense_google_safe_browsing
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2844511757792676073
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2844511757792676073
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails 3 plugin for Google's Safe Browsing API v2
 test_files: []
-