A few cleanups:

- Update gem dependencies to latest versions
- Update to require ruby 2.0 in Gemfile
- Clean up specs a bit to no longer require custom config
- Change contributors.yaml to contributors.json

Author: dwaite

Gemfile

@@ -1,10 +1,4 @@
 source "http://rubygems.org"
+ruby "2.0.0"
 
-group :build do
-  gem "yard"
-end
-
-group :test do
-  gem "json"
-  gem "rspec", "~>1.3.2"
-end
+gemspec

Rakefile

@@ -1,12 +1,10 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup(:default,:build,:test)
-
 require 'rake'
+
 require 'rake/clean'
-require 'rake/gempackagetask'
+require 'rake/packagetask'
 require 'yard'
 require 'yard/rake/yardoc_task'
+
 require 'fileutils'
 include FileUtils
 
@@ -21,41 +19,13 @@ YARD::Rake::YardocTask.new do |t|
 end
 
 begin
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
 
-  Spec::Rake::SpecTask.new do |t|
-    t.libs << 'lib'
-    t.spec_files = FileList['test/**/*_test.rb']
+  RSpec::Core::RakeTask.new do |t|
+#    t.libs << 'lib'
+#    t.pattern = 'test/**/*_test.rb'
   end
+  task :test => :spec
 rescue LoadError
   puts "Warning: unable to load rspec tasks"
 end
-task :test => :spec
-
-spec = Gem::Specification.new do |s|
-  s.name = 'cookiejar'
-  s.version = '0.3.0'
-  s.summary = "Client-side HTTP Cookie library"
-  s.description = 
-    %{Allows for parsing and returning cookies in Ruby HTTP client code}
-  s.files = Dir['lib/**/*.rb'] + Dir['test/**/*.rb']
-  s.require_path = 'lib'
-  s.has_rdoc = true
-#  s.extra_rdoc_files = Dir['[A-Z]*']
-  s.rdoc_options << '--title' <<  'CookieJar -- Client-side HTTP Cookies'
-  s.author = "David Waite"
-  s.email = "[email protected]"
-  s.homepage = "http://alkaline-solutions.com"
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-   pkg.need_zip = true
-   pkg.need_tar = true
-end
-
-desc "create a .gemspec file"
-task :gemspec do
-  File.open("#{spec.name}.gemspec", 'w') do |f|
-    f.write spec.to_ruby
-  end
-end

contributors.json

@@ -0,0 +1,14 @@
+[
+  {
+    "author": {
+      "github": "http://github.com/secobarbital",
+      "name":   "Seggy Umboh"
+    },
+    "contributions": [
+      "widen supported IP addresses",
+      "fix case-sensitivity issue with HTTP headers",
+      "correct issue when running under Ruby 1.8.x",
+      "made Jar act more like a browser (dropping cookies w/o exception)"
+    ]
+  }
+]

contributors.yaml

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cookiejar}
+  s.name = "cookiejar"
   s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Waite"]
-  s.date = %q{2010-06-12}
-  s.description = %q{Allows for parsing and returning cookies in Ruby HTTP client code}
-  s.email = %q{[email protected]}
+  s.date = "2010-06-12"
+  s.description = "Allows for parsing and returning cookies in Ruby HTTP client code"
+  s.email = "[email protected]"
   s.files = [
     "LICENSE",
     "README.markdown",
@@ -22,11 +22,11 @@ Gem::Specification.new do |s|
     "test/cookie_validation_test.rb",
     "test/jar_test.rb"
   ]
-  s.homepage = %q{http://alkaline-solutions.com}
+  s.homepage = "https://alkaline-solutions.com"
   s.rdoc_options = ["--title", "CookieJar -- Client-side HTTP Cookies"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Client-side HTTP Cookie library}
+  s.rubygems_version = "2.1.10"
+  s.summary = "Client-side HTTP Cookie library"
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -37,4 +37,9 @@ Gem::Specification.new do |s|
     end
   else
   end
+  s.add_dependency             "json",  "~> 1.8.1"
+  
+  s.add_development_dependency "rake",  "~> 10.1.0"
+  s.add_development_dependency "rspec", "~> 2.14.1"
+  s.add_development_dependency "yard",  "~> 0.8.7.2"
 end

cookiejar.gemspec

@@ -161,10 +161,13 @@ def to_json *a
     # @param o [Hash] the expanded JSON object
     # @return [CookieJar] a new CookieJar instance
     def self.json_create o
+      if o.is_a? String
+        o = JSON.parse(o)
+      end
       if o.is_a? Hash
         o = o['cookies']
       end
-      cookies = JSON.parse(o).inject [] do |result, cookie_json|
+      cookies = o.inject([]) do |result, cookie_json|
         result << (Cookie.json_create cookie_json)
       end
       self.from_a cookies

lib/cookiejar/jar.rb

@@ -209,7 +209,7 @@
       it "should deserialize a JSON array to a jar" do
         json = "[{\"name\":\"foo\",\"value\":\"bar\",\"domain\":\"localhost.local\",\"path\":\"\\/\",\"created_at\":\"2009-09-11 12:51:03 -0600\",\"expiry\":\"2028-11-01 12:00:00 GMT\",\"secure\":true}]" 
         array = JSON.parse json
-        
+       
         jar = Jar.json_create array
         jar.get_cookies('https://localhost/').should have(1).items
       end