express_admin 1.7.27 → 1.7.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1a10bf410c0e2d08756531f963dd722c22b328f
-  data.tar.gz: 15b6feeef65c8452edf48d4d9b60386556b40ebc
+  metadata.gz: b516340a35967fe889a0b444dbcaffba32b37391
+  data.tar.gz: 48d9ed2620e2d914b96341a1270702133964dc83
 SHA512:
-  metadata.gz: e7d81d053ca6c36ef11dd11396fc2c2309c192278377a1f57a838d788d0fa9bcff49ad216743ca944e9be22459c24f5dc8ada0ace2f6e280d667daa72117c83a
-  data.tar.gz: 4c67126e638192e99a320e6bd153d0286c8952dd8e1a6289e4993c6f72efd8c2b17ecb2bc7259a8deda51c620ba185aec44d9aff823ce7fce1ee503429ffac41
+  metadata.gz: 29a40ae6919f23c5b068bfe2a147b1ae556b7f0daddc70397bf3d46c7a56db2e7aed2c048b5af549dd8f172ef9bf08ff66118a19d91f325a8d3adde102d2d844
+  data.tar.gz: 2520ed01ae603ca06d3d83c5ad67844a4df190f2e588698de9ed213f8271cbf6657eada3892be8836987f6b93760baa13c13fb5c900c34b37231b510a52acb39

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 YOURNAME
+Copyright (c) 2014-2016 AELOGICA, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/helpers/express_admin/admin_helper.rb

@@ -74,7 +74,8 @@ module ExpressAdmin
 
     def admin_javascript_and_css_includes(admin_path = nil)
       current_module_path = current_module.to_s.underscore
-      admin_path ||= current_module_path.eql?('admin') ? "admin" : "#{current_module_path}/admin"
+      addon = Gem.loaded_specs[current_module_path]
+      admin_path ||= addon ? "#{current_module_path}/admin" : "admin"
       a = []
       a << stylesheet_link_tag("#{admin_path}")
       a << javascript_include_tag("express_admin", 'data-turbolinks-track' => true)

data/lib/express_admin/menu.rb

@@ -27,11 +27,10 @@ module ExpressAdmin
       @menus ||= {}
       @menus[addon_name.to_sym] ||= begin
         menu_yml_path =
-          if addon_name.eql?('admin')
-            File.join(Rails.root, 'config', 'menu.yml')
+          if addon = Gem.loaded_specs[addon_name]
+            File.join(addon.full_gem_path, 'config', 'menu.yml')
           else
-            addon_path = Gem.loaded_specs[addon_name].full_gem_path if addon_name.to_s.match(/^\w+$/)
-            File.join(addon_path, 'config', 'menu.yml')
+            File.join(Rails.root, 'config', 'menu.yml')
           end
         from(menu_yml_path)
       end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.27"
+  VERSION = "1.7.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.27
+  version: 1.7.28
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: express_templates