has_safe_dates 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1706f8d6cdbbd3d98e0fd78162be5d1a7e85c4f7
-  data.tar.gz: 5caf2882827bb4717238fa46fd553a18df1148e7
+  metadata.gz: 7ad3c88881117642f2beceb579a7518c23a44706
+  data.tar.gz: a9fe9e4210ba6b11acd35136f2a228694b58cb80
 SHA512:
-  metadata.gz: 9bff2a615d7ce86c75221117ed9ee75067bc62bd88c2fbd871ed6ff0e44ab31619cb707d78e1284ec3940e1192b38cccd0e32f57db2dd28d1fe092d59cc0fe12
-  data.tar.gz: 2fc82cd206c61761404981f6a73b98c757dabeaae97d2b84f9e688f0c0949655f8f54e3a7aeb659b93c368ce58b9fd3096ed492a49aeecf7b5d136ccad2c95b0
+  metadata.gz: 6a754711a149aded1183c1159fe55b7144b83411a920b9d149aca8ff50e2779efc9ce9c8f1accf8cb4f8385ae0e3d3a56b9d693d64f973d4f6d7729e6f08555f
+  data.tar.gz: 892c6860de80a36e91f0e4a53dca0c380b74cfa4cef32fde58e729135b121c764f5e2620e9318ad5950a3ec31ae618a21d7be6fd8ab2b0eee35be6cfb05944d5

data/Gemfile

@@ -2,4 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-# gem 'ruby-debug19'
+# gem 'ruby-debug19'
+
+gem "byebug"

data/lib/has_safe_dates/core_ext.rb

@@ -64,6 +64,16 @@ module HasSafeDates
         super  # has_safe_dates is not enabled for the current field, so invoke the super method (original #read_date method).
       end
     end
+
+    # Overrides #read_time when has_safe_dates is enabled for the current field the multiparameter.
+    # Otherwise the original #read_date method is invoked.
+    def read_time
+      if ActiveRecord::Base.has_safe_fields_config[object.class.base_class] && ActiveRecord::Base.has_safe_fields_config[object.class.base_class][:fields].include?(name)
+        "#{ values.values_at(1,2,3).join("-")} #{ values.values_at(4,5).join(":") }"  # Convert multiparameter parts into a Time string, e.g. "2011-4-23 12:34", return it, and allow CoreExt methods handle the result.
+      else
+        super  # has_safe_dates is not enabled for the current field, so invoke the super method (original #read_time method).
+      end
+    end
   end
 end
 

data/lib/has_safe_dates/version.rb

@@ -1,3 +1,3 @@
 module HasSafeDates
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/db/schema.rb

@@ -7,6 +7,7 @@ ActiveRecord::Schema.define(:version => 0) do
     t.date     "approved_at"
     t.date     "created_at"
     t.date     "updated_at"
+    t.datetime "published_at"
   end
 
   create_table "posts", :force => true do |t|

data/spec/has_safe_dates_spec.rb

@@ -7,7 +7,7 @@ class Post < ActiveRecord::Base
 end
 
 class Comment < ActiveRecord::Base
-  has_safe_dates :approved_at, :error_message => 'is not a real date'
+  has_safe_dates :approved_at, :published_at, :error_message => 'is not a real date'
 end
 
 describe "HasSafeDates" do
@@ -76,7 +76,7 @@ describe "HasSafeDates" do
 
     it "doesn't blow up when given an incorrect values" do
       invalid_post_attributes = {'published_date(1i)' => "2001", 'published_date(2i)' => "12", 'published_date(3i)' => "abc"}
-      invalid_comment_attributes = {'approved_at(1i)' => "2001", 'approved_at(2i)' => "12", 'approved_at(3i)' => "abc"}
+      invalid_comment_attributes = {'approved_at(1i)' => "2001", 'approved_at(2i)' => "15", 'approved_at(3i)' => "17"}
       expect {
         @post.update_attributes(invalid_post_attributes)
         @comment.update_attributes(invalid_comment_attributes)
@@ -91,11 +91,42 @@ describe "HasSafeDates" do
     end
 
     it "adds an error when Chronic returns nil" do
-      invalid_post_attributes = {'published_date(1i)' => "2001", 'published_date(2i)' => "12", 'published_date(3i)' => "abc"}
+      invalid_post_attributes = {'published_date(1i)' => "2014", 'published_date(2i)' => "12", 'published_date(3i)' => "abc"}
       @post.update_attributes(invalid_post_attributes)
       @post.errors[:published_date].should == ['is not a real date']
     end
 
+    context "with time" do
+      it "works" do
+        invalid_comment_attributes = {'published_at(1i)' => "2014", 'published_at(2i)' => "12", 'published_at(3i)' => "22", 'published_at(4i)' => "12", 'published_at(5i)' => "34"}
+        expect {
+          @comment.update_attributes(invalid_comment_attributes)
+        }.to_not raise_error
+        expect(@comment.published_at.utc.strftime("%FT%T%:z")).to eq(Time.new(2014, 12, 22, 12, 34).utc.strftime("%FT%T%:z"))
+      end
+
+      it "doesn't blow up when given an incorrect values" do
+        invalid_post_attributes = {'published_date(1i)' => "2001", 'published_date(2i)' => "12", 'published_date(3i)' => "17", 'published_date(4i)' => "12", 'published_date(5i)' => "34"}
+        invalid_comment_attributes = {'published_at(1i)' => "2001", 'published_at(2i)' => "15", 'published_at(3i)' => "17", 'published_at(4i)' => "12", 'published_at(5i)' => "34"}
+        expect {
+          @post.update_attributes(invalid_post_attributes)
+          @comment.update_attributes(invalid_comment_attributes)
+        }.to_not raise_error
+      end
+
+      it "does not interfere with a date column that it has not been told to make safe" do
+        invalid_attributes = {'unsafe_date(1i)' => "2011", 'unsafe_date(2i)' => "9", 'unsafe_date(3i)' => "83", 'unsafe_date(4i)' => "12", 'unsafe_date(5i)' => "34"}
+        expect {
+          @post.update_attributes(invalid_attributes)
+        }.to raise_error(ActiveRecord::MultiparameterAssignmentErrors)
+      end
+
+      it "adds an error when Chronic returns nil" do
+        invalid_comment_attributes = {'published_at(1i)' => "2009", 'published_at(2i)' => "12", 'published_at(3i)' => "90", 'published_at(4i)' => "12", 'published_at(5i)' => "34"}
+        @comment.update_attributes(invalid_comment_attributes)
+        @comment.errors[:published_at].should == ['is not a real date']
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_safe_dates
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - kylejginavan