platform 3.1.1

data/app/controllers/platform/ratings_controller.rb

@@ -0,0 +1,61 @@
+#--
+# Copyright (c) 2011 Michael Berkovich
+#
+# 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.
+#++
+
+class Platform::RatingsController < Platform::BaseController
+
+  def submit_app_rating
+    app = Platform::Application.find(params[:app_id])
+    
+    if request.post?
+      rating = Platform::Rating.find_or_create(app, Platform::Config.current_user)
+      
+      rating_value = params[:rating_value].to_i
+      if rating_value < 0 or rating_value > 5
+        trfe("Invalid application rating value")
+        return redirect_to_source
+      end
+      rating.value = rating_value
+      
+      rating.comment = params[:rating_comment].blank? ? nil : params[:rating_comment]
+      rating.save
+
+      app.update_rank!
+    end  
+    
+    redirect_to_source
+  end
+  
+  def delete_app_rating
+    rating = Platform::Rating.find(params[:rating_id])
+    
+    if rating and rating.user_id == Platform::Config.current_user.id
+      rating.destroy 
+      rating.object.update_rank!
+    else
+      trfe("Invalid application rating")
+    end
+    
+    redirect_to_source
+  end
+  
+end

data/app/helpers/platform/admin/categories_helper.rb

@@ -0,0 +1,54 @@
+#--
+# Copyright (c) 2011 Michael Berkovich, Geni Inc
+#
+# 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.
+#++
+
+module Platform::Admin::CategoriesHelper
+ 
+  def generate_tree(html, parent, parent_name, checkboxes=false) 
+    parent.children.each_with_index do |child, index|
+      name = "#{parent_name}_#{index}"
+      child_name = child.name.gsub("'", "\\'")
+      action = "javascript:openSubCategory(\"#{child.id}\", \"#{child_name}\");"
+      action = "" if checkboxes
+      checkbox_action = "onClick='assignCategory(this)'"
+      
+      html << "#{name} = insFld(#{parent_name}, gFld('&nbsp;<span class=tree_item>#{child_name.gsub("'", "\\'")}</span>', '#{action}'))"
+      html << "#{name}.xID = '#{child.id}'"
+      if checkboxes and child.children.size == 0
+        html << "#{name}.prependHTML = \"<td valign=middle align=left width=40px><input #{checkbox_action} type=checkbox id='check_#{child.id}'></td>\""
+      end
+      generate_tree(html, child, name, checkboxes) 
+    end
+  end
+  
+  def generate_categories_javascript(root, checkboxes=false)
+    html = []
+    action = "javascript:openSubCategory(\"#{root.id}\", \"#{root.name}\");"
+    action = "" if checkboxes
+    html << "foldersTree = gFld('&nbsp;<span class=tree_root>#{root.name.gsub("'", "\\'")}</span>', '#{action}')"
+    html << "foldersTree.treeID = 'categoriesTree'"
+    html << "foldersTree.xID = '#{root.id}'"
+    generate_tree(html, root, "foldersTree", checkboxes)
+    html.join("; \n").html_safe
+  end
+  
+end

data/app/helpers/platform/apps_helper.rb

@@ -0,0 +1,26 @@
+#--
+# Copyright (c) 2011 Michael Berkovich
+#
+# 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.
+#++
+
+module Platform::AppsHelper
+
+end

data/app/helpers/platform/developer/dashboard_helper.rb

@@ -0,0 +1,42 @@
+#--
+# Copyright (c) 2011 Michael Berkovich
+#
+# 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.
+#++
+
+module Platform::Developer::DashboardHelper
+
+  def daily_active_users_chart(developer)
+    values = [100, 200, 500]
+    names = ["Not Translated", "Translated", "Pending Approval"]
+    colors = ['FF0000', '00FF00', 'FFFF00']
+    chart_url = "https://chart.googleapis.com/chart?cht=p3&chs=350x80&chd=t:#{values.join(',')}&chl=#{names.join('|')}&chco=#{colors.join('|')}"
+    image_tag(chart_url)
+  end
+
+  def daily_new_users_chart(app)
+    values = [100, 200, 500]
+    names = ["Not Translated", "Translated", "Pending Approval"]
+    colors = ['FF0000', '00FF00', 'FFFF00']
+    chart_url = "https://chart.googleapis.com/chart?cht=p3&chs=350x80&chd=t:#{values.join(',')}&chl=#{names.join('|')}&chco=#{colors.join('|')}"
+    image_tag(chart_url)
+  end
+
+end

data/app/helpers/platform/developer/help_helper.rb

@@ -0,0 +1,45 @@
+#--
+# Copyright (c) 2011 Michael Berkovich
+#
+# 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.
+#++
+
+module Platform::Developer::HelpHelper
+
+  def documentation_field_type_tag(field)
+    return field[:type] if simple_field?(field[:type])
+    if field[:type] == "Array"
+      return "Array of #{field[:array_type].pluralize}".html_safe if simple_field?(field[:array_type])
+      return "Array of #{documentation_field_link_tag(field[:array_type].pluralize, field[:array_type])}".html_safe
+    end
+    documentation_field_link_tag(field[:type], field[:type])
+  end
+  
+  def documentation_field_link_tag(name, type)
+    link_to(name, :controller => "/platform/developer/help", :action => :api, :path => type.underscore)
+  end
+  
+private
+
+  def simple_field?(type)
+    ["String", "Number", "Boolean", "Array or String", "Hash", "Binary"].include?(type)
+  end
+  
+end

data/app/helpers/platform_helper.rb

@@ -0,0 +1,26 @@
+#--
+# Copyright (c) 2011 Michael Berkovich
+#
+# 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.
+#++
+
+module PlatformHelper
+
+end

data/app/models/platform/application.rb

@@ -0,0 +1,394 @@
+#--
+# Copyright (c) 2011 Michael Berkovich
+#
+# 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.
+#++
+
+class Platform::Application < ActiveRecord::Base
+  set_table_name :platform_applications
+  
+  # useful methods - should be public
+  include Platform::SimpleStringPermissions
+  acts_as_tree :order => "version"
+
+  belongs_to :developer, :class_name => "Platform::Developer"
+  has_many :application_developers, :class_name => "Platform::ApplicationDeveloper", :dependent => :destroy
+  has_many :application_metrics, :class_name => "Platform::ApplicationMetric", :dependent => :destroy
+  has_many :application_users, :class_name => "Platform::ApplicationUser", :dependent => :destroy
+  has_many :application_logs, :class_name => "Platform::ApplicationLog", :dependent => :destroy
+  
+  has_many :tokens,           :class_name => "Platform::Oauth::OauthToken", :dependent => :destroy
+  has_many :access_tokens,    :class_name => "Platform::Oauth::AccessToken", :dependent => :destroy
+  has_many :refresh_tokens,   :class_name => "Platform::Oauth::RefreshToken", :dependent => :destroy
+
+  has_many :application_categories,  :class_name => "Platform::ApplicationCategory", :dependent => :destroy
+  has_many :categories,  :class_name => "Platform::Category", :through => :application_categories
+
+  belongs_to :icon, :class_name => Platform::Config.site_media_class, :foreign_key => "icon_id"
+  belongs_to :logo, :class_name => Platform::Config.site_media_class, :foreign_key => "logo_id"
+
+  validates_presence_of :name, :key, :secret
+  validates_uniqueness_of :key
+  before_validation :generate_keys
+
+  URL_REGEX = /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i
+  validates_format_of :url,                   :with => URL_REGEX, :allow_blank=>true
+  validates_format_of :support_url,           :with => URL_REGEX, :allow_blank=>true
+  validates_format_of :callback_url,          :with => URL_REGEX, :allow_blank=>true
+  validates_format_of :support_url,           :with => URL_REGEX, :allow_blank=>true
+  validates_format_of :privacy_policy_url,    :with => URL_REGEX, :allow_blank=>true
+  validates_format_of :terms_of_service_url,  :with => URL_REGEX, :allow_blank=>true
+  validates_format_of :canvas_url,            :with => URL_REGEX, :allow_blank=>true
+
+  attr_accessor :token_callback_url
+
+  acts_as_state_machine :initial => :new
+  
+  state :new
+  state :submitted
+  state :approved
+  state :rejected 
+  state :blocked 
+  state :deprecated
+  
+  event :submit do
+    transitions :from => :new,        :to => :submitted
+    transitions :from => :rejected,   :to => :submitted
+  end
+
+  event :deprecate do
+    transitions :from => :approved,   :to => :deprecated
+  end
+  
+  event :block do
+    transitions :from => :new,        :to => :blocked
+    transitions :from => :submitted,  :to => :blocked
+    transitions :from => :approved,   :to => :blocked
+    transitions :from => :rejected,   :to => :blocked
+  end
+
+  event :unblock do
+    transitions :from => :blocked,    :to => :new
+  end
+
+  event :approve do
+    transitions :from => :new,        :to => :approved
+    transitions :from => :submitted,  :to => :approved
+  end
+
+  event :reject do
+    transitions :from => :submitted,  :to => :rejected
+  end
+  
+  def self.for(client_id)
+    app = Platform::Application.find_by_id(client_id) if client_id.to_s.match(/^[\d]+$/)
+    app || Platform::Application.find_by_key(client_id)
+  end
+  
+  def self.find_token(token_key)
+    token = Platform::Oauth::OauthToken.find_by_token(token_key, :include => :application)
+    if token && token.authorized?
+      token
+    else
+      nil
+    end
+  end
+
+  def last_token_for_user(user)
+    Platform::Oauth::OauthToken.find(:first, :conditions => ["application_id = ? and user_id = ?", self.id, user.id], :order => "updated_at desc")
+  end
+
+  def valid_tokens_for_user(user)
+    Platform::Oauth::OauthToken.find(:all, :conditions => ["application_id = ? and user_id = ? and invalidated_at is null", self.id, user.id], :order => "created_at desc")
+  end
+
+  def rate_limited(value=true)
+    set_permission(:no_rate_limit, !value)
+  end
+
+  def rate_limited!(value=true)
+    rate_limited(value)
+    save!
+  end
+
+  def rate_limited?
+    ! has_permission?(:no_rate_limit)
+  end
+
+  # Ticket 19135
+  def allow_grant_type_password(value=true)
+    set_permission(:grant_type_password, value)
+  end
+
+  # Ticket 19135
+  def allow_grant_type_password!(value=true)
+    allow_grant_type_password(value)
+    save!
+  end
+
+  # Ticket 19135
+  def allow_grant_type_password?
+    has_permission?(:grant_type_password)
+  end
+
+  def allow_grant_type_client_credentials?
+    true # for now, all applications have a right to get client_token
+  end
+
+  # Ticket 19180
+  def allow_unlimited_models(value=true)
+    set_permission(:unlimited_models, value)
+  end
+
+  # Ticket 19180
+  def allow_unlimited_models!(value=true)
+    allow_unlimited_models(value)
+    save!
+  end
+
+  # Ticket 19180
+  def allow_unlimited_models?
+    has_permission?(:unlimited_models)
+  end
+
+  # Ticket 19507
+  def allow_add_without_premium(value=true)
+    set_permission(:add_without_premium, value)
+  end
+
+  # Ticket 19507
+  def allow_add_without_premium!(value=true)
+    allow_add_without_premium(value)
+    save!
+  end
+
+  # Ticket 19507
+  def allow_add_without_premium?
+    has_permission?(:add_without_premium)
+  end
+
+  # If your application requires passing in extra parameters handle it here
+  def create_request_token(params={})
+    Platform::Oauth::RequestToken.create(params.merge(:application => self))
+  end
+
+  def create_access_token(params={})
+    access_token = Platform::Oauth::AccessToken.create(params.merge(:application => self))
+    Platform::ApplicationUser.touch(self, access_token.user)
+    access_token
+  end
+
+  def create_refresh_token(params={})
+    Platform::Oauth::RefreshToken.create(params.merge(:application => self))
+  end
+
+  def create_client_token(params={})
+    Platform::Oauth::ClientToken.create(params.merge(:application => self))
+  end
+
+  def admin_link
+    "#{DEFAULT_SITE_LINK}/admin/applications/view/#{id}"
+  end
+
+  def self.permissions
+    [:no_rate_limit, :grant_type_password, :unlimited_models, :add_without_premium]
+  end
+  
+  def icon_url
+    return Platform::Config.default_app_icon unless icon
+    if Platform::Config.site_media_enabled?
+      Platform::Config.icon_url(icon)  
+    else
+      icon.url
+    end
+  end
+  
+  def store_icon(file)
+    if Platform::Config.site_media_enabled?
+      update_attributes(:icon => Platform::Config.create_media(file))
+    else
+      self.icon = Platform::Media::Image.create
+      self.icon.write(file, :size => 16)
+      self.save
+    end  
+  end
+
+  def logo_url
+    return Platform::Config.default_app_logo unless logo
+    if Platform::Config.site_media_enabled?
+      Platform::Config.logo_url(logo)  
+    else
+      logo.url
+    end
+  end
+
+  def store_logo(file)
+    if Platform::Config.site_media_enabled?
+      update_attributes(:logo => Platform::Config.create_media(file))
+    else  
+      self.logo = Platform::Media::Image.create
+      self.logo.write(file, :size => 75)
+      self.save
+    end  
+  end
+  
+  def short_description
+    return description if description.blank? or description.length < 400
+    "#{description[0..400]}..."
+  end
+  
+  def app_url
+    return url if canvas_name.blank?      
+    "http://#{Platform::Config.site_base_url}/platform/apps/#{canvas_name}"
+  end
+  
+  def short_name
+    return name if name.length < 15
+    "#{name[0..15]}..."
+  end
+  
+  def update_rank!
+    total_rank = (rating_count == 0) ? 0 : (rating_sum/rating_count)
+    self.update_attributes(:rank => total_rank)
+    total_rank
+  end
+  
+  def developed_by?(dev = Platform::Config.current_developer)
+    self.developer == dev
+  end
+  
+  def rating_count
+    @rating_count ||= Platform::Rating.count(:id, :conditions => ["object_type = ? and object_id = ?", self.class.name, self.id])
+  end
+
+  def rating_sum
+    @rating_sum ||= Platform::Rating.sum(:value, :conditions => ["object_type = ? and object_id = ?", self.class.name, self.id])
+  end
+  
+  def reset_secret!
+    update_attributes(:secret => Platform::Helper.generate_key(40)[0,40])
+  end
+
+  def authorize_user(user = Platform::Config.current_user)
+    Platform::ApplicationUser.touch(self, user)
+  end
+  
+  def authorized_user?(user = Platform::Config.current_user)
+    not Platform::ApplicationUser.find(:first, :conditions => ["application_id = ? and user_id = ?", self.id, user.id]).nil?
+  end
+  
+  def deauthorize_user(user = Platform::Config.current_user)
+    valid_tokens_for_user(user).each do |token|
+      token.invalidate!
+    end
+    app_user = Platform::ApplicationUser.for(self, user)
+    app_user.destroy if app_user
+    
+    # ping the deauthorization url - maybe that should be done in a task
+  end
+  
+  # grant type password apps should require signature
+  def requires_signature?
+    false      
+  end
+  
+  def last_monthly_metric
+    @last_monthly_metric ||= Platform::MonthlyApplicationMetric.find(:first, :conditions => ["application_id = ?", id], :order => "interval desc")
+  end
+
+  def last_total_metric
+    @last_total_metric ||= Platform::TotalApplicationMetric.find(:first, :conditions => ["application_id = ?", id], :order => "interval desc")
+  end
+  
+  def recently_updated_reviews
+    @recently_updated_reviews ||= Platform::Rating.find(:all, :conditions => ["object_type = ? and object_id = ?", 'Platform::Application', self.id], :order => "updated_at desc", :limit => 5)    
+  end
+
+  def recently_updated_discussions
+    @recently_updated_discussions ||= Platform::ForumTopic.find(:all, :conditions => ["subject_type = ? and subject_id = ?", 'Platform::Application', self.id], :order => "updated_at desc", :limit => 5)    
+  end
+  
+  
+  ############################################################################
+  #### Category Management Methods
+  ############################################################################
+  
+  def category_names
+    categories.collect{|cat| cat.name}.join(", ")
+  end
+
+  def add_category(cat)
+    cat = Platform::Category.find_by_keyword(cat) if cat.is_a?(String)
+    return nil if not cat
+    
+    Platform::ApplicationCategory.find_or_create(self, cat)
+  end
+
+  def add_categories(catigories)
+    catigories.each do |cat|
+      add_category(cat)
+    end
+  end
+  
+  def remove_category(cat)
+    cat = Platform::Category.find_by_keyword(cat) if cat.is_a?(String)
+    return nil if not cat
+    
+    app_cat = Platform::ApplicationCategory.find_by_application_id_and_category_id(self.id, cat.id)
+    app_cat.destroy if app_cat                                                
+  end
+
+  def remove_categories(categories)
+    categories.each do |cat|
+      remove_category(cat)
+    end
+  end  
+  
+  def self.featured_for_category(category, page = 1, per_page = 20)
+    self.where("platform_applications.state='approved' and platform_application_categories.category_id = ? and platform_application_categories.featured = ?", category.id, true).joins(:categories).order("platform_application_categories.position asc").page(page).per(per_page)
+  end
+  
+  def self.regular_for_category(category, page = 1, per_page = 20)
+    self.where("platform_applications.state='approved' and platform_application_categories.category_id = ? and (platform_application_categories.featured is null or platform_application_categories.featured = ?)", category.id, false).joins(:categories).order("platform_application_categories.position asc").page(page).per(per_page)
+  end
+  
+  def versioned_name
+    @versioned_name ||= begin
+      "#{name} #{version}"
+    end
+  end
+  
+protected
+
+  def generate_keys
+    self.key = Platform::Helper.generate_key(40)[0,40] if key.nil?
+    self.secret = Platform::Helper.generate_key(40)[0,40] if secret.nil?
+  end
+
+#  after_create :notify_admins
+#  def notify_admins
+#    return unless Registry.api.admin_email?
+#    return unless Platform::Config.current_user
+#    
+#    message = "#{Platform::Config.current_user.name} (#{Platform::Config.current_user.admin_link}) has created an app called #{name} (#{admin_link})."
+#    SystemNotifier.deliver_to_admin(message, :subject => 'Client Application Created', :to => Registry.api.admin_email)
+#  end
+
+end