bastion 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ea08df26ebbfde937254c13e38daa24b323872b
-  data.tar.gz: 9949ffcc14503c38fea1d94c40c8572ed42e93ec
+  metadata.gz: 2a6ff751c7464fcee64d64f555729d74da6fad14
+  data.tar.gz: 6b4b431245941940ce7c98d679a8adff2207105a
 SHA512:
-  metadata.gz: 6d88553cd63d10ab1892fe8299787667eb12f4484ce10249b244baefd2e9539c16288301d2608e3475ec41d61fa811619c8f0e4775918b6313fe047980bbe7aa
-  data.tar.gz: b87c0950c2aa55a28542a4f9a6391344dd672592463052e87b2dd89df75d6fdc74878ff24b0635caff1550cffe8d763775bfb61370fdb4f824aaaabc663257c5
+  metadata.gz: 0c4376f43d2a7c428617fe1a41acd7ed0d52f06756dd334e01f813f5a50687ac02f09cc5881ac323ed5db96d3d9eff7ace97160089b487cbb563bc20afbe328f
+  data.tar.gz: 4a6aafb2ad7deac647dfe9f3588dea929c117184b73574faa33f1d8d73ed41cdeeb3979d850f38278b178860818f9e4bcb81a70a8b6ddbb2f73a7ffc717b685e

data/app/views/bastion/layouts/application.html.erb

@@ -1,12 +1,3 @@
-<% content_for(:stylesheets) do %>
-  <%= stylesheet_link_tag "bastion/bastion" %>
-  <% Bastion.plugins.each do |name, plugin| %>
-    <% if plugin[:stylesheet] %>
-      <%= stylesheet_link_tag(plugin[:stylesheet]) %>
-    <% end %>
-  <% end %>
-<% end %>
-
 <% content_for(:content) do %>
   <div class="article maincontent bastion" data-no-turbolink="true">
     <section class="container-fluid">
@@ -15,26 +6,4 @@
   </div>
 <% end %>
 
-<% content_for(:javascripts) do %>
-  <%= javascript_include_tag 'bastion/bastion' %>
-  <% if File.exist?("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path(I18n.locale)}") %>
-    <%= javascript_include_tag(Bastion.localization_path(I18n.locale)) %>
-  <% end %>
-  <script type="text/javascript">
-    angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
-    angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
-    angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
-    angular.module('Bastion').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
-    angular.module('Bastion').value('CurrentUser', {
-      id: <%= User.current.id %>,
-      admin: <%= User.current.admin || User.current.usergroups.any? { |group| group.admin } %>
-    });
-    angular.module('Bastion').value('markActiveMenu', mark_active_menu);
-    angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
-  </script>
-  <% Bastion.plugins.each do |name, plugin| %>
-    <%= javascript_include_tag(plugin[:javascript]) %>
-  <% end %>
-<% end %>
-  
-<%= render file: "layouts/base" %>
+<%= render file: "bastion/layouts/assets" %>

data/app/views/bastion/layouts/assets.html.erb

@@ -0,0 +1,32 @@
+<% content_for(:stylesheets) do %>
+  <%= stylesheet_link_tag "bastion/bastion" %>
+  <% Bastion.plugins.each do |name, plugin| %>
+    <% if plugin[:stylesheet] %>
+      <%= stylesheet_link_tag(plugin[:stylesheet]) %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% content_for(:javascripts) do %>
+  <%= javascript_include_tag 'bastion/bastion' %>
+  <% if File.exist?("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path(I18n.locale)}") %>
+    <%= javascript_include_tag(Bastion.localization_path(I18n.locale)) %>
+  <% end %>
+  <script type="text/javascript">
+    angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
+    angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
+    angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
+    angular.module('Bastion').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
+    angular.module('Bastion').value('CurrentUser', {
+      id: <%= User.current.id %>,
+      admin: <%= User.current.admin || User.current.usergroups.any? { |group| group.admin } %>
+    });
+    angular.module('Bastion').value('markActiveMenu', mark_active_menu);
+    angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
+  </script>
+  <% Bastion.plugins.each do |name, plugin| %>
+    <%= javascript_include_tag(plugin[:javascript]) %>
+  <% end %>
+<% end %>
+
+<%= render file: "layouts/base" %>

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates
@@ -155,6 +155,7 @@ files:
 - app/controllers/bastion/bastion_controller.rb
 - app/views/bastion/layouts/application.html.erb
 - app/views/bastion/layouts/application_ie.html.erb
+- app/views/bastion/layouts/assets.html.erb
 - bastion.js
 - bower.json
 - config/routes.rb
@@ -988,42 +989,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: UI library of AngularJS based components for Foreman
 test_files:
-- test/bastion/bastion-resource.factory.test.js
-- test/bastion/test-constants.js
 - test/features/bst-feature-flag.directive.test.js
 - test/features/feature-flag.service.test.js
 - test/auth/authorization.service.test.js
-- test/i18n/translate.service.test.js
+- test/components/bst-form-group.directive.test.js
+- test/components/bst-table.directive.test.js
+- test/components/page-title.directive.test.js
 - test/components/bst-nutupane-table.directive.test.js
-- test/components/bst-dropdown.directive.test.js
-- test/components/bst-bookmark.factory.test.js
-- test/components/bst-form-buttons.directive.test.js
-- test/components/typeahead-empty.directive.test.js
+- test/components/bst-menu.directive.test.js
 - test/components/bst-alerts.directive.test.js
 - test/components/nutupane.factory.test.js
-- test/components/page-title.directive.test.js
-- test/components/bst-table.directive.test.js
-- test/components/bst-container-scroll.directive.test.js
-- test/components/formatters/capitalize.filter.test.js
+- test/components/path-selector.directive.test.js
 - test/components/formatters/array-to-string.filter.test.js
-- test/components/formatters/boolean-to-yes-no.filter.test.js
 - test/components/formatters/unlimited-filter.filter.test.js
+- test/components/formatters/capitalize.filter.test.js
 - test/components/formatters/key-value-to-string.filter.test.js
-- test/components/bst-menu.directive.test.js
+- test/components/formatters/boolean-to-yes-no.filter.test.js
+- test/components/page-title.service.test.js
+- test/components/bst-bookmark.factory.test.js
+- test/components/bst-alert.directive.test.js
+- test/components/bst-container-scroll.directive.test.js
 - test/components/bst-bookmark.directive.test.js
+- test/components/bst-flyout.directive.test.js
+- test/components/bst-dropdown.directive.test.js
+- test/components/typeahead-empty.directive.test.js
+- test/components/bst-form-buttons.directive.test.js
 - test/components/bst-edit.directive.test.js
 - test/components/bst-modal.directive.test.js
-- test/components/bst-form-group.directive.test.js
-- test/components/bst-flyout.directive.test.js
-- test/components/page-title.service.test.js
-- test/components/bst-alert.directive.test.js
-- test/components/path-selector.directive.test.js
-- test/utils/as.filter.test.js
-- test/utils/form-utils.service.test.js
 - test/test-mocks.module.js
 - test/menu/menu-expander.service.test.js
+- test/i18n/translate.service.test.js
+- test/bastion/test-constants.js
+- test/bastion/bastion-resource.factory.test.js
+- test/utils/form-utils.service.test.js
+- test/utils/as.filter.test.js
+has_rdoc: