has_safe_dates 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b7568105303c5f9d5c1b89473f2285b06e7c3edc
+  data.tar.gz: 5b5d33acc5958d838bdec27cef14a0ac7c148058
+SHA512:
+  metadata.gz: 744066114fa7efe60a406f1bdbae48b90d6127ead6c021646c208adf391fa899808f0bf7b7e441881d232cd34ccf86237cd13797046a8356778362c466319932
+  data.tar.gz: 0043062b200e8a6d55f241ef4a9ec5f6c87bd7b3a25dd65b2d4ee1e3ad52a41453d4a137321372a3363dbd02c783b242c0e8f708e1c5f300e077044a30aa6cc2

data/Gemfile

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

data/has_safe_dates.gemspec

@@ -39,15 +39,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency("activerecord", ['>= 3.1.0'])
-      s.add_development_dependency("chronic")
-      s.add_development_dependency("rspec", [">= 0"])
+      s.add_development_dependency("activerecord", ['~> 4.0.0'])
+      s.add_dependency("chronic")
+      s.add_development_dependency("rspec", [">= 0", "< 3"])
       s.add_development_dependency("rdoc", ["~> 3.12"])
-      s.add_development_dependency("bundler", ["~> 1.0.0"])
+      s.add_development_dependency("bundler", ["~> 1.0"])
       s.add_development_dependency("sqlite3")
-      s.add_development_dependency("rspec")
       s.add_development_dependency('database_cleaner')
-  else
+      s.add_development_dependency('debugger')
+    else
       s.add_dependency("activerecord", ['>= 3.1.0'])
       s.add_dependency("chronic")
       s.add_dependency("rspec", [">= 0"])

data/lib/has_safe_dates/core_ext.rb

@@ -6,7 +6,6 @@ module HasSafeDates
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       def has_safe_fields_config
         @@has_safe_fields_config ||= {}
       end
@@ -25,42 +24,48 @@ module HasSafeDates
           raise ArgumentError, 'Must define the fields you want to be converted to safe dates with "has_safe_dates :my_field_name_date, :my_other_field_name_date"'
         end
         has_safe_fields_config[self][:fields] = args.map(&:to_s)
+
         has_safe_fields_config[self][:fields].each do |field|
           define_method "#{field.to_s}=" do |value|
             if value.present?
               value = Chronic.parse(value.to_s)
-              unless value.present?
-                self.errors.add(field, self.class.has_safe_fields_config[self.class][:error_message])
+              if value.blank? && self.class.has_safe_fields_config[self.class][:error_message].present?
+                @safe_date_validation_errors ||= {}
+                @safe_date_validation_errors[field] = self.class.has_safe_fields_config[self.class][:error_message]
               end
             end
             super value
           end
         end
-      end
-    end
 
-    def read_value_from_parameter(name, values_hash_from_param)
-      if self.class.has_safe_fields_config[self.class]
-        fields = self.class.has_safe_fields_config[self.class][:fields]
-      end
-
-      if fields.present? && fields.include?(name.to_s)
-
-        max_position = extract_max_param_for_multiparameter_attributes(values_hash_from_param, 6)
-        return nil if (1..3).any? {|position| values_hash_from_param[position].blank?}
-        set_values = (1..max_position).collect{|position| values_hash_from_param[position] }
+        define_method "_set_safe_date_validation_errors" do
+          if @safe_date_validation_errors.present?
+            @safe_date_validation_errors.each_pair do |field, error|
+              errors.add(field, error)
+            end
+          end
+          @safe_date_validation_errors = nil
+        end
 
-        date = set_values[0..2].join('-')
-        time = set_values[3..5].join(':')
-        value = Chronic.parse("#{date} #{time}")
+        class_eval do
+          validate :_set_safe_date_validation_errors
+        end
+      end
+    end
+  end
 
-        return value
+  module MultiparameterAttributeExt
+    # Overrides #read_date when has_safe_dates is enabled for the current field the multiparameter.
+    # Otherwise the original #read_date method is invoked.
+    def read_date
+      if ActiveRecord::Base.has_safe_fields_config[object.class] && ActiveRecord::Base.has_safe_fields_config[object.class][:fields].include?(name)
+        values.values_at(1,2,3).join("-")  # Convert multiparameter parts into a Date string, e.g. "2011-4-23", return it, and allow CoreExt methods handle the result.
       else
-        super name, values_hash_from_param
+        super  # has_safe_dates is not enabled for the current field, so invoke the super method (original #read_date method).
       end
     end
-
   end
 end
- 
+
 ActiveRecord::Base.send :include, HasSafeDates::CoreExt
+ActiveRecord::AttributeAssignment::MultiparameterAttribute.send :prepend, HasSafeDates::MultiparameterAttributeExt

data/lib/has_safe_dates/version.rb

@@ -1,3 +1,3 @@
 module HasSafeDates
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/has_safe_dates_spec.rb

@@ -12,7 +12,7 @@ end
 
 describe "HasSafeDates" do
 
-  before(:each) do 
+  before(:each) do
     @post = Post.new
     @comment = Comment.new
   end
@@ -53,8 +53,8 @@ describe "HasSafeDates" do
 
     ['     ', '', nil].each do |date|
       it "sets the field to nil if given the blank value #{date.inspect}" do
-        @post.update_attribute(:safe_date, date)
-        @post.reload
+        @post.safe_date = date
+        @post.valid?
         @post.safe_date.should == nil
         @post.errors.should be_blank
       end
@@ -62,18 +62,21 @@ describe "HasSafeDates" do
 
     ['random', 'does not compute'].each do |date|
       it "sets the field to nil and sets a validation error if given the value #{date.inspect}" do
-        @post.update_attribute(:safe_date, date)
-        @post.reload
+        @post.safe_date = date
+        @post.valid?
         @post.safe_date.should == nil
         @post.errors.should_not be_blank
+        @post.errors[:safe_date].should == ['is not a real date']
       end
     end
+
   end
 
   describe "multiparameter parsing" do
+
     it "doesn't blow up when given an incorrect values" do
-      invalid_post_attributes = {'published_date(1)' => "abc", 'published_date(2)' => "12", 'published_date(3)' => "1"}      
-      invalid_comment_attributes = {'approved_at(1)' => "abc", 'approved_at(2)' => "12", 'approved_at(3)' => "1"}      
+      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"}
       expect {
         @post.update_attributes(invalid_post_attributes)
         @comment.update_attributes(invalid_comment_attributes)
@@ -81,14 +84,18 @@ describe "HasSafeDates" do
     end
 
     it "does not interfere with a date column that it has not been told to make safe" do
-      invalid_attributes = {'unsafe_date(1)' => "abc", 'unsafe_date(2)' => "12", 'unsafe_date(3)' => "1"}      
+      invalid_attributes = {'unsafe_date(1i)' => "2001", 'unsafe_date(2i)' => "12", 'unsafe_date(3i)' => "abc"}
       expect {
         @post.update_attributes(invalid_attributes)
-      }.to raise_error(ActiveRecord::MultiparameterAssignmentErrors, '1 error(s) on assignment of multiparameter attributes')
+      }.to raise_error(ActiveRecord::MultiparameterAssignmentErrors)
     end
 
-  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"}
+      @post.update_attributes(invalid_post_attributes)
+      @post.errors[:published_date].should == ['is not a real date']
+    end
 
+  end
 
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require "active_support"
 require "active_record"
 require "database_cleaner"
+require 'yaml'
 
 ENV['debug'] = 'test' unless ENV['debug']
 

metadata

@@ -1,150 +1,142 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: has_safe_dates
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - kylejginavan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-24 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
   name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 3
-        - 12
-        version: "3.12"
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-description: Uses Chronic to parse incoming dates and does not raise errors on invalid multi parameter settings
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Uses Chronic to parse incoming dates and does not raise errors on invalid
+  multi parameter settings
 email: kylejginavan@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - MIT-LICENSE.txt
 - README.md
-files: 
+files:
 - Gemfile
 - Rakefile
 - MIT-LICENSE.txt
@@ -157,39 +149,27 @@ files:
 - spec/db/schema.rb
 - spec/has_safe_dates_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/kylejginavan/has_safe_dates
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: 1.5.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 3
 summary: Chronic based date setting for ActiveRecord models
 test_files: []
-