express_pigeon 1.0.1 → 1.0.2

data/CHANGELOG

@@ -0,0 +1,6 @@
+1.0.2
+
+* Added support for date types and valid date strings to date of birth on
+web form.
+* Format the date as MM/DD/YYYY to the web form.
+

data/express_pigeon.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency("activemodel")
   gem.add_runtime_dependency("curb-fu")
+  gem.add_runtime_dependency("chronic")
 end

data/lib/active_model/validations/date_format_validator.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+require 'chronic'
+
+module ActiveModel
+  module Validations
+    class DateFormatValidator < ActiveModel::Validator
+      def validate(record)
+
+        return if [DateTime, Date, Time].include? record.date_of_birth.class
+
+        return if record.date_of_birth.blank?
+
+        unless   Chronic.parse(record.date_of_birth)
+          record.errors[:base] << (options[:message] || "is not a valid date format")
+        end
+      end
+    end
+  end
+end

data/lib/express_pigeon.rb

@@ -1,12 +1,12 @@
 require "express_pigeon/version"
-require 'active_support'
-require 'time'
 require 'active_model'
-require 'awesome_print'
+require 'curb-fu'
+require 'active_model/validations/date_format_validator'
 
 module ExpressPigeon
   class WebForm
     include ActiveModel::Validations
+
     include ActiveModel::Dirty
 
     define_attribute_methods [
@@ -38,31 +38,22 @@ module ExpressPigeon
     # required and just check bounds.
     validates :address1, :length => 0..255, :allow_blank => true
     validates :address2, :length => 0..255, :allow_blank => true
-    validates :city, :length => 0..128, :allow_blank => true
-    validates :company, :length => 0..128, :allow_blank => true
-    validates :country, :length => 0..128, :allow_blank => true
+    validates :city,     :length => 0..128, :allow_blank => true
+    validates :company,  :length => 0..128, :allow_blank => true
+    validates :country,  :length => 0..128, :allow_blank => true
 
     # now sure why we can put 255 chars into date of birth but that's what it is.
     # TODO validate and require date format, submit as MM/DD/YYYY
-    validates :date_of_birth, :length => 0..255, :allow_blank => true
+    validates :date_of_birth, :length => 0..255, :allow_blank => true, :date_format => true
 
     # will email_form be a submittable field?
-
     validates :first_name, :length => 0..50, :allow_blank => true
     validates :last_name, :length => 0..50, :allow_blank => true
-
     validates :phone, :length => 0..30, :allow_blank => true
-
-    # state is 48?
-    validates :state, :length => 0..48, :allow_blank => true
-
+    validates :state, :length => 0..48, :allow_blank => true # state is 48?
     validates :title, :length => 0..30, :allow_blank => true
+    validates :zip, :length => 0..24, :allow_blank => true # zip is 24?
 
-    # zip is 24?
-    validates :zip, :length => 0..24, :allow_blank => true
-
-
-    # TODO validate date format MM/DD/YYYY
     # TODO validate state
     # TODO validate field sizes
 
@@ -116,7 +107,7 @@ module ExpressPigeon
         :city          => self.city,
         :company       => self.company,
         :country       => self.country,
-        :date_of_birth => self.date_of_birth,
+        :date_of_birth => format_date(self.date_of_birth),
         :email         => self.email,
         :first_name    => self.first_name,
         :guid          => self.guid,
@@ -127,11 +118,15 @@ module ExpressPigeon
         :zip           => self.zip,
       }
 
-      require 'curb-fu'
-
       response = CurbFu.post({:url => url}, params)
 
       response
     end
+
+    def format_date(date)
+      return "" if date.blank?
+
+      date.strftime("%m/%d/%Y")
+    end
   end
 end

data/lib/express_pigeon/version.rb

@@ -1,3 +1,3 @@
 module ExpressPigeon
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/web_forms_spec.rb

@@ -8,15 +8,19 @@ describe ExpressPigeon::WebForm do
     it { should validate_presence_of :email }
     it { should validate_presence_of :guid }
 
+
     describe "specific validations" do
       # TODO add the matchers to activemodel-rspec
       #      that will make this section easier
       let(:form) do
-        f = ExpressPigeon::WebForm.new
-        f.guid = "51697971-48b4-45d3-ab80-3b23152999ed"
-        f.email = "valid@just3ws.com"
-        f.should be_valid
-        f
+        wf = ExpressPigeon::WebForm.new
+
+        wf.guid = "51697971-48b4-45d3-ab80-3b23152999ed"
+        wf.email = "valid@just3ws.com"
+
+        wf.should be_valid
+
+        wf
       end
 
       it "checks email field" do
@@ -33,13 +37,45 @@ describe ExpressPigeon::WebForm do
         form.should_not be_valid
       end
 
+      it "only rejects non-date date of births" do
+        form.date_of_birth = "this is invalid"
+
+        form.should_not be_valid
+      end
+
+      it "accepts date of birth as MM/DD/YYYY" do
+        form.date_of_birth = "05/30/2008"
+        form.should be_valid
+        form.date_of_birth.should == "05/30/2008"
+      end
+
+      it "accepts a date object as date of birth" do
+        form.date_of_birth = Chronic.parse("2011-2-22")
+        form.should be_valid
+        form
+      end
+
+      it "accepts DateTime for date of birth" do
+        form.date_of_birth = DateTime.now
+        form.should be_valid
+      end
+
+      it "accepts Time for date of birth" do
+        form.date_of_birth = Time.now
+        form.should be_valid
+      end
+
+      it "accepts Date for date of birth" do
+        form.date_of_birth = Date.today
+        form.should be_valid
+      end
+
 
       {"address1" => 255,
        "address2" => 255,
        "city" => 128,
        "company" => 128,
        "country" => 128,
-       "date_of_birth" => 255,
        "first_name" => 50,
        "last_name" => 50,
        "phone" => 30,
@@ -75,52 +111,54 @@ describe ExpressPigeon::WebForm do
 
     it "resets changed after successfully saving" do
       wf = ExpressPigeon::WebForm.new
+
       wf.email = "doesnt@matter.com"
       wf.guid = "doesn't matter"
+
       wf.stub(:push_to_express_pigeon!).and_return(true)
+
       wf.save
+
       wf.should_not be_changed
     end
 
     it "remains changed when save fails" do
       wf = ExpressPigeon::WebForm.new
+
       wf.email = "doesnt@matter.com"
       wf.guid = "doesn't matter"
       wf.stub(:push_to_express_pigeon!).and_return(false)
+
       wf.save
+
       wf.should be_changed
     end
   end
 
   it "pushes to expresspigeon.com", :live => true do
     wf = ExpressPigeon::WebForm.new
-    wf.guid = "51697971-48b4-45d3-ab80-3b23152999ed"
-
-    wf.first_name = "Michael"
-    wf.last_name = "Hall"
-
-    wf.email = "mdh+rspec@just3ws.com"
-
-    wf.address1 = "1 Way Street"
-    wf.address1 = "Suite #0"
-
-    wf.city = "Springfield"
-    wf.state = "Illinois"
-    wf.zip = "60606"
-    wf.country = "United States"
 
+    wf.guid          = "51697971-48b4-45d3-ab80-3b23152999ed"
+    wf.first_name    = "Michael"
+    wf.last_name     = "Hall"
+    wf.email         = "mdh+rspec@just3ws.com"
+    wf.address1      = "1 Way Street"
+    wf.address1      = "Suite #0"
+    wf.city          = "Springfield"
+    wf.state         = "Illinois"
+    wf.zip           = "60606"
+    wf.country       = "United States"
     wf.date_of_birth = "1/1/1900"
+    wf.phone         = "888-555-1212"
+    wf.title         = "Emperor of Mankind"
+    wf.company       = "Imperium of Man"
 
-    wf.phone = "888-555-1212"
-
-    wf.title = "Emperor of Mankind"
-    wf.company = "Imperium of Man"
-
+    wf.save
 
-    #wf.should_receive(:push_to_express_pigeon!)
+    pending "Need to get the actual push to EP working first"
 
-    wf.save
-    pending "need to get the actual push to EP working first"
     wf.should be_changed
   end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_pigeon
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Light-weight wrapper around ExpressPigeon.
 email:
 - mdh@just3ws.com
@@ -55,12 +71,14 @@ files:
 - .rspec
 - .rvmrc
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/console
 - express_pigeon.gemspec
+- lib/active_model/validations/date_format_validator.rb
 - lib/express_pigeon.rb
 - lib/express_pigeon/version.rb
 - script/lint