express_admin 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d6a3fea68da45a25497be729e3f4122d3073ec
-  data.tar.gz: 1ffe48826b7a7a330a6adf849bcfd92b20562de0
+  metadata.gz: faf9fd31ec56bd2a725c15cfe8b2b902bc9e841b
+  data.tar.gz: 7d118947bdd9dcda591c6aeae958afbf6600bc14
 SHA512:
-  metadata.gz: 5de456daa50c148a1eff7f6119f3edb0213589fb4111ae344fd9e70b9630c436a51d0c9cfa2b068ab7576beb8873b7f4ae0b2276fbfee9469144853646910961
-  data.tar.gz: 7c543198ff8aabf901bc459cb48bde95afede6f011e3c4507e7e6936daf74ce68ccd995e83ae1658470ed470eea30fcf8bbd42cc337835f4b0eff1422ce81d08
+  metadata.gz: 78fd0b1a04e2fa9a3ecfae55300f5644497dc344fe0b3224be6c1e702ea1817be66d1b735d039e1648f2a955c5a5293b09e98f0b8c77c2a60942ea404ea2e796
+  data.tar.gz: 3a2515fe8b7729c1dfebb11955b9e4b7f250806ffa1a1527d6771281aaa51fc1fd3647d24412b9cebbe39e2bd01b51bce019265e15db5fa9ef0c31daf380f8f7

data/app/components/express_admin/nav_bar_actions.rb

@@ -0,0 +1,7 @@
+module ExpressAdmin
+  class NavBarActions < ExpressTemplates::Components::Base
+    contains -> {
+      render(partial: 'shared/nav_bar_actions') rescue nil
+    }
+  end
+end

data/app/views/shared/express_admin/_navigation_bar.html.et

@@ -10,7 +10,7 @@ nav(class: 'top-bar') {
       li {
         icon_link("android-open", text: 'View Site', href: '/', target: '_blank')
       }
-      render(partial: 'shared/nav_bar_actions')
+      nav_bar_actions
       li { flash_messages } unless helpers.flash.empty?
     }
   }

data/lib/express_admin/standard_actions.rb

@@ -7,9 +7,13 @@ module ExpressAdmin
         include InstanceMethods
         helper_method :collection
         helper_method :resource
+        helper_method :resource_path
+        helper_method :collection_path
 
         class_attribute :defaults
         self.defaults = {layout: 'layouts/express_admin/admin'}
+
+        before_filter :expose_parent_resources
       end
     end
 
@@ -94,14 +98,48 @@ module ExpressAdmin
 
       protected
         def resource_path
-          namespace_route_proxy.send("#{resource_name}_path", resource)
+          if parent_resource_names.blank?
+            self.send(scoped_path_helper("#{resource_name}_path"), resource)
+          elsif proxy = route_proxy
+            proxy.send(scoped_path_helper(nested_resource_path_helper), resource_ids_hash)
+          else
+            self.send(scoped_path_helper(nested_resource_path_helper), resource_ids_hash)
+          end
+        end
+
+        def scoped_path_helper(path_helper)
+          [scope_name, path_helper].compact.join('_')
+        end
+
+        def collection_path
+          if parent_resource_names.blank?
+            self.send(scoped_path_helper("#{collection_name}_path"), resource)
+          elsif proxy = route_proxy
+            proxy.send(scoped_path_helper(nested_collection_path_helper), resource_ids_hash)
+          else
+            self.send(scoped_path_helper(nested_collection_path_helper), resource_ids_hash)
+          end
+        end
+
+        def parent_module_name
+          self.class.to_s.match(/(\w+)::/).try(:[], 1)
         end
 
-        def namespace_route_proxy
-          if parent_namespace = self.class.to_s.match(/(\w+)::/).try(:[], 1)
-            self.send(parent_namespace.underscore)
+        def route_proxy
+          engine = "#{parent_module_name}::Engine".constantize rescue nil
+          if parent_module_name && engine
+            self.send(parent_module_name.underscore)
           else
-            self
+            nil
+          end
+        end
+
+        def scope_name
+          engine = "#{parent_module_name}::Engine".constantize rescue nil
+          if parent_module_name && engine.nil?
+            return parent_module_name.underscore
+          else
+            nil
           end
         end
 
@@ -109,8 +147,24 @@ module ExpressAdmin
           self.send("#{resource_name}_params")
         end
 
+        def nested?
+          !parent_resource_names.empty?
+        end
+
+        def parent_resource
+          self.send("current_#{parent_resource_names.last}")
+        end
+
+        def end_of_association_chain
+          if nested?
+            parent_resource.send(resource_name.pluralize)
+          else
+            resource_class
+          end
+        end
+
         def load_collection
-          self.instance_variable_set(collection_ivar, resource_class.all)
+          self.instance_variable_set(collection_ivar, end_of_association_chain.all)
         end
 
         def collection_ivar
@@ -149,7 +203,84 @@ module ExpressAdmin
         def resource_name
           self.class.resource_name
         end
-      end
 
+        def nested_resource_path_helper
+          (parent_resource_names + [resource_name, 'path']).join('_')
+        end
+
+        def nested_collection_path_helper
+          (parent_resource_names + [collection_name, 'path']).join('_')
+        end
+
+        def expose_parent_resources
+          parent_resources = parent_resource_names
+          return if parent_resources.blank?
+          previous_parent = nil
+          parent_resources.each do |parent_name|
+            # TODO: optimize
+            parent_id = extract_path_info_from_routes["#{parent_name}_id".to_sym]
+            current_parent = "current_#{parent_name}".to_sym
+            unless self.respond_to?(current_parent)
+              if previous_parent.nil?
+                self.class_eval do
+                  define_method(current_parent) do
+                    "::#{parent_name.capitalize}".constantize.find(parent_id)
+                  end
+                end
+              else
+                self.class_eval do
+                  grandparent_accessor = previous_parent
+                  define_method(current_parent) do
+                    grandparent_resource = self.send(grandparent_accessor)
+                    parent_scope = grandparent_resource.send(parent_name.pluralize)
+                    parent_scope.find(parent_id)
+                  end
+                end
+              end
+            end
+            previous_parent = current_parent
+          end
+        end
+
+        def parent_resource_names
+          path_info = extract_path_info_from_routes
+          unless path_info.nil?
+            path_info.keys.grep(/_id$/).map do |id|
+              id.to_s.gsub(/_id$/, '')
+            end
+          end
+        end
+
+        def extract_path_info_from_routes
+          recognized_path = nil
+          Rails::Engine.subclasses.each do |engine|
+            engine_instance = engine.instance
+            engine_route = Rails.application.routes.routes.find do |r|
+              r.app.app == engine_instance.class
+            end
+            next unless engine_route
+            path_for_engine = request.path.gsub(%r(^#{engine_route.path.spec.to_s}), "")
+            begin
+              recognized_path = engine_instance.routes.recognize_path(path_for_engine, method: request.method)
+            rescue ActionController::RoutingError => e
+            end
+          end
+          if recognized_path.nil?
+            begin
+              recognized_path = Rails.application.routes.recognize_path(request.path, method: request.method)
+            rescue ActionController::RoutingError => e
+            end
+          end
+          recognized_path
+        end
+
+        def resource_ids_hash
+          parent_resource_names.inject({id: resource.to_param}) do |hash, name|
+            hash["#{name}_id".to_sym] = self.send("current_#{name}".to_sym).to_param
+            hash
+          end
+        end
+
+    end
   end
-end
+end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

data/test/controllers/standard_controller_test.rb

@@ -8,6 +8,9 @@ module ExpressAdmin
       def resource_class
         Widget
       end
+      def parent_resource_names
+        [] # skip nested resource handling
+      end
     end
 
     def widgets_controller(params = {})
@@ -88,10 +91,21 @@ module ExpressAdmin
       end
     end
 
-    # test "it should provide collection and resource helpers"
+    test "it should provide collection and resource helpers" do
+      controller = widgets_controller
+      controller.index
+      assert controller.send(:collection).respond_to?(:count), "collection not provided by #index"
+      assert controller.send(:resource), "resource not provided by #index"
+    end
 
-    # test "it should provide a default strong params"
+    test "it should provide a default strong params" do
+      assert_raises(ActionController::ParameterMissing) do
+        widgets_controller.create
+      end
+      widgets_controller(widget: {column2: 'nothing'}).create
+    end
 
+    # TODO: Implement later
     # test "for nested resources it should try to expose a current method for parent resources"
   end
-end
+end

data/test/dummy/app/controllers/admin/categories_controller.rb

@@ -1,12 +1,11 @@
 module Admin
-  class CategoriesController < AdminController
+  class CategoriesController < ExpressAdmin::StandardController
 
-    defaults resource_class: Category
+    protected
 
-    private
-
-      def category_params
-        params.require(:category).permit!
+      def resource_class
+        ::Category
       end
+
   end
 end

data/test/dummy/app/controllers/admin/parts_controller.rb

@@ -0,0 +1,11 @@
+module Admin
+  class PartsController < ExpressAdmin::StandardController
+
+    protected
+
+      def resource_class
+        ::Part
+      end
+
+  end
+end

data/test/dummy/app/controllers/admin/widgets_controller.rb

@@ -1,12 +1,11 @@
 module Admin
-  class WidgetsController < AdminController
+  class WidgetsController < ExpressAdmin::StandardController
 
-    defaults resource_class: Widget
+    protected
 
-    private
-
-      def widget_params
-        params.require(:widget).permit!
+      def resource_class
+        ::Widget
       end
+
   end
 end

data/test/dummy/app/models/part.rb

@@ -0,0 +1,3 @@
+class Part < ActiveRecord::Base
+  belongs_to :widget
+end

data/test/dummy/app/models/widget.rb

@@ -3,5 +3,6 @@ class Widget < ActiveRecord::Base
 
   has_many :widget_tags, inverse_of: :widget
   has_many :tags, through: :widget_tags
+  has_many :parts
 
 end

data/test/dummy/app/views/admin/parts/index.html.et

@@ -0,0 +1,8 @@
+main_region {
+  smart_table(:parts)
+}
+sidebar_region {
+  widget_box(:part) {
+    smart_form(:part, only: [:name])
+  }
+}

data/test/dummy/app/views/admin/parts/show.html.et

@@ -0,0 +1,3 @@
+main_region {
+  smart_form(:part, only: [:name])
+}

data/test/dummy/app/views/admin/widgets/index.html.et

@@ -1,10 +1,8 @@
-row {
-  main_region {
-    smart_table(:widgets, show_on_click: true)
-  }
-  sidebar_region {
-    widget_box(:widget) {
-      smart_form(:widget)
-    }
+main_region {
+  smart_table(:widgets)
+}
+sidebar_region {
+  widget_box(:widget) {
+    smart_form(:widget)
   }
 }

data/test/dummy/app/views/admin/widgets/show.html.et

@@ -0,0 +1,3 @@
+main_region {
+  smart_form(:widget)
+}

data/test/dummy/config/menu.yml

@@ -0,0 +1,2 @@
+title: 'Express Widget'
+path: 'admin_widgets_path'

data/test/dummy/config/routes.rb

@@ -1,7 +1,12 @@
 Rails.application.routes.draw do
 
   namespace :admin do
-    resources :categories
+    resources :categories do
+      resources :widgets do
+        resources :parts
+      end
+    end
+
     resources :widgets
   end
 

data/test/dummy/db/migrate/20150812073447_create_parts.rb

@@ -0,0 +1,10 @@
+class CreateParts < ActiveRecord::Migration
+  def change
+    create_table :parts do |t|
+      t.string :name
+      t.integer :widget_id
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150610081204) do
+ActiveRecord::Schema.define(version: 20150812073447) do
 
   create_table "categories", force: :cascade do |t|
     t.string   "name"
@@ -19,6 +19,13 @@ ActiveRecord::Schema.define(version: 20150610081204) do
     t.datetime "updated_at", null: false
   end
 
+  create_table "parts", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "widget_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "tags", force: :cascade do |t|
     t.string "name"
   end

data/test/dummy/test/components/smart_form_test.rb

@@ -87,11 +87,6 @@ module ExpressAdmin
       assert_match /<div class="[^"]*field-wrapper"/, widget_form
     end
 
-    test 'path prefix is provided' do
-      action_attrib = 'action="/admin/widgets"'
-      assert_match action_attrib, widget_form(path_prefix: 'admin')
-    end
-
     test "options for select come from the related collection" do
       assert_match /<option.*>Toys<\/option>/, widget_form
       assert_match /<option.*>Tools<\/option>/, widget_form

data/test/dummy/test/components/smart_table_test.rb

@@ -15,7 +15,6 @@ module Components
         def widget_path(widget_id)
           "/widgets/#{widget_id.to_param}"
         end
-        alias resource_path widget_path
       end
       view
     end

data/test/dummy/test/controllers/admin/parts_controller_test.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+
+module Admin
+  class PartsControllerTest < ActionController::TestCase
+    fixtures :all
+
+    test "should get show" do
+      get :show, category_id: categories(:toys).to_param, widget_id: widgets(:one).to_param, id: parts(:one).to_param
+      assert_response :success
+    end
+
+    test "should display the nested index" do
+      response = get :index, category_id: categories(:toys).to_param, widget_id: widgets(:one).to_param
+      assert_response :success
+      assert_match /Some part/, response.body
+      refute_match /Another part/, response.body
+    end
+
+  end
+end