platform 3.1.2 → 3.1.3

data/lib/platform/api/proxy/base.rb

@@ -48,6 +48,10 @@ module Platform
         def to_api_hash(opts = {})
           raise NotImplementedError, 'Must be implemented in descendant class'
         end
+        
+        def sanitize_api_hash(hash)
+          hash.select{|key, value| !value.blank?}
+        end
 
         def to_api_path(opts = {})
           "#{Platform::Config.api_scheme}://#{Platform::Config.api_base_url}/#{instance.class.name.underscore}/#{instance.id}"

data/lib/platform/config.rb

@@ -89,17 +89,11 @@ module Platform
       end
 
       init_default_categories
-      init_default_applications
 
       puts "Done."
     end
   
     def self.system_user
-      if user_class_name == "Platform::PlatformUser"
-        @system_user ||= Platform::PlatformUser.first || Platform::PlatformUser.create(:name => "System User")
-        return @system_user
-      end
-    
       return nil unless site_info[:system_user_id]
       @system_user ||= user_class_name.constantize.find_by_id(site_info[:system_user_id])
     end
@@ -116,16 +110,8 @@ module Platform
       end
   
       default_applications.each do |keyword, description|
-        category_keywords = description.delete("category_keywords")
-        icon_path = description.delete("icon_path")
-        logo_path = description.delete("logo_path")
-
         app = Platform::Application.create(description.merge(:developer => system_developer))
-        app.store_icon(File.new("#{root}/#{icon_path}", "r")) if icon_path 
-        app.store_logo(File.new("#{root}/#{logo_path}", "r")) if logo_path 
-      
         puts "Initialized #{app.name}."
-        app.approve!
       end    
     end
 
@@ -158,8 +144,9 @@ module Platform
     end
 
     def self.load_yml(file_path, for_env = env)
-      yml = YAML.load_file("#{root}#{file_path}")
-      yml = yml[for_env] unless for_env.nil?
+      yml_path = "#{root}#{file_path}"
+      yml = YAML.load_file(yml_path)
+      yml = yml['defaults'].rmerge(yml[for_env] || {}) unless for_env.nil?
       HashWithIndifferentAccess.new(yml)
     end
 
@@ -191,6 +178,10 @@ module Platform
       config[:enable_developer_agreement]
     end
 
+    def self.developer_agreement_path
+      config[:developer_agreement_path]
+    end
+
     def self.enable_app_statistics?
       config[:enable_app_statistics]
     end
@@ -602,6 +593,11 @@ module Platform
       config[:api_explorer_app_id]
     end
   
+    def self.api_explorer_app
+      return if api_explorer_app_id.blank?
+      @api_explorer_app ||= Platform::Application.find_by_id(api_explorer_app_id)
+    end
+      
     def self.api_explorer_app?
       !api_explorer_app_id.blank?
     end

data/lib/platform/extensions/action_view_extension.rb

@@ -126,6 +126,18 @@ module Platform
         end
       end
 
+      def platform_app_icon_tag(app, options = {})
+        options[:style] ||= ""
+        options[:style] << "width:16px;height:16px;"
+        image_tag(app.icon_url, :style => options[:style])
+      end
+
+      def platform_app_logo_tag(app, options = {})
+        options[:style] ||= ""
+        options[:style] << "width:75px;height:75px;"
+        image_tag(app.logo_url, :style => options[:style])
+      end
+
       def platform_user_mugshot_tag(user, options = {})
         if user and !Platform::Config.user_mugshot(user).blank?
           img_url = Platform::Config.user_mugshot(user)
@@ -183,7 +195,7 @@ module Platform
         return platform_when_string_tr("{hours||hour} ago", :hours => (elapsed_seconds / 1.hour).to_i) if elapsed_seconds < 1.day
         return platform_when_string_tr("Yesterday") if elapsed_seconds < 48.hours
         return platform_when_string_tr("{days||day} ago", :days => elapsed_seconds.to_i / 1.day) if elapsed_seconds < 14.days
-        return platform_when_string_tr("{weeks||week} ago", :weeks => (elapsed_seconds / 1.day / 7).to_i) if elapsed_weeks < 4
+        return platform_when_string_tr("{weeks||week} ago", :weeks => (elapsed_seconds / 1.day / 7).to_i) if elapsed_seconds < 4.weeks
         return platform_display_time(time, :monthname_abbr) if Date.today.year == time.year
         return platform_display_time(time, :monthname_abbr_year)
       end      

data/lib/platform/extensions/hash_extension.rb

@@ -0,0 +1,69 @@
+# 
+# = Hash Recursive Merge
+# 
+# Merges a Ruby Hash recursively, Also known as deep merge.
+# Recursive version of Hash#merge and Hash#merge!.
+# 
+# Category::    Ruby
+# Package::     Hash
+# Author::      Simone Carletti <weppos@weppos.net>
+# Copyright::   2007-2008 The Authors
+# License::     MIT License
+# Link::        http://www.simonecarletti.com/
+# Source::      http://gist.github.com/gists/6391/
+
+class Hash
+  #
+  # Recursive version of Hash#merge!
+  # 
+  # Adds the contents of +other_hash+ to +hsh+, 
+  # merging entries in +hsh+ with duplicate keys with those from +other_hash+.
+  # 
+  # Compared with Hash#merge!, this method supports nested hashes.
+  # When both +hsh+ and +other_hash+ contains an entry with the same key,
+  # it merges and returns the values from both arrays.
+  # 
+  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
+  #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
+  #    h1.rmerge!(h2)   #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
+  #    
+  # Simply using Hash#merge! would return
+  # 
+  #    h1.merge!(h2)    #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
+  # 
+  def rmerge!(other_hash)
+    merge!(other_hash) do |key, oldval, newval| 
+        oldval.class == self.class ? oldval.rmerge!(newval) : newval
+    end
+  end
+
+  #
+  # Recursive version of Hash#merge
+  # 
+  # Compared with Hash#merge!, this method supports nested hashes.
+  # When both +hsh+ and +other_hash+ contains an entry with the same key,
+  # it merges and returns the values from both arrays.
+  # 
+  # Compared with Hash#merge, this method provides a different approch
+  # for merging nasted hashes.
+  # If the value of a given key is an Hash and both +other_hash+ abd +hsh
+  # includes the same key, the value is merged instead replaced with
+  # +other_hash+ value.
+  # 
+  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
+  #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
+  #    h1.rmerge(h2)    #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
+  #    
+  # Simply using Hash#merge would return
+  # 
+  #    h1.merge(h2)     #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
+  # 
+  def rmerge(other_hash)
+    r = {}
+    merge(other_hash)  do |key, oldval, newval| 
+      r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
+    end
+  end
+
+end
+  

data/lib/platform/railtie.rb

@@ -35,6 +35,7 @@ require 'pp'
 end
 
 require File.join(File.dirname(__FILE__), 'extensions/object_extension')
+require File.join(File.dirname(__FILE__), 'extensions/hash_extension')
 require File.join(File.dirname(__FILE__), 'extensions/action_view_extension')
 require File.join(File.dirname(__FILE__), 'extensions/action_controller_extension')
 

data/lib/platform/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Platform
-  VERSION = "3.1.2"
+  VERSION = "3.1.3"
 end

data/lib/tasks/platform.rake

@@ -26,6 +26,7 @@ namespace :platform do
   desc "Initializes all of the tables with default data"
   task :init => :environment do
     raise "This action is prohibited in this environment" if ['production', 'stage', 'staging'].include?(Rails.env) and env('force') != 'true'
+    Tr8n::Config.reset_all!
     Platform::Config.reset_all!
   end
   

data/platform.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'coffee-script', ['>= 0']
   s.add_dependency 'acts_as_tree', ['>= 0']
   s.add_dependency 'acts_as_state_machine', ['>= 0']
-  # s.add_dependency 'rmagick', ['>= 0']
   s.add_development_dependency 'pry', ['>= 0']
   s.add_development_dependency 'bundler', ['>= 1.0.0']
   s.add_development_dependency 'sqlite3', ['>= 0']

data/test/dummy/app/controllers/api/bookmarks_controller.rb

@@ -23,7 +23,7 @@ class Api::BookmarksController < Api::BaseController
     render_response page_model
   end
   
-  def delete
+  def destroy
     ensure_logged_in
     ensure_post    
     ensure_ownership

data/test/dummy/app/models/bookmark.rb

@@ -1,7 +1,5 @@
 class Bookmark < ActiveRecord::Base
 
-  has_platform_api_proxy
-
   belongs_to :user
   
 end

data/test/dummy/app/models/user.rb

@@ -3,13 +3,12 @@ class User < ActiveRecord::Base
   has_one :admin
   has_many :bookmarks
   
-  has_platform_api_proxy
-  
   def guest?
     id.blank?
   end
   
   def admin?
+    return true if Rails.env == 'development'
     not admin.nil? 
   end
   

data/test/dummy/app/views/home/index.html.erb

@@ -14,7 +14,7 @@
 <div class="content_bd">
   <h3><%=tr("If you are trying out Platform functionality, here are some helpful links to get started:")%></h3>
   <ul style="list-style-type:decimal; margin-left:30px; font-size:14px;">
-    <li><%= link_to(tr("Register for a developer account"), "/login/register")%></li>
+    <li><%= link_to(tr("Register for an account"), "/login/register")%></li>
     <li><%= link_to(tr("Create a new application"), "/platform/developer/apps")%></li>
     <li><%= link_to(tr("Explore existing applications"), "/platform/apps")%></li>
     <li><%= link_to(tr("View your application dashboard"), "/platform/developer/dashboard")%></li>
@@ -31,7 +31,7 @@
 		<%=tr("Drag the link below to your browser's toolbar or add it to your bookmark list:") %>
 	</p>
 	<p>
-	<a href="javascript:(function(){location.href='http://localhost:3000/api/bookmark/create?bookmarklet=1&title=' + escape(document.title) + '&url='+escape(location.href);})()">Post to Sample Application</a>
+	<a href="javascript:(function(){location.href='http://localhost:3000/api/bookmark/create?bookmarklet=1&title=' + escape(document.title) + '&url='+escape(location.href);})()">Post to Bookmarklet</a>
 	</p>
 	<p>
 	<%=tr("When you're surfing the web and find a page that you want to bookmark, just click the \"Post to Sample Application\" button on your toolbar or choose it in your bookmark list.") %>

data/test/dummy/app/views/layouts/_footer.html.erb

@@ -7,7 +7,7 @@
 	    <li><%=link_to(tr("Credits"), "/platform/developer/help/credits", :class => "quiet")%></li>
 	    <li><%=link_to(tr("License"), "/platform/developer/help/license", :class => "quiet")%></li>
 	  </ul>
-	  &copy; Copyright 2010-2011 Michael Berkovich
+	  &copy; Copyright 2010-2011
 	</div>
 
 </div>

data/test/dummy/app/views/layouts/_header.html.erb

@@ -12,7 +12,7 @@
         <li><%= tr8n_language_selector_tag(:lightbox=>false) %></li>
       </ul>
       <h1 class="logo">
-				<%=link_to("Sample Application", "/home", :style=>"text-decorations:none;")%>
+				<%=link_to("Bookmarklet", "/home", :style=>"text-decorations:none;")%>
 			</h1>
     </div>
   </div>

data/test/dummy/config/application.rb

@@ -9,7 +9,6 @@ require "kaminari"
 require "platform"
 require "acts_as_tree"
 require "acts_as_state_machine"
-# require "rmagick"
 
 module Dummy
   class Application < Rails::Application

data/test/dummy/config/environments/development.rb

@@ -4,7 +4,9 @@ Dummy::Application.configure do
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+
+  # must be enabled for injectable proxies - TODO: figure out how to unload them
+  config.cache_classes = true
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true

data/test/dummy/config/initializers/platform.rb

@@ -0,0 +1,3 @@
+[User, Bookmark, Platform::Application, Platform::Developer].each do |klass|
+  klass.has_platform_api_proxy
+end

data/test/dummy/config/platform/api/1/bookmark.yml

@@ -70,8 +70,8 @@ bookmark:
           description: "The bookmark's creation date as a timestamp"
           type: "Number"
           status: updated
-    delete:
-      path: "bookmark/delete" 
+    destroy:
+      path: "bookmark/destroy" 
       method: POST
       status: added
       description: "Removes a bookmark."

data/test/dummy/config/platform/config.yml

@@ -9,16 +9,23 @@
 # Alternatively, you can overload any of the methods of Platform::Config
 #############################################################################
 
-defaults: &defaults
+defaults:
   enable_platform:              true     
   enable_app_directory:         true
   enable_embedded_applications: true
   enable_mobile_applications:   true
-  enable_developer_agreement:   false
   enable_app_statistics:        false
   enable_api_verification:      false
   api_explorer_app_id:          1  # make sure to create an application for the test tool 
 
+  #############################################################################
+  # You can enforce users to accept the developers agreement before they
+  # become developers. To do so, enable the line below and provide path
+  # to your dev agreement.
+  #############################################################################
+  enable_developer_agreement:   true
+  developer_agreement_path:     /developer_agreement.html
+
   #############################################################################
   # Platform best run with caching enabled
   # You can configure cache adapter and store parameters by providing the
@@ -52,7 +59,7 @@ defaults: &defaults
   # Site Integration Settings
   #############################################################################
   site_info:
-    title:                    "Sample Application"
+    title:                    "Bookmarklet"
     logo_url:                 "/assets/platform/platform5.png"
     base_url:                 "localhost:3000"
     contact_email:            feedback@oauthx.com
@@ -118,19 +125,13 @@ defaults: &defaults
 # You can overload any feature defined in the defaults for any environment
 #############################################################################
 development:
-  <<: *defaults
         
 test:
-  <<: *defaults
       
 qa:
-  <<: *defaults
 
 stage:
-  <<: *defaults
 
 production:
-  <<: *defaults
 
 sandbox:
-  <<: *defaults

data/test/dummy/config/platform/data/default_applications.yml

@@ -1,39 +1,20 @@
-defaults: &defaults
-  google:
-    name: "Google"
-    description: "Google Search Engine"
-    url: "http://www.google.com"
-    contact_email: "apps@railsplatform.org"
-    category_keywords: ["all"]
-    icon_path: "/public/platform/images/apps/app_icon.gif"  
-    logo_path: "/public/platform/images/apps/app_logo.gif"  
-  
-  yahoo:
-    name: "Yahoo"
-    description: "Yahoo Search Engine"
-    url: "http://www.yahoo.com"
-    contact_email: "apps@railsplatform.org"
-    category_keywords: ["all"]
-    icon_path: "/public/platform/images/apps/app_icon.gif"  
-    logo_path: "/public/platform/images/apps/app_logo.gif"  
+defaults:
+  api_explorer:
+    name: "API Explorer"
+    description: "Allows developers to test API without having to create any applications"
 
 #############################################################################
 # Environment Settings
 # You can overload any feature defined in the defaults for any environment
 #############################################################################
 development:
-  <<: *defaults
   
 test:
-  <<: *defaults
       
 qa:
-  <<: *defaults
 
 stage:
-  <<: *defaults
 
 production:
-  <<: *defaults
 
     

data/test/dummy/config/platform/data/default_categories.yml

@@ -1,4 +1,4 @@
-defaults: &defaults
+defaults: 
   all:
     position: 1   
     name: "All Apps"
@@ -39,18 +39,13 @@ defaults: &defaults
 # You can overload any feature defined in the defaults for any environment
 #############################################################################
 development:
-  <<: *defaults
   
 test:
-  <<: *defaults
       
 qa:
-  <<: *defaults
 
 stage:
-  <<: *defaults
 
 production:
-  <<: *defaults