express_admin 1.4.9 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6525904c34f5ec4593ff82f6921c32c4597724
-  data.tar.gz: 15f8843bbad74ad6596e464004067f117442fe10
+  metadata.gz: e25ebe07ee84728e3a8f4acca5974226f02d2f21
+  data.tar.gz: 4a76de8d7ac61d45004c76f75b40e4fb7ed369d3
 SHA512:
-  metadata.gz: 4375c6e115b9e5b04d6d2c8f119f8bf050f784b04faf24918cab2b6e0d5833c901a5f45ad4493d7e5db10822dfacd93b1337e129da4079d275461a28613900a7
-  data.tar.gz: 9ae5e0edf572509570291774144b6afd7ab131c2ae7ffdea694c86a6c6c4c73341894e1e2ce64a263ad0a003a87f67e1fb5432276c17fbc43ff6fc494e13ec4c
+  metadata.gz: 490d110f3e7eaff50d813d3b7b1c7248e758635b1badeef9f44211c09d3efe64a0eb99902408ab67412a086c2bc03d7b3794587474b54eb216ec61342827b420
+  data.tar.gz: 7ad9bbce99efb8503150a6e955d905733da5b14b30eb92a493241e3dc448e92fc3820fde08ceb470ff5a6d279cf7f75a78d2de4f622b2d0dce5b3958ed1df3c5

data/lib/express_admin/standard_actions.rb

@@ -184,7 +184,11 @@ module ExpressAdmin
         end
 
         def build_resource(*args)
-          self.instance_variable_set(resource_ivar, resource_class.new(*args))
+          if nested?
+            self.instance_variable_set(resource_ivar, end_of_association_chain.build(*args))
+          else
+            self.instance_variable_set(resource_ivar, resource_class.new(*args))
+          end
         end
 
         def load_resource

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.4.9"
+  VERSION = "1.4.10"
 end

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

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

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

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+module Admin
+  class CategoriesControllerTest < ActionController::TestCase
+    fixtures :all
+
+    test 'it should properly build and create resources' do
+      post :create, category: {name: 'Songs'}
+
+      category = Category.find_by_name 'Songs'
+      assert_redirected_to admin_category_url category
+
+      response = get :index
+      assert_match /Songs/, response.body
+    end
+  end
+end

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

@@ -4,17 +4,32 @@ module Admin
   class PartsControllerTest < ActionController::TestCase
     fixtures :all
 
+    def setup
+      @toy_category = categories(:toys).to_param
+      @lego_widget = widgets(:one).to_param
+      @some_part = parts(:one).to_param
+    end
+
     test "should get show" do
-      get :show, category_id: categories(:toys).to_param, widget_id: widgets(:one).to_param, id: parts(:one).to_param
+      get :show, category_id: @toy_category, widget_id: @lego_widget, id: @some_part
       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
+      response = get :index, category_id: @toy_category, widget_id: @lego_widget
       assert_response :success
       assert_match /Some part/, response.body
       refute_match /Another part/, response.body
     end
 
+    test "nested resources should build from parent resource" do
+      post :create, category_id: @toy_category, widget_id: @lego_widget, part: {name: 'Yellow'}
+
+      response = get :index, category_id: @toy_category, widget_id: @lego_widget
+      assert_match /Some part/, response.body
+      assert_match /Yellow/, response.body
+      refute_match /Another part/, response.body
+    end
+
   end
 end

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

@@ -4,17 +4,30 @@ module Admin
   class WidgetsControllerTest < ActionController::TestCase
     fixtures :all
 
+    def setup
+      @toy_category = categories(:toys).to_param
+    end
+
     test "should get show" do
-      get :show, category_id: categories(:toys).to_param, id: widgets(:one).to_param
+      get :show, category_id: @toy_category, id: widgets(:one).to_param
       assert_response :success
     end
 
     test "should display the nested index" do
-      response = get :index, category_id: categories(:toys).to_param
+      response = get :index, category_id: @toy_category
       assert_response :success
       assert_match /Lego/, response.body
       refute_match /Hammer/, response.body
     end
 
+    test "nested resources should build from parent resource" do
+      post :create, category_id: @toy_category, widget: {column2: 'Cars'}
+
+      response = get :index, category_id: @toy_category
+      assert_match /Lego/, response.body
+      assert_match /Cars/, response.body
+      refute_match /Hammer/, response.body
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -521,6 +521,7 @@ files:
 - test/dummy/test/components/smart_form_test.rb
 - test/dummy/test/components/smart_table_test.rb
 - test/dummy/test/components/widget_box_test.rb
+- test/dummy/test/controllers/admin/categories_controller_test.rb
 - test/dummy/test/controllers/admin/parts_controller_test.rb
 - test/dummy/test/controllers/admin/widgets_controller_test.rb
 - test/dummy/test/controllers/demo_controller_test.rb
@@ -856,6 +857,7 @@ test_files:
 - test/dummy/test/components/smart_form_test.rb
 - test/dummy/test/components/smart_table_test.rb
 - test/dummy/test/components/widget_box_test.rb
+- test/dummy/test/controllers/admin/categories_controller_test.rb
 - test/dummy/test/controllers/admin/parts_controller_test.rb
 - test/dummy/test/controllers/admin/widgets_controller_test.rb
 - test/dummy/test/controllers/demo_controller_test.rb