appoxy_rails 0.0.24 → 0.0.25

data/lib/rails/api_controller.rb

@@ -1,32 +1,32 @@
 module Appoxy
 
-    module Rails
+  module Rails
 
-        # The rails controllers that use this should set:
+    # The rails controllers that use this should set:
 #        protect_from_forgery :only => [] # can add methods to here, eg: :create, :update, :destroy
 
 #                rescue_from SigError, :with => :send_error
 #                rescue_from Api::ApiError, :with => :send_error
-        # before_filter :verify_signature(params)
-
-        # Your Controller must define a secret_key_for_signature method which will return the secret key to use to generate signature.
-
-        module ApiController
-
-            def verify_signature
-                params2 = nil
-                if request.put? || request.post?
-                    # We'll extract params from body instead here
-                    # todo: maybe check for json format first in case this is a file or something?
-                    body = request.body.read
-                    puts 'body=' + body.inspect
-                    params2 = ActiveSupport::JSON.decode(body)
-                    puts 'params2=' + params2.inspect
-                    params.merge! params2
-                end
+    # before_filter :verify_signature(params)
+
+    # Your Controller must define a secret_key_for_signature method which will return the secret key to use to generate signature.
+
+    module ApiController
+
+      def verify_signature
+        params2 = nil
+        if request.put? || request.post?
+          # We'll extract params from body instead here
+          # todo: maybe check for json format first in case this is a file or something?
+          body = request.body.read
+          puts 'body=' + body.inspect
+          params2 = ActiveSupport::JSON.decode(body)
+          puts 'params2=' + params2.inspect
+          params.merge! params2
+        end
 
-                #operation = "#{controller_name}/#{action_name}"
-                #operation = request.env["PATH_INFO"].gsub(/\/rails\//, "")# here we're getting original request url'
+        #operation = "#{controller_name}/#{action_name}"
+        #operation = request.env["PATH_INFO"].gsub(/\/rails\//, "")# here we're getting original request url'
 
 #                #getting clean params (without parsed via routes)
 #                params_for_signature = params2||request.query_parameters
@@ -34,80 +34,81 @@ module Appoxy
 #                params_for_signature = params_for_signature.delete_if {|key, value| ["access_key", "sigv", "sig", "timestamp"].include? key}
 
 
-                #puts "params " +operation+Appoxy::Api::Signatures.hash_to_s(params_for_signature)
-                access_key = params["access_key"]
-                sigv = params["sigv"]
-                timestamp = params["timestamp"]
-                sig = params["sig"]
-                signature = ""
-                case sigv
-                    when "0.1"
-                        puts "outdated version of client"
-                        signature = "#{controller_name}/#{action_name}"
-                    when "0.2"
-                        puts "new version of client"
-                        operation = request.env["PATH_INFO"].gsub(/\/rails\//, "")# here we're getting original request url'
-                        params_for_signature = params2||request.query_parameters
-                        params_for_signature = params_for_signature.delete_if {|key, value| ["access_key", "sigv", "sig", "timestamp"].include? key}
-                        signature = operation+Appoxy::Api::Signatures.hash_to_s(params_for_signature)
-                end
+        #puts "params " +operation+Appoxy::Api::Signatures.hash_to_s(params_for_signature)
+        access_key = params["access_key"]
+        sigv = params["sigv"]
+        timestamp = params["timestamp"]
+        sig = params["sig"]
+        signature = ""
+        case sigv
+          when "0.1"
+            puts "outdated version of client"
+            signature = "#{controller_name}/#{action_name}"
+          when "0.2"
+            puts "new version of client"
+            operation = request.env["PATH_INFO"].gsub(/\/rails\//, "") # here we're getting original request url'
+            params_for_signature = params2||request.query_parameters
+            params_for_signature = params_for_signature.delete_if { |key, value| ["access_key", "sigv", "sig", "timestamp"].include? key }
+            signature = operation+Appoxy::Api::Signatures.hash_to_s(params_for_signature)
+        end
 #                puts "signature " + signature
-                raise Appoxy::Api::ApiError, "No access_key" if access_key.nil?
-                raise Appoxy::Api::ApiError, "No sigv" if sigv.nil?
-                raise Appoxy::Api::ApiError, "No timestamp" if timestamp.nil?
-                raise Appoxy::Api::ApiError, "No sig" if sig.nil?
-                timestamp2 = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
-                raise Appoxy::Api::ApiError, "Request timed out!" unless (Time.parse(timestamp2)-Time.parse(timestamp))<60 # deny all requests older than 60 seconds
-                sig2 = Appoxy::Api::Signatures.generate_signature(signature, timestamp, secret_key_for_signature(access_key))
-                raise Appoxy::Api::ApiError, "Invalid signature!" unless sig == sig2
+        raise Appoxy::Api::ApiError, "No access_key" if access_key.nil?
+        raise Appoxy::Api::ApiError, "No sigv" if sigv.nil?
+        raise Appoxy::Api::ApiError, "No timestamp" if timestamp.nil?
+        raise Appoxy::Api::ApiError, "No sig" if sig.nil?
+        gmtime = Time.now.gmtime
+#        timestamp2 = Appoxy::Api::Signatures.generate_timestamp(gmtime)
+        raise Appoxy::Api::ApiError, "Request timed out!" unless (gmtime - Time.parse(timestamp)) < 60 # deny all requests older than 60 seconds
+        sig2 = Appoxy::Api::Signatures.generate_signature(signature, timestamp, secret_key_for_signature(access_key))
+        raise Appoxy::Api::ApiError, "Invalid signature!" unless sig == sig2
 
-                puts 'Signature OK'
+        puts 'Signature OK'
 
-            end
+      end
 
 
-            def sig_should
-                raise "You didn't define a sig_should method in your controller!"
-            end
+      def sig_should
+        raise "You didn't define a sig_should method in your controller!"
+      end
 
 
-            def send_ok(msg={})
-                response_as_string = '' # in case we want to add debugging or something
+      def send_ok(msg={})
+        response_as_string = '' # in case we want to add debugging or something
 #                respond_to do |format|
-                #                format.json { render :json=>msg }
+        #                format.json { render :json=>msg }
 #                response_as_string = render_to_string :json => msg
-                render :json => msg
+        render :json => msg
 #                end
-                true
-            end
-
-
-            def send_error(statuscode_or_error, msg=nil)
-                exc = nil
-                if statuscode_or_error.is_a? Exception
-                    exc = statuscode_or_error
-                    statuscode_or_error = 400
-                    msg = exc.message
-                end
-                # deprecate status, should use status_code
-                json_msg = {"status_code"=>statuscode_or_error, "msg"=>msg}
-                render :json=>json_msg, :status=>statuscode_or_error
-                true
-            end
+        true
+      end
 
 
+      def send_error(statuscode_or_error, msg=nil)
+        exc = nil
+        if statuscode_or_error.is_a? Exception
+          exc = statuscode_or_error
+          statuscode_or_error = 400
+          msg = exc.message
         end
+        # deprecate status, should use status_code
+        json_msg = {"status_code"=>statuscode_or_error, "msg"=>msg}
+        render :json=>json_msg, :status=>statuscode_or_error
+        true
+      end
 
 
-        class ApiError < StandardError
+    end
 
-            def initialize(msg=nil)
-                super(msg)
 
-            end
+    class ApiError < StandardError
 
-        end
+      def initialize(msg=nil)
+        super(msg)
+
+      end
 
     end
 
+  end
+
 end

data/lib/sessions/sessions_controller.rb

@@ -430,6 +430,10 @@ module Appoxy
 
       end
 
+      def google_oauth
+
+      end
+
       private
 
       def after_save_setup(user)

data/lib/ui/application_helper.rb

@@ -70,7 +70,7 @@ module Appoxy
         end
 
         if ::Rails.env == "development"
-          ret += '<div style="margin-top: 10px;">' + ERB::Util.html_escape(SimpleRecord.stats.inspect) + '</div>'
+          ret += '<div class="debug">' + ERB::Util.html_escape(SimpleRecord.stats.inspect) + '</div>'
         end
         ret.html_safe
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoxy_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-03 00:00:00.000000000 -08:00
+date: 2011-03-10 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &22818252 !ruby/object:Gem::Requirement
+  requirement: &26331156 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22818252
+  version_requirements: *26331156
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &22817964 !ruby/object:Gem::Requirement
+  requirement: &26330856 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22817964
+  version_requirements: *26330856
 - !ruby/object:Gem::Dependency
   name: ruby-openid
-  requirement: &22817676 !ruby/object:Gem::Requirement
+  requirement: &26330520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22817676
+  version_requirements: *26330520
 - !ruby/object:Gem::Dependency
   name: appoxy_api
-  requirement: &22817388 !ruby/object:Gem::Requirement
+  requirement: &26330220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22817388
+  version_requirements: *26330220
 - !ruby/object:Gem::Dependency
   name: mini_fb
-  requirement: &22817100 !ruby/object:Gem::Requirement
+  requirement: &26329932 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22817100
+  version_requirements: *26329932
 - !ruby/object:Gem::Dependency
   name: simple_record
-  requirement: &22816812 !ruby/object:Gem::Requirement
+  requirement: &26329644 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22816812
+  version_requirements: *26329644
 description: Appoxy API Helper gem description...
 email: travis@appoxy.com
 executables: []
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Appoxy Rails Helper gem