active_scaffold 3.6.0.pre → 3.6.0.rc1

data/test/performance/list_people_performance_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'performance_test_help'
+
+class ListPeoplePerformanceTest < ActionDispatch::PerformanceTest
+  self.profile_options =
+    if ENV['BENCHMARK_TESTS']
+      {metrics: [:wall_time]}
+    else
+      {metrics: %i[process_time], formats: %i[flat graph_html call_stack]}
+    end
+  def setup
+    200.times do |i|
+      p = Person.create(first_name: "Name#{i}", last_name: 'Last')
+      p.buildings = Array.new(4) { |j| Building.create name: "B#{j} of #{p.first_name}" } unless (i % 4).zero?
+    end
+    PeopleController.class_eval do
+      before_action :setup
+      def list_columns
+        active_scaffold_config.columns.select { |col| %i[first_name last_name buildings].include?(col.name) }
+      end
+
+      def setup
+        active_scaffold_config.list.pagination = false
+      end
+    end
+  end
+
+  def test_list
+    get '/people'
+  end
+end

data/test/performance_test_help.rb

@@ -0,0 +1,3 @@
+require 'rails/performance_test_help'
+require 'rails/perftest/action_dispatch'
+require 'rails/perftest/action_controller'

data/test/test_helper.rb

@@ -60,4 +60,5 @@ end
 
 Config = RbConfig # HACK: needed some comments
 
-class ColumnMock < ActiveScaffold::Tableless::Column; end
+class ColumnMock < ActiveScaffold::Tableless::Column
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.0.pre
+  version: 3.6.0.rc1
 platform: ruby
 authors:
 - Many, see README
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- CHANGELOG
+- CHANGELOG.rdoc
 - LICENSE.md
 - README.md
 - app/assets/images/active_scaffold/add.png
@@ -116,7 +116,6 @@ files:
 - app/assets/javascripts/prototype/active_scaffold_chosen.js
 - app/assets/javascripts/prototype/dhtml_history.js
 - app/assets/javascripts/prototype/form_enhancements.js
-- app/assets/javascripts/prototype/rico_corner.js
 - app/assets/javascripts/prototype/tiny_mce_bridge.js
 - app/assets/stylesheets/active_scaffold-ie.scss
 - app/assets/stylesheets/active_scaffold.scss
@@ -216,6 +215,11 @@ files:
 - lib/active_scaffold/active_record_permissions.rb
 - lib/active_scaffold/attribute_params.rb
 - lib/active_scaffold/bridges.rb
+- lib/active_scaffold/bridges/active_storage.rb
+- lib/active_scaffold/bridges/active_storage/active_storage_bridge.rb
+- lib/active_scaffold/bridges/active_storage/active_storage_helpers.rb
+- lib/active_scaffold/bridges/active_storage/form_ui.rb
+- lib/active_scaffold/bridges/active_storage/list_ui.rb
 - lib/active_scaffold/bridges/ancestry.rb
 - lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb
 - lib/active_scaffold/bridges/bitfields.rb
@@ -248,7 +252,6 @@ files:
 - lib/active_scaffold/bridges/file_column/list_ui.rb
 - lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb
 - lib/active_scaffold/bridges/file_column/test/mock_model.rb
-- lib/active_scaffold/bridges/file_column/test/test_helper.rb
 - lib/active_scaffold/bridges/paper_trail.rb
 - lib/active_scaffold/bridges/paper_trail/actions.rb
 - lib/active_scaffold/bridges/paper_trail/config.rb
@@ -393,6 +396,7 @@ files:
 - test/misc/tableless_test.rb
 - test/mock_app/.gitignore
 - test/mock_app/Rakefile
+- test/mock_app/app/assets/config/manifest.js
 - test/mock_app/app/controllers/addresses_controller.rb
 - test/mock_app/app/controllers/application_controller.rb
 - test/mock_app/app/controllers/buildings_controller.rb
@@ -428,6 +432,9 @@ files:
 - test/mock_app/db/schema.rb
 - test/mock_app/db/test.sqlite3
 - test/model_stub.rb
+- test/performance/list_cars_performance_test.rb
+- test/performance/list_people_performance_test.rb
+- test/performance_test_help.rb
 - test/run_all.rb
 - test/test_helper.rb
 - vendor/assets/javascripts/getprototypeof.js
@@ -439,7 +446,7 @@ homepage: https://github.com/activescaffold/active_scaffold
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -454,9 +461,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery
 test_files:
@@ -511,6 +517,7 @@ test_files:
 - test/misc/tableless_test.rb
 - test/mock_app/.gitignore
 - test/mock_app/Rakefile
+- test/mock_app/app/assets/config/manifest.js
 - test/mock_app/app/controllers/addresses_controller.rb
 - test/mock_app/app/controllers/application_controller.rb
 - test/mock_app/app/controllers/buildings_controller.rb
@@ -546,5 +553,8 @@ test_files:
 - test/mock_app/db/schema.rb
 - test/mock_app/db/test.sqlite3
 - test/model_stub.rb
+- test/performance/list_cars_performance_test.rb
+- test/performance/list_people_performance_test.rb
+- test/performance_test_help.rb
 - test/run_all.rb
 - test/test_helper.rb

data/app/assets/javascripts/prototype/rico_corner.js

@@ -1,370 +0,0 @@
-/**
-  *
-  *  Copyright 2005 Sabre Airline Solutions
-  *
-  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
-  *  file except in compliance with the License. You may obtain a copy of the License at
-  *
-  *         http://www.apache.org/licenses/LICENSE-2.0
-  *
-  *  Unless required by applicable law or agreed to in writing, software distributed under the
-  *  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  *  either express or implied. See the License for the specific language governing permissions
-  *  and limitations under the License.
-  **/
-
-
-//-------------------- rico.js
-var Rico = {
-  Version: '1.1.0',
-  prototypeVersion: parseFloat(Prototype.Version.split(".")[0] + "." + Prototype.Version.split(".")[1])
-}
-
-//-------------------- ricoColor.js
-Rico.Color = Class.create();
-
-Rico.Color.prototype = {
-
-   initialize: function(red, green, blue) {
-      this.rgb = { r: red, g : green, b : blue };
-   },
-
-   blend: function(other) {
-      this.rgb.r = Math.floor((this.rgb.r + other.rgb.r)/2);
-      this.rgb.g = Math.floor((this.rgb.g + other.rgb.g)/2);
-      this.rgb.b = Math.floor((this.rgb.b + other.rgb.b)/2);
-   },
-
-   asRGB: function() {
-      return "rgb(" + this.rgb.r + "," + this.rgb.g + "," + this.rgb.b + ")";
-   },
-
-   asHex: function() {
-      return "#" + this.rgb.r.toColorPart() + this.rgb.g.toColorPart() + this.rgb.b.toColorPart();
-   },
-
-   asHSB: function() {
-      return Rico.Color.RGBtoHSB(this.rgb.r, this.rgb.g, this.rgb.b);
-   },
-
-   toString: function() {
-      return this.asHex();
-   }
-
-};
-
-Rico.Color.createFromHex = function(hexCode) {
-  if(hexCode.length==4) {
-    var shortHexCode = hexCode;
-    var hexCode = '#';
-    for(var i=1;i<4;i++) hexCode += (shortHexCode.charAt(i) + shortHexCode.charAt(i));
-  }
-   if ( hexCode.indexOf('#') == 0 )
-   hexCode = hexCode.substring(1);
-   var red   = hexCode.substring(0,2);
-   var green = hexCode.substring(2,4);
-   var blue  = hexCode.substring(4,6);
-   return new Rico.Color( parseInt(red,16), parseInt(green,16), parseInt(blue,16) );
-}
-
-/**
- * Factory method for creating a color from the background of
- * an HTML element.
- */
-Rico.Color.createColorFromBackground = function(elem) {
-
-   //var actualColor = RicoUtil.getElementsComputedStyle($(elem), "backgroundColor", "background-color"); // Changed to prototype style
-	var actualColor = $(elem).getStyle('backgroundColor');
-
-   if ( actualColor == "transparent" && elem.parentNode )
-      return Rico.Color.createColorFromBackground(elem.parentNode);
-
-   if ( actualColor == null )
-      return new Rico.Color(255,255,255);
-
-   if ( actualColor.indexOf("rgb(") == 0 ) {
-      var colors = actualColor.substring(4, actualColor.length - 1 );
-      var colorArray = colors.split(",");
-      return new Rico.Color( parseInt( colorArray[0] ),
-                            parseInt( colorArray[1] ),
-                            parseInt( colorArray[2] )  );
-
-   }
-   else if ( actualColor.indexOf("#") == 0 ) {
-      return Rico.Color.createFromHex(actualColor);
-   }
-   else
-      return new Rico.Color(255,255,255);
-}
-
-/* next two functions changed to mootools color.js functions */
-Rico.Color.HSBtoRGB = function(hue, saturation, brightness) {
-			
-			var br = Math.round(brightness / 100 * 255);
-			if (this[1] == 0){
-				return [br, br, br];
-			} else {
-				var hue = this[0] % 360;
-				var f = hue % 60;
-				var p = Math.round((brightness * (100 - saturation)) / 10000 * 255);
-				var q = Math.round((brightness * (6000 - saturation * f)) / 600000 * 255);
-				var t = Math.round((brightness * (6000 - saturation * (60 - f))) / 600000 * 255);
-				switch(Math.floor(hue / 60)){
-					case 0: return { r : br, g : t, b : p };
-					case 1: return { r : q, g : br, b : p };
-					case 2: return { r : p, g : br, b : t };
-					case 3: return { r : p, g : q, b : br };
-					case 4: return { r : t, g : p, b : br };
-					case 5: return { r : br, g : p, b : q };
-				}
-			}
-			return false;
-		}
-
-Rico.Color.RGBtoHSB = function(red, green, blue) {
-		var hue, saturation, brightness;
-		var max = Math.max(red, green, blue), min = Math.min(red, green, blue);
-		var delta = max - min;
-		brightness = max / 255;
-		saturation = (max != 0) ? delta / max : 0;
-		if (saturation == 0){
-			hue = 0;
-		} else {
-			var rr = (max - red) / delta;
-			var gr = (max - green) / delta;
-			var br = (max - blue) / delta;
-			if (red == max) hue = br - gr;
-			else if (green == max) hue = 2 + rr - br;
-			else hue = 4 + gr - rr;
-			hue /= 6;
-			if (hue < 0) hue++;
-		}
-		return { h : Math.round(hue * 360), s : Math.round(saturation * 100), b : Math.round(brightness * 100)};
-}
-
-
-//-------------------- ricoCorner.js
-Rico.Corner = {
-
-   round: function(e, options) {
-      var e = $(e);
-      this._setOptions(options);
-
-      var color = this.options.color;
-      if ( this.options.color == "fromElement" )
-         color = this._background(e);
-
-      var bgColor = this.options.bgColor;
-      if ( this.options.bgColor == "fromParent" )
-         bgColor = this._background(e.offsetParent);
-
-      this._roundCornersImpl(e, color, bgColor);
-   },
-
-   _roundCornersImpl: function(e, color, bgColor) {
-      if(this.options.border)
-         this._renderBorder(e,bgColor);
-      if(this._isTopRounded())
-         this._roundTopCorners(e,color,bgColor);
-      if(this._isBottomRounded())
-         this._roundBottomCorners(e,color,bgColor);
-   },
-
-   _renderBorder: function(el,bgColor) {
-      var borderValue = "1px solid " + this._borderColor(bgColor);
-      var borderL = "border-left: "  + borderValue;
-      var borderR = "border-right: " + borderValue;
-      var style   = "style='" + borderL + ";" + borderR +  "'";
-      el.innerHTML = "<div " + style + ">" + el.innerHTML + "</div>"
-   },
-
-   _roundTopCorners: function(el, color, bgColor) {
-      var corner = this._createCorner(bgColor);
-      for(var i=0 ; i < this.options.numSlices ; i++ )
-         corner.appendChild(this._createCornerSlice(color,bgColor,i,"top"));
-      el.style.paddingTop = 0;
-      el.insertBefore(corner,el.firstChild);
-   },
-
-   _roundBottomCorners: function(el, color, bgColor) {
-      var corner = this._createCorner(bgColor);
-      for(var i=(this.options.numSlices-1) ; i >= 0 ; i-- )
-         corner.appendChild(this._createCornerSlice(color,bgColor,i,"bottom"));
-      el.style.paddingBottom = 0;
-      el.appendChild(corner);
-   },
-
-   _createCorner: function(bgColor) {
-      var corner = document.createElement("div");
-      corner.style.backgroundColor = (this._isTransparent() ? "transparent" : bgColor);
-      return corner;
-   },
-
-   _createCornerSlice: function(color,bgColor, n, position) {
-      var slice = document.createElement("span");
-
-      var inStyle = slice.style;
-      inStyle.backgroundColor = color;
-      inStyle.display  = "block";
-      inStyle.height   = "1px";
-      inStyle.overflow = "hidden";
-      inStyle.fontSize = "1px";
-
-      var borderColor = this._borderColor(color,bgColor);
-      if ( this.options.border && n == 0 ) {
-         inStyle.borderTopStyle    = "solid";
-         inStyle.borderTopWidth    = "1px";
-         inStyle.borderLeftWidth   = "0px";
-         inStyle.borderRightWidth  = "0px";
-         inStyle.borderBottomWidth = "0px";
-         inStyle.height            = "0px"; // assumes css compliant box model
-         inStyle.borderColor       = borderColor;
-      }
-      else if(borderColor) {
-         inStyle.borderColor = borderColor;
-         inStyle.borderStyle = "solid";
-         inStyle.borderWidth = "0px 1px";
-      }
-
-      if ( !this.options.compact && (n == (this.options.numSlices-1)) )
-         inStyle.height = "2px";
-
-      this._setMargin(slice, n, position);
-      this._setBorder(slice, n, position);
-      return slice;
-   },
-
-   _setOptions: function(options) {
-      this.options = {
-         corners : "all",
-         color   : "fromElement",
-         bgColor : "fromParent",
-         blend   : true,
-         border  : false,
-         compact : false
-      }
-      Object.extend(this.options, options || {});
-
-      this.options.numSlices = this.options.compact ? 2 : 4;
-      if ( this._isTransparent() )
-         this.options.blend = false;
-   },
-
-   _whichSideTop: function() {
-      if ( this._hasString(this.options.corners, "all", "top") )
-         return "";
-
-      if ( this.options.corners.indexOf("tl") >= 0 && this.options.corners.indexOf("tr") >= 0 )
-         return "";
-
-      if (this.options.corners.indexOf("tl") >= 0)
-         return "left";
-      else if (this.options.corners.indexOf("tr") >= 0)
-          return "right";
-      return "";
-   },
-
-   _whichSideBottom: function() {
-      if ( this._hasString(this.options.corners, "all", "bottom") )
-         return "";
-
-      if ( this.options.corners.indexOf("bl")>=0 && this.options.corners.indexOf("br")>=0 )
-         return "";
-
-      if(this.options.corners.indexOf("bl") >=0)
-         return "left";
-      else if(this.options.corners.indexOf("br")>=0)
-         return "right";
-      return "";
-   },
-
-   _borderColor : function(color,bgColor) {
-      if ( color == "transparent" )
-         return bgColor;
-      else if ( this.options.border )
-         return this.options.border;
-      else if ( this.options.blend )
-         return this._blend( bgColor, color );
-      else
-         return "";
-   },
-
-
-   _setMargin: function(el, n, corners) {
-      var marginSize = this._marginSize(n);
-      var whichSide = corners == "top" ? this._whichSideTop() : this._whichSideBottom();
-
-      if ( whichSide == "left" ) {
-         el.style.marginLeft = marginSize + "px"; el.style.marginRight = "0px";
-      }
-      else if ( whichSide == "right" ) {
-         el.style.marginRight = marginSize + "px"; el.style.marginLeft  = "0px";
-      }
-      else {
-         el.style.marginLeft = marginSize + "px"; el.style.marginRight = marginSize + "px";
-      }
-   },
-
-   _setBorder: function(el,n,corners) {
-      var borderSize = this._borderSize(n);
-      var whichSide = corners == "top" ? this._whichSideTop() : this._whichSideBottom();
-      if ( whichSide == "left" ) {
-         el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = "0px";
-      }
-      else if ( whichSide == "right" ) {
-         el.style.borderRightWidth = borderSize + "px"; el.style.borderLeftWidth  = "0px";
-      }
-      else {
-         el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = borderSize + "px";
-      }
-      if (this.options.border != false)
-        el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = borderSize + "px";
-   },
-
-   _marginSize: function(n) {
-      if ( this._isTransparent() )
-         return 0;
-
-      var marginSizes          = [ 5, 3, 2, 1 ];
-      var blendedMarginSizes   = [ 3, 2, 1, 0 ];
-      var compactMarginSizes   = [ 2, 1 ];
-      var smBlendedMarginSizes = [ 1, 0 ];
-
-      if ( this.options.compact && this.options.blend )
-         return smBlendedMarginSizes[n];
-      else if ( this.options.compact )
-         return compactMarginSizes[n];
-      else if ( this.options.blend )
-         return blendedMarginSizes[n];
-      else
-         return marginSizes[n];
-   },
-
-   _borderSize: function(n) {
-      var transparentBorderSizes = [ 5, 3, 2, 1 ];
-      var blendedBorderSizes     = [ 2, 1, 1, 1 ];
-      var compactBorderSizes     = [ 1, 0 ];
-      var actualBorderSizes      = [ 0, 2, 0, 0 ];
-
-      if ( this.options.compact && (this.options.blend || this._isTransparent()) )
-         return 1;
-      else if ( this.options.compact )
-         return compactBorderSizes[n];
-      else if ( this.options.blend )
-         return blendedBorderSizes[n];
-      else if ( this.options.border )
-         return actualBorderSizes[n];
-      else if ( this._isTransparent() )
-         return transparentBorderSizes[n];
-      return 0;
-   },
-
-   _hasString: function(str) { for(var i=1 ; i<arguments.length ; i++) if (str.indexOf(arguments[i]) >= 0) return true; return false; },
-   _blend: function(c1, c2) { var cc1 = Rico.Color.createFromHex(c1); cc1.blend(Rico.Color.createFromHex(c2)); return cc1; },
-   _background: function(el) { try { return Rico.Color.createColorFromBackground(el).asHex(); } catch(err) { return "#ffffff"; } },
-   _isTransparent: function() { return this.options.color == "transparent"; },
-   _isTopRounded: function() { return this._hasString(this.options.corners, "all", "top", "tl", "tr"); },
-   _isBottomRounded: function() { return this._hasString(this.options.corners, "all", "bottom", "bl", "br"); },
-   _hasSingleTextChild: function(el) { return el.childNodes.length == 1 && el.childNodes[0].nodeType == 3; }
-}
-