scaptimony 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1de7b66071d1a5cdc7b8a35b6e771aa9c1afab00
-  data.tar.gz: 45ac4cc03c0630a39a5b8f9e1e85e390a3795cf3
+  metadata.gz: 174629941484facee505dbde5487c78b99637ed5
+  data.tar.gz: 20c9244c166567ba00d4f1c11ca881edffa48ee9
 SHA512:
-  metadata.gz: 40b85faa5dca890f6c0935e823ec40110d3107fb7fde70f20cac95cd9d82e90f8c2635af70d8826b35d7e11658b023a771b71996a9110439b0a85c5f69bf9db2
-  data.tar.gz: 101fec51fa7ae58fd6290866b4103a2f573ecb252278c5a24e49ec1946c6c2a632ca3f5cca9c7f316dca5604259e8ef48039554308f9a3f4e82829f40a971fb9
+  metadata.gz: ec63c92e187c0ef6ed66870e9b373000bf79e08a46cc25c1c93f49bbd7f00d5af9f2339e821a8dae3d844925003ca40506345cd136106b73489276b02f78d2c6
+  data.tar.gz: 0de79f67e2ca2c2530aeadee65d5f801ab13508ba68d511b58542f24c9ce2f9403864b1678c25b471dca7594c9291c4689f7b2260abb4be4ac7ed91a95d454c8

data/app/models/scaptimony/arf_report.rb

@@ -56,7 +56,7 @@ module Scaptimony
     def self.search_by_policy_results(policy_name, &selection)
       cond = sanitize_sql_for_conditions('scaptimony_policies.name' => policy_name)
       { :conditions => Scaptimony::ArfReport.arel_table[:id].in(
-          Scaptimony::ArfReport.select(Scaptimony::ArfReport.arel_table[:id])
+        Scaptimony::ArfReport.select(Scaptimony::ArfReport.arel_table[:id])
             .latest.instance_eval(&selection).joins(:policy).where(cond).ast
         ).to_sql
       }

data/app/models/scaptimony/policy.rb

@@ -20,9 +20,9 @@ module Scaptimony
     end
 
     def to_html
-      if self.scap_content.blank? || self.scap_content_profile.blank?
-        return warn(_('Cannot generate HTML guide for %{scap_content}/%{profile}') %
-          { :scap_content => self.scap_content, :profile => self.scap_content_profile })
+      if self.scap_content.nil? || self.scap_content.source.nil?
+        return (_('<h2>Cannot generate HTML guide for %{scap_content}/%{profile}</h2>') %
+          { :scap_content => self.scap_content, :profile => self.scap_content_profile }).html_safe
       end
 
       sds = OpenSCAP::DS::Sds.new self.scap_content.source

data/app/models/scaptimony/scap_content.rb

@@ -41,6 +41,7 @@ module Scaptimony
     validates :scap_file, :presence => true
 
     after_save :create_profiles
+    before_validation :redigest, :if => lambda { |scap_content| scap_content.persisted? && scap_content.scap_file_changed? }
 
     scoped_search :on => :title,             :complete_value => true
     scoped_search :on => :original_filename, :complete_value => true, :rename => :filename
@@ -81,5 +82,9 @@ module Scaptimony
 
     end
 
+    def redigest
+      self[:digest] = Digest::SHA256.hexdigest "#{scap_file}"
+    end
+
   end
 end

data/db/migrate/20141121120326_create_scaptimony_arf_report_breakdowns.rb

@@ -1,6 +1,6 @@
 class CreateScaptimonyArfReportBreakdowns < ActiveRecord::Migration
-   def self.up
-     execute <<-SQL
+  def self.up
+    execute <<-SQL
 CREATE VIEW scaptimony_arf_report_breakdowns AS
   SELECT
     arf.id as arf_report_id,
@@ -15,6 +15,10 @@ CREATE VIEW scaptimony_arf_report_breakdowns AS
     arf.id = rule.arf_report_id
     AND rule.xccdf_result_id = result.id
   GROUP BY arf.id;
-SQL
+    SQL
+  end
+
+  def self.down
+    execute 'DROP VIEW scaptimony_arf_report_breakdowns' if table_exists? 'scaptimony_arf_report_breakdowns'
   end
 end

data/db/migrate/20141121164042_replace_arf_report_breakdown_view.rb

@@ -1,6 +1,6 @@
 class ReplaceArfReportBreakdownView < ActiveRecord::Migration
-   def self.up
-     execute <<-SQL
+  def self.up
+    execute <<-SQL
 CREATE OR REPLACE VIEW scaptimony_arf_report_breakdowns AS
   SELECT
     arf.id as arf_report_id,
@@ -15,6 +15,10 @@ CREATE OR REPLACE VIEW scaptimony_arf_report_breakdowns AS
   LEFT OUTER JOIN scaptimony_xccdf_results result
     ON rule.xccdf_result_id = result.id
   GROUP BY arf.id;
-SQL
+    SQL
+  end
+
+  def self.down
+    execute 'DROP VIEW scaptimony_arf_report_breakdowns' if table_exists? 'scaptimony_arf_report_breakdowns'
   end
 end

data/lib/scaptimony/version.rb

@@ -1,3 +1,3 @@
 module Scaptimony
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: scaptimony
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
-- Šimon Lukašík
+- "Šimon Lukašík"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: openscap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -62,111 +62,111 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/views/layouts/scaptimony/application.html.erb
-- app/helpers/scaptimony/application_helper.rb
-- app/controllers/scaptimony/application_controller.rb
-- app/assets/stylesheets/scaptimony/application.css
+- COPYING
+- README.md
+- Rakefile
 - app/assets/javascripts/scaptimony/application.js
-- app/models/scaptimony/xccdf_rule_result.rb
-- app/models/scaptimony/scap_content.rb
-- app/models/scaptimony/policy.rb
-- app/models/scaptimony/policy_revision.rb
+- app/assets/stylesheets/scaptimony/application.css
+- app/controllers/scaptimony/application_controller.rb
+- app/helpers/scaptimony/application_helper.rb
 - app/models/scaptimony/arf_report.rb
-- app/models/scaptimony/xccdf_rule.rb
-- app/models/scaptimony/xccdf_result.rb
+- app/models/scaptimony/arf_report_breakdown.rb
+- app/models/scaptimony/arf_report_raw.rb
 - app/models/scaptimony/asset.rb
 - app/models/scaptimony/asset_policy.rb
+- app/models/scaptimony/policy.rb
+- app/models/scaptimony/policy_revision.rb
+- app/models/scaptimony/scap_content.rb
 - app/models/scaptimony/scap_content_profile.rb
-- app/models/scaptimony/arf_report_raw.rb
-- app/models/scaptimony/arf_report_breakdown.rb
+- app/models/scaptimony/xccdf_result.rb
+- app/models/scaptimony/xccdf_rule.rb
+- app/models/scaptimony/xccdf_rule_result.rb
+- app/views/layouts/scaptimony/application.html.erb
 - config/routes.rb
-- db/migrate/20141116171305_add_profile_to_scaptimony_policies.rb
-- db/migrate/20141116170632_remove_xccdf_profile_from_scaptimony_policies.rb
-- db/migrate/20141119182606_create_scaptimony_xccdf_rule_results.rb
-- db/migrate/20150116083129_add_day_of_month_and_cron_line_to_scaptimony_policy.rb
-- db/migrate/20141015115511_add_arf_report_unique_constraint.rb
-- db/migrate/20141015092642_create_scaptimony_arf_reports.rb
-- db/migrate/20150111085317_polymorph_asset.rb
-- db/migrate/20141216154502_rename_scaptimony_asset_policies.rb
-- db/migrate/20141119175434_create_scaptimony_xccdf_rules.rb
+- db/migrate/20141013172051_create_scaptimony_policies.rb
 - db/migrate/20141014105333_create_scaptimony_assets.rb
-- db/migrate/20141119164918_create_scaptimony_xccdf_results.rb
-- db/migrate/20150112152944_create_scaptimony_arf_report_raws.rb
-- db/migrate/20141107091756_add_columns_to_scaptimony_scap_contents.rb
-- db/migrate/20141113221054_create_scaptimony_scap_content_profiles.rb
-- db/migrate/20141111104519_add_constraint_to_scaptimony_scap_contents.rb
-- db/migrate/20141105174834_add_columns_to_scaptimony_policies.rb
+- db/migrate/20141015092642_create_scaptimony_arf_reports.rb
+- db/migrate/20141015115511_add_arf_report_unique_constraint.rb
 - db/migrate/20141104164201_create_scaptimony_scap_contents.rb
-- db/migrate/20141013172051_create_scaptimony_policies.rb
-- db/migrate/20141206211151_create_scaptimony_assets_policies.rb
-- db/migrate/20141105174625_add_description_to_scaptimony_policy_revisions.rb
-- db/migrate/20150115155947_add_scaptimony_scap_content_digest.rb
 - db/migrate/20141104171545_create_scaptimony_policy_revisions.rb
-- db/migrate/20150114210634_rename_scaptimony_arf_report_raw_raw.rb
-- db/migrate/20141214112917_add_scap_file_to_scap_content.rb
-- db/migrate/20141121120326_create_scaptimony_arf_report_breakdowns.rb
+- db/migrate/20141105174625_add_description_to_scaptimony_policy_revisions.rb
+- db/migrate/20141105174834_add_columns_to_scaptimony_policies.rb
+- db/migrate/20141107091756_add_columns_to_scaptimony_scap_contents.rb
+- db/migrate/20141111104519_add_constraint_to_scaptimony_scap_contents.rb
+- db/migrate/20141113221054_create_scaptimony_scap_content_profiles.rb
+- db/migrate/20141116170632_remove_xccdf_profile_from_scaptimony_policies.rb
+- db/migrate/20141116171305_add_profile_to_scaptimony_policies.rb
 - db/migrate/20141118142954_add_constraint_to_scaptimony_policies.rb
+- db/migrate/20141119164918_create_scaptimony_xccdf_results.rb
+- db/migrate/20141119175434_create_scaptimony_xccdf_rules.rb
+- db/migrate/20141119182606_create_scaptimony_xccdf_rule_results.rb
+- db/migrate/20141121120326_create_scaptimony_arf_report_breakdowns.rb
 - db/migrate/20141121164042_replace_arf_report_breakdown_view.rb
+- db/migrate/20141206211151_create_scaptimony_assets_policies.rb
+- db/migrate/20141214112917_add_scap_file_to_scap_content.rb
+- db/migrate/20141216154502_rename_scaptimony_asset_policies.rb
+- db/migrate/20150111085317_polymorph_asset.rb
+- db/migrate/20150112152944_create_scaptimony_arf_report_raws.rb
+- db/migrate/20150114210634_rename_scaptimony_arf_report_raw_raw.rb
+- db/migrate/20150115155947_add_scaptimony_scap_content_digest.rb
+- db/migrate/20150116083129_add_day_of_month_and_cron_line_to_scaptimony_policy.rb
 - db/seeds.rb
 - lib/scaptimony.rb
-- lib/tasks/scaptimony_tasks.rake
+- lib/scaptimony/arf_reports_helper.rb
 - lib/scaptimony/engine.rb
 - lib/scaptimony/version.rb
-- lib/scaptimony/arf_reports_helper.rb
-- COPYING
-- Rakefile
-- README.md
-- test/dummy/script/rails
+- lib/tasks/scaptimony_tasks.rake
+- test/dummy/README.rdoc
 - test/dummy/Rakefile
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/public/500.html
-- test/dummy/public/422.html
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/config/boot.rb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
 - test/dummy/config/application.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/routes.rb
+- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config.ru
-- test/dummy/README.rdoc
-- test/fixtures/scaptimony/xccdf_rule_results.yml
-- test/fixtures/scaptimony/xccdf_results.yml
+- test/dummy/config/routes.rb
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/script/rails
+- test/fixtures/scaptimony/arf_reports.yml
+- test/fixtures/scaptimony/assets.yml
 - test/fixtures/scaptimony/policies.yml
-- test/fixtures/scaptimony/xccdf_rules.yml
 - test/fixtures/scaptimony/policy_revisions.yml
-- test/fixtures/scaptimony/arf_reports.yml
 - test/fixtures/scaptimony/scap_content_profiles.yml
-- test/fixtures/scaptimony/assets.yml
-- test/scaptimony_test.rb
-- test/lib/scaptimony/arf_reports_helper_test.rb
-- test/test_helper.rb
+- test/fixtures/scaptimony/xccdf_results.yml
+- test/fixtures/scaptimony/xccdf_rule_results.yml
+- test/fixtures/scaptimony/xccdf_rules.yml
 - test/integration/navigation_test.rb
-- test/models/scaptimony/scap_content_profiles_test.rb
-- test/models/scaptimony/policy_revision_test.rb
-- test/models/scaptimony/xccdf_rule_test.rb
-- test/models/scaptimony/scap_content_test.rb
-- test/models/scaptimony/xccdf_result_test.rb
+- test/lib/scaptimony/arf_reports_helper_test.rb
 - test/models/scaptimony/arf_report_breakdown_test.rb
+- test/models/scaptimony/arf_report_raw_test.rb
 - test/models/scaptimony/arf_report_test.rb
 - test/models/scaptimony/asset_test.rb
-- test/models/scaptimony/arf_report_raw_test.rb
-- test/models/scaptimony/xccdf_rule_result_test.rb
+- test/models/scaptimony/policy_revision_test.rb
 - test/models/scaptimony/policy_test.rb
+- test/models/scaptimony/scap_content_profiles_test.rb
+- test/models/scaptimony/scap_content_test.rb
+- test/models/scaptimony/xccdf_result_test.rb
+- test/models/scaptimony/xccdf_rule_result_test.rb
+- test/models/scaptimony/xccdf_rule_test.rb
+- test/scaptimony_test.rb
+- test/test_helper.rb
 homepage: https://github.com/OpenSCAP/scaptimony
 licenses:
 - GPL-3.0
@@ -177,17 +177,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: SCAPtimony is SCAP database and storage server
@@ -243,3 +243,4 @@ test_files:
 - test/models/scaptimony/arf_report_raw_test.rb
 - test/models/scaptimony/xccdf_rule_result_test.rb
 - test/models/scaptimony/policy_test.rb
+has_rdoc: