express_pigeon 1.0.2 → 1.0.3

data/express_pigeon-rb.yml

@@ -0,0 +1,10 @@
+project_name: ep
+project_root: ~/projects/express_pigeon-rb
+socket_name: express_pigeon-rb
+rvm: ruby-1.9.3-perf@express_pigeon
+tabs:
+  - editor:
+      layout: main-vertical
+      panes:
+        - vim
+        - clear; bundle exec rspec spec/

data/lib/express_pigeon/version.rb

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

data/lib/express_pigeon.rb

@@ -4,8 +4,78 @@ require 'curb-fu'
 require 'active_model/validations/date_format_validator'
 
 module ExpressPigeon
+  module WebFormValidations
+    def self.included(base)
+
+      base.validates :guid,  :presence => true
+      base.validates :email, :presence => true, :length => 3..50, :allow_blank => false
+
+      # TODO check the actual form to see whether a field is required.
+      #
+      # The functionality to check whether a field is actually required
+      # hasn't been implemented yet. Go ahead and just assume they're not
+      # required and just check bounds.
+      base.validates :address1, :length => 0..255, :allow_blank => true
+      base.validates :address2, :length => 0..255, :allow_blank => true
+      base.validates :city,     :length => 0..128, :allow_blank => true
+      base.validates :company,  :length => 0..128, :allow_blank => true
+      base.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
+      base.validates :date_of_birth, :length => 0..255, :allow_blank => true, :date_format => true
+
+      # will email_form be a submittable field?
+      base.validates :first_name, :length => 0..50, :allow_blank => true
+      base.validates :last_name, :length => 0..50, :allow_blank => true
+      base.validates :phone, :length => 0..30, :allow_blank => true
+      base.validates :state, :length => 0..48, :allow_blank => true # state is 48?
+      base.validates :title, :length => 0..30, :allow_blank => true
+      base.validates :zip, :length => 0..24, :allow_blank => true # zip is 24?
+
+      # TODO validate state
+      # TODO validate field sizes
+    end
+  end
+
+  module WebFormPushable
+    def push_to_express_pigeon!
+      def url; "https://expresspigeon.com/subscription/add_contact"; end
+
+      params = {
+        :address1      => self.address1,
+        :address2      => self.address2,
+        :city          => self.city,
+        :company       => self.company,
+        :country       => self.country,
+        :date_of_birth => format_date(self.date_of_birth),
+        :email         => self.email,
+        :first_name    => self.first_name,
+        :guid          => self.guid,
+        :last_name     => self.last_name,
+        :phone         => self.phone,
+        :state         => self.state,
+        :title         => self.title,
+        :zip           => self.zip,
+      }
+
+      response = CurbFu.post({:url => url}, params)
+
+      response
+    end
+
+    def format_date(date)
+      return "" if date.blank?
+
+      Chronic.parse(date).strftime("%m/%d/%Y")
+    end
+  end
+
+
   class WebForm
     include ActiveModel::Validations
+    include WebFormValidations
+    include WebFormPushable
 
     include ActiveModel::Dirty
 
@@ -28,35 +98,6 @@ module ExpressPigeon
 
     # TODO after submitting the form try to capture the response for errors?
 
-    validates :guid,  :presence => true
-    validates :email, :presence => true, :length => 3..50, :allow_blank => false
-
-    # TODO check the actual form to see whether a field is required.
-    #
-    # The functionality to check whether a field is actually required
-    # hasn't been implemented yet. Go ahead and just assume they're not
-    # 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
-
-    # 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, :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
-    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?
-
-    # TODO validate state
-    # TODO validate field sizes
-
     def address1      ; @address1      ; end
     def address2      ; @address2      ; end
     def city          ; @city          ; end
@@ -98,35 +139,5 @@ module ExpressPigeon
 
     private
 
-    def push_to_express_pigeon!
-      url = "https://expresspigeon.com/subscription/add_contact"
-
-      params = {
-        :address1      => self.address1,
-        :address2      => self.address2,
-        :city          => self.city,
-        :company       => self.company,
-        :country       => self.country,
-        :date_of_birth => format_date(self.date_of_birth),
-        :email         => self.email,
-        :first_name    => self.first_name,
-        :guid          => self.guid,
-        :last_name     => self.last_name,
-        :phone         => self.phone,
-        :state         => self.state,
-        :title         => self.title,
-        :zip           => self.zip,
-      }
-
-      response = CurbFu.post({:url => url}, params)
-
-      response
-    end
-
-    def format_date(date)
-      return "" if date.blank?
-
-      date.strftime("%m/%d/%Y")
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_pigeon
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -77,6 +77,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- express_pigeon-rb.yml
 - express_pigeon.gemspec
 - lib/active_model/validations/date_format_validator.rb
 - lib/express_pigeon.rb