express_admin 1.6.4 → 1.6.7

data/test/test_helper.rb

@@ -75,5 +75,13 @@ module ActiveSupport
       eigenklass.class_eval &block unless block.nil?
       view
     end
+
+    def resource
+      @resource ||= OpenStruct.new(
+      id: 123,
+      name: 'header',
+      content: 'This is a header')
+    end
+
   end
 end

data/vendor/gems/express_templates/express_templates.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", "~> 4.2" # strictly speaking we only depend on active support
   s.add_dependency "parslet", "~> 1.6"
   s.add_dependency "arbre", "~> 1.0"
-  s.add_dependency "countries"
 
   s.add_development_dependency "rails", "~> 4.2"
   s.add_development_dependency "pry", "~> 0"

data/vendor/gems/express_templates/lib/express_templates/components/base.rb

@@ -17,6 +17,35 @@ module ExpressTemplates
 
       class_attribute :builder_method_name
 
+      # mark a component as abstract ie. can't be used
+      # in Express Designer
+      #
+      @is_abstract = false
+
+      def self.abstract_component(value = true)
+        @is_abstract = value
+      end
+
+      def self.abstract_component?
+        @is_abstract
+      end
+
+      abstract_component
+
+      # define the parent componennt ie. can't be used
+      # in Express Designer unless parent is present
+      #
+      @parent_component = nil
+
+      def self.require_parent(component)
+        raise "must pass a sublcass of ExpressTemplates::Components::Base" if !component.kind_of? ExpressTemplates::Components::Base
+        @parent_component = component
+      end
+
+      def self.required_parent
+        @parent_component
+      end
+
       def self.builder_method_and_class(method_name, klass)
         Arbre::Element::BuilderMethods.class_eval <<-EOF, __FILE__, __LINE__
           def #{method_name}(*args, &block)

data/vendor/gems/express_templates/lib/express_templates/components/configurable.rb

@@ -27,6 +27,8 @@ module ExpressTemplates
     #
     class Configurable < Base
 
+      abstract_component
+
       class_attribute :supported_options
       self.supported_options = {}
 
@@ -176,4 +178,4 @@ module ExpressTemplates
 
     end
   end
-end
+end

data/vendor/gems/express_templates/lib/express_templates/components/container.rb

@@ -2,6 +2,8 @@ module ExpressTemplates
   module Components
     class Container < Configurable
 
+      abstract_component
+
       class_attribute :prepended_blocks
       self.prepended_blocks = []
 
@@ -40,4 +42,4 @@ module ExpressTemplates
 
     end
   end
-end
+end

data/vendor/gems/express_templates/lib/express_templates/components/forms.rb

@@ -10,7 +10,6 @@ require 'express_templates/components/forms/form_component'
 require 'express_templates/components/forms/option_support'
 require 'express_templates/components/forms/submit'
 require 'express_templates/components/forms/select'
-require 'express_templates/components/forms/country_select'
 require 'express_templates/components/forms/select_collection'
 require 'express_templates/components/forms/radio'
 require 'express_templates/components/forms/checkbox'

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

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.11.2"
+  VERSION = "0.11.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.7
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -124,14 +124,14 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -224,6 +224,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-validation-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -357,6 +385,7 @@ files:
 - app/assets/fonts/ionicons.woff
 - app/assets/images/express_admin/appexpress_logo_dark.png
 - app/assets/javascripts/ace/ace.js
+- app/assets/javascripts/ace/mode-html.js
 - app/assets/javascripts/ace/mode-ruby.js
 - app/assets/javascripts/ace/theme-github.js
 - app/assets/javascripts/ace/worker-html.js
@@ -364,6 +393,7 @@ files:
 - app/assets/javascripts/express_admin/admin.js.coffee
 - app/assets/javascripts/express_admin/dataTables/dataTables.foundation.js
 - app/assets/javascripts/express_admin/dataTables/jquery.dataTables.js
+- app/assets/javascripts/express_admin/form_validation.js.coffee
 - app/assets/javascripts/express_admin/scrollTableBody.js
 - app/assets/javascripts/express_admin/sub_menu.js
 - app/assets/javascripts/express_admin/utility.js
@@ -409,8 +439,10 @@ files:
 - app/assets/stylesheets/express_admin/shared/_trees.sass
 - app/assets/stylesheets/express_admin/shared/_widgets.sass
 - app/assets/stylesheets/ionicons/ionicons.scss
+- app/components/express_admin/code_editor.rb
 - app/components/express_admin/command_button.rb
 - app/components/express_admin/command_button_list.rb
+- app/components/express_admin/country_select.rb
 - app/components/express_admin/definition_list.rb
 - app/components/express_admin/definition_table.rb
 - app/components/express_admin/flash_messages.rb
@@ -534,7 +566,9 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/test/components/code_editor_test.rb
 - test/dummy/test/components/command_button_test.rb
+- test/dummy/test/components/country_select_test.rb
 - test/dummy/test/components/definition_list_test.rb
 - test/dummy/test/components/definition_table_test.rb
 - test/dummy/test/components/flash_messages_test.rb
@@ -606,7 +640,6 @@ files:
 - vendor/gems/express_templates/lib/express_templates/components/forms.rb
 - vendor/gems/express_templates/lib/express_templates/components/forms/basic_fields.rb
 - vendor/gems/express_templates/lib/express_templates/components/forms/checkbox.rb
-- vendor/gems/express_templates/lib/express_templates/components/forms/country_select.rb
 - vendor/gems/express_templates/lib/express_templates/components/forms/express_form.rb
 - vendor/gems/express_templates/lib/express_templates/components/forms/form_component.rb
 - vendor/gems/express_templates/lib/express_templates/components/forms/option_support.rb
@@ -627,7 +660,6 @@ files:
 - vendor/gems/express_templates/test/components/configurable_test.rb
 - vendor/gems/express_templates/test/components/forms/basic_fields_test.rb
 - vendor/gems/express_templates/test/components/forms/checkbox_test.rb
-- vendor/gems/express_templates/test/components/forms/country_select_test.rb
 - vendor/gems/express_templates/test/components/forms/express_form_test.rb
 - vendor/gems/express_templates/test/components/forms/radio_test.rb
 - vendor/gems/express_templates/test/components/forms/select_test.rb
@@ -866,7 +898,9 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
+- test/dummy/test/components/code_editor_test.rb
 - test/dummy/test/components/command_button_test.rb
+- test/dummy/test/components/country_select_test.rb
 - test/dummy/test/components/definition_list_test.rb
 - test/dummy/test/components/definition_table_test.rb
 - test/dummy/test/components/flash_messages_test.rb

data/vendor/gems/express_templates/test/components/forms/country_select_test.rb

@@ -1,34 +0,0 @@
-require 'test_helper'
-require 'ostruct'
-class CountrySelectTest < ActiveSupport::TestCase
-
-  def assigns
-    {person: ::Person.new}
-  end
-
-  def helpers
-    mock_action_view do
-      def people_path
-        '/people'
-      end
-    end
-  end
-
-
-  test "country_select renders without an error" do
-    assert arbre {
-      express_form(:person) {
-        country_select :country_code
-      }
-    }
-  end
-
-  test "can change label for country_select" do
-    html = arbre {
-      express_form(:person) {
-        country_select :country_code, label: "Country"
-      }
-    }
-    assert_match(/<label.*Country<\/label>/, html)
-  end
-end