clark_kent 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1602aef2a067c09bd335e26d9e81044e7aab0d9e
-  data.tar.gz: 86c09aa7f1519452e5eb73c9e898ce16a616cf8b
+  metadata.gz: 946b82a5e471b450c9c62dd81a3bfeee3b00dda8
+  data.tar.gz: 17d1d6d74996eff40d562da68ca0c70db7d442ca
 SHA512:
-  metadata.gz: 5a07ab29841ddfbd24bcba27e3f89bc95c906123768c090fe2250f2b7c40635f7bf4658877d826d7d8ff19ba295c80cadecd90e9dca095f58f9ae7cfa4718e6c
-  data.tar.gz: c1b02256030c39ee13716f5c3b3457dc6e9fa97bd45f7124fbf206a3f7613d2fba1508d940b888c6637503a2de26714b1772726f18d6b80ae1e7336487b6859a
+  metadata.gz: 4677bcc4135ee9f7f17b86e645b3fce7cd43a597490632449ed9ccb0177ddfedda804985e3e11df08fb7027c8fb4ecfa50fb3897db33b6d0184b2b1662b3885f
+  data.tar.gz: cdb0ad4ec67d5296f3c2d4d5a3890df1896f4c2cfd6c58d93ba4ba696157446e1004d5cf2b323d49685d18e7434c34529997d0e21e07d20f54d8fa025832d7a0

data/app/controllers/clark_kent/reports_controller.rb

@@ -1,6 +1,5 @@
 class ClarkKent::ReportsController < ClarkKent::ApplicationController
   require 'csv'
-  respond_to :html, :csv
   before_filter :get_these_params, :prepare_filters
 
   def set_manage_tab

data/app/views/clark_kent/report_filters/_form.html.erb

@@ -14,19 +14,16 @@
           sub_type: "AddALineForm",
           ajax_target: report_filter.new_record? ? "#report_filter_list_#{dom_id(report_filter.filterable)}" : "#report_filter_#{report_filter.id}",
           insert_method: report_filter.new_record? ? 'append' : 'html',
-          container: "#new_report_filter_container_#{dom_id(report_filter.filterable)}",
+          container: dom_target(report_filter.filterable, :new_report_filter_container),
           ajax_flash: true } } do |f| %>
     <div class="ih-span one-third">
       <%= f.input :filterable_id, as: :hidden %>
       <%= f.input :filterable_type, as: :hidden %>
       <% if report_filter.new_record? %>
         <%= f.input :filter_name, collection: report_filter.filterable.available_filter_options,
-              input_html: {
-                data: {
-                  revealer: 'true',
-                  sub_type: 'FormFieldRevealer',
-                  revealer_children_id: "filter_value_options_#{report_filter.object_id}" },
-                id: "report_filter_filter_name_#{report_filter.object_id}"},
+              input_html:
+                revealer("filter_value_options_#{report_filter.object_id}", highlander: true).merge(
+                  id: "report_filter_filter_name_#{report_filter.object_id}"),
               include_blank: false %>
       <% else %>
         <div class="ih-row quiet">Filter Name</div>
@@ -34,9 +31,9 @@
       <% end %>
     </div>
     <% if report_filter.new_record? %>
-      <div class="ih-span one-third" data-revealer-target="filter_value_options_<%= report_filter.object_id %>">
+      <div class="ih-span one-third" <%= revealer_target_attrs("filter_value_options_#{report_filter.object_id}") %>>
         <% report_filter.filterable.available_filters.each do |name,label| %>
-          <div data-revealer_id="filter_value_options_<%= report_filter.object_id %>" data-revealer-trigger="<%= name %>" id="filter_value_options_<%= name %>">
+          <div <%= revealer_option_attrs("filter_value_options_#{report_filter.object_id}", trigger: name) %> id="filter_value_options_<%= name %>">
             <%= render partial: report_filter.filterable.filter_kind(name) + '_edit', locals: {f: f, report_filter: report_filter, name: name} %>
           </div>
         <% end %>
@@ -48,7 +45,9 @@
     <% end %>
     <div class="ih-span right margin-top">
       <%= f.button :submit %>
-      <% unless report_filter.new_record? %>
+      <% if report_filter.new_record? %>
+        &nbsp; <a <%= emptier dom_target(report_filter.filterable, :new_report_filter_container) %>> cancel </a>
+      <% else %>
         &nbsp; <%= link_to 'cancel', report_filter_url(report_filter),
           data: {ajax_link: "true", ajax_target: "#report_filter_#{report_filter.id}"} %>
         &nbsp; <%= link_to '&otimes;'.html_safe, report_filter_url(report_filter), class: "delete", data: {ajax_delete: "true", ajax_target: "#report_filter_#{report_filter.id}" }, tabindex: "-1" %>

data/app/views/clark_kent/report_filters/_index.html.erb

@@ -10,7 +10,7 @@
       <%= link_to 'Add a Filter', new_report_filter_url(filterable_id: filterable.id, filterable_type: filterable.class.name), class: 'btn btn-primary', data: {ajax_link: "true", ajax_target: "#new_report_filter_container_#{dom_id(filterable)}" } %>
     </div>
 
-    <div id="new_report_filter_container_<%= dom_id(filterable) %>" class="ih-row margin-top">
+    <div id="<%= dom_id filterable, :new_report_filter_container %>" class="ih-row margin-top">
 
     </div>
   </div>

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

@@ -1,9 +1,5 @@
 <div class="ih-row">
-  <%= simple_form_for @report, html: @report.persisted? ? {
-    data: {
-      ajax_form: true,
-      ajax_target: '#report_info_container' }
-  } : {} do |f| %>
+  <%= simple_form_for @report, html: @report.persisted? ? ajax_form_hash( '#report_info_container' ) : {} do |f| %>
     <div class="ih-span one-quarter">
       <%= f.input :name %>
     </div>
@@ -17,21 +13,21 @@
       <div class="ih-row">sharing</div>
       <div class="ih-row">
         <%= f.input :sharing_scope_type, collection: ClarkKent::SharingScopeKind.select_options_for_user(current_user),
-          input_html: {data: {revealer: true, sub_type: "FormFieldRevealer", revealer_children_id: "sharing_options"}},
+          input_html: revealer("sharing_options", highlander: true),
           label: false, include_blank: false %>
       </div>
-      <div class="ih-row" data-revealer-target="sharing_options">
-        <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: current_user.id}, wrapper_html: {'data-revealer_id' => "sharing_options", 'data-revealer-trigger' => ClarkKent.user_class_name, id: "sharing_options_#{ClarkKent.user_class_name}"} %>
+      <div class="ih-row" <%= revealer_target_attrs("sharing_options") %>>
+        <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: current_user.id}, wrapper_html: revealer_option("sharing_options", trigger: ClarkKent.user_class_name).merge(id: "sharing_options_#{ClarkKent.user_class_name}") %>
         <% ClarkKent::SharingScopeKind.custom_for_user(current_user).each do |sharing_scope_kind| %>
           <% if sharing_scope_kind.associated_containers_for(current_user).respond_to? :each %>
             <%= f.input :sharing_scope_id, collection: sharing_scope_kind.associated_containers_for(current_user), label: false, include_blank: false,
-              wrapper_html: {'data-revealer_id' => "sharing_options", 'data-revealer-trigger' => sharing_scope_kind.class_name, id: "sharing_options_#{sharing_scope_kind.class_name}"} %>
+              wrapper_html: revealer_option("sharing_options", trigger: sharing_scope_kind.class_name).merge(id: "sharing_options_#{sharing_scope_kind.class_name}") %>
           <% else %>
-            <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: sharing_scope_kind.associated_containers_for(current_user).id}, wrapper_html: {'data-revealer_id' => "sharing_options", 'data-revealer-trigger' => sharing_scope_kind.associated_containers_for(current_user).class.name, id: "sharing_options_#{sharing_scope_kind.associated_containers_for(current_user).class.name}"} %>
+            <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: sharing_scope_kind.associated_containers_for(current_user).id}, wrapper_html: revealer_option("sharing_options", trigger: sharing_scope_kind.associated_containers_for(current_user).class.name).merge(id: "sharing_options_#{sharing_scope_kind.associated_containers_for(current_user).class.name}") %>
           <% end %>
         <% end %>
         <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: ''},
-          wrapper_html: {'data-revealer_id' => "sharing_options", 'data-revealer-trigger' => "", id: "sharing_options_"} %>
+          wrapper_html: revealer_option("sharing_options", trigger: "").merge(id: "sharing_options_") %>
       </div>
     </div>
     <div class="ih-span one-quarter margin-top right">
@@ -39,7 +35,6 @@
         <%= f.button :submit %>
         <% unless @report.new_record? %>
             &nbsp; <%= ajax_link 'cancel', report_url(@report), {class: 'right'}, "#report_info_container" %>
-            }
           </div>
           <div class="ih-row right">or</div>
           <div class="ih-row">

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

@@ -3,7 +3,12 @@
 		<%= filter.param.humanize %>
 	</div>
 	<div class="ih-row">
-		<% options = @filter_collections.send(filter.collection) %>
+		<% options = case filter.collection.class.name
+			 when 'String', 'Symbol'
+			   @filter_collections.send(filter.collection)
+			 when 'Array'
+			   filter.collection
+			 end %>
 		<%= select_tag filter.param,
 			options_from_collection_for_select(
 				options,

data/lib/clark_kent/version.rb

@@ -1,3 +1,3 @@
 module ClarkKent
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/test/controllers/clark_kent/reports_controller_test.rb

@@ -1,75 +1,75 @@
 require 'test_helper'
 
-module ClarkKent
-  class ReportsControllerTest < ActionController::TestCase
-    setup do
-      @report = ClarkKent::Report.first
-      @routes = Engine.routes
-      @current_user = User.first
-    end
+describe ClarkKent::ReportsController do
+  setup do
+    @routes = ClarkKent::Engine.routes
+  end
 
-    test "should get index" do
-      get :index, current_user_id: @current_user.id
-      assert_response :success
-    end
+  before do
+    @report = ClarkKent::Report.first
+    @current_user = User.first
+  end
 
-    test "should get new" do
-      get :new, current_user_id: @current_user.id
-      assert_response :success
-    end
+  test "should get index" do
+    get :index, current_user_id: @current_user.id
+    assert_response :success
+  end
 
-    test "should create report" do
-      assert_difference('Report.count') do
-        post :create,
-          report: {
-            name: 'delete me', resource_type: @report.resource_type,
-            sharing_scope_id: @report.sharing_scope_id, sharing_scope_type: @report.sharing_scope_type },
-          current_user_id: @current_user.id
-      end
-      report = Report.find_by(name: 'delete me')
-      report.destroy
-      assert_response :success
-    end
+  test "should get new" do
+    get :new, current_user_id: @current_user.id
+    assert_response :success
+  end
 
-    test "should show report" do
-      get :show, id: @report, current_user_id: @current_user.id
-      assert_response :success
-    end
+  test "should create report" do
+    post :create,
+      report: {
+        name: 'delete me', resource_type: @report.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.wont_be_nil
+    report.destroy
+    assert_response :success
+  end
 
-    test "should show report results" do
-      get :show, id: @report, current_user_id: @current_user.id, run_report: true, created_at_until: Date.today, created_at_from: Date.yesterday
-      assert_response :success
-      assert_not_nil assigns(:rows)
-      @response.body.must_match 'Guitar strings'
-    end
+  test "should show report" do
+    get :show, id: @report, current_user_id: @current_user.id
+    assert_response :success
+  end
 
-    test "should show report run errors" do
-      get :show, id: @report, current_user_id: @current_user.id, run_report: true
-      assert_response :success
-      @response.body.must_match 'At least one date range is required.'
-    end
+  test "should show report results" do
+    get :show, id: @report, current_user_id: @current_user.id, run_report: true, created_at_until: Date.today, created_at_from: Date.yesterday
+    assert_response :success
+    assert_not_nil assigns(:rows)
+    @response.body.must_match 'Guitar strings'
+  end
 
-    test "should get edit" do
-      get :edit, id: @report, current_user_id: @current_user.id
-      assert_response :success
-    end
+  test "should show report run errors" do
+    get :show, id: @report, current_user_id: @current_user.id, run_report: true
+    assert_response :success
+    @response.body.must_match 'At least one date range is required.'
+  end
 
-    test "should update report" do
-      patch :update, id: @report,
-        report: {
-          name: @report.name, resource_type: @report.resource_type,
-          sharing_scope_id: @report.sharing_scope_id, sharing_scope_type: @report.sharing_scope_type },
-        current_user_id: @current_user.id
-      assert_response :success
-    end
+  test "should get edit" do
+    get :edit, id: @report, current_user_id: @current_user.id
+    assert_response :success
+  end
 
-    test "should destroy report" do
-      report = Report.create(name: 'delete me', resource_type: 'Order')
-      assert_difference('Report.count', -1) do
-        delete :destroy, id: report, current_user_id: @current_user.id
-      end
+  test "should update report" do
+    patch :update, id: @report,
+      report: {
+        name: @report.name, resource_type: @report.resource_type,
+        sharing_scope_id: @report.sharing_scope_id, sharing_scope_type: @report.sharing_scope_type },
+      current_user_id: @current_user.id
+    assert_response :success
+  end
 
-      assert_redirected_to reports_path
+  test "should destroy report" do
+    report = ClarkKent::Report.create(name: 'delete me', resource_type: 'Order')
+    assert_difference('ClarkKent::Report.count', -1) do
+      delete :destroy, id: report, current_user_id: @current_user.id
     end
+
+    assert_redirected_to reports_path
   end
 end