express_admin 1.8.1 → 2.0.0.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab62ca548e0883c918f30a5ea5e3745521dec28
-  data.tar.gz: f6a86dbad85d0608eaddf8bbc6fd4b4958e031c9
+  metadata.gz: c9fa4b4791a8a901c9018d9bf93b75ced23dbf02
+  data.tar.gz: 4fb56d2b5d3f7e0724846493d05003ba34d288f9
 SHA512:
-  metadata.gz: f42edaf5acbca1a324aaa1225cd3679f1c96f5eadc14c7fb685315630880a7a62b97b6505c289eb55678ff1b91c9ba4b3adbd85e68f03d6d24e7731496091cf5
-  data.tar.gz: 404a3729821f5e0d908ce0f773a1f48e2831eb10645470c64d29e6533992fc25649a5c71a9ea683aae87d93eecd1375f0dad519b2b2451b94f8c9464c7c6cacf
+  metadata.gz: 3b55bd2b4667162f8811db67232a909142df3b71ba2f0f850f28b1c04c5d01e75337da794096db8503899a9446e50debb46c88b17aeb0e2d9aa7092a1d535d89
+  data.tar.gz: c013542b783ed80b55c5c9ab20d4038b90eb6987cc6e05ed975070c71c9e29e530b5b0066379c873d307cd097df027934cd15c2cab37eb7280bfbf967c630c8f

data/app/assets/stylesheets/express_admin/screen.sass

@@ -1,63 +1,63 @@
-@import 'foundation'
-@import 'select2'
-
-@import 'globals/variables'
-@import 'globals/mixins'
-@import 'globals/typography'
-@import 'globals/foundation_overrides'
-
-@import 'sections/header'
-@import 'sections/main_content'
-@import 'sections/page_sidebar'
-@import 'sections/page_body'
-@import 'sections/main_region'
-@import 'sections/sidebar_region'
-
-@import 'components/main_menu'
-@import 'components/oauth_sign_in_links'
-@import 'components/sub_menu'
-@import 'components/module_sidebar'
-@import 'components/widget_box'
-@import 'components/pane'
-@import 'components/definition'
-@import 'components/v_box'
-@import 'components/h_box'
-@import 'components/smart_table'
-@import 'components/label'
-@import 'components/image'
-@import 'components/filter'
-
-@import 'shared/media_object'
-@import 'shared/breadcrumbs'
-@import 'shared/icons'
-@import 'shared/forms'
-@import 'shared/tables'
-@import 'shared/trees'
-@import 'shared/loading'
-@import 'shared/messages'
-@import 'shared/alerts'
-@import 'shared/progress'
-@import 'shared/buttons'
-
-@import 'components/command_button'
-
-@import 'components/empty_state'
-
-@import 'plugins/select2'
-@import 'plugins/tinymce'
-@import '../ionicons/ionicons'
-
-.generate-subdomain
-  cursor: pointer
-
-.devise-options
-  margin:
-    bottom: 30px
-
-.hidden
-  display: none
-
-#app_subdomain
-
-  &:read-only
-    background-color: #f0f0f0
+// @import 'foundation'
+// @import 'select2'
+
+// @import 'globals/variables'
+// @import 'globals/mixins'
+// @import 'globals/typography'
+// @import 'globals/foundation_overrides'
+
+// @import 'sections/header'
+// @import 'sections/main_content'
+// @import 'sections/page_sidebar'
+// @import 'sections/page_body'
+// @import 'sections/main_region'
+// @import 'sections/sidebar_region'
+
+// @import 'components/main_menu'
+// @import 'components/oauth_sign_in_links'
+// @import 'components/sub_menu'
+// @import 'components/module_sidebar'
+// @import 'components/widget_box'
+// @import 'components/pane'
+// @import 'components/definition'
+// @import 'components/v_box'
+// @import 'components/h_box'
+// @import 'components/smart_table'
+// @import 'components/label'
+// @import 'components/image'
+// @import 'components/filter'
+
+// @import 'shared/media_object'
+// @import 'shared/breadcrumbs'
+// @import 'shared/icons'
+// @import 'shared/forms'
+// @import 'shared/tables'
+// @import 'shared/trees'
+// @import 'shared/loading'
+// @import 'shared/messages'
+// @import 'shared/alerts'
+// @import 'shared/progress'
+// @import 'shared/buttons'
+
+// @import 'components/command_button'
+
+// @import 'components/empty_state'
+
+// @import 'plugins/select2'
+// @import 'plugins/tinymce'
+// @import '../ionicons/ionicons'
+
+// .generate-subdomain
+//   cursor: pointer
+
+// .devise-options
+//   margin:
+//     bottom: 30px
+
+// .hidden
+//   display: none
+
+// #app_subdomain
+
+//   &:read-only
+//     background-color: #f0f0f0

data/app/assets/stylesheets/express_admin/sections/_header.sass

@@ -1,6 +1,6 @@
 .top-bar
   @extend .menu-group
-  @include menu-bar-style($dark-color, $autocolor: true)
+  // @include menu-bar-style($dark-color, $autocolor: true)
   flex-shrink: 0
 
   .nav-logo

data/app/assets/stylesheets/express_admin/sections/_main_content.sass

@@ -1,8 +1,8 @@
 .main-container
-  @include grid-frame($orientation: vertical)
+  // @include grid-frame($orientation: vertical)
 
   > .main-page
-    @include grid-block
+    // @include grid-block
     @include breakpoint(small)
       @include grid-orient(vertical)
     @include breakpoint(medium)

data/lib/express_admin/commandable.rb

@@ -17,20 +17,21 @@ module ExpressAdmin
       scope = mapper.instance_variable_get(:@scope)
 
       while scope.respond_to?(:parent) && scope = scope.parent
-        possible_module = scope.instance_variable_get(:@hash)[:module]
-        break if possible_module.nil?
+        possible_module = scope.instance_variable_get(:@hash).try(:[],:module)
         modules << possible_module
       end
-      modules.compact!
+      modules.uniq!.compact!
       modules << controller_name
 
       controller_class = nil
       begin
-        controller_class = "#{modules.join("/").classify.pluralize}Controller".constantize
+        controller_class_name = "#{modules.join("/").classify.pluralize}Controller"
+        controller_class = controller_class_name.constantize
       rescue NameError => e
         # if plural fails, use singular
         begin
-          controller_class = "#{modules.join("/").classify}Controller".constantize
+          controller_class_name = "#{modules.join("/").classify}Controller"
+          controller_class = controller_class_name.constantize
         rescue NameError => e2
           # if we get here, the first exception wasn't what we thought
           # it was something else and we should politely let the developer know

data/lib/express_admin/engine.rb

@@ -4,11 +4,10 @@ require 'express_admin/standard_actions'
 require 'express_admin/search'
 require 'express_templates'
 require 'jquery-rails'
-require 'jquery-ui-rails'
+# require 'jquery-ui-rails'
 require 'select2-rails'
 require 'dropzonejs-rails'
 require 'sass-rails'
-require 'foundation_apps_styles'
 require 'gravatar_image_tag'
 require 'kaminari'
 require 'responders'

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.8.1"
+  VERSION = "2.0.0.a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 2.0.0.a
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: express_templates
@@ -38,26 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: foundation_apps_styles
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
@@ -138,22 +118,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -182,20 +156,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -573,6 +533,7 @@ files:
 - test/dummy/db/migrate/20150610081204_create_widget_tags.rb
 - test/dummy/db/migrate/20150812073447_create_parts.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -645,12 +606,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: ExpressAdmin provides an admin menu framework based on Foundation.
@@ -712,6 +673,7 @@ test_files:
 - test/dummy/db/migrate/20150610081204_create_widget_tags.rb
 - test/dummy/db/migrate/20150812073447_create_parts.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html