clark_kent 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea2c03ca235e9769d38e62c4efe859120b3d9e4b
-  data.tar.gz: 0f9e745ae8e5e4c4edc1776a8fe0d398c0872aa5
+  metadata.gz: e5126c39816a9544607fada9211a8afac589e127
+  data.tar.gz: bbf908d01246044a51c2bbfa3aba70073cc76d3d
 SHA512:
-  metadata.gz: ee7494afc2d75989cf4b65cb1083a795a9ffc1c776ddd38b2548fbefdd35bb1481fc9b6ac34f667b6e34f0ae4b752d62527370a2f7a3682a54d41a9c544eaf17
-  data.tar.gz: 5365995fd08314a2cb168805ac876c5b21711ffcaf429402d3006eb2db7cd5fe7b2abc3a32e69578bca29670f4bc5f91180cce61afbe1995f180b01bbbd18563
+  metadata.gz: 553f89a8085a418d8aa66245e4b782ca613c2327fb52bc7473c28e5354ccd5f2bc27f820e46af7eb62404f97adf0a067bdc8f860ce9eced7d8aa666fac04913f
+  data.tar.gz: 69acda8f042a47ab8dc58d8eed29de78f7c45469ef3c1cc3a007683051442a4383cb70a6a43dbc295b47ba55e2566e9923bcae3bfd8b7493652a495b78f05014

data/app/controllers/clark_kent/reports_controller.rb

@@ -16,7 +16,11 @@ class ClarkKent::ReportsController < ClarkKent::ApplicationController
   def create
     @report = ClarkKent::Report.new(report_params)
     @report.save
-    render action: :edit
+    if @report.errors.empty?
+      render action: :edit
+    else
+      render action: :new, status: :conflict
+    end
   end
 
   def show

data/app/models/clark_kent/report.rb

@@ -19,6 +19,7 @@ require 'aws-sdk-v1'
     scope :shared, -> { where(sharing_scope_id: nil) }
 
     validates :sharing_scope_id, presence: true, if: ->(r) { r.sharing_scope_type.present? }
+    validates :resource_type, presence: {message: 'You must choose a type.'}, allow_blank: false
 
     def self.send_report_to_s3(report_id, params)
       report_class = params[:report_class].constantize if params[:report_class]

data/app/views/clark_kent/reports/_edit.html.erb

@@ -6,7 +6,8 @@
     <div class="ih-span one-quarter">
       <%= f.input :resource_type,
           collection: ClarkKent.resource_options,
-          label: 'A row for every:' %>
+          label: 'A row for every:',
+          prompt: 'Please Choose' %>
 
     </div>
     <div class="ih-span one-quarter">

data/lib/clark_kent/version.rb

@@ -1,3 +1,3 @@
 module ClarkKent
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/test/controllers/clark_kent/reports_controller_test.rb

@@ -32,6 +32,18 @@ class ClarkKent::ReportsControllerTest < ControllerTest
     assert_response :success
   end
 
+  it "should render errors during creation" do
+    post :create, params:
+      {report: {
+            name: 'delete me', resource_type: '',
+            sharing_scope_id: report.sharing_scope_id, sharing_scope_type: report.sharing_scope_type },
+            current_user_id: current_user.id}
+    report = ClarkKent::Report.find_by(name: 'delete me')
+    report.must_be_nil
+    assert_response :conflict
+    @response.body.must_match 'You must choose a type.'
+  end
+
   it "should show report" do
     get :show, params: {id: report, current_user_id: current_user.id}
     assert_response :success