puppetdb_foreman 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf740dafda9ec6838c44cb4d44bf8bf1d653fbe4
-  data.tar.gz: af83f76838e285c9d80e31a1ffc9b653c738c663
+  metadata.gz: 84a178d844838f6b0700fe061146387b74bb2fe2
+  data.tar.gz: 0c5c53cf3ab639d6a5714bbffd5da35817620de8
 SHA512:
-  metadata.gz: 506c6af06c9f3c36a5a4ec0fb6dac4dcd7c0fef67be009fab2c173b62e747754b34230bc68121efe6c33501fb0afa7ed9dd9a1dfe999aed56c263902ed8ac6b9
-  data.tar.gz: c5a2cdc057f39fe9c88c68f7faec3d0f5f76bfadd905f47987bc65332ea095c65ec2251035a8e4db862b6b4365450dfcfcf28d2a7b1a3cf093ec6b8882f8549b
+  metadata.gz: e8f2e07d114710c786dc4da06052a06dfdc43ee5ee97b3e97cc174a36955ff8379f5874428f3510709a805a891ba7249731ea42923579c8cbfd1473112065c0a
+  data.tar.gz: 112c0a72a78d6c94bfb26c73d2c6ea9be9f102fc019c6a0bf3cab52a0896f1e255621f52bfbfd65118821a1d78fd4d6684beee7ada9b32e96e430e7ecc0bf42a

data/app/views/puppetdb_foreman/puppetdb/error.html.erb

@@ -1,4 +1,6 @@
-<div class="alert alert-block alert-warning">
-  <p><strong><%= _("Notice") %></strong> <%= _("Error Proxying PuppetDB Dashboard: #{@proxy_error}") %></p>
-  <p><%= _("Maybe you need to set") %> <%= link_to(_("puppetdb_dashboard_address"), settings_path(:search => 'puppetdb_dashboard_address')) %> <%= _("in Settings") %></p>
-</div>
+<%= alert(:class => 'alert-warning',
+          :text => _("Error proxying PuppetDB Dashboard: #{@proxy_error}.") +
+          ' ' + _('Maybe you need to set ') +
+          link_to(_('puppetdb_dashboard_address'),
+          settings_path(:search => 'puppetdb_dashboard_address')) +
+          _(' in Settings')) %>

data/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  match ':puppetdb(/*puppetdb_url)', :to => 'puppetdb_foreman/puppetdb#index', :puppetdb => /d3\.v2|charts|v3|puppetdb|metrics|\/pdb\/meta\/v1\/version\/latest|pdb\/meta\/v1\/version/, :as => "puppetdb"
+  get ':puppetdb(/*puppetdb_url)', :to => 'puppetdb_foreman/puppetdb#index', :puppetdb => /d3\.v2|charts|v3|puppetdb|metrics|\/pdb\/meta\/v1\/version\/latest|pdb\/meta\/v1\/version/, :as => "puppetdb"
 end

data/lib/puppetdb_foreman.rb

@@ -1,3 +1,3 @@
 module PuppetdbForeman
-  require 'puppetdb_foreman/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  require 'puppetdb_foreman/engine'
 end

data/lib/puppetdb_foreman/engine.rb

@@ -7,7 +7,7 @@ module PuppetdbForeman
 
     initializer 'puppetdb_foreman.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :puppetdb_foreman do
-        requires_foreman '> 1.0'
+        requires_foreman '> 1.10'
         security_block :puppetdb_foreman do
           permission :view_puppetdb_dashboard, {:'puppetdb_foreman/puppetdb' => [:index]}
         end

data/lib/puppetdb_foreman/version.rb

@@ -1,3 +1,3 @@
 module PuppetdbForeman
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia