democrats · sr · May 11, 2010 · Sep 2, 2010 · Sep 2, 2010 · Sep 3, 2010
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 pkg
+.bundle
+vendor/bundle
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+gem "rspec"
+gem "ruby-debug"
+gem "activesupport"
+gem "rake"
+gem "hoe"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,29 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.0)
+    columnize (0.3.1)
+    hoe (2.6.2)
+      rake (>= 0.8.7)
+      rubyforge (>= 2.0.4)
+    json_pure (1.4.6)
+    linecache (0.43)
+    rake (0.8.7)
+    rspec (1.3.0)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  hoe
+  rake
+  rspec
+  ruby-debug
diff --git a/README.rdoc b/README.rdoc
@@ -4,6 +4,9 @@
 
 auth-hmac is a Ruby implementation of HMAC[http://en.wikipedia.org/wiki/HMAC] based authentication of HTTP requests.
 
+This is the DNC Innovation Lab fork of the project. We added Rack support and some other more obscure stuff for HMAC proxying that you probably won't need unless you're doing something weird like we are. :)
+Github user rjackson contributed Ruby 1.9 support, which is pretty awesome.
+
 HMAC authentication involves a client and server having a shared secret key.  When sending the request the client, signs the request using the secret key. This involves building a canonical representation of the request and then generating a HMAC of the request using the secret. The generated HMAC is then sent as part of the request.
 
 When the server receives the request it builds the same canonical representation and generates a HMAC using it's copy of the secret key, if the HMAC produced by the server matches the HMAC sent by the client, the server can be assured that the client also possesses the shared secret key.
@@ -33,7 +36,7 @@ AuthHMAC.sign! takes a HTTP request object, an access id and a secret key and si
 * The secret key is the shared secret between the client and the server.  You should make this sufficiently random so that is can't be guessed or exposed to dictionary attacks. The follow code will give you a pretty good secret key:
 
 	random = File.read('/dev/random', 512)
-	secret_key = Base64.encode64(Digest::SHA2.new(512).digest(random))
+	secret_key = [Digest::SHA2.new(512).digest(random)].pack('m')
 
 On the server side you can then authenticate these requests using the AuthHMAC.authenticated? method. This takes the same arguments as the sign! method but returns true if the request has been signed with the access id and secret	or false if it hasn't.
 
@@ -51,10 +54,6 @@ will sign +request+ with "access_id1" and it's corresponding secret key.  Simila
 
 which will return true if the request has been signed with one of the access id and secret key pairs provided in the constructor.
 
-=== Rails Integration
-
-AuthHMAC supports authentication within Rails controllers and signing of requests generated by Active Resource. See AuthHMAC::Rails::ControllerFilter::ClassMethods and AuthHMAC::Rails::ActiveResourceExtension::BaseHmac::ClassMethods for details.
-
 == How does it work?
 
 When creating a signature for a HTTP request AuthHMAC first generates a canonical representation of the request. 
@@ -83,25 +82,23 @@ Using these details it is possible to build code that will sign and authenticate
 
 == INSTALL:
 
-* sudo gem install auth-hmac
+* sudo gem install dnclabs-auth-hmac
 
 == Source Code
 
-The source repository is accessible via GitHub or Ruby Forge:
+The source repository is accessible via GitHub:
 
-  git clone git://github.com/seangeo/auth-hmac.git
-
-
-  git clone git://rubyforge.org/auth-hmac.git
+  git clone git://github.com/dnclabs/auth-hmac.git
 
 == Contact Information
 
-The project page is at http://rubyforge.org/projects/auth-hmac. Please file any bugs or feedback
-using the trackers and forums there.
+Please file any bugs or feedback on http://github.com/dnclabs/auth-hmac/
 
 == Authors and Contributors
 
-rAtom was developed by Peerworks[http://peerworks.org] and written by Sean Geoghegan.
+Upstream credits: rAtom was developed by Peerworks[http://peerworks.org] and written by Sean Geoghegan.
+
+This fork: Maintained by the Democratic National Committee Innovation Labs team.
 
 == LICENSE:
 
@@ -126,4 +123,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Rakefile b/Rakefile
@@ -1,4 +1,9 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+require 'config/requirements'
+require 'config/hoe' # setup Hoe + all gem configuration
+
+require 'spec/rake/spectask'
+desc "Run the specs under spec/models"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ['--options', "spec/spec.opts"]
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
diff --git a/auth-hmac.gemspec b/auth-hmac.gemspec
@@ -1,26 +1,18 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{auth-hmac}
-  s.version = "1.1.0"
+  s.name = %q{dnclabs-auth-hmac}
+  s.version = "1.1.1.2010090201"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sean Geoghegan", "ascarter"]
-  s.date = %q{2009-02-26}
-  s.description = %q{A gem providing HMAC based authentication for HTTP}
-  s.email = %q{seangeo@gmail.com}
+  s.authors = ["Sean Geoghegan", "ascarter", "Wes Morgan", "Adrian Cushman"]
+  s.date = %q{2010-09-02}
+  s.description = %q{A gem providing HMAC based authentication for HTTP. This is the DNC Labs fork.}
+  s.email = %q{innovationlab@dnc.org}
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt"]
   s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "config/hoe.rb", "config/requirements.rb", "lib/auth-hmac.rb", "lib/auth-hmac/version.rb", "script/console", "script/destroy", "script/generate", "setup.rb", "spec/auth-hmac_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake", "tasks/website.rake"]
   s.has_rdoc = true
-  s.homepage = %q{http://auth-hmac.rubyforge.org}
-  s.post_install_message = %q{
-For more information on auth-hmac, see http://auth-hmac.rubyforge.org
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
-
-}
+  s.homepage = %q{http://github.com/dnclabs/auth-hmac/}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{auth-hmac}

diff --git a/config/hoe.rb b/config/hoe.rb
@@ -1,37 +1,13 @@
 require 'auth-hmac/version'
 
-AUTHOR = ['Sean Geoghegan', 'ascarter']  # can also be an array of Authors
-EMAIL = "seangeo@gmail.com"
-DESCRIPTION = "A gem providing HMAC based authentication for HTTP"
-GEM_NAME = 'auth-hmac' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'auth-hmac' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-EXTRA_DEPENDENCIES = [
-#  ['activesupport', '>= 1.3.1']
-]    # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil
+AUTHOR = ['Sean Geoghegan', 'ascarter', "Wes Morgan", "Adrian Cushman"]  # can also be an array of Authors
+EMAIL = "innovationlab@dnc.org"
+DESCRIPTION = "A gem providing HMAC based authentication for HTTP. This is the DNC Labs fork."
+GEM_NAME = 'dnclabs-auth-hmac' # what ppl will type to install your gem
+HOMEPATH = "http://github.com/dnclabs/auth-hmac/"
+RUBYFORGE_PROJECT = ''
+
+REV = '2010090201'
 # UNCOMMENT IF REQUIRED:
 # REV = YAML.load(`svn info`)['Revision']
 VERS = AuthHMAC::VERSION::STRING + (REV ? ".#{REV}" : "")
@@ -65,10 +41,4 @@ def extra_deps
   #p.extra_deps = EXTRA_DEPENDENCIES
 
     #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''))
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""
+end
diff --git a/config/requirements.rb b/config/requirements.rb
@@ -2,13 +2,13 @@
 include FileUtils
 
 require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
+%w[rake hoe].each do |req_gem|
   begin
     require req_gem
   rescue LoadError
     puts "This Rakefile requires the '#{req_gem}' RubyGem."
     puts "Installation: gem install #{req_gem} -y"
-    exit
+    exit 1
   end
 end