kynetx_am_api 0.1.2 → 0.1.10

data/LICENSE

@@ -1,21 +1,18 @@
-The MIT License
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-Copyright (c) 2010 Kynetx Inc.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/kynetx_am_api/application.rb

@@ -158,7 +158,7 @@ module KynetxAmApi
       options = {
         "extname" => name,
         "extdesc" => description,
-        "extauthor" => author.to_s.empty? ? @user.name : author
+        "extauthor" => author.blank? ? @user.name : author
       }
       options["appguid"] = @guid if type == :ie
       return @api.post_app_generate(@application_id, type.to_s, options)
@@ -174,10 +174,7 @@ 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
+      puts "APPDETAILS: #{app_details.inspect}"
       @name = app_details["name"]
       @application_id = app_details["appid"]
       @guid = app_details["guid"]
@@ -200,7 +197,7 @@ module KynetxAmApi
   
     def load_versions
       app_info = @api.get_app_info(@application_id)
-      puts "APPINFO: #{app_info.inspect}"  if $DEBUG
+      puts "APPINFO: #{app_info.inspect}"
       @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"]
@@ -210,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}"  if $DEBUG
+      puts "NEW KRL: #{krl}" 
       response = @api.post_app_source(@application_id, krl, "krl")
       response = JSON.parse(response)
       if response["valid"]

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
@@ -128,9 +128,13 @@ module KynetxAmApi
     end
     
     def post_app_updateappimage(application_id, filename, content_type, image_data)
-      # TODO: Make this go through the APIß
-      response = ""      
-      url = URI.parse('https://accounts.kynetx.com/api/0.1/updateAppInfo')      
+      # 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')
+      
       StringIO.open(image_data) do |i|
         req = Net::HTTP::Post::Multipart.new url.path,
           "image" => UploadIO.new(i, content_type, filename),
@@ -149,7 +153,7 @@ module KynetxAmApi
 
     def get_user_info
       user = @oauth.user
-      if user.username.to_s.empty?
+      if user.username.blank?
         user_info = get_response("userinfo", :json)
         user.username = user_info["username"]
         user.userid = user_info["userid"]
@@ -165,16 +169,16 @@ module KynetxAmApi
         headers = {'Accept'=>'application/json'}
       end
       api_call = "/0.1/#{api_method}"
-      puts "---------GET---------------" if $DEBUG
-      puts api_call  if $DEBUG
-      puts "___________________________"  if $DEBUG
+      puts "---------GET---------------"
+      puts api_call
+      puts "___________________________"
       response = @oauth.get_access_token.get(api_call, headers).body
-      puts response.inspect if $DEBUG
-      puts "___________________________"  if $DEBUG
+      puts response.inspect if RAILS_ENV == 'development'
+      puts "___________________________"
       begin
         response = JSON.parse(response) if format == :json
       rescue
-        puts $! if $DEBUG
+        puts $!
         raise "Unexpected response from the api: (#{api_method}) :: #{response}"
       end
       return response
@@ -189,17 +193,17 @@ module KynetxAmApi
         headers.merge!(additional_headers)
       end
       api_call = "/0.1/#{api_method}"
-      puts "---------POST--------------"  if $DEBUG
-      puts api_call  if $DEBUG
-      puts data.inspect if $DEBUG
-      puts "___________________________" if $DEBUG
+      puts "---------POST--------------"
+      puts api_call
+      puts data.inspect if RAILS_ENV == 'development'
+      puts "___________________________"
       response = @oauth.get_access_token.post(api_call, data, headers).body
-      puts response.inspect if $DEBUG
-      puts "---------------------------" if $DEBUG
+      puts response.inspect if RAILS_ENV == 'development'
+      puts "---------------------------"
       begin
         response = JSON.parse(response) if format == :json
       rescue
-        puts $! if $DEBUG
+        puts $!
         raise "Unexpected response from the api: (#{api_method}) :: #{response}"
       end
       return response

data/lib/kynetx_am_api/oauth.rb

@@ -1,9 +1,15 @@
 module KynetxAmApi
   require 'oauth'
   require 'json'
+  require 'pp'
 
   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
     attr_accessor :api_consumer
@@ -29,22 +35,6 @@ 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
 
    
@@ -56,10 +46,20 @@ module KynetxAmApi
 
     end
 
+
+    private
+
     def get_account_consumer
+#      puts Oauth.consumer_key
+#      puts Oauth.consumer_secret
+#      puts Oauth.accounts_server_url
+
       return @account_consumer if @account_consumer
-      return @account_consumer = OAuth::Consumer.new(@@consumer_key, @@consumer_secret, {
-              :site               => @@accounts_server_url,
+
+      # 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,
               :method             => :get,
               :request_token_path => "/oauth/request_token",
@@ -74,8 +74,16 @@ module KynetxAmApi
 
     def get_api_consumer
       return @api_consumer if @api_consumer
-      return @api_consumer = OAuth::Consumer.new(@@consumer_key, @@consumer_secret, {
-              :site               => @@api_server_url,
+
+      # 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,
               :method             => :get,
               :request_token_path => "/oauth/request_token",

data/lib/kynetx_am_api/user.rb

@@ -1,40 +1,17 @@
 module KynetxAmApi
-  #
-  # Simple wrapper to allow access to the OAuth user information.   This also hold some basic user data like
-  # username, name and user id.
-  #
   class User
-    # OAuth Request Token
     attr_accessor :request_token
-    # OAuth Secret Token
     attr_accessor :request_secret
-    # OAuth Verifieer
     attr_accessor :oauth_verifier
-    # OAuth Access Token
     attr_accessor :access_token
-    # OAuth Access Secret
     attr_accessor :access_secret
-    # Kynetx User name
     attr_accessor :username
-    # Kynetx User ID
     attr_accessor :userid
-    # Full name of user
     attr_accessor :name
-    # Current Application context.
     attr_reader :current_application
 
-
-    #
-    # Accepts a hash that has the following entries.
-    # - :request_token
-    # - :request_secret
-    # - :oauth_verifier
-    # - :access_token
-    # - :access_secret
-    # - :username
-    # - :userid
-    # - :name
-    #
+    # attr :api
+    # attr :applications
 
     def initialize(attributes)
       @request_token = attributes[:request_token]
@@ -48,9 +25,7 @@ module KynetxAmApi
       @current_applicaion = nil
     end
 
-    #
-    # Returns the direct api to the Kynetx Application Manager.
-    #
+
     def api
       @api ||= KynetxAmApi::DirectApi.new({:access_token => @access_token, :access_secret => @access_secret})
       return @api
@@ -59,12 +34,12 @@ module KynetxAmApi
     #
     # Read applications list 
     #
-    # - :offset => Start in list (not implemented)
-    # - :size => Number of application to list (not implemented)
+    # :offset => Start in list (not implemented)
+    # :size => Number of application to list (not implemented)
     #
     # Returns a has with two keys
-    # - "apps" => Array Off Hashes with :appid , :role, :name, :created
-    # - "valid" => true
+    # "apps" => Array Off Hashes with :appid , :role, :name, :created
+    # "valid" => true
     #
     def applications(options = {})
       @applications = api.get_applist if !@applications
@@ -72,18 +47,21 @@ module KynetxAmApi
     end
 
     #
-    # - :application_id => application_id
-    # - :version => Version of application to obtain
+    # :application_id => application_id
+    # :version => Version of application to obtain
     #
     def find_application(options = {})
       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
 
@@ -97,28 +75,17 @@ module KynetxAmApi
     
     def duplicate_application(application_id)
       old_app = KynetxAmApi::Application.new(self, application_id)
-      new_app = create_application(old_app.name || "", "")
+      new_app = create_application(old_app.name, "")
       new_app.krl = old_app.krl
       return new_app
     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
-    
-    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

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
-  - 2
-  version: 0.1.2
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Michael Farmer, Cid Dennis