cloudfront-signer 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39a04cdad6eadba7f441fb8cfba1c643b3f5fe9b
-  data.tar.gz: 7786c9d47b121178a26e832b129b9a163e299bf5
+  metadata.gz: 7d944157441307ac5089ebdebf6cb792ae146de9
+  data.tar.gz: c1e333b58d90f8d3538a50daa6dc7d812b92e53c
 SHA512:
-  metadata.gz: 39a5a4e824e33d04b5b5d19726f2a935e0b51d3202ed9819900cf9ff952b6e1eea17a335a355d5990a0048e1c2f203684a5033d38abe1d381b36d86e62c62a14
-  data.tar.gz: 03a54b2be4915bb859b96c5ffba4fb15d5c845a8c0fef62f70e81dc6566e73b4d4c3653d31906599100f5a78829694dee2e2f98a4ae42b505a822dc7a18f000f
+  metadata.gz: cc3ca840dd7ba3894e4dbb265b3ccc0dd2412397dbfd4887d09112c06b4985679c9f8607b5d67a21df72b7e0f4278d4daec8561aa9835a4c220012232326b152
+  data.tar.gz: 9888e0ce34a7892461721a68f61aa4480b93ac3ea9f7deb33fb146274508d5578313e1e4f2b9bb27d43896749f38a2ed3e0a91b8d8f13cb88c42ebfae0ffc51e

data/ChangeLog.markdown

@@ -1,5 +1,9 @@
+### 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.
+
 ### 2.1.2 / 2015-04-16
 * Accepted merge request from https://github.com/tuvistavie - fixing custom policy bug.
+
 ### 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/lib/cloudfront-signer.rb

@@ -157,15 +157,11 @@ module AWS
         self.sign(subject, {:remove_spaces => false, :html_escape => true}, policy_options)
       end
 
-
-      # Public: Sign a subject url or stream resource name with optional configuration and
+      # 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 = {})
-
-        raise "Configure using AWS::CF::Signer.configure before signing." unless self.is_configured?
-
         # If the url or stream path already has a query string parameter - append to that.
         separator = subject =~ /\?/ ? '&' : '?'
 
@@ -173,29 +169,43 @@ module AWS
           subject.gsub!(/\s/, "%20")
         end
 
+        result = subject + separator + self.signed_params(subject, policy_options).collect{ |k,v| "#{k}=#{v}" }.join('&')
+
+        if configuration_options[:html_escape]
+          return html_encode(result)
+        else
+          return result
+        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
+      #
+      # Returns a Hash
+      def self.signed_params(subject, policy_options = {})
+        result = {}
+
         if policy_options[:policy_file]
           policy = IO.read(policy_options[:policy_file])
-          result = "#{subject}#{separator}Policy=#{encode_policy(policy)}&Signature=#{create_signature(policy)}&Key-Pair-Id=#{@key_pair_id}"
+          result['Policy'] = encode_policy(policy)
         else
           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}}}}]})
-            result = "#{subject}#{separator}Expires=#{expires_at}&Signature=#{create_signature(policy)}&Key-Pair-Id=#{@key_pair_id}"
+            result['Expires'] = expires_at
           else
             # Custom Policy
             resource = policy_options[:resource] || subject
             policy = generate_custom_policy(resource, policy_options)
-            result = "#{subject}#{separator}Policy=#{encode_policy(policy)}&Signature=#{create_signature(policy)}&Key-Pair-Id=#{@key_pair_id}"
+            result['Policy'] = encode_policy(policy)
           end
         end
 
-        if configuration_options[:html_escape]
-          return html_encode(result)
-        else
-          return result
-        end
+        result.merge 'Signature' => create_signature(policy),
+                     'Key-Pair-Id' => @key_pair_id
       end
 
       # Private helper methods

data/lib/cloudfront-signer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudfront-signer
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Anthony Bouch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec