appoxy_rails 0.0.20 → 0.0.21

data/lib/appoxy_rails.rb

@@ -1,10 +1,26 @@
 require 'active_support/core_ext'
+require 'digest/hmac'
+require 'net/http'
+require 'base64'
+
 require_relative 'utils'
 require_relative 'appoxy_ui'
-require_relative 'appoxy_api'
 require_relative 'appoxy_sessions'
 require_relative 'ui/time_zoner'
 
+require_relative "rails/api_controller"
+require_relative "rails/signatures"
+
+
+# backwards compatible.
+# @deprecated
+module Appoxy
+  module Api
+    include Appoxy::Rails
+    extend Appoxy::Rails
+  end
+end
+
 
 if defined?(Rails)
 #  puts 'Rails=' + Rails.inspect

data/lib/{api → rails}/api_controller.rb

@@ -1,8 +1,8 @@
 module Appoxy
 
-    module Api
+    module Rails
 
-        # The api 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
@@ -26,7 +26,7 @@ module Appoxy
                 end
 
                 #operation = "#{controller_name}/#{action_name}"
-                #operation = request.env["PATH_INFO"].gsub(/\/api\//, "")# here we're getting original request url'
+                #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
@@ -46,7 +46,7 @@ module Appoxy
                         signature = "#{controller_name}/#{action_name}"
                     when "0.2"
                         puts "new version of client"
-                        operation = request.env["PATH_INFO"].gsub(/\/api\//, "")# here we're getting original request url'
+                        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)

data/lib/{api → rails}/signatures.rb

@@ -1,5 +1,5 @@
 module Appoxy
-    module Api
+    module Rails
         module Signatures
 
 

data/lib/railtie.rb

@@ -1,4 +1,4 @@
-# see http://api.rubyonrails.org/classes/Rails/Railtie.html
+# see http://rails.rubyonrails.org/classes/Rails/Railtie.html
 
 # Nice write-up of hooking gems into the views/layouts/statics of Rails 3 apps: 
 # http://numbers.brighterplanet.com/2010/07/26/sharing-views-across-rails-3-apps/

data/lib/sessions/application_controller.rb

@@ -118,9 +118,9 @@ module Appoxy
 
       def facebook_oauth_url(options={})
 #        puts 'appconfig==' + Rails.application.config.inspect
-        raise "Please config your facebook id and api keys." unless Rails.application.config.respond_to?(:facebook_app_id)
+        raise "Please config your facebook id and rails keys." unless ::Rails.application.config.respond_to?(:facebook_app_id)
         raise "Scope must be specified." unless options[:scope]
-        app_id = Rails.application.config.facebook_app_id
+        app_id = ::Rails.application.config.facebook_app_id
         if app_id
           @facebook_oauth_url = MiniFB.oauth_url(app_id,
                                                  "#{base_url}/sessions/create_facebook", # redirect url

data/lib/sessions/sessions_controller.rb

@@ -284,8 +284,8 @@ module Appoxy
 
       def create_facebook
         return if before_create == false
-        if facebook_auth(Rails.application.config.facebook_app_id,
-                         Rails.application.config.facebook_secret)
+        if facebook_auth(::Rails.application.config.facebook_app_id,
+                         ::Rails.application.config.facebook_secret)
           after_create
 
         end
@@ -357,9 +357,9 @@ module Appoxy
         signin                  = true
         callback_url            = "#{base_url}/sessions/#{(signin ? "create_twitter" : "create_twitter_oauth")}"
         auth_path               = signin ? "authenticate" : "authorize"
-        consumer                = oauth_start(Rails.application.config.twitter_consumer_key, Rails.application.config.twitter_consumer_secret,
+        consumer                = oauth_start(::Rails.application.config.twitter_consumer_key, Rails.application.config.twitter_consumer_secret,
                                                  callback_url,
-                                                 "https://api.twitter.com",
+                                                 "https://rails.twitter.com",
                                                  "/oauth/request_token",
                                                  "/oauth/#{auth_path}",
                                                  "/oauth/access_token"

data/lib/ui/application_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoxy_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &27547968 !ruby/object:Gem::Requirement
+  requirement: &23651196 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27547968
+  version_requirements: *23651196
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &27547644 !ruby/object:Gem::Requirement
+  requirement: &23650908 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27547644
+  version_requirements: *23650908
 - !ruby/object:Gem::Dependency
   name: ruby-openid
-  requirement: &27547320 !ruby/object:Gem::Requirement
+  requirement: &23650620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27547320
+  version_requirements: *23650620
 - !ruby/object:Gem::Dependency
   name: appoxy_api
-  requirement: &27546996 !ruby/object:Gem::Requirement
+  requirement: &23650332 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27546996
+  version_requirements: *23650332
 - !ruby/object:Gem::Dependency
   name: mini_fb
-  requirement: &27546660 !ruby/object:Gem::Requirement
+  requirement: &23650044 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27546660
+  version_requirements: *23650044
 - !ruby/object:Gem::Dependency
   name: simple_record
-  requirement: &27546348 !ruby/object:Gem::Requirement
+  requirement: &23649756 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27546348
+  version_requirements: *23649756
 description: Appoxy API Helper gem description...
 email: travis@appoxy.com
 executables: []
@@ -85,12 +85,11 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- lib/api/api_controller.rb
-- lib/api/signatures.rb
-- lib/appoxy_api.rb
 - lib/appoxy_rails.rb
 - lib/appoxy_sessions.rb
 - lib/appoxy_ui.rb
+- lib/rails/api_controller.rb
+- lib/rails/signatures.rb
 - lib/railtie.rb
 - lib/sessions/application_controller.rb
 - lib/sessions/oauth_token.rb

data/lib/appoxy_api.rb

@@ -1,8 +0,0 @@
-require 'active_support/core_ext'
-require 'digest/hmac'
-require 'net/http'
-require 'base64'
-
-require_relative "api/api_controller"
-require_relative "api/signatures"
-