express_admin 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faf9fd31ec56bd2a725c15cfe8b2b902bc9e841b
-  data.tar.gz: 7d118947bdd9dcda591c6aeae958afbf6600bc14
+  metadata.gz: b280b2e1d3c54a158bfc2bad5abcb50004caee39
+  data.tar.gz: ce55f9db93caefa427a01e130b7e380fec00b32b
 SHA512:
-  metadata.gz: 78fd0b1a04e2fa9a3ecfae55300f5644497dc344fe0b3224be6c1e702ea1817be66d1b735d039e1648f2a955c5a5293b09e98f0b8c77c2a60942ea404ea2e796
-  data.tar.gz: 3a2515fe8b7729c1dfebb11955b9e4b7f250806ffa1a1527d6771281aaa51fc1fd3647d24412b9cebbe39e2bd01b51bce019265e15db5fa9ef0c31daf380f8f7
+  metadata.gz: 4108063cc8fc0c5c9641777a053305943647b45094fb91093e780212716d9094a4429928a007819a64ef440b860dbe6ea13ccfd22e9e6a2d2e875750952cc3f9
+  data.tar.gz: 5620cc7ebaf22e52d8cc806c1707a2c9c96380422cf709ebfab16d865927d75962cad87b10477b66aa55f00167977c1e1fe6e01ee603d207ccfccc3448813f5f

data/lib/express_admin/engine.rb

@@ -9,12 +9,12 @@ require 'gravatar_image_tag'
 require 'kaminari'
 require 'responders'
 require 'tinymce-rails'
-require 'inherited_resources'
 
 require File.join(File.dirname(__FILE__), '..', '..', 'app', 'components', 'express_admin', 'definition_list')
 
 # should be a way to add this folder to rails' autoload paths
 components = Dir.glob(File.join(File.dirname(__FILE__), '..', '..', 'app', 'components', '**', '*.rb'))
+components.sort!
 components.each {|component| require component }
 
 module ExpressAdmin

data/lib/express_admin/standard_actions.rb

@@ -98,12 +98,12 @@ module ExpressAdmin
 
       protected
         def resource_path
+          proxy = route_proxy
+          proxy ||= self
           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)
+            proxy.send(scoped_path_helper("#{resource_name}_path"), resource)
           else
-            self.send(scoped_path_helper(nested_resource_path_helper), resource_ids_hash)
+            proxy.send(scoped_path_helper(nested_resource_path_helper), resource_ids_hash)
           end
         end
 
@@ -112,12 +112,12 @@ module ExpressAdmin
         end
 
         def collection_path
+          proxy = route_proxy
+          proxy ||= self
           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)
+            proxy.send(scoped_path_helper("#{collection_name}_path"))
           else
-            self.send(scoped_path_helper(nested_collection_path_helper), resource_ids_hash)
+            proxy.send(scoped_path_helper(nested_collection_path_helper), resource_ids_hash)
           end
         end
 
@@ -224,7 +224,12 @@ module ExpressAdmin
               if previous_parent.nil?
                 self.class_eval do
                   define_method(current_parent) do
-                    "::#{parent_name.capitalize}".constantize.find(parent_id)
+                    parent_class = parent_module_name.constantize
+                    current_class_name = parent_name.capitalize
+                    current_class = parent_class.const_defined?(current_class_name) ?
+                      parent_class.const_get(current_class_name) :
+                      "::#{parent_name.capitalize}".constantize
+                    current_class.find(parent_id)
                   end
                 end
               else

data/lib/express_admin/version.rb

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

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

@@ -36,7 +36,7 @@ module ExpressAdmin
       assert_match /form.*id="widget"/, widget_form
     end
 
-    test "uses inherited_resources path helpers to set correct action" do
+    test "uses StandardController path helpers to set correct action" do
       action_attrib = 'action="/widgets"'
       assert_match action_attrib, widget_form
     end

data/vendor/gems/express_templates/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    express_templates (0.9.5)
+    express_templates (0.9.7)
       activesupport (~> 4.2)
       arbre (~> 1.0)
       parslet (~> 1.6)

data/vendor/gems/express_templates/lib/express_templates/components/capabilities/resourceful.rb

@@ -182,7 +182,8 @@ module ExpressTemplates
               config[:resource_path]
             end
           else
-            if helpers.respond_to?(:resource_path)
+            if helpers.respond_to?(:resource_path) &&
+               helpers.resource.to_param.present? # skip on nil resource
               helpers.resource_path
             else
               if ivar_or_resource.respond_to?(:to_param) &&

data/vendor/gems/express_templates/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/vendor/gems/express_templates/test/dummy/log/test.log

@@ -13504,3 +13504,324 @@ SubmitTest: test_submit_accepts_a_value_and_class_option
 ----------------------------------------------------
 SubmitTest: test_submit_takes_string_param_for_value
 ----------------------------------------------------
+-----------------------------------------------------------------------------
+ConfigurableTest: test_.has_argument_adds_a_positional_configuration_argument
+-----------------------------------------------------------------------------
+----------------------------------------------------------------------------------------
+ConfigurableTest: test_.has_argument_appends_supported_arguments_in_order_of_inheritence
+----------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+ConfigurableTest: test_.has_argument_as:_allows_overwrite_of_inherited_argument
+-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------
+ConfigurableTest: test_.has_argument_makes_builder_arguments_accessible_by_name_according_to_position
+-----------------------------------------------------------------------------------------------------
+---------------------------------------------------
+ConfigurableTest: test_default_values_are_supported
+---------------------------------------------------
+----------------------------------------------------------------------
+ConfigurableTest: test_default_values_for_attributes_can_be_overridden
+----------------------------------------------------------------------
+------------------------------------------------------------------------
+ConfigurableTest: test_does_not_pass_declared_options_as_html_attributes
+------------------------------------------------------------------------
+-----------------------------------------------------------
+ConfigurableTest: test_has_no_id_attribute_if_not_specified
+-----------------------------------------------------------
+--------------------------------------------
+ConfigurableTest: test_options_are_inherited
+--------------------------------------------
+-------------------------------------------------------
+ConfigurableTest: test_renders_first_argument_as_dom_id
+-------------------------------------------------------
+----------------------------------------------------
+ConfigurableTest: test_required_options_are_required
+----------------------------------------------------
+--------------------------------------------------
+ConfigurableTest: test_supports_option_declaration
+--------------------------------------------------
+---------------------------------------------------------------
+ConfigurableTest: test_unrecognized_options_raises_an_exception
+---------------------------------------------------------------
+----------------------------------------------------
+ConfigurableTest: test_values_can_be_set_for_options
+----------------------------------------------------
+------------------------------------------------------------
+TreeForTest: test_tree_for_accepts_block_with_custom_content
+------------------------------------------------------------
+---------------------------------------------------------------------------
+TreeForTest: test_tree_for_renders_correct_markup_with_node.name_as_default
+---------------------------------------------------------------------------
+-----------------------------------------
+HelloControllerTest: test_should_get_show
+-----------------------------------------
+Processing by HelloController#show as HTML
+  Rendered hello/show.html.et within layouts/application (0.8ms)
+Completed 200 OK in 125ms (Views: 125.0ms)
+-----------------------------------------------------------
+RadioTest: test_radio_has_correct_label_field_name_and_text
+-----------------------------------------------------------
+------------------------------------------------------------------
+RadioTest: test_radio_options_from_collection_when_options_omitted
+------------------------------------------------------------------
+----------------------------------------------------------
+RadioTest: test_radio_options_may_be_specified_with_a_hash
+----------------------------------------------------------
+--------------------------------------------------------
+RadioTest: test_radio_options_present_with_class_'radio'
+--------------------------------------------------------
+-------------------------------------------------
+RadioTest: test_radio_requires_a_parent_component
+-------------------------------------------------
+------------------------------------------------------------
+RadioTest: test_radio_throws_error_if_given_improper_options
+------------------------------------------------------------
+------------------------------------------------------------------------------------
+StringTest: test_String#inspect_works_normally_when_#to_view_code_hasn't_been_called
+------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+StringTest: test_String#to_view_code_causes_subsequent_#inspect_to_remove_quotes
+--------------------------------------------------------------------------------
+-------------------------------------------------------
+StringTest: test_String#to_view_code_returns_the_string
+-------------------------------------------------------
+---------------------------------------------------------------------------------------
+BasicFieldsTest: test_adds_error_class_if_there_are_errors_on_a_field_with_no_class_set
+---------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------
+BasicFieldsTest: test_adds_error_class_if_there_are_errors_on_a_field_with_no_input_attributes
+----------------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------
+BasicFieldsTest: test_adds_error_to_class_if_there_are_errors_on_a_field_with_existing_class
+--------------------------------------------------------------------------------------------
+-------------------------------------
+BasicFieldsTest: test_all_fields_work
+-------------------------------------
+---------------------------------------------------------------------------------
+BasicFieldsTest: test_hidden_field_passes_additional_html_options_to_rails_helper
+---------------------------------------------------------------------------------
+---------------------------------------------------------
+BasicFieldsTest: test_hidden_uses_rails_hidden_tag_helper
+---------------------------------------------------------
+---------------------------------------------------------
+BasicFieldsTest: test_passing_html_options_to_fields_work
+---------------------------------------------------------
+-----------------------------------------------------------------------------
+BasicFieldsTest: test_textarea_passes_additional_html_options_to_rails_helper
+-----------------------------------------------------------------------------
+----------------------------------------------------------
+BasicFieldsTest: test_textarea_uses_rails_text_area_helper
+----------------------------------------------------------
+---------------------------------------------------------------------
+ExpressTemplatesTest: test_ExpressTemplates.render_renders_a_template
+---------------------------------------------------------------------
+-------------------------------------------
+ExpressTemplatesTest: test_we_have_a_module
+-------------------------------------------
+--------------------------------------------
+CompilerTest: test_.compile_returns_a_string
+--------------------------------------------
+------------------------------------------------------------------------------------
+InterpolatorTest: test_"{{some_{{thing}}_foo}}"_transforms_to_"#{some_#{thing}_foo}"
+------------------------------------------------------------------------------------
+-------------------------------------------------------------------
+InterpolatorTest: test_"{{something}}"_transforms_to_"#{something}"
+-------------------------------------------------------------------
+---------------------------------------------------------------------
+InterpolatorTest: test_'a_lot_of_{{something_"{{good}}"}}'_transforms
+---------------------------------------------------------------------
+---------------------------------------------------------------------
+InterpolatorTest: test_nested_with_multiple_nested_expressions_parses
+---------------------------------------------------------------------
+----------------------------------------------------
+InterpolatorTest: test_nested_with_outer_text_parses
+----------------------------------------------------
+-------------------------------------------------------
+InterpolatorTest: test_nested_without_outer_text_parses
+-------------------------------------------------------
+---------------------------------------------------------------------
+InterpolatorTest: test_simple_expression_with_surrounding_text_parses
+---------------------------------------------------------------------
+-------------------------------------------------
+InterpolatorTest: test_simplest_expression_parses
+-------------------------------------------------
+-----------------------------------------------------------------------------------------
+ProcTest: test_#source_body_captures_full_body_when_parens_around_parameters_not_provided
+-----------------------------------------------------------------------------------------
+------------------------------------------------
+ProcTest: test_#source_body_handles_funky_bodies
+------------------------------------------------
+----------------------------------------------------------
+ProcTest: test_#source_body_raises_exception_for_arity_>_0
+----------------------------------------------------------
+------------------------------------------------------
+ProcTest: test_#source_body_returns_the_body_of_a_proc
+------------------------------------------------------
+----------------------------------------------
+ProcTest: test_#source_returns_a_proc's_source
+----------------------------------------------
+---------------------------------------------------------------
+ProcTest: test_#source_work_with_a_stabby_lambda_spanning_lines
+---------------------------------------------------------------
+-----------------------------------------------------------------
+ProcTest: test_#source_works_when_a_proc_is_inside_a_hash_literal
+-----------------------------------------------------------------
+------------------------------------------------------------
+ProcTest: test_#source_works_with_a_block_containing_a_block
+------------------------------------------------------------
+--------------------------------------------
+ProcTest: test_#source_works_with_a_do_block
+--------------------------------------------
+-----------------------------------------------------
+ProcTest: test_#source_works_with_a_single_line_block
+-----------------------------------------------------
+-------------------------------------------------
+ProcTest: test_#source_works_with_a_stabby_lambda
+-------------------------------------------------
+----------------------------------------------------------------------------------------
+ProcTest: test_.from_source_stores_source_of_a_dynamicly_built_proc_for_later_inspection
+----------------------------------------------------------------------------------------
+--------------------------------------------------------------
+HandlerTest: test_helpers_returning_html_when_alone_in_a_block
+--------------------------------------------------------------
+------------------------------------------------------------------------
+HandlerTest: test_helpers_returning_html_work_in_sequence_within_a_block
+------------------------------------------------------------------------
+----------------------------------------------------------
+HandlerTest: test_html_generates_<h1>Hello</h1>_by_default
+----------------------------------------------------------
+-----------------------------
+HandlerTest: test_locals_work
+-----------------------------
+------------------------------------------------------------
+HandlerTest: test_nesting_elements_with_ruby_block_structure
+------------------------------------------------------------
+----------------------------------
+HandlerTest: test_other_attributes
+----------------------------------
+-------------------------------------------
+HandlerTest: test_our_handler_is_registered
+-------------------------------------------
+------------------------------------------------------------------
+HandlerTest: test_raises_warning_if_template_has_conditional_logic
+------------------------------------------------------------------
+---------------------------------------
+HandlerTest: test_string_in_block_works
+---------------------------------------
+----------------------------------------------
+SubmitTest: test_submit_accepts_a_class_option
+----------------------------------------------
+--------------------------------------------------------
+SubmitTest: test_submit_accepts_a_value_and_class_option
+--------------------------------------------------------
+----------------------------------------------------
+SubmitTest: test_submit_takes_string_param_for_value
+----------------------------------------------------
+---------------------------------------------------------------
+ExpressFormTest: test_express_form_contents_are_inside_the_form
+---------------------------------------------------------------
+---------------------------------------------------------
+ExpressFormTest: test_express_form_default_method_is_POST
+---------------------------------------------------------
+-----------------------------------------------------
+ExpressFormTest: test_simplest_form_contains_form_tag
+-----------------------------------------------------
+---------------------------------------------------------------
+ExpressFormTest: test_simplest_form_contains_rails_form_helpers
+---------------------------------------------------------------
+---------------------------------------------------
+ExpressFormTest: test_simplest_form_contains_submit
+---------------------------------------------------
+-------------------------------------------
+ExpressFormTest: test_simplest_form_renders
+-------------------------------------------
+-------------------------------------------------------------------
+ExpressFormTest: test_simplest_form_uses_form_action_for_the_action
+-------------------------------------------------------------------
+-----------------------------------------------------------
+ExpressFormTest: test_simplest_form_will_have_the_proper_id
+-----------------------------------------------------------
+-------------------------------------------------------------
+CheckboxTest: test_checkbox_places_the_label_before_the_input
+-------------------------------------------------------------
+-------------------------------------------------------
+CheckboxTest: test_checkbox_respects_label_after:_true_
+-------------------------------------------------------
+-----------------------------------------------------------------
+BaseTest: test_.contains_places_fragment_inside_the_enclosing_tag
+-----------------------------------------------------------------
+---------------------------------------------------------
+BaseTest: test_.has_attributes_creates_default_attributes
+---------------------------------------------------------
+-----------------------------------------------------
+BaseTest: test_.tag_name_determines_the_enclosing_tag
+-----------------------------------------------------
+--------------------------------------------------
+BaseTest: test_before_build_hook_runs_before_build
+--------------------------------------------------
+--------------------------------------------------------------
+BaseTest: test_class_name_is_dasherized_instead_of_underscored
+--------------------------------------------------------------
+-----------------------------------------------------------
+BaseTest: test_class_option_adds_a_class,_does_not_override
+-----------------------------------------------------------
+----------------------------------------------------
+BaseTest: test_options_are_passed_to_html_attributes
+----------------------------------------------------
+----------------------------------------------------------------
+SelectTest: test_select_collection_works_using_collection_select
+----------------------------------------------------------------
+------------------------------------------
+SelectTest: test_select_comes_with_a_label
+------------------------------------------
+--------------------------------------------------
+SelectTest: test_select_defaults_can_be_overridden
+--------------------------------------------------
+-------------------------------------------------------
+SelectTest: test_select_defaults_to_include_blank:_true
+-------------------------------------------------------
+------------------------------------------------------------------------------------
+SelectTest: test_select_generates_correct_options_when_values_are_specified_as_array
+------------------------------------------------------------------------------------
+------------------------------------------------------------------------
+SelectTest: test_select_generates_options_from_data_when_options_omitted
+------------------------------------------------------------------------
+--------------------------------------------------------------
+SelectTest: test_select_multiple:_true_if_passed_multiple_true
+--------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+SelectTest: test_select_multiple_gets_options_from_associated_has_many_through_collection
+-----------------------------------------------------------------------------------------
+---------------------------------------------------
+SelectTest: test_select_requires_a_parent_component
+---------------------------------------------------
+---------------------------------------------------------------------------
+SelectTest: test_select_uses_options_from_collect..._when_field_is_relation
+---------------------------------------------------------------------------
+-------------------------------------------------------------------------
+SelectTest: test_selected_option_is_omitted_selection_is_taken_from_model
+-------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
+ExpressTemplates::ResourcefulTest: test_#resource_class_returns_resource_class_option_if_specified
+--------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+ExpressTemplates::ResourcefulTest: test_infers_a_namespace_and_no_prefix_within_an_engine
+-----------------------------------------------------------------------------------------
+---------------------------------------------------------------------------------------------------
+ExpressTemplates::ResourcefulTest: test_infers_namespace_and_path_prefix_within_an_engine_and_scope
+---------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+ExpressTemplates::ResourcefulTest: test_no_namespace,_infers_prefix_within_a_scope_within_an_app
+------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+ExpressTemplates::ResourcefulTest: test_no_namespace,_no_prefix_within_an_app
+-----------------------------------------------------------------------------
+---------------------------------------------------------------------------------------------
+IndenterTest: test_.for(:name)_returns_current_indent_without_newline_when_block_is_not_given
+---------------------------------------------------------------------------------------------
+-----------------------------------------------------------------
+IndenterTest: test_.for(:name)_takes_a_block_receiving_whitespace
+-----------------------------------------------------------------
+------------------------------------------------------------------
+IndenterTest: test_nesting_blocks_increases_whitespace_accordingly
+------------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -168,20 +168,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: inherited_resources
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -571,6 +557,7 @@ files:
 - vendor/gems/express_templates/express_templates-0.9.4.gem
 - vendor/gems/express_templates/express_templates-0.9.5.gem
 - vendor/gems/express_templates/express_templates-0.9.6.gem
+- vendor/gems/express_templates/express_templates-0.9.7.gem
 - vendor/gems/express_templates/express_templates.gemspec
 - vendor/gems/express_templates/lib/arbre/patches.rb
 - vendor/gems/express_templates/lib/core_extensions/proc.rb