activeadmin-rb 1.4.0 → 1.5.0

data/spec/unit/resource_controller/data_access_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
 
       it "reorders chain" do
         chain = double "ChainObj"
-        expect(chain).to receive(:reorder).with('"posts"."id" asc').once.and_return(Post.search)
+        expect(chain).to receive(:reorder).with('"posts"."id" asc').once.and_return(Post.ransack)
         controller.send :apply_sorting, chain
       end
     end
@@ -86,7 +86,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
         let(:http_params) {{ order: "published_date_desc" }}
         it "reorders chain" do
           chain = double "ChainObj"
-          expect(chain).to receive(:reorder).with('"posts"."published_date" desc NULLS LAST').once.and_return(Post.search)
+          expect(chain).to receive(:reorder).with('"posts"."published_date" desc NULLS LAST').once.and_return(Post.ransack)
           controller.send :apply_sorting, chain
         end
       end
@@ -94,7 +94,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
         let(:http_params) {{ order: "published_date_asc" }}
         it "reorders chain" do
           chain = double "ChainObj"
-          expect(chain).to receive(:reorder).with('"posts"."published_date" asc').once.and_return(Post.search)
+          expect(chain).to receive(:reorder).with('"posts"."published_date" asc').once.and_return(Post.ransack)
           controller.send :apply_sorting, chain
         end
       end

data/spec/unit/routing_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe ActiveAdmin, "Routing", type: :routing do
+RSpec.describe "Routing", type: :routing do
 
   before do
     load_defaults!

data/spec/unit/view_helpers/flash_helper_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe ActiveAdmin::ViewHelpers::FlashHelper do
 
   describe '.flash_messages' do
-    let(:view) { action_view }
+    let(:view) { mock_action_view }
 
     it "should not include 'timedout' flash messages by default" do
       view.request.flash[:alert] = "Alert"

data/spec/unit/view_helpers/form_helper_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe ActiveAdmin::ViewHelpers::FormHelper do
 
   describe '.active_admin_form_for' do
-    let(:view) { action_view }
+    let(:view) { mock_action_view }
     let(:resource) { double 'resource' }
     let(:default_options) { { builder: ActiveAdmin::FormBuilder } }
 
@@ -22,7 +22,7 @@ RSpec.describe ActiveAdmin::ViewHelpers::FormHelper do
   end
 
   describe ".hidden_field_tags_for" do
-    let(:view) { action_view }
+    let(:view) { mock_action_view }
 
     it "should render hidden field tags for params" do
       html = Capybara.string view.hidden_field_tags_for(ActionController::Parameters.new(scope: "All", filter: "None"))

data/spec/unit/views/components/attributes_table_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe ActiveAdmin::Views::AttributesTable do
 
   describe "creating with the dsl" do
-    let(:helpers) { action_view }
+    let(:helpers) { mock_action_view }
 
     let(:post) do
       post = Post.new title: "Hello World", body: nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-rb
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -115,9 +129,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,9 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -258,6 +266,7 @@ files:
 - app/views/active_admin/devise/passwords/new.html.erb
 - app/views/active_admin/devise/registrations/new.html.erb
 - app/views/active_admin/devise/sessions/new.html.erb
+- app/views/active_admin/devise/shared/_error_messages.html.erb
 - app/views/active_admin/devise/shared/_links.erb
 - app/views/active_admin/devise/unlocks/new.html.erb
 - app/views/active_admin/page/index.html.arb
@@ -452,6 +461,7 @@ files:
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
 - gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
 - lib/active_admin.rb
 - lib/active_admin/abstract_view_factory.rb
 - lib/active_admin/application.rb
@@ -763,31 +773,6 @@ files:
 - tasks/local.rake
 - tasks/parallel_tests.rake
 - tasks/test.rake
-- vendor/assets/javascripts/jquery-ui/data.js
-- vendor/assets/javascripts/jquery-ui/disable-selection.js
-- vendor/assets/javascripts/jquery-ui/escape-selector.js
-- vendor/assets/javascripts/jquery-ui/focusable.js
-- vendor/assets/javascripts/jquery-ui/ie.js
-- vendor/assets/javascripts/jquery-ui/keycode.js
-- vendor/assets/javascripts/jquery-ui/plugin.js
-- vendor/assets/javascripts/jquery-ui/position.js
-- vendor/assets/javascripts/jquery-ui/safe-active-element.js
-- vendor/assets/javascripts/jquery-ui/safe-blur.js
-- vendor/assets/javascripts/jquery-ui/scroll-parent.js
-- vendor/assets/javascripts/jquery-ui/tabbable.js
-- vendor/assets/javascripts/jquery-ui/unique-id.js
-- vendor/assets/javascripts/jquery-ui/version.js
-- vendor/assets/javascripts/jquery-ui/widget.js
-- vendor/assets/javascripts/jquery-ui/widgets/button.js
-- vendor/assets/javascripts/jquery-ui/widgets/checkboxradio.js
-- vendor/assets/javascripts/jquery-ui/widgets/controlgroup.js
-- vendor/assets/javascripts/jquery-ui/widgets/datepicker.js
-- vendor/assets/javascripts/jquery-ui/widgets/dialog.js
-- vendor/assets/javascripts/jquery-ui/widgets/draggable.js
-- vendor/assets/javascripts/jquery-ui/widgets/mouse.js
-- vendor/assets/javascripts/jquery-ui/widgets/resizable.js
-- vendor/assets/javascripts/jquery-ui/widgets/sortable.js
-- vendor/assets/javascripts/jquery-ui/widgets/tabs.js
 - vendor/assets/stylesheets/active_admin/_normalize.scss
 homepage: http://activeadmin.info
 licenses:
@@ -801,15 +786,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The administration framework for Ruby on Rails.

data/vendor/assets/javascripts/jquery-ui/data.js

@@ -1,41 +0,0 @@
-//= require jquery-ui/version
-
-/*!
- * jQuery UI :data 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: :data Selector
-//>>group: Core
-//>>description: Selects elements which have data stored under the specified key.
-//>>docs: http://api.jqueryui.com/data-selector/
-
-( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery", "./version" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-} ( function( $ ) {
-return $.extend( $.expr[ ":" ], {
-	data: $.expr.createPseudo ?
-		$.expr.createPseudo( function( dataName ) {
-			return function( elem ) {
-				return !!$.data( elem, dataName );
-			};
-		} ) :
-
-		// Support: jQuery <1.8
-		function( elem, i, match ) {
-			return !!$.data( elem, match[ 3 ] );
-		}
-} );
-} ) );

data/vendor/assets/javascripts/jquery-ui/disable-selection.js

@@ -1,48 +0,0 @@
-//= require jquery-ui/version
-
-/*!
- * jQuery UI Disable Selection 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: disableSelection
-//>>group: Core
-//>>description: Disable selection of text content within the set of matched elements.
-//>>docs: http://api.jqueryui.com/disableSelection/
-
-// This file is deprecated
-( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery", "./version" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-} ( function( $ ) {
-
-return $.fn.extend( {
-	disableSelection: ( function() {
-		var eventType = "onselectstart" in document.createElement( "div" ) ?
-			"selectstart" :
-			"mousedown";
-
-		return function() {
-			return this.on( eventType + ".ui-disableSelection", function( event ) {
-				event.preventDefault();
-			} );
-		};
-	} )(),
-
-	enableSelection: function() {
-		return this.off( ".ui-disableSelection" );
-	}
-} );
-
-} ) );

data/vendor/assets/javascripts/jquery-ui/escape-selector.js

@@ -1,23 +0,0 @@
-//= require jquery-ui/version
-
-( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery", "./version" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-} ( function( $ ) {
-
-// Internal use only
-return $.ui.escapeSelector = ( function() {
-	var selectorEscape = /([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;
-	return function( selector ) {
-		return selector.replace( selectorEscape, "\\$1" );
-	};
-} )();
-
-} ) );

data/vendor/assets/javascripts/jquery-ui/focusable.js

@@ -1,86 +0,0 @@
-//= require jquery-ui/version
-
-/*!
- * jQuery UI Focusable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: :focusable Selector
-//>>group: Core
-//>>description: Selects elements which can be focused.
-//>>docs: http://api.jqueryui.com/focusable-selector/
-
-( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery", "./version" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-} ( function( $ ) {
-
-// Selectors
-$.ui.focusable = function( element, hasTabindex ) {
-	var map, mapName, img, focusableIfVisible, fieldset,
-		nodeName = element.nodeName.toLowerCase();
-
-	if ( "area" === nodeName ) {
-		map = element.parentNode;
-		mapName = map.name;
-		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
-			return false;
-		}
-		img = $( "img[usemap='#" + mapName + "']" );
-		return img.length > 0 && img.is( ":visible" );
-	}
-
-	if ( /^(input|select|textarea|button|object)$/.test( nodeName ) ) {
-		focusableIfVisible = !element.disabled;
-
-		if ( focusableIfVisible ) {
-
-			// Form controls within a disabled fieldset are disabled.
-			// However, controls within the fieldset's legend do not get disabled.
-			// Since controls generally aren't placed inside legends, we skip
-			// this portion of the check.
-			fieldset = $( element ).closest( "fieldset" )[ 0 ];
-			if ( fieldset ) {
-				focusableIfVisible = !fieldset.disabled;
-			}
-		}
-	} else if ( "a" === nodeName ) {
-		focusableIfVisible = element.href || hasTabindex;
-	} else {
-		focusableIfVisible = hasTabindex;
-	}
-
-	return focusableIfVisible && $( element ).is( ":visible" ) && visible( $( element ) );
-};
-
-// Support: IE 8 only
-// IE 8 doesn't resolve inherit to visible/hidden for computed values
-function visible( element ) {
-	var visibility = element.css( "visibility" );
-	while ( visibility === "inherit" ) {
-		element = element.parent();
-		visibility = element.css( "visibility" );
-	}
-	return visibility !== "hidden";
-}
-
-$.extend( $.expr[ ":" ], {
-	focusable: function( element ) {
-		return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );
-	}
-} );
-
-return $.ui.focusable;
-
-} ) );

data/vendor/assets/javascripts/jquery-ui/ie.js

@@ -1,17 +0,0 @@
-//= require jquery-ui/version
-
-( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery", "./version" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-} ( function( $ ) {
-
-// This file is deprecated
-return $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
-} ) );

data/vendor/assets/javascripts/jquery-ui/keycode.js

@@ -1,47 +0,0 @@
-//= require jquery-ui/version
-
-/*!
- * jQuery UI Keycode 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Keycode
-//>>group: Core
-//>>description: Provide keycodes as keynames
-//>>docs: http://api.jqueryui.com/jQuery.ui.keyCode/
-
-( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery", "./version" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-} ( function( $ ) {
-return $.ui.keyCode = {
-	BACKSPACE: 8,
-	COMMA: 188,
-	DELETE: 46,
-	DOWN: 40,
-	END: 35,
-	ENTER: 13,
-	ESCAPE: 27,
-	HOME: 36,
-	LEFT: 37,
-	PAGE_DOWN: 34,
-	PAGE_UP: 33,
-	PERIOD: 190,
-	RIGHT: 39,
-	SPACE: 32,
-	TAB: 9,
-	UP: 38
-};
-
-} ) );