platform 3.1.1 → 3.1.2

data/lib/generators/platform/templates/config/platform/api/0/platform_developer.yml

@@ -0,0 +1,22 @@
+platform_developer:
+  type: "struct"
+  title: "Platform Developer"
+  path: "platform/developer"
+  description: "Returns information about a developer."
+
+  fields:
+    id: 
+      description: "The developer's id"
+      type: "Number"
+    name: 
+      description: "The developer's name"
+      type: "String"
+    about: 
+      description: "The developer's description"
+      type: "String"
+    url: 
+      description: "The developer's url"
+      type: "String"
+    created_at: 
+      description: "The developer's creation timestamp"
+      type: "Number"

data/{config → lib/generators/platform/templates/config}/platform/config.yml

@@ -17,7 +17,7 @@ defaults: &defaults
   enable_developer_agreement:   false
   enable_app_statistics:        false
   enable_api_verification:      false
-  api_explorer_app_id:          -1  
+  api_explorer_app_id:          1  # make sure to create an application for the test tool 
 
   #############################################################################
   # Platform best run with caching enabled
@@ -36,7 +36,8 @@ defaults: &defaults
   #############################################################################
   caching:
     enabled:                  false
-    adapter:                  "Platform::CacheAdapter"
+    adapter:                  "ActiveSupport::Cache"
+    cache_store:              ["mem_cache_store", "localhost:11211"]
     version:                  1 # you can change the version to invalidate the cache
       
   #############################################################################
@@ -51,18 +52,23 @@ defaults: &defaults
   # Site Integration Settings
   #############################################################################
   site_info:
-    title:                    "Sample"
+    title:                    "Sample Application"
+    logo_url:                 "/assets/platform/platform5.png"
     base_url:                 "localhost:3000"
-    contact_email:            platform@geni.com
+    contact_email:            feedback@oauthx.com
     default_url:              "/home"
     login_url:                "/login"
+    logout_url:               "/login/out"
     platform_layout:          application
     admin_layout:             admin
-    oauth_layout:             minimal
+    oauth_web_layout:         minimal
+    oauth_popup_layout:       popup
+    oauth_iframe_layout:      blank
+    oauth_mobile_layout:      mobile
+    oauth_desktop_layout:     popup
     system_user_id:           10
     media_directory:          "/media/p1"
     user_info:
-      enabled:                true
       current_user_method:    current_user
       logout_method:          "logout!"
       class_name:             User
@@ -70,17 +76,17 @@ defaults: &defaults
         id:                   id
         name:                 name
         email:                "email"
-        link:                 path
-        mugshot:              square_mugshot_url
+        link:                 link
+        mugshot:              mugshot
         admin:                admin?
         guest:                guest?
         locale:               language
     media_info:              
-      enabled:                true
+      enabled:                false  # use internal implementation
       class_name:             "Platform::Media::Image"
       write_method:           "write"
-      logo_url_method:        "media_url(:logo)"
-      icon_url_method:        "media_url(:icon)"
+      logo_url_method:        "url"
+      icon_url_method:        "url"
   
   #############################################################################
   # API Settings
@@ -88,9 +94,11 @@ defaults: &defaults
   API:
     enabled:                  true
     base_url:                 "localhost:3000/api"
+    scheme:                   "http" # can also provide an array ["http", "https"]
     config_path:              "config/platform/api"
+    proxies_path:             "lib/platform/api"
     logging_enabled:          true          
-    admin_email:              scott.steadman@geni.com
+    admin_email:              feedback@oauthx.com
     allow_public:             true
     cookies_enabled:          true
     max_models:               50
@@ -100,8 +108,8 @@ defaults: &defaults
     supported_versions:       ['1', '0']
     default_version:          '1'    
     explorer_groups:
-      '0':                    [['document', 'photo'], ['project', 'video', 'union'], ['profile']]
-      '1':                    [['user', 'project', 'photo_album', 'union', 'surname'], ['document', 'photo', 'video', 'revision'], ['profile']]
+      '0':                    [['user'], ['bookmark']]
+      '1':                    [['platform', 'user'], ['bookmark']]
     user:
       create_enabled:         true
   
@@ -111,8 +119,6 @@ defaults: &defaults
 #############################################################################
 development:
   <<: *defaults
-  enable_api_verification:      true
-  api_explorer_app_id:          "TBUDuxvLLqY7ndxjzS5hnPykVMl1hIN29RwfKjh1"  
         
 test:
   <<: *defaults
@@ -122,12 +128,9 @@ qa:
 
 stage:
   <<: *defaults
-  api_explorer_app_id:          "ci9EG77hmXg53AEsKlRuDe9TL2beeGupq6slAHMX"  
 
 production:
   <<: *defaults
-  api_explorer_app_id:          "ci9EG77hmXg53AEsKlRuDe9TL2beeGupq6slAHMX"  
 
 sandbox:
   <<: *defaults
-  api_explorer_app_id:          "tAGjqNSsCYfbDP3At9Qaf3UDrcZfIHbJH7Jp29Nn"  

data/lib/platform.rb

@@ -1,3 +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.
+#++
+
 require File.join(File.dirname(__FILE__), 'platform/railtie')
 require File.join(File.dirname(__FILE__), 'platform/engine')
 

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

@@ -1,5 +1,3 @@
-require 'platform/api/proxy'
-
 module Platform
   module Api
     module Proxy
@@ -55,6 +53,11 @@ module Platform
           "#{Platform::Config.api_scheme}://#{Platform::Config.api_base_url}/#{instance.class.name.underscore}/#{instance.id}"
         end
 
+        def full_url(url)
+          return url if url.index('http')
+          "http://#{Platform::Config.site_base_url}#{url}"
+        end
+
       end # class Base
 
     end # module Proxy

data/lib/platform/cache.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich, Geni Inc
+# 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

data/lib/platform/config.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich, Geni Inc
+# 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
@@ -606,12 +606,12 @@ module Platform
       !api_explorer_app_id.blank?
     end
     
-    def self.proxies_path
+    def self.api_proxies_path
       api[:proxies_path]
     end
     
     def self.load_proxies
-      Dir["#{root}/#{proxies_path}/*_proxy_*.rb"].each do |file|
+      Dir["#{root}/#{api_proxies_path}/*_proxy_*.rb"].each do |file|
         require_or_load file
       end
     end  
@@ -640,6 +640,23 @@ module Platform
       @api_reference[api_version]
     end
 
+    def self.api_reference_by_path(api_version,  path)
+      @api_reference_by_path ||= {}
+      @api_reference_by_path[api_version] ||= begin
+        api = api_reference(api_version)
+        by_path = {}
+        api.each do |key, defs|
+          by_path[defs["path"]] = api[key]
+          (defs[:actions] || []).each do |act_key, acts|
+            path = acts["path"] || "#{defs["path"]}/#{act_key}"
+            by_path[path] = defs[:actions][act_key]
+          end
+        end
+        by_path
+      end
+      @api_reference_by_path[api_version][path]
+    end
+
     def self.api_explorer_groups(api_version = api_default_version)
       api[:explorer_groups][api_version]
     end

data/lib/platform/engine.rb

@@ -1,3 +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
   class Engine < Rails::Engine
     isolate_namespace Platform

data/lib/platform/exception.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich, Geni Inc
+# 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

data/lib/platform/extensions/action_view_extension.rb

@@ -163,6 +163,31 @@ module Platform
       def platform_stringify_url(path, params)
         "#{path}#{path.index('?') ? '&' : '?'}#{params.collect{|n,v| "#{n}=#{CGI.escape(v.to_s)}"}.join("&")}"
       end
+      
+      def platform_when_string_tr(key, opts = {})
+        tr(key, 'Time reference', opts)
+      end
+      
+      def platform_display_time(time, format)
+        time.tr(format).gsub('/ ', '/').sub(/^[0:]*/,"")
+      end
+      
+      def platform_when_string_tag(time, opts = {})
+        elapsed_seconds = Time.now - time
+        return platform_when_string_tr("Today") if time.today_in_time_zone? if opts[:days_only]
+        return platform_when_string_tr('In the future, Marty!') if elapsed_seconds < 0
+        return platform_when_string_tr('A moment ago') if elapsed_seconds < 2.minutes
+        return platform_when_string_tr("{minutes||minute} ago", :minutes => (elapsed_seconds / 1.minute).to_i) if elapsed_seconds < 1.hour
+        return platform_when_string_tr("{hours||hour} ago", :hours => 1) if elapsed_seconds < 1.75.hours
+        return platform_when_string_tr("{hours||hour} ago", :hours => 2) if elapsed_seconds < 2.hours
+        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_display_time(time, :monthname_abbr) if Date.today.year == time.year
+        return platform_display_time(time, :monthname_abbr_year)
+      end      
+      
     end
   end
 end

data/lib/platform/helper.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich, Geni Inc
+# 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

data/lib/platform/logger.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich, Geni Inc
+# 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

data/lib/platform/random_password_generator.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich, Geni Inc
+# 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

data/lib/platform/simple_string_permissions.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich, Geni Inc
+# 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

data/lib/platform/version.rb

@@ -1,3 +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
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end

data/lib/tasks/platform.rake

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich, Geni Inc
+# 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

data/platform.gemspec

@@ -30,7 +30,7 @@ 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_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/.pryrc

@@ -0,0 +1,15 @@
+rails = File.join Dir.getwd, 'config', 'environment.rb'
+
+if File.exist?(rails) && ENV['SKIP_RAILS'].nil?
+  require rails
+
+  if Rails.version[0..0] == "2"
+    require 'console_app'
+    require 'console_with_helpers'
+  elsif Rails.version[0..0] == "3"
+    require 'rails/console/app'
+    require 'rails/console/helpers'
+  else
+    warn "[WARN] cannot load Rails console commands (Not on Rails2 or Rails3?)"
+  end
+end

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

@@ -1,5 +1,4 @@
 # This is where all of the custom application stuff goes
 class Api::BaseController < Platform::Api::BaseController
   
-  
 end

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

@@ -2,10 +2,13 @@ class Api::BookmarksController < Api::BaseController
 
   def index
     ensure_get
-    render_response page_model
+    ensure_ids_provided
+    ensure_ownership
+    render_response page_models
   end
 
   def create
+    ensure_logged_in
     raise BadRequestError.new("Title and url must be provided") if params[:title].blank? or params[:url].blank?
     bookmark = Bookmark.create(:user => current_user, :title => params[:title], :url => params[:url])
     return redirect_to(params[:url]) if params[:bookmarklet]
@@ -13,6 +16,7 @@ class Api::BookmarksController < Api::BaseController
   end
   
   def update
+    ensure_logged_in
     ensure_ownership
     raise BadRequestError.new("Title and url must be provided") if params[:title].blank? or params[:url].blank?
     page_model.update_attributes(params.slice(:title, :url))
@@ -20,6 +24,7 @@ class Api::BookmarksController < Api::BaseController
   end
   
   def delete
+    ensure_logged_in
     ensure_post    
     ensure_ownership
     page_model.destroy

data/{app/controllers/platform/developer/resources_controller.rb → test/dummy/app/controllers/api/platform_controller.rb}

@@ -21,10 +21,24 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class Platform::Developer::ResourcesController < Platform::Developer::BaseController
+class Api::PlatformController < Api::BaseController
   
   def index
-    
+    render_response(:status => "ok")
+  end
+  
+  def apps
+    render_response(page_models) 
+  end
+
+  def services
+    render_response Platform::Config.api_reference(api_version)
+  end
+
+private 
+
+  def model_class
+    Platform::Application
   end
 
 end