kynetx_am_api 0.1.12 → 0.1.21

data/lib/kynetx_am_api/application.rb

@@ -158,7 +158,7 @@ module KynetxAmApi
       options = {
         "extname" => name,
         "extdesc" => description,
-        "extauthor" => author.blank? ? @user.name : author
+        "extauthor" => author.to_s.empty? ? @user.name : author
       }
       options["appguid"] = @guid if type == :ie
       return @api.post_app_generate(@application_id, type.to_s, options)
@@ -175,6 +175,9 @@ module KynetxAmApi
     def load_base
       app_details = @api.get_app_details(@application_id)
       puts "APPDETAILS: #{app_details.inspect}" if $DEBUG
+      if app_details["error"]
+        raise app_details["error"]
+      end
       @name = app_details["name"]
       @application_id = app_details["appid"]
       @guid = app_details["guid"]

data/lib/kynetx_am_api/direct_api.rb

@@ -1,7 +1,7 @@
 module KynetxAmApi
+  require 'rubygems'
   require 'oauth'
   require 'json'
-  require 'pp'
   require 'net/http/post/multipart'
 
   class DirectApi
@@ -149,7 +149,7 @@ module KynetxAmApi
 
     def get_user_info
       user = @oauth.user
-      if user.username.blank?
+      if user.username.to_s.empty?
         user_info = get_response("userinfo", :json)
         user.username = user_info["username"]
         user.userid = user_info["userid"]
@@ -192,10 +192,10 @@ module KynetxAmApi
       puts "---------POST--------------"  if $DEBUG
       puts api_call  if $DEBUG
       puts data.inspect if $DEBUG
-      puts "___________________________"
+      puts "___________________________" if $DEBUG
       response = @oauth.get_access_token.post(api_call, data, headers).body
       puts response.inspect if $DEBUG
-      puts "---------------------------"
+      puts "---------------------------" if $DEBUG
       begin
         response = JSON.parse(response) if format == :json
       rescue

data/lib/kynetx_am_api/oauth.rb

@@ -3,10 +3,6 @@ module KynetxAmApi
   require 'json'
 
   class Oauth
-    cattr_accessor :accounts_server_url
-    cattr_accessor :api_server_url
-    cattr_accessor :consumer_key
-    cattr_accessor :consumer_secret
 
     attr_accessor :request_token
     attr_accessor :account_consumer
@@ -33,6 +29,22 @@ module KynetxAmApi
     end
 
 
+    def self.accounts_server_url=(v)
+      @@accounts_server_url = v
+    end
+    
+    def self.api_server_url=(v)
+      @@api_server_url = v
+    end
+    
+    def self.consumer_key=(v)
+      @@consumer_key = v
+    end
+    
+    def self.consumer_secret=(v)
+      @@consumer_secret = v
+    end
+
     private
 
    
@@ -44,13 +56,10 @@ module KynetxAmApi
 
     end
 
-
-    private
-
     def get_account_consumer
       return @account_consumer if @account_consumer
-      return @account_consumer = OAuth::Consumer.new(Oauth.consumer_key, Oauth.consumer_secret, {
-              :site               => Oauth.accounts_server_url,
+      return @account_consumer = OAuth::Consumer.new(@@consumer_key, @@consumer_secret, {
+              :site               => @@accounts_server_url,
               :scheme             => :header,
               :method             => :get,
               :request_token_path => "/oauth/request_token",
@@ -65,8 +74,8 @@ module KynetxAmApi
 
     def get_api_consumer
       return @api_consumer if @api_consumer
-      return @api_consumer = OAuth::Consumer.new(Oauth.consumer_key, Oauth.consumer_secret, {
-              :site               => Oauth.api_server_url,
+      return @api_consumer = OAuth::Consumer.new(@@consumer_key, @@consumer_secret, {
+              :site               => @@api_server_url,
               :scheme             => :header,
               :method             => :get,
               :request_token_path => "/oauth/request_token",

data/lib/kynetx_am_api/user.rb

@@ -106,6 +106,19 @@ module KynetxAmApi
       return false unless @current_application
       return @current_application.owner["kynetxuserid"].to_i == self.userid.to_i
     end
+    
+    def to_h
+      return {
+        :access_secret => @access_secret,
+        :access_token => @access_token,
+        :request_token => @request_token,
+        :request_secret => @request_secret,
+        :oauth_verifier => @oauth_verifier,
+        :name => @name,
+        :userid => @userid,
+        :username => @username
+      }
+    end
 
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 21
+  version: 0.1.21
 platform: ruby
 authors: 
 - Michael Farmer, Cid Dennis