cloudfront-signer 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d944157441307ac5089ebdebf6cb792ae146de9
-  data.tar.gz: c1e333b58d90f8d3538a50daa6dc7d812b92e53c
+  metadata.gz: af2fd7402de3304dcebf5c73545b34f34a4bd793
+  data.tar.gz: 1758268e87d18ecaca43588ca03b34a0bd00e7a6
 SHA512:
-  metadata.gz: cc3ca840dd7ba3894e4dbb265b3ccc0dd2412397dbfd4887d09112c06b4985679c9f8607b5d67a21df72b7e0f4278d4daec8561aa9835a4c220012232326b152
-  data.tar.gz: 9888e0ce34a7892461721a68f61aa4480b93ac3ea9f7deb33fb146274508d5578313e1e4f2b9bb27d43896749f38a2ed3e0a91b8d8f13cb88c42ebfae0ffc51e
+  metadata.gz: 61d635f44898c5ad71c2dad0a75c475f0307c8dd7f16b7e14e58ee789552c60e312ebe8dbf9e5cfe926db34356fc208ba57b4270b5f106dcdd8e03990e89b0b7
+  data.tar.gz: 779f86267e2e7027a28ce2ff11629349f325cac5d608065b914cc72b9fc42407d8fa99c7ad77414820ccfcfc840d1b2cb254de7691c1677d1c06608eefca40b8

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+
+coverage

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+cache: bundler
+rvm:
+- 2.2.2
+script:
+- bundle exec rspec
+addons:
+  code_climate:
+    repo_token: ef3c90e7b5eb13c9242a30d783ed701afa9a8514b6544d5972ca590505d2a12e

data/ChangeLog.markdown

@@ -1,3 +1,6 @@
+### 2.2.1 / 2015-04-29
+* Fixes policy generation when specifying an ip_range. See https://github.com/leonelgalan/cloudfront-signer/commit/18b19cc2f833850f360a92f4e244358601bba5ec#commitcomment-11249140 for details.
+
 ### 2.2.0 / 2015-04-29
 * Accepted merge request from https://github.com/leonelgalan - `sign_params` method returns raw params to be used in urls or cookies.
 
@@ -7,4 +10,3 @@
 ### 2.1.1 / 2013-10-31
 * Added changelog file
 * Aceppted merge request from https://github.com/bullfight, Refactored configuration to allow for key to be passed in directly.
-

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-# Specify your gem's dependencies in aws-cf-signer.gemspec
+# Specify your gem's dependencies in cloudfront-signer.gemspec
 gemspec

data/LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2011 Anthony Bouch
+Copyright (c) 2015 Leonel Galán
+Portions Copyright (c) 2011 Anthony Bouch
 Portions Copyright (c) 2011 Dylan Vaughn
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.markdown

@@ -1,10 +1,10 @@
-# cloudfront-signer
+# cloudfront-signer [![Build Status](https://travis-ci.org/leonelgalan/cloudfront-signer.svg)](https://travis-ci.org/leonelgalan/cloudfront-signer) [![Code Climate](https://codeclimate.com/github/leonelgalan/cloudfront-signer/badges/gpa.svg)](https://codeclimate.com/github/leonelgalan/cloudfront-signer) [![Test Coverage](https://codeclimate.com/github/leonelgalan/cloudfront-signer/badges/coverage.svg)](https://codeclimate.com/github/leonelgalan/cloudfront-signer/coverage) [![Gem Version](https://badge.fury.io/rb/cloudfront-signer.svg)](http://badge.fury.io/rb/cloudfront-signer) [![Dependency Status](https://gemnasium.com/leonelgalan/cloudfront-signer.svg)](https://gemnasium.com/leonelgalan/cloudfront-signer)
 
 See the [ChangeLog](https://github.com/58bits/cloudfront-signer/blob/master/ChangeLog.markdown) for details of this release.
 
-A fork and re-write of Dylan Vaughn's [signing gem](https://github.com/stlondemand/aws_cf_signer).
+See Amazon docs for [Serving Private Content through CloudFront](http://docs.amazonwebservices.com/AmazonCloudFront/latest/DeveloperGuide/index.html?PrivateContent.html)
 
-See Amazon docs for [Using a Signed URL to Serve Private Content](http://docs.amazonwebservices.com/AmazonCloudFront/latest/DeveloperGuide/index.html?PrivateContent.html)
+A fork and rewrite started by [Anthony Bouch](https://github.com/58bits) of Dylan Vaughn's [aws_cf_signer](https://github.com/stlondemand/aws_cf_signer).
 
 This version uses all class methods and a configure method to set options.
 
@@ -12,47 +12,60 @@ Seperate helper methods exist for safe signing of urls and stream paths, each of
 
 ## Installation
 
-The original gem was published as `aws_cf_signer`. Use `gem install aws_cf_signer` to install that version.
-
 This gem has been publised as `cloudfront-signer`. Use `gem install cloudfront-signer` to install this gem.
 
 Alternatively, place a copy of cloudfront-signer.rb (and the cloundfront-signer sub directory) in your lib directory.
 
 In either case the signing class must be configured - supplying the path to a signing key, or supplying the signing key directly as a string along with the `key_pair_id`. Create the initializer by running:
 
-```
-bundle exec rails g cloudfront:install
+```sh
+bundle exec rails generate cloudfront:install
 ```
 
-and customizing the resulting `config/initializers/cloudfront-signer.rb` file.
+and customizing the resulting _config/initializers/cloudfront-signer.rb_ file.
 
-### Generated `cloudfront-signer.rb`
+### Generated _cloudfront-signer.rb_
 
-    AWS::CF::Signer.configure do |config|
-      config.key_path = '/path/to/keyfile.pem'
-      # config.key = ENV.fetch('PRIVATE_KEY') # key_path not required if key supplied directly
-      config.key_pair_id  = "XXYYZZ"
-      config.default_expires = 3600
-    end
+```ruby
+AWS::CF::Signer.configure do |config|
+  config.key_path = '/path/to/keyfile.pem'
+  # config.key = ENV.fetch('PRIVATE_KEY') # key_path not required if key supplied directly
+  config.key_pair_id  = 'XXYYZZ'
+  config.default_expires = 3600
+end
+```
 
 ## Usage
 
 Call the class `sign_url` or `sign_path` method with optional policy settings.
 
-    AWS::CF::Signer.sign_url 'http://mydomain/path/to/my/content'
+```ruby
+AWS::CF::Signer.sign_url 'http://mydomain/path/to/my/content'
+```
 
 or
 
-    AWS::CF::Signer.sign_url 'http://mydomain/path/to/my/content', :expires => Time.now + 600
+```ruby
+AWS::CF::Signer.sign_url 'http://mydomain/path/to/my/content', expires: Time.now + 600
+```
 
 Streaming paths can be signed with the `sign_path` method.
 
-    AWS::CF::Signer.sign_path 'path/to/my/content'
+```ruby
+AWS::CF::Signer.sign_path 'path/to/my/content'
+```
 
 or
 
-    AWS::CF::Signer.sign_path 'path/to/my/content', :expires => Time.now + 600
+```ruby
+AWS::CF::Signer.sign_path 'path/to/my/content', expires: Time.now + 600
+```
 
+Raw parameters can be get with the `signed_params` method. See [commit message](https://github.com/leonelgalan/cloudfront-signer/commit/fedcc3182e32133e4bd0ad0b79c0106168896c91) for additional details.
+
+```ruby
+AWS::CF::Signer.sign_params 'path/to/my/content'
+```
 
 Both `sign_url` and `sign_path` have _safe_ versions that HTML encode the result allowing signed paths or urls to be placed in HTML markup. The 'non'-safe versions can be used for placing signed urls or paths in JavaScript blocks or Flash params.
 
@@ -61,25 +74,30 @@ Both `sign_url` and `sign_path` have _safe_ versions that HTML encode the result
 
 See Example Custom Policy 1 at above AWS doc link
 
-    url = AWS::CF::Signer.sign_url('http://d604721fxaaqy9.cloudfront.net/training/orientation.avi',
-            :expires   => 'Sat, 14 Nov 2009 22:20:00 GMT',
-            :resource => 'http://d604721fxaaqy9.cloudfront.net/training/*',
-            :ip_range => '145.168.143.0/24'
-    )
+```ruby
+url = AWS::CF::Signer.sign_url 'http://d604721fxaaqy9.cloudfront.net/training/orientation.avi',
+                               expires: 'Sat, 14 Nov 2009 22:20:00 GMT',
+                               resource: 'http://d604721fxaaqy9.cloudfront.net/training/*',
+                               ip_range: '145.168.143.0/24'
+)
+```
 
 See Example Custom Policy 2 at above AWS doc link
 
-    url = AWS::CF::Signer.sign_url('http://d84l721fxaaqy9.cloudfront.net/downloads/pictures.tgz',
-            :starting => 'Thu, 30 Apr 2009 06:43:10 GMT',
-            :expires   => 'Fri, 16 Oct 2009 06:31:56 GMT',
-            :resource => 'http://*',
-            :ip_range => '216.98.35.1/32'
-    )
+```ruby
+AWS::CF::Signer.sign_url 'http://d84l721fxaaqy9.cloudfront.net/downloads/pictures.tgz',
+                         starting: 'Thu, 30 Apr 2009 06:43:10 GMT',
+                         expires: 'Fri, 16 Oct 2009 06:31:56 GMT',
+                         resource: 'http://*',
+                         ip_range: '216.98.35.1/32'
+```
 
 You can also pass in a path to a policy file. This will supersede any other policy options
 
-    url = AWS::CF::Signer.sign_url('http://d84l721fxaaqy9.cloudfront.net/downloads/pictures.tgz', :policy_file => '/path/to/policy/file.txt')
-
+```ruby
+AWS::CF::Signer.sign_url 'http://d84l721fxaaqy9.cloudfront.net/downloads/pictures.tgz',
+                         policy_file: '/path/to/policy/file.txt'
+```
 
 ## Patches/Pull Requests
 
@@ -90,18 +108,12 @@ You can also pass in a path to a policy file. This will supersede any other poli
 * Send me a pull request. Bonus points for topic branches.
 
 ## Attributions
+Hat tip to [Anthony Bouch](https://github.com/58bits) for contributing to Dylan's effort. Only reading both gem's code I was able to figure out the signing needed for the newly introduced signed cookies.
 
-Parts of signing code taken from a question on Stack Overflow asked by Ben Wiseley, and answered by Blaz Lipuscek and Manual M:
-
-* [http://stackoverflow.com/questions/2632457/create-signed-urls-for-cloudfront-with-ruby](http://stackoverflow.com/questions/2632457/create-signed-urls-for-cloudfront-with-ruby)
-* [http://stackoverflow.com/users/315829/ben-wiseley](http://stackoverflow.com/users/315829/ben-wiseley)
-* [http://stackoverflow.com/users/267804/blaz-lipuscek](http://stackoverflow.com/users/267804/blaz-lipuscek)
-* [http://stackoverflow.com/users/327914/manuel-m](http://stackoverflow.com/users/327914/manuel-m)
-
-Note: Dylan blazed a trail here - however, after several attempts, I was unable to contact Dylan in order to suggest that we combine our efforts to produce a single gem - hence the re-write and new gem here.
+> Dylan blazed a trail here - however, after several attempts, I was unable to contact Dylan in order to suggest that we combine our efforts to produce a single gem - hence the re-write and new gem here. - **Anthony Bouch**
 
+Parts of signing code taken from a question on [Stack Overflow](http://stackoverflow.com/questions/2632457/create-signed-urls-for-cloudfront-with-ruby) asked by [Ben Wiseley](http://stackoverflow.com/users/315829/ben-wiseley), and answered by [Blaz Lipuscek](http://stackoverflow.com/users/267804/blaz-lipuscek) and [Manual M](http://stackoverflow.com/users/327914/manuel-m).
 
-License
--------
+## License
 
-cloudfront-signer is distributed under the MIT License, portions copyright © 2011 Dylan Vaughn, STL, Anthony Bouch
+cloudfront-signer is distributed under the MIT License, portions copyright © 2015 Dylan Vaughn, STL, Anthony Bouch, Leonel Galán

data/Rakefile

@@ -1,11 +1,10 @@
 require 'bundler/gem_tasks'
 
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/**/*_spec.rb'
-  t.rspec_opts = ["--colour", "--format", "nested"]
+  t.rspec_opts = ['--colour', '--format', 'nested']
 end
 
-task :default => :spec
-
+task default: :spec

data/cloudfront-signer.gemspec

@@ -1,22 +1,27 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "cloudfront-signer/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'cloudfront-signer/version'
 
 Gem::Specification.new do |s|
-  s.name        = "cloudfront-signer"
-  s.version     = AWS::CF::VERSION
-  s.authors     = ["Anthony Bouch"]
-  s.email       = ["tony@58bits.com"]
-  s.homepage    = "http://github.com/58bits/cloudfront-signer"
-  s.summary     = %q{A gem to sign url and stream paths for Amazon CloudFront private content.}
-  s.description = %q{A gem to sign url and stream paths for Amazon CloudFront private content. Includes specific signing methods for both url and streaming paths, including html 'safe' escpaed versions of each.}
+  s.name = 'cloudfront-signer'
+  s.version = AWS::CF::VERSION
+  s.authors = ['Anthony Bouch', 'Leonel Galan']
+  s.email = ['tony@58bits.com', 'leonelgalan@gmail.com']
+  s.homepage = 'http://github.com/leonelgalan/cloudfront-signer'
+  s.summary = 'A gem to sign url and stream paths for Amazon CloudFront ' \
+                  'private content.'
+  s.description = 'A gem to sign url and stream paths for Amazon CloudFront ' \
+                  'private content. Includes specific signing methods for ' \
+                  "both url and streaming paths, including html 'safe' " \
+                  'escaped versions of each.'
+  s.license = 'MIT'
 
-  s.rubyforge_project = "cloudfront-signer"
-
-  s.add_development_dependency "rspec" 
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.rubyforge_project = 'cloudfront-signer'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'codeclimate-test-reporter'
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n")
+    .map { |f| File.basename f }
+  s.require_paths = ['lib']
 end

data/lib/cloudfront-signer.rb

@@ -3,7 +3,7 @@
 require 'openssl'
 require 'time'
 require 'base64'
-require "cloudfront-signer/version"
+require 'cloudfront-signer/version'
 require 'json'
 
 module AWS
@@ -11,9 +11,8 @@ module AWS
     class Signer
       # Public non-inheritable class accessors
       class << self
-
-        # Public: Provides a configuration option to set the key_pair_id if it has not
-        # been inferred from the key_path
+        # Public: Provides a configuration option to set the key_pair_id if it
+        # has not been inferred from the key_path
         #
         # Examples
         #
@@ -34,12 +33,16 @@ module AWS
         #
         # Returns nothing.
         def key_path=(path)
-          raise ArgumentError.new("The signing key could not be found at #{path}") unless File.exists?(path)
+          unless File.exist?(path)
+            fail ArgumentError,
+                 "The signing key could not be found at #{path}"
+          end
           @key_path = path
-          self.key=(File.readlines(path).join(""))
+          self.key = File.readlines(path).join('')
         end
 
-        # Public: Provides a configuration option to set the key directly as a string e.g. as an ENV var
+        # Public: Provides a configuration option to set the key directly as a
+        # string e.g. as an ENV var
         #
         # Examples
         #
@@ -54,12 +57,10 @@ module AWS
         # Public: Provides an accessor to the key_path
         #
         # Returns a String value indicating the current setting
-        def key_path
-          @key_path
-        end
-
+        attr_reader :key_path
 
-        # Public: Provides a configuration option that sets the default_expires in milliseconds
+        # Public: Provides a configuration option that sets the default_expires
+        # in milliseconds
         #
         # Examples
         #
@@ -68,9 +69,7 @@ module AWS
         #   end
         #
         # Returns nothing.
-        def default_expires=(value)
-          @default_expires = value
-        end
+        attr_writer :default_expires
 
         # Public: Provides an accessor to the default_expires value
         #
@@ -79,7 +78,6 @@ module AWS
           @default_expires ||= 3600
         end
 
-
         private
 
         # Private: Provides an accessor to the RSA key value
@@ -104,16 +102,20 @@ module AWS
       #
       # Returns nothing.
       def self.configure
-
         yield self if block_given?
 
-        raise ArgumentError.new("You must supply the path to a PEM format RSA key pair.") unless self.key_path || private_key
+        unless key_path || private_key
+          fail ArgumentError,
+               'You must supply the path to a PEM format RSA key pair.'
+        end
 
         unless @key_pair_id
-          @key_pair_id = extract_key_pair_id(self.key_path)
-          raise ArgumentError.new("The Cloudfront signing key id could not be inferred from #{self.key_path}. Please supply the key pair id as a configuration argument.") unless @key_pair_id
+          @key_pair_id = extract_key_pair_id(key_path)
+          fail ArgumentError,
+               'The Cloudfront signing key id could not be inferred from ' \
+               "#{key_path}. Please supply the key pair id as a " \
+               'configuration argument.' unless @key_pair_id
         end
-
       end
 
       # Public: Provides a configuration check method which tests to see
@@ -121,55 +123,58 @@ module AWS
       #
       # Returns a Boolean value indicating that settings are present.
       def self.is_configured?
-        (self.key_pair_id.nil? || private_key.nil?) ? false : true
+        (key_pair_id.nil? || private_key.nil?) ? false : true
       end
 
-      # Public: Sign a url - encoding any spaces in the url before signing. CloudFront
-      # stipulates that signed URLs must not contain spaces (as opposed to stream
-      # paths/filenames which CAN contain spaces).
+      # Public: Sign a url - encoding any spaces in the url before signing.
+      # CloudFront stipulates that signed URLs must not contain spaces (as
+      # opposed to stream paths/filenames which CAN contain spaces).
       #
       # Returns a String
       def self.sign_url(subject, policy_options = {})
-        self.sign(subject, {:remove_spaces => true}, policy_options)
+        sign subject, { remove_spaces: true }, policy_options
       end
 
-
-
       # Public: Sign a url (as above) and HTML encode the result.
       #
       # Returns a String
       def self.sign_url_safe(subject, policy_options = {})
-        self.sign(subject, {:remove_spaces => true, :html_escape => true}, policy_options)
+        sign subject, { remove_spaces: true, html_escape: true }, policy_options
       end
 
-      # Public: Sign a stream path part or filename (spaces are allowed in stream paths
-      # and so are not removed).
+      # Public: Sign a stream path part or filename (spaces are allowed in
+      # stream paths and so are not removed).
       #
       # Returns a String
-      def self.sign_path(subject, policy_options ={})
-        self.sign(subject, {:remove_spaces => false}, policy_options)
+      def self.sign_path(subject, policy_options = {})
+        sign subject, { remove_spaces: false }, policy_options
       end
 
       # Public: Sign a stream path or filename and HTML encode the result.
       #
       # Returns a String
-      def self.sign_path_safe(subject, policy_options ={})
-        self.sign(subject, {:remove_spaces => false, :html_escape => true}, policy_options)
+      def self.sign_path_safe(subject, policy_options = {})
+        sign subject,
+             { remove_spaces: false, html_escape: true },
+             policy_options
       end
 
-      # Public: Builds a signed url or stream resource name with optional configuration and
-      # policy options
+      # Public: Builds a signed url or stream resource name with optional
+      # configuration and policy options
       #
       # Returns a String
       def self.sign(subject, configuration_options = {}, policy_options = {})
-        # If the url or stream path already has a query string parameter - append to that.
+        # If the url or stream path already has a query string parameter -
+        # append to that.
         separator = subject =~ /\?/ ? '&' : '?'
 
-        if configuration_options[:remove_spaces]
-          subject.gsub!(/\s/, "%20")
-        end
+        subject.gsub!(/\s/, '%20') if configuration_options[:remove_spaces]
 
-        result = subject + separator + self.signed_params(subject, policy_options).collect{ |k,v| "#{k}=#{v}" }.join('&')
+        result = subject +
+                 separator +
+                 signed_params(subject, policy_options).collect do |key, value|
+                   "#{key}=#{value}"
+                 end.join('&')
 
         if configuration_options[:html_escape]
           return html_encode(result)
@@ -178,8 +183,8 @@ module AWS
         end
       end
 
-      # Public: Sign a subject url or stream resource name with optional policy options.
-      # It returns raw params to be used in urls or cookies
+      # Public: Sign a subject url or stream resource name with optional policy
+      # options. It returns raw params to be used in urls or cookies
       #
       # Returns a Hash
       def self.signed_params(subject, policy_options = {})
@@ -189,12 +194,13 @@ module AWS
           policy = IO.read(policy_options[:policy_file])
           result['Policy'] = encode_policy(policy)
         else
-          policy_options[:expires] = epoch_time(policy_options[:expires] || Time.now + default_expires)
+          policy_options[:expires] = epoch_time(policy_options[:expires] ||
+                                                Time.now + default_expires)
 
           if policy_options.keys.size <= 1
             # Canned Policy - shorter URL
             expires_at = policy_options[:expires]
-            policy = %({"Statement":[{"Resource":"#{subject}","Condition":{"DateLessThan":{"AWS:EpochTime":#{expires_at}}}}]})
+            policy = %{{"Statement":[{"Resource":"#{subject}","Condition":{"DateLessThan":{"AWS:EpochTime":#{expires_at}}}}]}}
             result['Expires'] = expires_at
           else
             # Custom Policy
@@ -208,13 +214,23 @@ module AWS
                      'Key-Pair-Id' => @key_pair_id
       end
 
-      # Private helper methods
       private
 
       def self.generate_custom_policy(resource, options)
-        conditions = { 'DateLessThan' => { 'AWS:EpochTime' => epoch_time(options[:expires]) } }
-        conditions['DateGreaterThan'] = { 'AWS:EpochTime' => epoch_time(options[:starting]) } if options[:starting]
-        conditions['IpAddress'] = { 'AWS:SourceIp' => option[:ip_range] } if options[:ip_range]
+        conditions = {
+          'DateLessThan' => {
+            'AWS:EpochTime' => epoch_time(options[:expires])
+          }
+        }
+
+        conditions['DateGreaterThan'] = {
+          'AWS:EpochTime' => epoch_time(options[:starting])
+        } if options[:starting]
+
+        conditions['IpAddress'] = {
+          'AWS:SourceIp' => options[:ip_range]
+        } if options[:ip_range]
+
         {
           'Statement' => [{
             'Resource' => resource,
@@ -228,28 +244,33 @@ module AWS
         when String then Time.parse(timelike).to_i
         when Time   then timelike.to_i
         when Fixnum then timelike
-        else raise ArgumentError.new("Invalid argument - String, Fixnum or Time required - #{timelike.class} passed.")
+        else fail ArgumentError,
+                  'Invalid argument - String, Fixnum or Time required - ' \
+                  "#{timelike.class} passed."
         end
       end
 
       def self.encode_policy(policy)
-        url_encode(Base64.encode64(policy))
+        url_encode Base64.encode64(policy)
       end
 
       def self.create_signature(policy)
-        url_encode(Base64.encode64(private_key.sign(OpenSSL::Digest::SHA1.new, (policy))))
+        url_encode Base64.encode64(
+          private_key.sign(OpenSSL::Digest::SHA1.new, (policy))
+        )
       end
 
       def self.extract_key_pair_id(key_path)
-        File.basename(key_path) =~ /^pk-(.*).pem$/ ? $1 : nil
+        File.basename(key_path) =~ /^pk-(.*).pem$/ ? Regexp.last_match[1] : nil
       end
 
       def self.url_encode(s)
-        s.gsub('+','-').gsub('=','_').gsub('/','~').gsub(/\n/,'').gsub(' ','')
+        s.gsub('+', '-').gsub('=', '_').gsub('/', '~').gsub(/\n/, '')
+          .gsub(' ', '')
       end
 
       def self.html_encode(s)
-        return s.gsub('?', '%3F').gsub('=', '%3D').gsub('&', '%26')
+        s.gsub('?', '%3F').gsub('=', '%3D').gsub('&', '%26')
       end
     end
   end

data/lib/cloudfront-signer/version.rb

@@ -1,5 +1,5 @@
 module AWS
-    module CF
-        VERSION = "2.2.0"
-    end
+  module CF
+    VERSION = '2.2.1'
+  end
 end

data/lib/generators/cloudfront/install/install_generator.rb

@@ -3,12 +3,12 @@ require 'rails/generators'
 
 module Cloudfront
   class InstallGenerator < Rails::Generators::Base
-    source_root File.expand_path("../templates", __FILE__)
-    
-    desc "This generator creates an initializer file at config/initializers"
+    source_root File.expand_path('../templates', __FILE__)
+
+    desc 'This generator creates an initializer file at config/initializers'
     def add_initializer
-      template "cloudfront-signer.rb", "config/initializers/cloudfront-signer.rb"
+      template 'cloudfront-signer.rb',
+               'config/initializers/cloudfront-signer.rb'
     end
   end
 end
-  

data/lib/generators/cloudfront/install/templates/cloudfront-signer.rb

@@ -1,6 +1,6 @@
 AWS::CF::Signer.configure do |config|
   config.key_path = '/path/to/keyfile.pem'
-  # config.key = ENV.fetch('PRIVATE_KEY') # key_path not required if key supplied directly
-  config.key_pair_id  = "XXYYZZ"
+  # or config.key = ENV.fetch('PRIVATE_KEY')
+  config.key_pair_id  = 'XXYYZZ'
   config.default_expires = 3600
 end

data/spec/signer_spec.rb

@@ -2,10 +2,12 @@ require 'spec_helper'
 
 describe AWS::CF::Signer do
   let(:key_pair_id) { 'APKAIKUROOUNR2BAFUUU' }
-  let(:key_path) { File.expand_path(File.dirname(__FILE__) + "/keys/pk-#{key_pair_id}.pem") }
-  let(:key) { File.readlines(key_path).join("") }
+  let(:key_path) do
+    File.expand_path File.dirname(__FILE__) + "/keys/pk-#{key_pair_id}.pem"
+  end
+  let(:key) { File.readlines(key_path).join '' }
 
-  context "configured with key and key_pair_id" do
+  context 'configured with key and key_pair_id' do
     before do
       AWS::CF::Signer.configure do |config|
         config.key_pair_id = key_pair_id
@@ -13,98 +15,92 @@ describe AWS::CF::Signer do
       end
     end
 
-    it "should be configured" do
-      AWS::CF::Signer.is_configured?.should eql(true)
+    it 'should be configured' do
+      expect(AWS::CF::Signer.is_configured?).to be true
     end
 
-    it "sets the private_key" do
-      AWS::CF::Signer.send(:private_key).should be_instance_of OpenSSL::PKey::RSA
+    it 'sets the private_key' do
+      expect(AWS::CF::Signer.send(:private_key)).to(
+        be_an_instance_of OpenSSL::PKey::RSA
+      )
     end
 
-    it "should expire in one hour by default" do
-      url = "http://somedomain.com/sign me"
+    it 'should expire in one hour by default' do
+      url = 'http://somedomain.com/sign me'
       result = AWS::CF::Signer.sign_url(url)
-      get_query_value(result, 'Expires').to_i.should eql((Time.now + 3600).to_i)
+      expect(get_query_value(result, 'Expires').to_i).to(
+        eq Time.now.to_i + 3600
+      )
     end
   end
 
-  context "configured with key_path" do
-
+  context 'configured with key_path' do
     before(:each) do
       AWS::CF::Signer.configure do |config|
         config.key_path = key_path
-        #config.key_pair_id  = "XXYYZZ"
-        #config.default_expires = 3600
       end
     end
 
-    describe "before default use" do
-
-      it "should be configured" do
-        AWS::CF::Signer.is_configured?.should eql(true)
+    describe 'before default use' do
+      it 'should be configured' do
+        expect(AWS::CF::Signer.is_configured?).to be true
       end
 
-      it "sets the private_key" do
-        AWS::CF::Signer.send(:private_key).should be_instance_of OpenSSL::PKey::RSA
+      it 'sets the private_key' do
+        expect(AWS::CF::Signer.send(:private_key)).to(
+          be_an_instance_of OpenSSL::PKey::RSA
+        )
       end
 
-      it "should expire urls and paths in one hour by default" do
-        AWS::CF::Signer.default_expires.should eql(3600)
+      it 'should expire urls and paths in one hour by default' do
+        expect(AWS::CF::Signer.default_expires).to eq 3600
       end
 
-      it "should optionally be configured to expire urls and paths in ten minutes" do
+      it 'should optionally be configured to expire urls and paths' do
         AWS::CF::Signer.default_expires =  600
-        AWS::CF::Signer.default_expires.should eql(600)
+        expect(AWS::CF::Signer.default_expires).to eq 600
         AWS::CF::Signer.default_expires =  nil
       end
     end
 
-    describe "when signing a url" do
-
-      it "should remove spaces from the url" do
-        url = "http://somedomain.com/sign me"
-        result = AWS::CF::Signer.sign_url(url)
-        (result =~ /\s/).should be_nil
+    describe 'when signing a url' do
+      it 'should remove spaces from the url' do
+        url = 'http://somedomain.com/sign me'
+        expect(AWS::CF::Signer.sign_url(url)).not_to match(/\s/)
       end
 
-      it "should not html encode the signed url by default" do
-        url = "http://somedomain.com/someresource?opt1=one&opt2=two"
-        result = AWS::CF::Signer.sign_url(url)
-        (result =~ /\?/).should_not be_nil
-        (result =~ /=/).should_not be_nil
-        (result =~ /&/).should_not be_nil
+      it 'should not html encode the signed url by default' do
+        url = 'http://somedomain.com/someresource?opt1=one&opt2=two'
+        expect(AWS::CF::Signer.sign_url(url)).to match(/\?|=|&/)
       end
 
-      it "should optionally html encode the signed url" do
-        url = "http://somedomain.com/someresource?opt1=one&opt2=two"
-        result = AWS::CF::Signer.sign_url_safe(url)
-        (result =~ /\?/).should be_nil
-        (result =~ /=/).should be_nil
-        (result =~ /&/).should be_nil
+      it 'should optionally html encode the signed url' do
+        url = 'http://somedomain.com/someresource?opt1=one&opt2=two'
+        expect(AWS::CF::Signer.sign_url_safe(url)).not_to match(/\?|=|&/)
       end
 
-      it "should expire in one hour by default" do
-        url = "http://somedomain.com/sign me"
+      it 'should expire in one hour by default' do
+        url = 'http://somedomain.com/sign me'
         result = AWS::CF::Signer.sign_url(url)
-        get_query_value(result, 'Expires').to_i.should eql((Time.now + 3600).to_i)
+        expect(get_query_value(result, 'Expires').to_i).to(
+          eq Time.now.to_i + 3600
+        )
       end
 
-      it "should optionally expire in ten minutes" do
-        url = "http://somedomain.com/sign me"
-        result = AWS::CF::Signer.sign_url(url, :expires => Time.now + 600)
-        get_query_value(result, 'Expires').to_i.should eql((Time.now + 600 ).to_i)
+      it 'should optionally expire in ten minutes' do
+        url = 'http://somedomain.com/sign me'
+        result = AWS::CF::Signer.sign_url(url, expires: Time.now + 600)
+        expect(get_query_value(result, 'Expires').to_i).to(
+          eq Time.now.to_i + 600
+        )
       end
-
     end
 
-    describe "when signing a path" do
-
-      it "should not remove spaces from the path" do
-        path = "/someprefix/sign me"
-        result = AWS::CF::Signer.sign_path(path)
-        (result =~ /\s/).should_not be_nil
+    describe 'when signing a path' do
+      it 'should not remove spaces from the path' do
+        path = '/someprefix/sign me'
+        expect(AWS::CF::Signer.sign_path(path)).to match(/\s/)
       end
-
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
@@ -5,16 +8,13 @@ require 'rspec'
 require 'cloudfront-signer'
 
 def get_query_value(url, key)
-  query_string = url.slice((url =~ /\?/) + 1..-1) 
+  query_string = url.slice((url =~ /\?/) + 1..-1)
   pairs = query_string.split('&')
   pairs.each do |item|
-    if item.start_with?(key)
-      return item.split('=')[1]
-    end
+    return item.split('=')[1] if item.start_with?(key)
   end
 end
 
-
-RSpec.configure do |config|
+RSpec.configure do |_config|
 
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cloudfront-signer
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Anthony Bouch
+- Leonel Galan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,17 +25,33 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem to sign url and stream paths for Amazon CloudFront private content.
   Includes specific signing methods for both url and streaming paths, including html
-  'safe' escpaed versions of each.
+  'safe' escaped versions of each.
 email:
 - tony@58bits.com
+- leonelgalan@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - ChangeLog.markdown
 - Gemfile
 - LICENSE
@@ -49,8 +66,9 @@ files:
 - spec/keys/rsa-APKAIKUROOUNR2BAFUUU.pem
 - spec/signer_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/58bits/cloudfront-signer
-licenses: []
+homepage: http://github.com/leonelgalan/cloudfront-signer
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -77,3 +95,4 @@ test_files:
 - spec/keys/rsa-APKAIKUROOUNR2BAFUUU.pem
 - spec/signer_spec.rb
 - spec/spec_helper.rb
+has_rdoc: