platform 3.1.3 → 3.1.4

data/app/models/platform/rollup_log.rb

@@ -1,25 +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.
-#++
+#--
+# Copyright (c) 2010-2012 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.
+#++
+#
+#-- Platform::RollupLog Schema Information
+#
+# Table name: platform_rollup_logs
+#
+#  id             INTEGER     not null, primary key
+#  interval       datetime    
+#  started_at     datetime    
+#  finished_at    datetime    
+#  created_at     datetime    
+#  updated_at     datetime    
+#
+# Indexes
+#
+#  index_platform_rollup_logs_on_interval    (interval) 
+#
+#++
 
 class Platform::RollupLog < ActiveRecord::Base
   set_table_name :platform_rollup_logs

data/app/models/platform/rollup_log_filter.rb

@@ -1,25 +1,44 @@
-#--
-# 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.
-#++
+#--
+# Copyright (c) 2010-2012 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.
+#++
+#
+#-- Platform::RollupLogFilter Schema Information
+#
+# Table name: will_filter_filters
+#
+#  id                  INTEGER         not null, primary key
+#  type                varchar(255)    
+#  name                varchar(255)    
+#  data                text            
+#  user_id             integer         
+#  model_class_name    varchar(255)    
+#  created_at          datetime        
+#  updated_at          datetime        
+#
+# Indexes
+#
+#  index_will_filter_filters_on_user_id    (user_id) 
+#
+#++
 
 class Platform::RollupLogFilter < Platform::BaseFilter
   

data/app/models/platform/total_application_metric.rb

@@ -1,25 +1,44 @@
-#--
-# 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.
-#++
+#--
+# Copyright (c) 2010-2012 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.
+#++
+#
+#-- Platform::TotalApplicationMetric Schema Information
+#
+# Table name: platform_application_metrics
+#
+#  id                   INTEGER         not null, primary key
+#  type                 varchar(255)    
+#  interval             datetime        
+#  application_id       integer         
+#  active_user_count    integer         
+#  new_user_count       integer         
+#  created_at           datetime        
+#  updated_at           datetime        
+#
+# Indexes
+#
+#  pamai    (application_id, interval) 
+#
+#++
 
 class Platform::TotalApplicationMetric < Platform::ApplicationMetric
   

data/app/models/platform/weekly_application_metric.rb

@@ -1,25 +1,44 @@
-#--
-# 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.
-#++
+#--
+# Copyright (c) 2010-2012 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.
+#++
+#
+#-- Platform::WeeklyApplicationMetric Schema Information
+#
+# Table name: platform_application_metrics
+#
+#  id                   INTEGER         not null, primary key
+#  type                 varchar(255)    
+#  interval             datetime        
+#  application_id       integer         
+#  active_user_count    integer         
+#  new_user_count       integer         
+#  created_at           datetime        
+#  updated_at           datetime        
+#
+# Indexes
+#
+#  pamai    (application_id, interval) 
+#
+#++
 
 class Platform::WeeklyApplicationMetric < Platform::ApplicationMetric
 

data/app/views/platform/developer/api_explorer/index.html.erb

@@ -36,17 +36,17 @@
   <div class="section blue" style="margin-top:10px;">
   	<table>
   		<tr>
-        <td style="width:50px;">
-          <%=select_tag("api_version", options_for_select(Platform::Config.api_supported_version_options, @api_version), :onChange=>"switchApiVersion()")%>
+        <td style="width:55px;">
+          <%=select_tag("api_version", options_for_select(Platform::Config.api_supported_version_options, @api_version), :style=>"width:55px;", :onChange=>"switchApiVersion()")%>
         </td>
   			<td style="width:80px;">
-				  <%=select_tag("request_method", options_for_select(['GET', 'POST', 'PUT', 'DELETE'], params[:method] || 'GET'), :style=>"", :onChange=>"switchRequestMethod()")%>
+				  <%=select_tag("request_method", options_for_select(['GET', 'POST', 'PUT', 'DELETE'], params[:method] || 'GET'), :style=>"width:78px;", :onChange=>"switchRequestMethod()")%>
   			</td>
 				<td>
 					<table cellspacing="0" cellpadding="0" style="border:1px solid #ccc;padding:0px;margin:0px;font-size:12px;vertical-align:middle; background-color:white;height:23px;">
 						<tr>
 							<td style="background-color:#eee;"><span style="padding-left:5px;vertical-align:middle;white-space:nowrap;padding-right:0px;">http://<%=Platform::Config.api_base_url%>/</span></td>
-							<td><%=text_field_tag(:api_path, params[:path], :style=>"width:500px;border:0px;padding:0px;margin:0px;font-size:12px;vertical-align:middle;", :onKeyUp=>"if (event.keyCode == 13) {api_history_index=-1; submitRequest();}")%></td>
+							<td><%=text_field_tag(:api_path, params[:path], :style=>"width:530px;border:0px;padding:0px;margin:0px;font-size:14px;vertical-align:middle;", :onKeyUp=>"if (event.keyCode == 13) {api_history_index=-1; submitRequest();}")%></td>
 							<td><span style="float:right;padding-right:5px;"><%=link_to_function(image_tag("platform/arrow_down.gif"), "toggleApiOptions(this)")%></span></td>
 						</tr>	
 					</table>	

data/app/views/platform/developer/apps/index.html.erb

@@ -289,7 +289,7 @@
                 <%=link_to(tr("edit"), :action => :edit, :id => @app.id)%>
               </span>
               <%= platform_toggler_tag("authentication") %> 
-              <%=tr('Authentication', 'Client application section')%>
+              <%=tr('Authorization', 'Client application section')%>
             </div>
             <div id="authentication"> 
               <div class="app_key_value"> 
@@ -300,7 +300,10 @@
                 <div class="app_key"><%=tr('Callback URL:', 'Client application field label')%></div>
                 <div class="app_value"><%=@app.callback_url%></div>
               </div>
-
+              <div class="app_key_value"> 
+                <div class="app_key"><%=tr('Authorization URL:', 'Client application field label')%></div>
+                <div class="app_value"><%=@app.oauth_url%></div>
+              </div>
               <div class="app_key_value"> 
                 <div class="app_key"><%=tr('Deauthorize Callback URL:', 'Client application field label')%></div>
                 <div class="app_value"><%=@app.deauthorize_callback_url%></div>

data/lib/platform/config.rb

@@ -280,6 +280,10 @@ module Platform
       site_info[:oauth_web_layout]
     end
 
+    def self.oauth_fluid_layout
+      site_info[:oauth_fluid_layout]
+    end
+
     def self.oauth_popup_layout
       site_info[:oauth_popup_layout]
     end

data/lib/platform/version.rb

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

data/lib/tasks/dev.rake

@@ -0,0 +1,154 @@
+#--
+# Copyright (c) 2010-2012 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.
+#++
+
+namespace :dev do
+
+# <ActiveRecord::ConnectionAdapters::SQLiteColumn:0x007fdffc77bee0
+#  @coder=nil,
+#  @default=nil,
+#  @limit=nil,
+#  @name="id",
+#  @null=false,
+#  @precision=nil,
+#  @primary=true,
+#  @scale=nil,
+#  @sql_type="INTEGER",
+#  @type=:integer>
+
+# <struct ActiveRecord::ConnectionAdapters::IndexDefinition
+#  table="will_filter_filters",
+#  name="index_will_filter_filters_on_user_id",
+#  unique=false,
+#  columns=["user_id"],
+#  lengths=nil>
+
+  desc "Annotates tr8n models"
+  task :annotate => :environment do
+    Dir[File.expand_path("#{File.dirname(__FILE__)}/../../app/models/platform/*.rb")].sort.each do |file|
+      class_name = file[file.rindex('platform')..-1].gsub('.rb', '').camelcase
+      klass = class_name.constantize
+      lines = []
+      lines << "#--"
+      lines << "# Copyright (c) 2010-2012 Michael Berkovich"
+      lines << "#"
+      lines << "# Permission is hereby granted, free of charge, to any person obtaining"
+      lines << "# a copy of this software and associated documentation files (the"
+      lines << "# \"Software\"), to deal in the Software without restriction, including"
+      lines << "# without limitation the rights to use, copy, modify, merge, publish,"
+      lines << "# distribute, sublicense, and/or sell copies of the Software, and to"
+      lines << "# permit persons to whom the Software is furnished to do so, subject to"
+      lines << "# the following conditions:"
+      lines << "#"
+      lines << "# The above copyright notice and this permission notice shall be"
+      lines << "# included in all copies or substantial portions of the Software."
+      lines << "#"
+      lines << "# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,"
+      lines << "# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF"
+      lines << "# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND"
+      lines << "# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE"
+      lines << "# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION"
+      lines << "# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION"
+      lines << "# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+      lines << "#++"
+      lines << "#"
+      lines << "#-- #{class_name} Schema Information"
+      lines << "#"
+      lines << "# Table name: #{klass.table_name}"
+      lines << "#"
+
+      name_width = 0
+      type_width = 0
+      sql_type_width = 0
+
+      klass.columns.each do |column|
+        name_width = [column.name.to_s.length, name_width].max
+        type_width = [column.type.to_s.length, type_width].max
+        sql_type_width = [column.sql_type.to_s.length, sql_type_width].max
+      end
+
+      klass.columns.each do |column|
+        line = ["#  "]
+        line << column.name
+        line << (" " * (name_width - column.name.length + 4))
+        # line << column.type.to_s
+        # line << (" " * (type_width - column.type.to_s.length + 4))
+        line << column.sql_type
+        line << (" " * (sql_type_width - column.sql_type.to_s.length + 4))
+
+        meta = []
+        meta << "not null" if !column.null
+        meta << "primary key" if column.primary
+        meta << "default = #{column.default.to_s}" if column.default
+        line << meta.join(', ')
+
+        lines << line.join('')
+      end
+
+      lines << "#"
+      lines << "# Indexes"
+      lines << "#"
+
+      indexes = ActiveRecord::Base.connection.indexes(klass.table_name)
+
+      name_width = 0
+
+      indexes.each do |index|
+        name_width = [index.name.to_s.length, name_width].max
+      end
+
+      indexes.each do |index|
+        line = ["#  "]
+        line << index.name
+        line << (" " * (name_width - index.name.length + 4))
+        line << "(#{index.columns.join(', ')})"
+        line << " "
+        line << "UNIQUE" if index.unique
+        lines << line.join('')
+      end
+
+      lines << "#"
+      lines << "#++"
+
+      pp "Updating #{file}..."
+
+      model_file = File.open(file, "r+")
+      old_lines = model_file.readlines
+      model_file.close
+      
+      model_file = File.new(file, "w")
+      lines.each do |line|
+        model_file.write(line + "\r\n")
+      end
+
+      in_class = false
+      old_lines.each do |line|
+        in_class = true unless line.index("#") == 0
+
+        next unless in_class
+        model_file.write(line)
+      end
+      model_file.close      
+    end
+  end
+
+end