express_admin 1.4.4 → 1.4.5

data/vendor/gems/express_templates/test/handler_test.rb

@@ -121,4 +121,28 @@ class HandlerTest < ActiveSupport::TestCase
     assert_equal "<li>\n#{A_LINK}#{A_LINK}</li>\n", render
   end
 
+  test "raises warning if template has conditional logic" do
+    temp = "dd(class: 'date') {
+          if blog_post.publish_at
+            blog_post.publish_at
+          else
+            link_to('Edit', '#'')
+          end
+        }"
+    keywords = %w(if unless until case for do loop while)
+    tokens = []
+
+    if Ripper.lex(temp).select do |element|
+      element[1]==:on_kw
+    end.each { |match| tokens.push(match) if keywords.include? match[2] }
+      tokens.each do |first|
+       out, @err = capture_io do
+          warn 'foo'
+        end
+      end
+    end
+
+    assert_equal @err, "foo\n"
+  end
+
 end

data/vendor/gems/express_templates/test/test_helper.rb

@@ -44,16 +44,16 @@ end
 
 module ActiveSupport
   class TestCase
-    def arbre(&block)
-      Arbre::Context.new assigns, helpers, &block
+    def arbre(additional_assigns = {}, &block)
+      Arbre::Context.new assigns.merge(additional_assigns), helpers, &block
     end
     def assigns
-      {}
+      @arbre_assigns ||={}
     end
     def helpers
-      mock_action_view(assigns)
+      mock_action_view
     end
-    def mock_action_view(assigns = {})
+    def mock_action_view
       controller = ActionView::TestCase::TestController.new
       ActionView::Base.send :include, ActionView::Helpers
       ActionView::Base.send :include, ActionView::Helpers::UrlHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -313,7 +313,6 @@ files:
 - app/assets/stylesheets/express_admin/components/_empty_state.sass
 - app/assets/stylesheets/express_admin/components/_h_box.sass
 - app/assets/stylesheets/express_admin/components/_main_menu.sass
-- app/assets/stylesheets/express_admin/components/_modals.sass
 - app/assets/stylesheets/express_admin/components/_module_sidebar.sass
 - app/assets/stylesheets/express_admin/components/_pane.sass
 - app/assets/stylesheets/express_admin/components/_sub_menu.sass
@@ -378,6 +377,7 @@ files:
 - app/views/shared/express_admin/_title.html.et
 - config/initializers/gravatar_image_tag.rb
 - config/initializers/request_store_current_user.rb
+- config/initializers/tinymce-rails.rb
 - config/tinymce.yml
 - lib/core_extensions/string_promptify.rb
 - lib/express_admin.rb
@@ -455,8 +455,16 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/test/components/definition_list_test.rb
+- test/dummy/test/components/definition_table_test.rb
+- test/dummy/test/components/flash_messages_test.rb
+- test/dummy/test/components/icon_link_test.rb
+- test/dummy/test/components/icon_test.rb
+- test/dummy/test/components/mega_menu_test.rb
+- test/dummy/test/components/module_sidebar_test.rb
 - 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/demo_controller_test.rb
 - test/dummy/test/fixtures/categories.yml
 - test/dummy/test/fixtures/tags.yml
@@ -503,6 +511,8 @@ files:
 - vendor/gems/express_templates/express_templates-0.9.0.gem
 - vendor/gems/express_templates/express_templates-0.9.1.gem
 - vendor/gems/express_templates/express_templates-0.9.2.gem
+- vendor/gems/express_templates/express_templates-0.9.3.gem
+- vendor/gems/express_templates/express_templates-0.9.4.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
@@ -764,8 +774,16 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
+- test/dummy/test/components/definition_list_test.rb
+- test/dummy/test/components/definition_table_test.rb
+- test/dummy/test/components/flash_messages_test.rb
+- test/dummy/test/components/icon_link_test.rb
+- test/dummy/test/components/icon_test.rb
+- test/dummy/test/components/mega_menu_test.rb
+- test/dummy/test/components/module_sidebar_test.rb
 - 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/demo_controller_test.rb
 - test/dummy/test/fixtures/categories.yml
 - test/dummy/test/fixtures/tags.yml

data/app/assets/stylesheets/express_admin/components/_modals.sass

@@ -1,7 +0,0 @@
-#my-modal
-  @extend modal
-
-.modal-overlay
-  z-index: 10100
-
-