Merged

Author: dwaite

.gitignore

@@ -3,3 +3,4 @@
 pkg
 doc
 .bundle
+Gemfile.lock

.rspec

@@ -0,0 +1,2 @@
+--color
+-w

Gemfile

@@ -1,4 +1,2 @@
-source "http://rubygems.org"
-# requires ruby >= 2.0
-
+source 'https://rubygems.org'
 gemspec

Rakefile

@@ -1,19 +1,15 @@
+require 'bundler/gem_tasks'
+
 require 'rake'
 
 require 'rake/clean'
-require 'rake/packagetask'
 require 'yard'
 require 'yard/rake/yardoc_task'
 
-require 'fileutils'
-include FileUtils
-
-# Default Rake task is to run all tests
-task :default => :test
 CLEAN << Rake::FileList['doc/**', '.yardoc']
-#Yard
+# Yard
 YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']   # optional
+  t.files   = ['lib/**/*.rb'] # optional
   t.options = ['--title', 'CookieJar, a HTTP Client Cookie Parsing Library',
                '--main', 'README.markdown', '--files', 'LICENSE']
 end
@@ -22,10 +18,14 @@ begin
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new do |t|
-#    t.libs << 'lib'
-#    t.pattern = 'test/**/*_test.rb'
+    t.ruby_opts = %w(-w)
+    t.pattern = 'spec/**/*_spec.rb'
   end
-  task :test => :spec
+  task test: :spec
 rescue LoadError
-  puts "Warning: unable to load rspec tasks"
+  puts 'Warning: unable to load rspec tasks'
 end
+task test: :spec
+
+# Default Rake task is to run all tests
+task default: :test

cookiejar.gemspec

@@ -1,45 +1,26 @@
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = "cookiejar"
-  s.version = "0.3.2"
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'cookiejar/version'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["David Waite"]
-  s.date = "2014-02-16"
-  s.license = "BSD-2-Clause"
-  s.description = "Allows for parsing and returning cookies in Ruby HTTP client code"
-  s.email = "[email protected]"
-  s.files = [
-    "LICENSE",
-    "README.markdown",
-    "Rakefile",
-    "contributors.json",
-    "lib/cookiejar/cookie.rb",
-    "lib/cookiejar/cookie_validation.rb",
-    "lib/cookiejar/jar.rb",
-    "lib/cookiejar.rb",
-    "spec/cookie_spec.rb",
-    "spec/cookie_validation_spec.rb",
-    "spec/jar_spec.rb"
-  ]
-  s.homepage = "https://alkaline-solutions.com"
-  s.rdoc_options = ["--title", "CookieJar -- Client-side HTTP Cookies"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.10"
-  s.summary = "Client-side HTTP Cookie library"
+Gem::Specification.new do |s|
+  s.name        = 'cookiejar'
+  s.version     = CookieJar::VERSION
+  s.authors     = ['David Waite']
+  s.email       = ['[email protected]']
+  s.description = 'Allows for parsing and returning cookies in Ruby HTTP client code'
+  s.summary     = 'Client-side HTTP Cookie library'
+  s.homepage    = 'http://alkaline-solutions.com'
+  s.date        = '2014-02-01'
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.test_files    = s.files.grep(%r{^(spec)/})
+  s.rdoc_options  = ['--title', 'CookieJar -- Client-side HTTP Cookies']
+  s.require_paths = ['lib']
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-  s.add_development_dependency "rake",  "~> 10.0"
-  s.add_development_dependency "rspec-collection_matchers", "~> 1.0"
-  s.add_development_dependency "rspec", "~> 3.0"
-  s.add_development_dependency "yard",  "~> 0.8", ">= 0.8.7"
+  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency 'rspec-collection_matchers', '~> 1.0'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'yard',  '~> 0.8', '>= 0.8.7'
 end

lib/cookiejar.rb

@@ -1,2 +1,3 @@
 require 'cookiejar/cookie'
 require 'cookiejar/jar'
+require 'cookiejar/version'

lib/cookiejar/cookie_validation.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'cgi'
 require 'uri'
 
@@ -266,7 +267,7 @@ def self.validate_cookie(request_uri, cookie)
         end
       end
 
-      raise InvalidCookieError, errors unless errors.empty?
+      fail InvalidCookieError, errors unless errors.empty?
 
       # Note: 'secure' is not explicitly defined as an SSL channel, and no
       # test is defined around validity and the 'secure' attribute
@@ -288,8 +289,8 @@ def self.parse_set_cookie(set_cookie_value)
       params.each do |param|
         result = PARAM1.match param
         unless result
-          raise InvalidCookieError,
-                "Invalid cookie parameter in cookie '#{set_cookie_value}'"
+          fail InvalidCookieError,
+               "Invalid cookie parameter in cookie '#{set_cookie_value}'"
         end
         key = result[1].downcase.to_sym
         keyvalue = result[2]
@@ -313,7 +314,7 @@ def self.parse_set_cookie(set_cookie_value)
           when :httponly
             args[:http_only] = true
           else
-            raise InvalidCookieError, "Unknown cookie parameter '#{key}'"
+            fail InvalidCookieError, "Unknown cookie parameter '#{key}'"
           end
         end
       end
@@ -354,8 +355,8 @@ def self.parse_set_cookie2(set_cookie_value)
       begin
         md = PARAM2.match set_cookie_value[index..-1]
         if md.nil? || md.offset(0).first != 0
-          raise InvalidCookieError,
-                "Invalid Set-Cookie2 header '#{set_cookie_value}'"
+          fail InvalidCookieError,
+               "Invalid Set-Cookie2 header '#{set_cookie_value}'"
         end
         index += md.offset(0)[1]
 
@@ -383,14 +384,14 @@ def self.parse_set_cookie2(set_cookie_value)
             ports = keyvalue.split(/,\s*/)
             args[:ports] = ports.map(&:to_i)
           else
-            raise InvalidCookieError, "Unknown cookie parameter '#{key}'"
+            fail InvalidCookieError, "Unknown cookie parameter '#{key}'"
           end
         end
       end until md.post_match.empty?
       # if our last match in the scan failed
       if args[:version] != 1
-        raise InvalidCookieError,
-              'Set-Cookie2 declares a non RFC2965 version cookie'
+        fail InvalidCookieError,
+             'Set-Cookie2 declares a non RFC2965 version cookie'
       end
 
       args

lib/cookiejar/version.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+module CookieJar
+  VERSION = '0.3.3'.freeze
+end

spec/cookie_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 include CookieJar