<%= link_to "Back", node_classes_path, :class => 'btn btn-sm btn-default' %>
<%= link_to "Edit", edit_node_class_path(@node_class), :class => 'btn btn-sm btn-primary' %>
- <%= link_to "Delete", @node_class, :method => :delete, :confirm => "Are you sure?", :class => 'btn btn-sm btn-danger pull-right' %>
+ <%= link_to "Delete", @node_class, :method => :delete, :data => { :confirm => "Are you sure?" }, :class => 'btn btn-sm btn-danger pull-right' %>
<%= link_to "Back", node_groups_path, :class => 'btn btn-sm btn-default' %>
<%= link_to "Edit", edit_node_group_path(@node_group), :class => 'btn btn-sm btn-primary' %>
- <%= link_to "Delete", @node_group, :method => :delete, :confirm => "Are you sure?", :class => 'btn btn-sm btn-danger pull-right' %>
+ <%= link_to "Delete", @node_group, :method => :delete, :data => { :confirm => "Are you sure?" }, :class => 'btn btn-sm btn-danger pull-right' %>
<%= link_to "Back", @report.node ? node_path(@report.node) : reports_path, :class => 'btn btn-sm btn-default' %>
- <%= link_to "Delete", @report, :method => :delete, :confirm => "Are you sure?", :class => 'btn btn-sm btn-danger pull-right' %>
+ <%= link_to "Delete", @report, :method => :delete, :data => { :confirm => "Are you sure?" }, :class => 'btn btn-sm btn-danger pull-right' %>
diff --git a/config/application.rb b/config/application.rb
index 38fdd57..f1c8963 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,7 +4,7 @@
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
- Bundler.require(*Rails.groups(:assets => %w(development test)))
+ Bundler.require(*Rails.groups)
# If you want your assets lazily compiled in production, use this line
# Bundler.require(:default, :assets, Rails.env)
end
diff --git a/config/database.yml b/config/database.yml
index 0f2eeb1..dd5c7fd 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -18,15 +18,27 @@ postgresql: &pg
defaults: &defaults
pool: 16
timeout: 5000
- host: localhost
<<: *<%= ENV['DB'] || "mysql2" %>
development:
- <<: *defaults
+ adapter: mysql2
+ encoding: utf8
+ host: enc-dashboard.c1phlpd5jvwq.us-west-2.rds.amazonaws.com
+ port: 3306
+ database: dashboard_development
+ username: dashboard
+ password: d4aca968
test:
<<: *defaults
+ host: localhost
production:
- <<: *defaults
+ # <<: *defaults
# presumably, we'd erb-echo the production password from /etc/something here.
+ adapter: mysql2
+ encoding: utf8
+ host: enc-dashboard
+ database: dashboard_production
+ username: dashboard
+ password: d4aca968
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0335c29..a5bf402 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -6,8 +6,7 @@
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
- # Log error messages when you accidentally call methods on nil.
- config.whiny_nils = true
+ config.eager_load = false
# Show full error reports and disable caching
config.consider_all_requests_local = true
@@ -19,19 +18,9 @@
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
- # Only use best-standards-support built into browsers
- config.action_dispatch.best_standards_support = :builtin
-
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- config.active_record.auto_explain_threshold_in_seconds = 0.5
-
- # Do not compress assets
- config.assets.compress = false
-
# Expands the lines which load the assets
config.assets.debug = true
end
diff --git a/config/environments/prod.rb b/config/environments/prod.rb
index 3f68241..76c4bb1 100644
--- a/config/environments/prod.rb
+++ b/config/environments/prod.rb
@@ -4,6 +4,8 @@
# Code is not reloaded between requests
config.cache_classes = true
+ config.eager_load = true
+
# Full error reports are disabled and caching is turned on
config.consider_all_requests_local = false
config.action_controller.perform_caching = true
@@ -12,7 +14,7 @@
config.serve_static_assets = false
# Compress JavaScripts and CSS
- config.assets.compress = true
+ config.assets.js_compressor = :uglifier
# Don't fallback to assets pipeline if a precompiled asset is missed
config.assets.compile = false
@@ -61,10 +63,6 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- # config.active_record.auto_explain_threshold_in_seconds = 0.5
-
config.serve_static_assets = true
config.assets.compile = false
config.paths['config/database'] = '/etc/enc_dashboard/database.yml' if File.exists? '/etc/enc_dashboard/database.yml'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4c19acd..d100d72 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -4,6 +4,8 @@
# Code is not reloaded between requests
config.cache_classes = true
+ config.eager_load = true
+
# Full error reports are disabled and caching is turned on
config.consider_all_requests_local = false
config.action_controller.perform_caching = true
@@ -12,7 +14,7 @@
config.serve_static_assets = false
# Compress JavaScripts and CSS
- config.assets.compress = true
+ config.assets.js_compressor = :uglifier
# Don't fallback to assets pipeline if a precompiled asset is missed
config.assets.compile = false
@@ -60,8 +62,4 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
-
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- # config.active_record.auto_explain_threshold_in_seconds = 0.5
end
diff --git a/config/environments/stage.rb b/config/environments/stage.rb
index e9efcd4..cb39d68 100644
--- a/config/environments/stage.rb
+++ b/config/environments/stage.rb
@@ -6,8 +6,7 @@
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
- # Log error messages when you accidentally call methods on nil.
- config.whiny_nils = true
+ config.eager_load = false
# Show full error reports and disable caching
config.consider_all_requests_local = true
@@ -19,19 +18,9 @@
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
- # Only use best-standards-support built into browsers
- config.action_dispatch.best_standards_support = :builtin
-
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- config.active_record.auto_explain_threshold_in_seconds = 0.5
-
- # Do not compress assets
- config.assets.compress = false
-
# Expands the lines which load the assets
config.assets.debug = true
diff --git a/config/environments/test.rb b/config/environments/test.rb
index b365299..69f771b 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -11,8 +11,7 @@
config.serve_static_assets = true
config.static_cache_control = "public, max-age=3600"
- # Log error messages when you accidentally call methods on nil
- config.whiny_nils = true
+ config.eager_load = false
# Show full error reports and disable caching
config.consider_all_requests_local = true
diff --git a/config/initializers/00_enc_settings.rb b/config/initializers/00_enc_settings.rb
index d826860..db4811f 100644
--- a/config/initializers/00_enc_settings.rb
+++ b/config/initializers/00_enc_settings.rb
@@ -1,7 +1,9 @@
if File.exists? "config/settings.yml"
- ENC_CONFIG = YAML.load_file("#{Rails.root}/config/settings.yml")[Rails.env].with_indifferent_access
+ ENC_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.read("#{Rails.root}/config/settings.yml"))[Rails.env])
+ puts "=> Config file(settings.yml) loaded. \n ENC_CONFIG: #{ENC_CONFIG}"
elsif File.exists? "/etc/enc_dashboard/settings.yml"
- ENC_CONFIG = YAML.load_file("/etc/enc_dashboard/settings.yml")[Rails.env].with_indifferent_access
+ ENC_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.read("/etc/enc_dashboard/settings.yml"))[Rails.env])
+ puts "=> Config file(settings.yml) loaded. \n ENC_CONFIG: #{ENC_CONFIG}"
else
puts "WARNING: No config/settings.yml file found"
ENC_CONFIG = {}
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index be058f1..6cb96ce 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -2,6 +2,9 @@
# Your secret key for verifying the integrity of signed cookies.
# If you change this key, all old signed cookies will become invalid!
+
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-Enc::Application.config.secret_token = '920e97b1d36c9c3f92c6fb9ba9c2ff72e3dccea603965445d2e8e1ce0e003e55ac084008a9841940bb3173ed6269e412ffecb23b20598c730e2fe85f8ac5ce60'
+# You can use `rake secret` to generate a secure secret key.
+
+Enc::Application.config.secret_key_base = '5c82fd92241d77979577a72754fbe29de81e14a7343814aa9b9486147920bbdf2f71e7dc271e33c1a7037e8d1c1b487b7209ff4ba7820278069d6e02992ee38e'
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index 999df20..c2f744d 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -7,8 +7,3 @@
ActiveSupport.on_load(:action_controller) do
wrap_parameters format: [:json]
end
-
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
- self.include_root_in_json = false
-end
diff --git a/config/routes.rb b/config/routes.rb
index d9dee89..c413289 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,5 +32,7 @@
end
resources :parameters, only: [:index, :new, :create]
root :to => 'nodes#index'
- match 'moov_check' => "home#moov_check"
+ # Rails 4.0 requires that routes using match must specify the request method
+ # match 'moov_check' => "home#moov_check"
+ get 'moov_check' => 'home#moov_check'
end
diff --git a/config/settings.yml.sample b/config/settings.yml.sample
deleted file mode 100644
index 355a6ed..0000000
--- a/config/settings.yml.sample
+++ /dev/null
@@ -1,10 +0,0 @@
-development:
-# spool_path: /tmp/enc_spool
- puppetdb:
- host: hostname
- port: port
-production:
-# spool_path: /tmp/enc_spool
- puppetdb:
- host: hostname
- port: port
diff --git a/db/schema.rb b/db/schema.rb
index 0ccfedf..2c42a1c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,110 +9,110 @@
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
#
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20160503213802) do
+ActiveRecord::Schema.define(version: 20160503213802) do
- create_table "metrics", :force => true do |t|
- t.integer "report_id", :null => false
+ create_table "metrics", force: true do |t|
+ t.integer "report_id", null: false
t.string "category"
t.string "name"
- t.decimal "value", :precision => 12, :scale => 6
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.decimal "value", precision: 12, scale: 6
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "metrics", ["report_id"], :name => "index_metrics_on_report_id"
+ add_index "metrics", ["report_id"], name: "index_metrics_on_report_id", using: :btree
- create_table "node_class_memberships", :force => true do |t|
+ create_table "node_class_memberships", force: true do |t|
t.integer "node_id"
t.integer "node_class_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- create_table "node_classes", :force => true do |t|
- t.string "name", :null => false
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ create_table "node_classes", force: true do |t|
+ t.string "name", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "node_classes", ["name"], :name => "index_node_classes_on_name", :unique => true
+ add_index "node_classes", ["name"], name: "index_node_classes_on_name", unique: true, using: :btree
- create_table "node_group_memberships", :force => true do |t|
+ create_table "node_group_memberships", force: true do |t|
t.integer "node_id"
t.integer "node_group_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "node_group_memberships", ["node_group_id"], :name => "index_node_group_memberships_on_node_group_id"
+ add_index "node_group_memberships", ["node_group_id"], name: "index_node_group_memberships_on_node_group_id", using: :btree
- create_table "node_groups", :force => true do |t|
- t.string "name", :null => false
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ create_table "node_groups", force: true do |t|
+ t.string "name", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "node_groups", ["name"], :name => "index_node_groups_on_name", :unique => true
+ add_index "node_groups", ["name"], name: "index_node_groups_on_name", unique: true, using: :btree
- create_table "nodes", :force => true do |t|
- t.string "name", :null => false
+ create_table "nodes", force: true do |t|
+ t.string "name", null: false
t.text "description"
t.datetime "reported_at"
t.integer "last_apply_report_id"
t.string "status"
- t.boolean "hidden", :default => false
+ t.boolean "hidden", default: false
t.integer "last_inspect_report_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.string "environment"
end
- add_index "nodes", ["name"], :name => "index_nodes_on_name", :unique => true
+ add_index "nodes", ["name"], name: "index_nodes_on_name", unique: true, using: :btree
- create_table "parameters", :force => true do |t|
+ create_table "parameters", force: true do |t|
t.string "key"
t.text "value"
t.integer "parameterable_id"
t.string "parameterable_type"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- create_table "report_logs", :force => true do |t|
+ create_table "report_logs", force: true do |t|
t.integer "report_id"
t.string "level"
t.text "message"
t.datetime "time"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.string "source"
end
- add_index "report_logs", ["report_id"], :name => "index_report_logs_on_report_id"
+ add_index "report_logs", ["report_id"], name: "index_report_logs_on_report_id", using: :btree
- create_table "reports", :force => true do |t|
+ create_table "reports", force: true do |t|
t.integer "node_id"
t.string "status"
t.string "environment"
t.datetime "time"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "reports", ["node_id"], :name => "index_reports_on_node_id"
+ add_index "reports", ["node_id"], name: "index_reports_on_node_id", using: :btree
- create_table "resource_statuses", :force => true do |t|
+ create_table "resource_statuses", force: true do |t|
t.integer "report_id"
t.boolean "failed"
t.boolean "skipped"
t.boolean "is_changed"
t.text "title"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "resource_statuses", ["report_id"], :name => "index_resource_statuses_on_report_id"
+ add_index "resource_statuses", ["report_id"], name: "index_resource_statuses_on_report_id", using: :btree
end
diff --git a/db/seeds.rb b/db/seeds.rb
index 6c82759..fb5384d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,12 +5,12 @@
#
# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
# Mayor.create(name: 'Emanuel', city: cities.first)
-node1 = Node.find_or_create_by_name("node1")
+node1 = Node.find_or_create_by(name: "node1")
node1.status = "unchanged"
node1.save
-node2 = Node.find_or_create_by_name("node2")
+node2 = Node.find_or_create_by(name: "node2")
node2.status = "changed"
node2.save
-group1 = NodeGroup.find_or_create_by_name("group1")
-group2 = NodeGroup.find_or_create_by_name("group2")
-group3 = NodeGroup.find_or_create_by_name("group3")
+group1 = NodeGroup.find_or_create_by(name: "group1")
+group2 = NodeGroup.find_or_create_by(name: "group2")
+group3 = NodeGroup.find_or_create_by(name: "group3")
diff --git a/spec/lib/puppetdb_spec.rb b/spec/lib/puppetdb_spec.rb
index 69c97c2..9392624 100644
--- a/spec/lib/puppetdb_spec.rb
+++ b/spec/lib/puppetdb_spec.rb
@@ -1,5 +1,5 @@
require 'spec_helper'
describe PuppetDB do
- its(:options) { should be_kind_of Hash }
+ it(:options) { should be_kind_of Hash }
end