From 2856bd60fe184d0bc4384c67f20d82b4cc392351 Mon Sep 17 00:00:00 2001 From: Jeff Dallien Date: Tue, 21 Feb 2012 19:53:53 -0500 Subject: [PATCH] Move the two exactly duplicated methods into a module. --- lib/cookie_extractor.rb | 1 + .../chrome_cookie_extractor.rb | 17 +---------------- lib/cookie_extractor/common.rb | 19 +++++++++++++++++++ .../firefox_cookie_extractor.rb | 17 +---------------- 4 files changed, 22 insertions(+), 32 deletions(-) create mode 100644 lib/cookie_extractor/common.rb diff --git a/lib/cookie_extractor.rb b/lib/cookie_extractor.rb index 013c4ba..b9cd79e 100644 --- a/lib/cookie_extractor.rb +++ b/lib/cookie_extractor.rb @@ -1,4 +1,5 @@ require "cookie_extractor/version" +require "cookie_extractor/common" require "cookie_extractor/firefox_cookie_extractor" require "cookie_extractor/chrome_cookie_extractor" diff --git a/lib/cookie_extractor/chrome_cookie_extractor.rb b/lib/cookie_extractor/chrome_cookie_extractor.rb index ba94331..61901f5 100644 --- a/lib/cookie_extractor/chrome_cookie_extractor.rb +++ b/lib/cookie_extractor/chrome_cookie_extractor.rb @@ -2,6 +2,7 @@ require 'sqlite3' module CookieExtractor class ChromeCookieExtractor + include Common def initialize(cookie_file) @cookie_file = cookie_file @@ -23,21 +24,5 @@ module CookieExtractor end @result end - - private - - def is_domain_wide(hostname) - hostname[0..0] == "." - end - - def true_false_word(value) - if value == "1" || value == 1 || value == true - "TRUE" - elsif value == "0" || value == 0 || value == false - "FALSE" - else - raise "Invalid value passed to true_false_word: #{value.inspect}" - end - end end end diff --git a/lib/cookie_extractor/common.rb b/lib/cookie_extractor/common.rb new file mode 100644 index 0000000..a1af08f --- /dev/null +++ b/lib/cookie_extractor/common.rb @@ -0,0 +1,19 @@ +module CookieExtractor + module Common + private + + def is_domain_wide(hostname) + hostname[0..0] == "." + end + + def true_false_word(value) + if value == "1" || value == 1 || value == true + "TRUE" + elsif value == "0" || value == 0 || value == false + "FALSE" + else + raise "Invalid value passed to true_false_word: #{value.inspect}" + end + end + end +end diff --git a/lib/cookie_extractor/firefox_cookie_extractor.rb b/lib/cookie_extractor/firefox_cookie_extractor.rb index 5072464..e665849 100644 --- a/lib/cookie_extractor/firefox_cookie_extractor.rb +++ b/lib/cookie_extractor/firefox_cookie_extractor.rb @@ -2,6 +2,7 @@ require 'sqlite3' module CookieExtractor class FirefoxCookieExtractor + include Common def initialize(cookie_file) @cookie_file = cookie_file @@ -23,21 +24,5 @@ module CookieExtractor end @result end - - private - - def is_domain_wide(hostname) - hostname[0..0] == "." - end - - def true_false_word(value) - if value == "1" || value == 1 || value == true - "TRUE" - elsif value == "0" || value == 0 || value == false - "FALSE" - else - raise "Invalid value passed to true_false_word: #{value.inspect}" - end - end end end