Active 0.0.21 → 0.0.22

data/lib/services/activity.rb

@@ -171,10 +171,8 @@ module Active
       # returns the best address possible by loading other data sources
       # 2. if the primary data source is unknow (ex asset_type_id is unknow ) we will return the GSA address.
       # 3. if no address but we have lat/lng we'll do a reverse look up
-      def _address
-        if Validators.full_address(@gsa.address)
-          return @gsa.address
-        end
+      def full_address
+        @primary.address
         # 3.  MOVE TO A PRIVATE METHOD OR A NEW CLASS
         # if (returned_address["lat"]=="")
         #   #geocode
@@ -202,6 +200,10 @@ module Active
         #   end
         # end        
       end
+      
+      def user
+        @gsa.user
+      end
 
       def start_date
         return @gsa.start_date     unless @gsa.nil?

data/lib/services/dto/user.rb

@@ -0,0 +1,14 @@
+module Active
+  module Services
+    
+    class User
+      def email=(value)
+        @email = value
+      end
+      def email
+        @email
+      end
+    end  
+  
+  end
+end

data/lib/services/gsa.rb

@@ -129,6 +129,14 @@ module Active
           ""
         end
       end
+      
+      def user
+        email   = @data["meta"]["contactEmail"] || nil
+        u       = User.new
+        u.email = email if Validators.email(email)
+        u
+      end
+      
       # substitutionUrl could be formatted like this
       # 1. "meta":{"substitutionUrl":"vistarecreation/registrationmain.sdi?source=showAsset.sdi&activity_id=4900"}
       # 2. "meta":{"substitutionUrl":"4900"}

data/lib/services/reg_center.rb

@@ -155,16 +155,12 @@ module Active
 
       def self.find_by_id(id) #local id
         
-        search_hash = Digest::SHA1.hexdigest("reg_#{id}")
-        if Active.CACHE
-          cached_version = Active.CACHE.get(search_hash)
-          return cached_version if cached_version
-        end
-        
         begin
           doc  = Nokogiri::XML(open("http://apij.active.com/regcenter/event/#{id}"))
+          puts "////////<br/>"
+          puts doc.to_s
+          puts "////////<br/>"
           reg  = RegCenter.new(Hash.from_xml(doc.to_s))
-          Active.CACHE.set(search_hash, reg) if Active.CACHE          
         rescue Exception => e
           raise RegCenterError, "Couldn't find Reg Center activity with the id of #{id} - #{e.inspect}"
           return

data/lib/services/validators.rb

@@ -2,14 +2,22 @@ module Active
   module Services
     class Validators
       
-      def self.full_address address
-        
+      def self.email arg
+        if (arg =~  /^(\w|\.|-)+?@(\w|-)+?\.\w{2,4}($|\.\w{2,4})$/) == nil
+          return false
+        else
+          return true
+        end
       end
       
       # return true or false
       # very short check for 5 consecutive digits, no leading or trailing whitespace.
       def self.zip(arg)
-        # arg ~= /\be(\w*)s\b/
+        # if (arg =~ /\be(\w*)/) != -1
+        #   true
+        # else
+        #   false
+        # end
       end
       
       def self.state

data/spec/activity_spec.rb

@@ -101,8 +101,8 @@ describe Activity do
     end    
     it "should have an address from this hash with null name and address" do
       g = Activity.new(GSA.new(JSON.parse('{"escapedUrl":"http://www.active.com/cycling/san-francisco-ca/california-wine-country-bike-tours-in-october-2010","language":"en","title":"2010 California Wine Country Bike Tours in October | San \u003cb\u003e...\u003c/b\u003e","url":"http://www.active.com/cycling/san-francisco-ca/california-wine-country-bike-tours-in-october-2010","summary":"","meta":{"startDate":"2010-10-10","eventDate":"2010-10-10T00:00:00-07:00","state":"California","endDate":"2010-10-22","eventLongitude":"-122.4200000","lastModifiedDateTime":"2010-08-26 02:15:54.36","splitMediaType":"Event","endTime":"0:00:00","mediaType":"Event","city":"San Francisco","google-site-verification":"","estParticipants":"2000","startTime":"0:00:00","assetId":["81A4A089-CAB5-4293-BFBF-87C74A1C6370","81a4a089-cab5-4293-bfbf-87c74a1c6370"],"eventId":"1889827","participationCriteria":"All","description":"","longitude":"-122.4200000","onlineDonationAvailable":"0","substitutionUrl":"1889827","assetName":["2010 California Wine Country Bike Tours in October","2010 California Wine Country Bike Tours in October"],"eventURL":"http://www.trektravel.com/contentpage.cfm?ID\u003d703","zip":"94101","contactPhone":"866-464-8735","eventLatitude":"37.7800000","eventState":"California","sortDate":"2000-10-10","keywords":"Event","onlineMembershipAvailable":"0","dma":"San Francisco - Oakland - San Jose","trackbackurl":"http://www.active.com/cycling/san-francisco-ca/california-wine-country-bike-tours-in-october-2010","seourl":"http://www.active.com/cycling/san-francisco-ca/california-wine-country-bike-tours-in-october-2010","country":"United States","onlineRegistrationAvailable":"0","category":"Activities","market":"San Francisco - Oakland - San Jose","assetTypeId":"EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65","lastModifiedDate":"2010-08-26","eventZip":"94101","UpdateDateTime":"8/18/2010 10:16:26 AM","latitude":"37.7800000","channel":"Cycling"}}')))
-      g.address[:name].should_not be_nil
-      g.address[:address].should_not be_nil
+      g.address[:name].should be_nil
+      g.address[:address].should be_nil
       g.address[:city].should eql("San Francisco")
       g.address[:state].should eql("California")
       g.address[:zip].should eql("94101")
@@ -124,6 +124,16 @@ describe Activity do
     #   g.address[:lng].should eql("-117.2425355")
     # end    
 
+    # USER
+      it "should have a nil user email" do
+        g = Activity.new(GSA.new(JSON.parse('{"escapedUrl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","language":"en","title":"Seismic Challenge 3.0 | San Francisco, California 94101 \u003cb\u003e...\u003c/b\u003e","url":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","summary":"","meta":{"startDate":"2010-10-02","eventDate":"2010-10-02T00:00:00-07:00","tag":"event:10","state":"California","eventLongitude":"-122.42","endDate":"2010-10-03","lastModifiedDateTime":"2010-10-04 03:08:51.65","splitMediaType":"Event","locationName":"San Francisco Bay","endTime":"0:00:00","mediaType":"Event","city":"San Francisco","google-site-verification":"","estParticipants":"2000","startTime":"0:00:00","assetId":["35A99FCB-E238-4D78-9205-96179F827CB0","35a99fcb-e238-4d78-9205-96179f827cb0"],"eventId":"1883181","participationCriteria":"All","description":"","longitude":"-122.42","onlineDonationAvailable":"0","substitutionUrl":"1883181","assetName":["Seismic Challenge 3.0","Seismic Challenge 3.0"],"eventURL":"http://greaterthanone.org/events/seismic-challenge/","zip":"94101","contactPhone":"415-487-3053","sortDate":"2000-10-02","eventState":"California","eventLatitude":"37.78","keywords":"Event","onlineMembershipAvailable":"0","dma":"San Francisco - Oakland - San Jose","trackbackurl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","seourl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","country":"United States","onlineRegistrationAvailable":"false","category":"Activities","market":"San Francisco - Oakland - San Jose","assetTypeId":"EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65","lastModifiedDate":"2010-10-04","eventZip":"94101","UpdateDateTime":"9/22/2010 11:46:24 AM","latitude":"37.78","channel":"Cycling"}}')))
+        g.user.email.should be_nil    
+      end
+      it "should have a valid user email" do
+        g = Activity.new(GSA.new(JSON.parse('{"escapedUrl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","language":"en","title":"Seismic Challenge 3.0 | San Francisco, California 94101 \u003cb\u003e...\u003c/b\u003e","url":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","summary":"","meta":{"startDate":"2010-10-02","eventDate":"2010-10-02T00:00:00-07:00","tag":"event:10","state":"California","eventLongitude":"-122.42","endDate":"2010-10-03","lastModifiedDateTime":"2010-10-04 03:08:51.65","splitMediaType":"Event","locationName":"San Francisco Bay","endTime":"0:00:00","mediaType":"Event","city":"San Francisco","google-site-verification":"","estParticipants":"2000","startTime":"0:00:00","assetId":["35A99FCB-E238-4D78-9205-96179F827CB0","35a99fcb-e238-4d78-9205-96179f827cb0"],"eventId":"1883181","participationCriteria":"All","description":"","longitude":"-122.42","onlineDonationAvailable":"0","substitutionUrl":"1883181","assetName":["Seismic Challenge 3.0","Seismic Challenge 3.0"],"eventURL":"http://greaterthanone.org/events/seismic-challenge/","zip":"94101","contactPhone":"415-487-3053","sortDate":"2000-10-02","eventState":"California","eventLatitude":"37.78","keywords":"Event","contactEmail":"eventinfo@sfaf.org","onlineMembershipAvailable":"0","dma":"San Francisco - Oakland - San Jose","trackbackurl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","seourl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","country":"United States","onlineRegistrationAvailable":"false","category":"Activities","market":"San Francisco - Oakland - San Jose","assetTypeId":"EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65","lastModifiedDate":"2010-10-04","eventZip":"94101","UpdateDateTime":"9/22/2010 11:46:24 AM","latitude":"37.78","channel":"Cycling"}}')))
+        g.user.email.should eql("eventinfo@sfaf.org")
+      end
+
 
 
   end

data/spec/gsa_spec.rb

@@ -98,8 +98,6 @@ describe GSA do
     r =  s.results.first
     r.address["city"].should eql("San Francisco")
   end
-  
-
 # address
   it "should have a full address" do
     g = GSA.new(JSON.parse('{"title":"Calabasas", "meta":{"location":"Oceanside Harbor","eventLongitude":"-117.3586","locationName":"Oceanside Harbor","eventAddress":"1540 Harbor Drive North", "city":"San Diego", "eventState":"CA", "eventZip":"92121", "latitude":"-22", "longitude":"222", "country":"USA" }}'))
@@ -156,6 +154,23 @@ describe GSA do
     g.address[:lat].should eql("37.77869")
     g.address[:lng].should eql("-122.4212")    
   end
+# USER
+  it "should have a nil user email" do
+    g = GSA.new(JSON.parse('{"escapedUrl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","language":"en","title":"Seismic Challenge 3.0 | San Francisco, California 94101 \u003cb\u003e...\u003c/b\u003e","url":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","summary":"","meta":{"startDate":"2010-10-02","eventDate":"2010-10-02T00:00:00-07:00","tag":"event:10","state":"California","eventLongitude":"-122.42","endDate":"2010-10-03","lastModifiedDateTime":"2010-10-04 03:08:51.65","splitMediaType":"Event","locationName":"San Francisco Bay","endTime":"0:00:00","mediaType":"Event","city":"San Francisco","google-site-verification":"","estParticipants":"2000","startTime":"0:00:00","assetId":["35A99FCB-E238-4D78-9205-96179F827CB0","35a99fcb-e238-4d78-9205-96179f827cb0"],"eventId":"1883181","participationCriteria":"All","description":"","longitude":"-122.42","onlineDonationAvailable":"0","substitutionUrl":"1883181","assetName":["Seismic Challenge 3.0","Seismic Challenge 3.0"],"eventURL":"http://greaterthanone.org/events/seismic-challenge/","zip":"94101","contactPhone":"415-487-3053","sortDate":"2000-10-02","eventState":"California","eventLatitude":"37.78","keywords":"Event","onlineMembershipAvailable":"0","dma":"San Francisco - Oakland - San Jose","trackbackurl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","seourl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","country":"United States","onlineRegistrationAvailable":"false","category":"Activities","market":"San Francisco - Oakland - San Jose","assetTypeId":"EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65","lastModifiedDate":"2010-10-04","eventZip":"94101","UpdateDateTime":"9/22/2010 11:46:24 AM","latitude":"37.78","channel":"Cycling"}}'))    
+    g.user.email.should be_nil    
+  end
+  it "should have a nil user email" do
+    g = GSA.new(JSON.parse('{"escapedUrl":"http://www.active.com/running/san-francisco-ca/nike-womens-marathon-2010","language":"en","title":"Nike Women\u0026#39;s Marathon | San Francisco, California 94102 \u003cb\u003e...\u003c/b\u003e","url":"http://www.active.com/running/san-francisco-ca/nike-womens-marathon-2010","summary":"","meta":{"startDate":"2010-10-17","eventDate":"2010-10-17T07:00:00-07:00","location":"Union Square","tag":["event:10","Running:10"],"state":"California","eventLongitude":"-122.4212","endDate":"2010-10-17","lastModifiedDateTime":"2010-10-01 21:04:24.977","splitMediaType":["Event","Marathon"],"locationName":"Union Square","endTime":"7:00:00","mediaType":["Event","Event\\Marathon"],"city":"San Francisco","google-site-verification":"","estParticipants":"2000","startTime":"7:00:00","assetId":["715ED4EF-E4FF-42F2-B24B-2E4255649676","715ed4ef-e4ff-42f2-b24b-2e4255649676"],"eventId":"1854168","participationCriteria":"All","description":"","longitude":"-122.4212","onlineDonationAvailable":"0","substitutionUrl":"1854168","assetName":["Nike Women\'s Marathon","Nike Women\'s Marathon"],"eventURL":"http://inside.nike.com/blogs/nikerunning_events-en_US/?tags\u003dnike_womens_marathon_2010","zip":"94102","contactPhone":"866-786-6453","eventState":"California","sortDate":"2000-10-17","eventLatitude":"37.77869","keywords":"Event","onlineMembershipAvailable":"0","dma":"San Francisco - Oakland - San Jose","trackbackurl":"http://www.active.com/running/san-francisco-ca/nike-womens-marathon-2010","seourl":"http://www.active.com/running/san-francisco-ca/nike-womens-marathon-2010","country":"United States","onlineRegistrationAvailable":"false","category":"Activities","market":"San Francisco - Oakland - San Jose","assetTypeId":"EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65","lastModifiedDate":"2010-10-01","eventZip":"94102","UpdateDateTime":"9/22/2010 11:46:24 AM","latitude":"37.77869","channel":"Running"}}'))    
+    g.user.email.should be_nil    
+  end
+  it "should have a nil user email when the email is not valid" do
+    g = GSA.new(JSON.parse('{"escapedUrl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","language":"en","title":"Seismic Challenge 3.0 | San Francisco, California 94101 \u003cb\u003e...\u003c/b\u003e","url":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","summary":"","meta":{"startDate":"2010-10-02","eventDate":"2010-10-02T00:00:00-07:00","tag":"event:10","state":"California","eventLongitude":"-122.42","endDate":"2010-10-03","lastModifiedDateTime":"2010-10-04 03:08:51.65","splitMediaType":"Event","locationName":"San Francisco Bay","endTime":"0:00:00","mediaType":"Event","city":"San Francisco","google-site-verification":"","estParticipants":"2000","startTime":"0:00:00","assetId":["35A99FCB-E238-4D78-9205-96179F827CB0","35a99fcb-e238-4d78-9205-96179f827cb0"],"eventId":"1883181","participationCriteria":"All","description":"","longitude":"-122.42","onlineDonationAvailable":"0","substitutionUrl":"1883181","assetName":["Seismic Challenge 3.0","Seismic Challenge 3.0"],"eventURL":"http://greaterthanone.org/events/seismic-challenge/","zip":"94101","contactPhone":"415-487-3053","sortDate":"2000-10-02","eventState":"California","eventLatitude":"37.78","keywords":"Event","contactEmail":"eventfaf.org","onlineMembershipAvailable":"0","dma":"San Francisco - Oakland - San Jose","trackbackurl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","seourl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","country":"United States","onlineRegistrationAvailable":"false","category":"Activities","market":"San Francisco - Oakland - San Jose","assetTypeId":"EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65","lastModifiedDate":"2010-10-04","eventZip":"94101","UpdateDateTime":"9/22/2010 11:46:24 AM","latitude":"37.78","channel":"Cycling"}}'))    
+    g.user.email.should be_nil
+  end
+  it "should have a valid user email" do
+    g = GSA.new(JSON.parse('{"escapedUrl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","language":"en","title":"Seismic Challenge 3.0 | San Francisco, California 94101 \u003cb\u003e...\u003c/b\u003e","url":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","summary":"","meta":{"startDate":"2010-10-02","eventDate":"2010-10-02T00:00:00-07:00","tag":"event:10","state":"California","eventLongitude":"-122.42","endDate":"2010-10-03","lastModifiedDateTime":"2010-10-04 03:08:51.65","splitMediaType":"Event","locationName":"San Francisco Bay","endTime":"0:00:00","mediaType":"Event","city":"San Francisco","google-site-verification":"","estParticipants":"2000","startTime":"0:00:00","assetId":["35A99FCB-E238-4D78-9205-96179F827CB0","35a99fcb-e238-4d78-9205-96179f827cb0"],"eventId":"1883181","participationCriteria":"All","description":"","longitude":"-122.42","onlineDonationAvailable":"0","substitutionUrl":"1883181","assetName":["Seismic Challenge 3.0","Seismic Challenge 3.0"],"eventURL":"http://greaterthanone.org/events/seismic-challenge/","zip":"94101","contactPhone":"415-487-3053","sortDate":"2000-10-02","eventState":"California","eventLatitude":"37.78","keywords":"Event","contactEmail":"eventinfo@sfaf.org","onlineMembershipAvailable":"0","dma":"San Francisco - Oakland - San Jose","trackbackurl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","seourl":"http://www.active.com/cycling/san-francisco-ca/seismic-challenge-30-2010","country":"United States","onlineRegistrationAvailable":"false","category":"Activities","market":"San Francisco - Oakland - San Jose","assetTypeId":"EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65","lastModifiedDate":"2010-10-04","eventZip":"94101","UpdateDateTime":"9/22/2010 11:46:24 AM","latitude":"37.78","channel":"Cycling"}}'))    
+    g.user.email.should eql("eventinfo@sfaf.org")
+  end
 end
 
 

data/spec/reg_spec.rb

@@ -15,6 +15,10 @@ describe RegCenter do
 # <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body><getAssetMetadataResponse xmlns="http://api.asset.services.active.com"><out xmlns="http://api.asset.services.active.com">&lt;importSource>&lt;asset row="1" destinationID="">&lt;isSearchable>true&lt;/isSearchable>&lt;assetId>BF304447-0052-4466-A044-68D1459C5068&lt;/assetId>&lt;assetTypeId>EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65&lt;/assetTypeId>&lt;substitutionUrl>1886328&lt;/substitutionUrl>&lt;assetName>Excellence in Writing&lt;/assetName>&lt;category>Activities&lt;/category>&lt;channel>Not Specified&lt;/channel>&lt;mediaType>Recware Activities&lt;/mediaType>&lt;searchWeight>1&lt;/searchWeight>&lt;zip>92027&lt;/zip>&lt;city>Escondido&lt;/city>&lt;state>California&lt;/state>&lt;country>United States&lt;/country>&lt;startDate>2010-09-07&lt;/startDate>&lt;startTime>15:30:00&lt;/startTime>&lt;endDate>2010-09-07&lt;/endDate>&lt;endTime>15:30:00&lt;/endTime>&lt;participationCriteria>All&lt;/participationCriteria>&lt;onlineRegistrationAvailable>true&lt;/onlineRegistrationAvailable>&lt;onlineDonationAvailable>0&lt;/onlineDonationAvailable>&lt;onlineMembershipAvailable>0&lt;/onlineMembershipAvailable>&lt;avgUserRating/>&lt;userCommentText/>&lt;image1>http://www.active.com/images/events/hotrace.gif&lt;/image1>&lt;contactEmail>recreation@escondido.org&lt;/contactEmail>&lt;contactPhone>760-839-4691&lt;/contactPhone>&lt;eventResults/>&lt;location>Grove Room - East Valley Community Center&lt;/location>&lt;contactName>Escondido Community Services Department&lt;/contactName>&lt;market>San Diego&lt;/market>&lt;trackbackurl>http://www.active.com/page/Event_Details.htm?event_id=1886328&amp;amp;assetId=BF304447-0052-4466-A044-68D1459C5068&lt;/trackbackurl>&lt;seourl>http://www.active.com/not-specified-recware-activities/escondido-ca/excellence-in-writing-2010&lt;/seourl>&lt;dma>San Diego&lt;/dma>&lt;longitude>-117.0864&lt;/longitude>&lt;latitude>33.11921&lt;/latitude>&lt;/asset>&lt;/importSource></out></getAssetMetadataResponse></soap:Body></soap:Envelope>
 
   end
+  it "should create a new regCenter class" do
+    r = RegCenter.new(Hash.from_xml('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>  <event>    <assetID>5c6fa2f2-0434-4d6c-953d-cab9bade4f64</assetID>    <eventID>1877942</eventID>    <eventName>Realistic Drawing (6-12 Yrs.)</eventName>    <eventDate>2010-09-16T15:30:00-07:00</eventDate>    <eventTime>3:30 PM</eventTime>    <eventLocation>Arts &amp; Crafts Room - Nick Rodriguez Community Center</eventLocation>    <eventAddress>213 "F" Street</eventAddress>    <eventCity>Antioch</eventCity>    <eventState>California</eventState>    <eventZip>94509</eventZip>    <eventCountry>USA</eventCountry>    <eventDescription>Do you love to draw?Learn how to make your drawings more realistic with projects that focus on observation,proportion,perspective,composition,light and shadow and texture.Media will include pencil,pen,charcoal,and pastel.A &amp;10 materials fee is payable to the instuctor at the first class.</eventDescription>    <usatSanctioned>false</usatSanctioned>    <regOnline>true</regOnline>    <eventCloseDate>2010-09-16T00:00:00-07:00</eventCloseDate>    <currencyCode>USD</currencyCode>    <eventTypeID>1</eventTypeID>    <eventType>Recware Activities</eventType>    <hasEventResults>false</hasEventResults>    <hasMetaResults>false</hasMetaResults>    <showMap>true</showMap>    <longitude>-121.8058</longitude>    <latitude>38.00492</latitude>    <eventContactEmail>dadams@ci.antioch.ca.us</eventContactEmail>    <eventContactPhone>925-779-7070</eventContactPhone>    <displayCloseDate>true</displayCloseDate>    <excludedFromEmailing>false</excludedFromEmailing>    <category>Activities</category>    <mediaTypes>      <mediaType>Recware Activities</mediaType>    </mediaTypes>    <channels>      <channel>        <primaryChannel>false</primaryChannel>      </channel>    </channels>    <eventCategories/>    <eventDetails>      <eventDetail>        <eventDetailsName>Ages</eventDetailsName>        <eventDetailsOrder>1</eventDetailsOrder>        <eventDetailsValue>6 years - 12 years 11months</eventDetailsValue>      </eventDetail>      <eventDetail>        <eventDetailsName>Instructor</eventDetailsName>        <eventDetailsOrder>2</eventDetailsOrder>        <eventDetailsValue>Nancy Roberts</eventDetailsValue>      </eventDetail>      <eventDetail>        <eventDetailsName>Code</eventDetailsName>        <eventDetailsOrder>3</eventDetailsOrder>        <eventDetailsValue>1447.401</eventDetailsValue>      </eventDetail>      <eventDetail>        <eventDetailsName>Classification</eventDetailsName>        <eventDetailsOrder>4</eventDetailsOrder>        <eventDetailsValue>Art</eventDetailsValue>      </eventDetail>      <eventDetail>        <eventDetailsName>Schedule</eventDetailsName>        <eventDetailsOrder>5</eventDetailsOrder>        <eventDetailsValue>Occurs every week on Thursday effective 9/16/10 until 10/21/10 from 3:30 PM to 4:30 PM</eventDetailsValue>      </eventDetail>    </eventDetails>    <eventDonationLinks/>    <eventSanctions/>    <eventDetailsPageUrl>http://www.active.com/page/Event_Details.htm?event_id=1877942</eventDetailsPageUrl>    <eventContactUrl>http://www.active.com/event_contact.cfm?event_id=1877942</eventContactUrl>  </event>'))
+    r.title.should eql("Realistic Drawing (6-12 Yrs.)")
+  end
   it "should set find by id" do
     a = RegCenter.find_by_id(@valid_id)
     a.data.should_not be_nil

data/spec/search_spec.rb

@@ -384,8 +384,8 @@ describe Search do
     it "should find events that have online regristration"
     it "should find events that do not have online regristration"
     
-    it "should have a start date" do
-      Search.search(:asset_id => "715ED4EF-E4FF-42F2-B24B-2E4255649676").results.first.should_not be_nil
+    it "should have a nil email address from GSA" do
+      Search.search(:asset_id => "715ED4EF-E4FF-42F2-B24B-2E4255649676").results.first.user.email.should be_nil
       # first.address["address"].should_not be_nil
     end
 

data/spec/validators_spec.rb

@@ -0,0 +1,24 @@
+# Require the spec helper relative to this file
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+require File.join(File.dirname(__FILE__), %w[custom_matchers_spec])
+require File.join(File.dirname(__FILE__), %w[ .. lib services search])
+require File.join(File.dirname(__FILE__), %w[ .. lib services activity])
+include Active
+include Active::Services
+
+
+describe Validators do
+
+  it "should find a valid email address" do
+    Validators.email("diney.bom-fim_23db@google.com").should be_true
+    Validators.email("jspooner@gmail.com").should be_true
+    Validators.email("jspooner@ga").should be_false
+  end
+  
+end
+
+
+
+
+
+

data/version.txt

@@ -1 +1 @@
-0.0.21
+0.0.22

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: Active
 version: !ruby/object:Gem::Version 
-  hash: 53
   prerelease: false
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Jonathan Spooner, Brian Levine
@@ -22,11 +21,9 @@ dependencies:
   name: savon
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 7
@@ -38,11 +35,9 @@ dependencies:
   name: dalli
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
@@ -54,11 +49,9 @@ dependencies:
   name: bones
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 3
         - 4
@@ -76,21 +69,25 @@ extra_rdoc_files:
 - History.txt
 - README.txt
 - bin/Active
+- lib/.DS_Store
+- lib/services/.DS_Store
 - lib/services/search.txt
 - version.txt
 files: 
-- .bnsignore
 - Active.gemspec
 - History.txt
 - README.txt
 - Rakefile
 - bin/Active
+- lib/.DS_Store
 - lib/Active.rb
+- lib/services/.DS_Store
 - lib/services/IActivity.rb
 - lib/services/active_works.rb
 - lib/services/activity.rb
 - lib/services/address.rb
 - lib/services/ats.rb
+- lib/services/dto/user.rb
 - lib/services/gsa.rb
 - lib/services/reg_center.rb
 - lib/services/sanitize.rb
@@ -109,6 +106,7 @@ files:
 - spec/search_memcached_spec.rb
 - spec/search_spec.rb
 - spec/spec_helper.rb
+- spec/validators_spec.rb
 - test/test_Active.rb
 - version.txt
 has_rdoc: true
@@ -122,27 +120,23 @@ rdoc_options:
 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"
 requirements: []
 
 rubyforge_project: Active
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Search api for Active Network

data/.bnsignore

@@ -1,19 +0,0 @@
-# The list of files that should be ignored by Mr Bones.
-# Lines that start with '#' are comments.
-#
-# A .gitignore file can be used instead by setting it as the ignore
-# file in your Rakefile:
-#
-#   Bones {
-#     ignore_file  '.gitignore'
-#   }
-#
-# For a project with a C extension, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-announcement.txt
-coverage
-doc
-pkg
-.DS_Store