express_admin 1.7.32 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7203cd11047e5af24b9b0b5e18712dc795a31b
-  data.tar.gz: d38502cbb43733b0148b3d6a83853fb7ffb473c8
+  metadata.gz: 4a8259fa012044052d609f7a6881237554b0ccdf
+  data.tar.gz: 44f29a68c1ec5dab242ed703807bbb6058a22062
 SHA512:
-  metadata.gz: e8a44e05cf7bec13d68307f375234f18cff805bc37924525e0ccfc0849ade392cca1f06f3ad291a08f9ab50f3eb3631b90d9b6ff2c71a8827674a9e17ebb6315
-  data.tar.gz: 3e20299dc4a5a07c4b6a2d1974404a2202cf59fe66a289844cee901ea4e0acb94a74c4cceee2d7dfa27cd19d3897f68b2972bcd06f7ec90a6db456ae8d2fe7ee
+  metadata.gz: 067926317358129976bb254f20e684c46724d639251b93385099c80f274fae24fe665419949deb9bdfffcecac6298c73e78a32d9f9b14a3ff894a10ff02a76fd
+  data.tar.gz: 0d864ebea27d88057a800508ff14fd50da9a89475454fb2c829d9c6dba38de8dccd9752b587cde35a802459ebf9c40ab93ff8b02886906b3778b8f8488d7572a

data/lib/express_admin/commandable.rb

@@ -29,7 +29,13 @@ module ExpressAdmin
         controller_class = "#{modules.join("/").classify.pluralize}Controller".constantize
       rescue NameError => e
         # if plural fails, use singular
-        controller_class = "#{modules.join("/").classify}Controller".constantize
+        begin
+          controller_class = "#{modules.join("/").classify}Controller".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
+          raise e
+        end
       end
       if controller_class.respond_to?(:resource_class)
         resource_class = controller_class.resource_class

data/lib/express_admin/standard_actions.rb

@@ -87,14 +87,14 @@ module ExpressAdmin
         build_resource
         load_collection
         respond_to do |format|
-          format.html { render index_view, layout: defaults[:layout] }
+          format.html { render index_view, layout: index_layout }
         end
       end
 
       def new
         build_resource
         respond_to do |format|
-          format.html { render new_view, layout: defaults[:layout] }
+          format.html { render new_view, layout: new_layout }
         end
       end
 
@@ -102,11 +102,13 @@ module ExpressAdmin
         build_resource(resource_params)
         if resource.save
           respond_to do |format|
-            format.html { redirect_to resource_path }
+            format.html { redirect_to after_create_path }
+            format.js   { render create_view, status: :created }
           end
         else
           respond_to do |format|
-            format.html { render new_view, layout: defaults[:layout] }
+            format.html { render new_view, layout: new_layout }
+            format.js   { render create_view, status: :unprocessable_entity }
           end
         end
       end
@@ -115,14 +117,14 @@ module ExpressAdmin
         load_resource
         load_collection
         respond_to do |format|
-          format.html { render show_view, layout: defaults[:layout] }
+          format.html { render show_view, layout: show_layout }
         end
       end
 
       def edit
         load_resource
         respond_to do |format|
-          format.html { render edit_view, layout: defaults[:layout] }
+          format.html { render edit_view, layout: edit_layout }
         end
       end
 
@@ -130,11 +132,13 @@ module ExpressAdmin
         load_resource
         if resource.update_attributes(resource_params)
           respond_to do |format|
-            format.html { redirect_to resource_path }
+            format.html { redirect_to after_update_path }
+            format.js   { render update_view, status: :ok }
           end
         else
           respond_to do |format|
-            format.html { render edit_view, layout: defaults[:layout] }
+            format.html { render edit_view, layout: edit_layout }
+            format.js   { render update_view, status: :unprocessable_entity }
           end
         end
       end
@@ -143,12 +147,24 @@ module ExpressAdmin
         load_resource
         resource.destroy!
         respond_to do |format|
-          format.html { redirect_to collection_path }
+          format.html { redirect_to after_destroy_path }
         end
       end
 
       protected
 
+        def after_update_path
+          resource_path
+        end
+
+        def after_create_path
+          resource_path
+        end
+
+        def after_destroy_path
+          collection_path
+        end
+
         def edit_view
           :edit
         end
@@ -165,6 +181,23 @@ module ExpressAdmin
           :index
         end
 
+        def create_view
+          :create
+        end
+
+        def update_view
+          :udpate
+        end
+
+        def default_layout
+          defaults[:layout]
+        end
+
+        alias new_layout default_layout
+        alias edit_layout default_layout
+        alias show_layout default_layout
+        alias index_layout default_layout
+
         def resource_path
           proxy = route_proxy
           proxy ||= self
@@ -334,6 +367,8 @@ module ExpressAdmin
           (parent_resource_names + [collection_name, 'path']).join('_')
         end
 
+        # defines a current_<something> for each parent
+        # resource in a nested resource situation
         def expose_parent_resources
           parent_resources = parent_resource_names
           return if parent_resources.blank?
@@ -345,12 +380,17 @@ module ExpressAdmin
             unless self.methods.include?(current_parent)
               if previous_parent.nil?
                 self.class_eval do
+
                   define_method(current_parent) do
-                    parent_class = parent_module_name.constantize
                     current_class_name = parent_name.camelize
-                    current_class = parent_class.const_defined?(current_class_name) ?
-                      parent_class.const_get(current_class_name) :
-                      "::#{parent_name.camelize}".constantize
+                    parent_module = parent_module_name.constantize rescue nil
+                    current_class =
+                      if parent_module && # try to find the class in the parent module
+                         parent_module.const_defined?(current_class_name)
+                        parent_module.const_get(current_class_name)
+                      else
+                        "::#{current_class_name.camelize}".constantize
+                      end
                     current_class.find(parent_id)
                   end
                 end
@@ -378,8 +418,17 @@ module ExpressAdmin
           end
         end
 
-        def extract_path_info_from_routes
-          recognized_path = nil
+        def extract_path_info_from_application_routes
+          begin
+            recognized_path = Rails.application.routes.recognize_path(request.path)
+          rescue ActionController::RoutingError => e
+          end
+        end
+
+        # TODO:  to accurately reproduce the fall through matching
+        # we need to do this in order of mounting within the
+        # application routes.
+        def extract_path_info_from_engine_routes
           Rails::Engine.subclasses.each do |engine|
             engine_instance = engine.instance
             engine_route = Rails.application.routes.routes.find do |r|
@@ -392,13 +441,11 @@ module ExpressAdmin
             rescue ActionController::RoutingError => e
             end
           end
-          if recognized_path.nil?
-            begin
-              recognized_path = Rails.application.routes.recognize_path(request.path)
-            rescue ActionController::RoutingError => e
-            end
-          end
-          recognized_path
+        end
+
+        def extract_path_info_from_routes
+          extract_path_info_from_application_routes ||
+          extract_path_info_from_engine_routes
         end
 
         def resource_ids_hash

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.32"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.32
+  version: 1.8.0
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: express_templates
@@ -760,3 +760,4 @@ test_files:
 - test/lib/generators/express_admin/scaffold_generator_test.rb
 - test/support/test_menu.yml
 - test/test_helper.rb
+has_rdoc: