clark_kent 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4de57766aecd490acb4b984021138075f84a8628
-  data.tar.gz: 42f55e194b368c09d5c0789ec4de17f8d6d67c12
+  metadata.gz: f7455a5b7bb8bbd0dbff552b602c5fa7bee82286
+  data.tar.gz: 41c44657ae8564900914b274b7206ffda749bc5b
 SHA512:
-  metadata.gz: df66b58c6e04a380b67c7addf610509526032bfb280dcfed30620e4b85297be1ba06019ab00797a2b60967ee1f2aff92eb3fb56aa0840cf98e215f554708d59f
-  data.tar.gz: 091995c346ca849f168ccbade8565bdc399034b5927f707e8679f6c41bcbdc4f0a9f92d4b40050796a78f6a11026a590400cf44636f8f689b755e0feaf29b087
+  metadata.gz: 4cd74c6cad18ced8ddc123dacf14e63c82a66fd5b2e641496e6c9532993212f4ae0878bd682a3d501a9c6cded5879dbaaa24129ea3c5d7cc9adafa8b21bf185b
+  data.tar.gz: 6095ea444bdd97a9d8054082a23cc06b3af7071b8e6adfd005d59bafba90f695e9aa03e0030b33ec3edc5464987745f33d6957c988f22c228166e1112bbf2caf

data/app/controllers/clark_kent/reports_controller.rb

@@ -30,6 +30,13 @@ class ClarkKent::ReportsController < ClarkKent::ApplicationController
     else
       prepare_params(params.permit!) if defined? prepare_params
       if params[:run_report].present?
+        @these_params.each do |k,v|
+          if @report.date_filter_names.detect{|fn|
+            @report.filter_options_for(fn).filter_params.include? k.to_s
+          }.present?
+            @these_params[k] = parse_date(v)
+          end
+        end
         @these_params[:page] = params[:page]
         @these_params[:per] = @report.resource_class.default_per_page
         begin
@@ -96,4 +103,28 @@ class ClarkKent::ReportsController < ClarkKent::ApplicationController
     params.require(:report).permit(:name, :resource_type, :sharing_scope_id, :sharing_scope_type)
   end
 
+  def parse_date(date_input)
+    begin
+      date = american_parse(date_input)
+      date ||= Date.parse(date_input)
+    rescue ArgumentError
+      return nil
+    end
+  end
+
+  def american_parse(string)
+    string.gsub!("%2F", "/")
+    month,day,year = string.split('/').map{|part| part.to_i}
+    return nil unless [month,day,year].all? { |c| !!c }
+    year = normalize_year(year)
+    Date.new(year,month,day)
+  end
+
+  def normalize_year(year)
+    if year < 100
+      year = year + ((Date.today.year / 100) * 100)
+    end
+    year
+  end
+
 end

data/lib/clark_kent/version.rb

@@ -1,3 +1,3 @@
 module ClarkKent
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

data/test/controllers/clark_kent/reports_controller_test.rb

@@ -50,7 +50,7 @@ class ClarkKent::ReportsControllerTest < ControllerTest
   end
 
   it "should show report results" do
-    get :show, params: {id: report, current_user_id: current_user.id, run_report: true, created_at_until: Date.today, created_at_from: Date.yesterday}
+    get :show, params: {id: report, current_user_id: current_user.id, run_report: true, created_at_until: Date.today.strftime("%m/%d/%Y"), created_at_from: Date.yesterday}
     assert_response :success
     @response.body.must_match 'Guitar strings'
   end