Add OpenStruct from ruby 2.0.

Author: Amir Tocker

lib/cloudinary.rb

@@ -1,5 +1,10 @@
 # Copyright Cloudinary
-require "ostruct"
+if RUBY_VERSION > "2"
+  require "ostruct"
+else
+  require "cloudinary/ostruct2"
+end
+
 require "pathname"
 require "yaml"
 require "uri"

lib/cloudinary/auth_token.rb

@@ -1,58 +1,68 @@
 require 'openssl'
+if RUBY_VERSION > "2"
+  require "ostruct"
+else
+  require "cloudinary/ostruct2"
+end
+
 
 module Cloudinary
-  module Akamai
+  module AuthToken
     SEPARATOR = '~'
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      def generate_auth_token(options = {})
-        options = (Cloudinary.config.auth_token || {}).to_h.merge options
-        key = options[:key]
-        throw "Missing auth token key configuration" unless key
+    def self.generate(options = {})
+      key = options[:key]
+      throw "Missing auth token key configuration" unless key
         name = options[:token_name] || "__cld_token__"
         start = options[:start_time]
         expiration = options[:expiration]
         ip = options[:ip]
         acl = options[:acl]
         duration = options[:duration]
         url = options[:url]
-        start = Time.new.getgm.to_i if start == 'now'
-        if expiration.nil? || expiration == 0
-          if !(duration.nil? || duration == 0)
-            expiration = (start || Time.new.getgm.to_i) + duration
-          else
-            throw 'Must provide either expiration or duration'
-          end
+      start = Time.new.getgm.to_i if start == 'now'
+      if expiration.nil? || expiration == 0
+        if !(duration.nil? || duration == 0)
+          expiration = (start || Time.new.getgm.to_i) + duration
+        else
+          throw 'Must provide either expiration or duration'
         end
-
-        token = []
-        token << "ip=#{ip}" if ip
-        token << "st=#{start}" if start
-        token << "exp=#{expiration}"
-        token << "acl=#{escape_to_lower(acl)}" if acl
-        to_sign = token.clone
-        to_sign << "url=#{escape_to_lower(url)}" if url
-        auth = digest(to_sign.join(SEPARATOR), key)
-        token << "hmac=#{auth}"
-        "#{name}=#{token.join(SEPARATOR)}"
       end
 
-      # escape URI pattern using lowercase hex. For example "/" -> "%2f".
-      def escape_to_lower(url)
-        CGI::escape(url).gsub(/%../) { |h| h.downcase }
-      end
+      token = []
+      token << "ip=#{ip}" if ip
+      token << "st=#{start}" if start
+      token << "exp=#{expiration}"
+      token << "acl=#{escape_to_lower(acl)}" if acl
+      to_sign = token.clone
+      to_sign << "url=#{escape_to_lower(url)}" if url
+      auth = digest(to_sign.join(SEPARATOR), key)
+      token << "hmac=#{auth}"
+      "#{name}=#{token.join(SEPARATOR)}"
+    end
 
-      private
 
-      def digest(message, key)
-        bin_key = Array(key).pack("H*")
-        digest = OpenSSL::Digest::SHA256.new
-        OpenSSL::HMAC.hexdigest(digest, bin_key, message)
-      end
+    # Merge token2 to token1 returning a new
+    # Requires to support Ruby 1.9
+    def self.merge_auth_token(token1, token2)
+      token1 = token1 || {}
+      token2 = token2 || {}
+      token1 = token1.respond_to?( :to_h) ? token1.to_h : token1
+      token2 = token2.respond_to?( :to_h) ? token2.to_h : token2
+      token1.merge(token2)
+    end
+
+    private
+
+    # escape URI pattern using lowercase hex. For example "/" -> "%2f".
+    def self.escape_to_lower(url)
+      CGI::escape(url).gsub(/%../) { |h| h.downcase }
+    end
+
+    def self.digest(message, key)
+      bin_key = Array(key).pack("H*")
+      digest = OpenSSL::Digest::SHA256.new
+      OpenSSL::HMAC.hexdigest(digest, bin_key, message)
     end
   end
 end