kynetx_am_api 0.1.11 → 0.1.12

data/lib/kynetx_am_api/application.rb

@@ -174,7 +174,7 @@ module KynetxAmApi
     
     def load_base
       app_details = @api.get_app_details(@application_id)
-      puts "APPDETAILS: #{app_details.inspect}"
+      puts "APPDETAILS: #{app_details.inspect}" if $DEBUG
       @name = app_details["name"]
       @application_id = app_details["appid"]
       @guid = app_details["guid"]
@@ -197,7 +197,7 @@ module KynetxAmApi
   
     def load_versions
       app_info = @api.get_app_info(@application_id)
-      puts "APPINFO: #{app_info.inspect}"
+      puts "APPINFO: #{app_info.inspect}"  if $DEBUG
       @production_version = app_info["production"]["version"] if app_info["production"]
       @development_version = app_info["development"]["version"] if app_info["development"]
       @application_id = app_info["appid"]
@@ -207,7 +207,7 @@ module KynetxAmApi
     def set_krl(krl)
       # ensure that the ruleset_id is correct.
       krl.gsub!(/ruleset.*?\{/m, "ruleset #{@application_id} {")  
-      puts "NEW KRL: #{krl}" 
+      puts "NEW KRL: #{krl}"  if $DEBUG
       response = @api.post_app_source(@application_id, krl, "krl")
       response = JSON.parse(response)
       if response["valid"]

data/lib/kynetx_am_api/direct_api.rb

@@ -128,13 +128,9 @@ module KynetxAmApi
     end
     
     def post_app_updateappimage(application_id, filename, content_type, image_data)
-      # headers = {'Content-type'=>'multipart/form-data'}
-      # puts "IMAGE INFO: #{image.class}"
-      # return multipart_post_response("app/#{application_id}/updateappimage", {:image => image})
-      response = ""
-      
-      url = URI.parse('https://accounts.kynetx.com/api/0.1/updateAppInfo')
-      
+      # TODO: Make this go through the APIß
+      response = ""      
+      url = URI.parse('https://accounts.kynetx.com/api/0.1/updateAppInfo')      
       StringIO.open(image_data) do |i|
         req = Net::HTTP::Post::Multipart.new url.path,
           "image" => UploadIO.new(i, content_type, filename),
@@ -169,16 +165,16 @@ module KynetxAmApi
         headers = {'Accept'=>'application/json'}
       end
       api_call = "/0.1/#{api_method}"
-      puts "---------GET---------------"
-      puts api_call
-      puts "___________________________"
+      puts "---------GET---------------" if $DEBUG
+      puts api_call  if $DEBUG
+      puts "___________________________"  if $DEBUG
       response = @oauth.get_access_token.get(api_call, headers).body
-      puts response.inspect if RAILS_ENV == 'development'
-      puts "___________________________"
+      puts response.inspect if $DEBUG
+      puts "___________________________"  if $DEBUG
       begin
         response = JSON.parse(response) if format == :json
       rescue
-        puts $!
+        puts $! if $DEBUG
         raise "Unexpected response from the api: (#{api_method}) :: #{response}"
       end
       return response
@@ -193,17 +189,17 @@ module KynetxAmApi
         headers.merge!(additional_headers)
       end
       api_call = "/0.1/#{api_method}"
-      puts "---------POST--------------"
-      puts api_call
-      puts data.inspect if RAILS_ENV == 'development'
+      puts "---------POST--------------"  if $DEBUG
+      puts api_call  if $DEBUG
+      puts data.inspect if $DEBUG
       puts "___________________________"
       response = @oauth.get_access_token.post(api_call, data, headers).body
-      puts response.inspect if RAILS_ENV == 'development'
+      puts response.inspect if $DEBUG
       puts "---------------------------"
       begin
         response = JSON.parse(response) if format == :json
       rescue
-        puts $!
+        puts $! if $DEBUG
         raise "Unexpected response from the api: (#{api_method}) :: #{response}"
       end
       return response

data/lib/kynetx_am_api/oauth.rb

@@ -1,10 +1,8 @@
 module KynetxAmApi
   require 'oauth'
   require 'json'
-  require 'pp'
 
   class Oauth
-
     cattr_accessor :accounts_server_url
     cattr_accessor :api_server_url
     cattr_accessor :consumer_key
@@ -50,14 +48,7 @@ module KynetxAmApi
     private
 
     def get_account_consumer
-#      puts Oauth.consumer_key
-#      puts Oauth.consumer_secret
-#      puts Oauth.accounts_server_url
-
       return @account_consumer if @account_consumer
-
-      # TODO: Accounts url must come form settings.
-
       return @account_consumer = OAuth::Consumer.new(Oauth.consumer_key, Oauth.consumer_secret, {
               :site               => Oauth.accounts_server_url,
               :scheme             => :header,
@@ -74,14 +65,6 @@ module KynetxAmApi
 
     def get_api_consumer
       return @api_consumer if @api_consumer
-
-      # TODO: Accounts url must come form settings.
-
-#      puts Oauth.consumer_key
-#      puts Oauth.consumer_secret
-#      puts Oauth.api_server_url
-
-
       return @api_consumer = OAuth::Consumer.new(Oauth.consumer_key, Oauth.consumer_secret, {
               :site               => Oauth.api_server_url,
               :scheme             => :header,

data/lib/kynetx_am_api/user.rb

@@ -12,7 +12,7 @@ module KynetxAmApi
     attr_accessor :oauth_verifier
     # OAuth Access Token
     attr_accessor :access_token
-    # OAuth Acces sSecret
+    # OAuth Access Secret
     attr_accessor :access_secret
     # Kynetx User name
     attr_accessor :username
@@ -79,14 +79,11 @@ module KynetxAmApi
       options[:version] ||= "development"
       raise "Expecting :application_id" unless options[:application_id]
       
-      puts "Creating a new Application object."
       if @current_application && @current_application.application_id != options[:application_id]
         @current_application = KynetxAmApi::Application.new(self, options[:application_id], options[:version])
       else
         @current_application ||= KynetxAmApi::Application.new(self, options[:application_id], options[:version])
       end
-      # rst  = api.get_app_source(options[:application_id],options[:version], :krl);
-      # app.source = rst;
       return @current_application
     end
 
@@ -106,9 +103,7 @@ module KynetxAmApi
     end
     
     def owns_current?
-      puts "OWNER / CURRENT_APP: #{@current_application.name}"
       return false unless @current_application
-      puts "ME: #{self.userid.to_i}  OWNER: #{@current_application.owner["kynetxuserid"].to_i}"
       return @current_application.owner["kynetxuserid"].to_i == self.userid.to_i
     end
 

data/lib/kynetx_am_api.rb

@@ -5,37 +5,37 @@ require File.dirname(__FILE__) + '/kynetx_am_api/application.rb'
 
 
 DEFAULT_META = <<-KRL
-meta {
-  name "<<NAME>>"
-  description <<
-    <<DESCRIPTION>>
-  >>
-  author ""
-  // Uncomment this line to require Markeplace purchase to use this app.
-  // authz require user
-  logging off
-}
+  meta {
+    name "<<NAME>>"
+    description <<
+      <<DESCRIPTION>>
+    >>
+    author ""
+    // Uncomment this line to require Markeplace purchase to use this app.
+    // authz require user
+    logging off
+  }
 KRL
 
 DEFAULT_GLOBAL = <<-KRL
-global {
+  global {
   
-}
+  }
 KRL
 
 DEFAULT_DISPATCH = <<-KRL
-dispatch {
-  // Some example dispatch domains
-  // www.exmple.com
-  // other.example.com
-}
+  dispatch {
+    // Some example dispatch domains
+    // www.exmple.com
+    // other.example.com
+  }
 KRL
 
 DEFAULT_RULE = <<-KRL
-rule <<NAME>> is active {
-  select using "" setting ()
-  // pre {   }
-  // notify("Hello World", "This is a sample rule.");
-  noop();
-}
+  rule <<NAME>> is active {
+    select using "" setting ()
+    // pre {   }
+    // notify("Hello World", "This is a sample rule.");
+    noop();
+  }
 KRL

metadata

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