appoxy_rails 0.0.10 → 0.0.11

data/lib/api/client.rb

@@ -7,7 +7,7 @@ module Appoxy
         #  host: endpoint url for service
         class Client
 
-            attr_accessor :host, :access_key, :secret_key
+            attr_accessor :host, :access_key, :secret_key, :version
 
 
             def initialize(host, access_key, secret_key, options={})
@@ -66,25 +66,21 @@ module Appoxy
             end
 
 
-            # old way
- def add_params(command_path, hash)
+            def add_params(command_path, hash)
+                v = version||"0.1"
                 ts = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
                 # puts 'timestamp = ' + ts
-                sig = Appoxy::Api::Signatures.generate_signature(command_path, ts, secret_key)
+                sig =  case v
+                    when "0.2"
+                        Appoxy::Api::Signatures.generate_signature(command_path + Appoxy::Api::Signatures.hash_to_s(hash), ts, secret_key)
+                    when "0.1"
+                        Appoxy::Api::Signatures.generate_signature(command_path, ts, secret_key)
+                end
 
-                extra_params = {'sigv'=>"0.1", 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
+                extra_params = {'sigv'=>v, 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
                 hash.merge!(extra_params)
 
- end
-
-#            def add_params(command_path, hash)
-#                ts = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
-#                #p "hash_to s" + command_path + Appoxy::Api::Signatures.hash_to_s(hash)
-#                sig = Appoxy::Api::Signatures.generate_signature(command_path + Appoxy::Api::Signatures.hash_to_s(hash), ts, secret_key)
-#                extra_params = {'sigv'=>"0.2", 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
-#                hash.merge!(extra_params)
-#
-#            end
+            end
 
 
             def append_params(host, params)

data/lib/api/signatures.rb

@@ -16,8 +16,8 @@ module Appoxy
 
 
             def self.hash_to_s(hash)
-                str = ""
-                hash.each_pair {|key, value| str+= "#{key}#{value}" }
+                str = ""                 
+                hash.sort.each{|a| str+= "#{a[0]}#{a[1]}" }
                 #removing all characters that could differ after parsing with rails
                 return str.delete "\"\/:{}[]\' T"
             end

data/lib/ui/time_zoner.rb

@@ -1,47 +1,47 @@
-# adds a to_pst method to Time
-module TimePluginizer #  ActiveSupport::CoreExtensions::Time::Conversions
-
-    def self.included(base) #:nodoc:
-        base.class_eval do
-            #puts 'TP mixing'
-            # If we want to_s to ALWAYS be local, uncomment the below line
-            #alias_method :to_s, :to_local_s #
-        end
-    end
-
-    def to_pst
-        return in_time_zone('Pacific Time (US & Canada)')
-    end
-
-    def to_user_time(user = nil)
-        local = nil
-        if user && user.time_zone
-            local = in_time_zone(user.time_zone)
-        else
-            local = to_pst
-        end
-        local
-    end
-
-    def to_local_s(format = :default, user = nil)
-        #puts 'calling to_local_s on ' + self.class.name
-        zone = to_user_time(user)
-        return zone.to_formatted_s(format)
-    end
-
-end
-
-module StringTimezoner
-    def to_user_time(user)
-        tz = ActiveSupport::TimeZone.new(user.time_zone || 'Pacific Time (US & Canada)')
-#        puts 'tz=' + tz.inspect
-        t = tz.parse(self)
-        return t
-    end
-end
-
-Time.send :include, TimePluginizer
-DateTime.send :include, TimePluginizer
-#Date.send :include, TimePluginizer
-
-String.send :include, StringTimezoner
+# adds a to_pst method to Time
+module TimePluginizer #  ActiveSupport::CoreExtensions::Time::Conversions
+
+    def self.included(base) #:nodoc:
+        base.class_eval do
+            #puts 'TP mixing'
+            # If we want to_s to ALWAYS be local, uncomment the below line
+            #alias_method :to_s, :to_local_s #
+        end
+    end
+
+    def to_pst
+        return in_time_zone('Pacific Time (US & Canada)')
+    end
+
+    def to_user_time(user = nil)
+        local = nil
+        if user && user.time_zone
+            local = in_time_zone(user.time_zone)
+        else
+            local = to_pst
+        end
+        local
+    end
+
+    def to_local_s(format = :default, user = nil)
+        #puts 'calling to_local_s on ' + self.class.name
+        zone = to_user_time(user)
+        return zone.to_formatted_s(format)
+    end
+
+end
+
+module StringTimezoner
+    def to_user_time(user)
+        tz = ActiveSupport::TimeZone.new(user.time_zone || 'Pacific Time (US & Canada)')
+#        puts 'tz=' + tz.inspect
+        t = tz.parse(self)
+        return t
+    end
+end
+
+Time.send :include, TimePluginizer
+DateTime.send :include, TimePluginizer
+#Date.send :include, TimePluginizer
+
+String.send :include, StringTimezoner

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -08:00
+date: 2011-01-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency