Active 0.0.18 → 0.0.21

data/lib/services/active_works.rb

@@ -1,11 +1,13 @@
+require 'rubygems'
+require 'nokogiri'
+require 'open-uri'
+
 module Active
   module Services
 
     class ActiveWorksError < StandardError;  end
 
     class ActiveWorks < IActivity
-      require 'nokogiri'
-      require 'open-uri'
       
       attr_accessor :asset_type_id
       

data/lib/services/activity.rb

@@ -136,9 +136,8 @@ module Active
         # end
         
       end
-      # if address is incomplete we will load data from the primary data source
-      # if the primary data source is unknow (ex asset_type_id is unknow ) we will return the GSA address.
-      # ?
+
+      # returns the best address possible from the data returned by the GSA
       def address
         # returned_address = validated_address({})
         # returned_address = @primary.address unless (@primary.nil? || @primary.address.nil?)
@@ -147,10 +146,8 @@ module Active
         returned_address = @gsa.address     
         if @gsa.address[:address] != nil #and returned_address.city and returned_address.state and returned_address.country
           return returned_address
-        else
-          if load_master
-            return @gsa.address
-          end
+        else          
+          return @gsa.address if load_master
         end
         # returned_address =  @address        if @address
         # 
@@ -169,6 +166,16 @@ module Active
         #   end
         # end
         # 
+        return returned_address
+      end
+      # 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
+        # 3.  MOVE TO A PRIVATE METHOD OR A NEW CLASS
         # if (returned_address["lat"]=="")
         #   #geocode
         #   geocode_url=""
@@ -193,9 +200,7 @@ module Active
         #     end
         #     
         #   end
-        # end
-
-        return returned_address
+        # end        
       end
 
       def start_date

data/lib/services/gsa.rb

@@ -61,12 +61,12 @@ module Active
       def address
         @address = HashWithIndifferentAccess.new({
           :name    => @data["meta"]["location"],
-          :address => @data["meta"]["eventAddress"],
           :city    => @data["meta"]["city"],
           :lat     => @data["meta"]["latitude"],
           :lng     => @data["meta"]["longitude"],
           :country => @data["meta"]["country"]
         })       
+       @address[:address] = @data["meta"]["eventAddress"] || @data["meta"]["location"] || nil
        @address[:state] = @data["meta"]["eventState"] || @data["meta"]["state"]
        @address[:zip]   = @data["meta"]["eventZip"] || @data["meta"]["zip"]
        @address
@@ -74,7 +74,9 @@ module Active
 
       def start_date
         if @data.has_key?("meta") and  @data["meta"].has_key?("eventDate")
-          DateTime.parse @data["meta"]["eventDate"] 
+          DateTime.parse( @data["meta"]["eventDate"] )
+        elsif @data.has_key?("meta") and  @data["meta"].has_key?("startDate")
+          DateTime.parse( @data["meta"]["startDate"] )
         else
           nil
         end

data/lib/services/search.rb

@@ -244,8 +244,6 @@ module Active
               Active.CACHE.set( Digest::MD5.hexdigest(end_point), self) if Active.CACHE
             rescue Exception => e              
             end
-            
-            
 
           rescue JSON::ParserError => e
             raise RuntimeError, "JSON::ParserError json=#{res.body}"

data/lib/services/validators.rb

@@ -1,7 +1,29 @@
 module Active
   module Services
     class Validators
-
+      
+      def self.full_address address
+        
+      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/
+      end
+      
+      def self.state
+        true
+      end
+      
+      def self.city
+        false
+      end
+      
+      def self.address
+        false
+      end
+      
       STATES = [
         [ "Alabama", "AL" ],
         [ "Alaska", "AK" ],
@@ -76,7 +98,8 @@ module Active
         return nil
       end
 
-      # clean zip 
+      # NO MODIFYING IN A VALIDATION CLASS 
+      # !! clean zip 
       # (http://geekswithblogs.net/MainaD/archive/2007/12/03/117321.aspx)
       def self.valid_zip(zip)
         if zip!="00000" && zip.to_s.strip=~/(^\d{5}(-\d{4})?$)|(^[ABCEGHJKLMNPRSTVXY]{1}\d{1}[A-Z]{1} *\d{1}[A-Z]{1}\d{1}$)/

data/spec/activity_spec.rb

@@ -99,6 +99,18 @@ describe Activity do
       g.address[:lat].should eql("33.2000368")
       g.address[:lng].should eql("-117.2425355")
     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[:city].should eql("San Francisco")
+      g.address[:state].should eql("California")
+      g.address[:zip].should eql("94101")
+      g.address[:country].should eql("United States")
+      g.address[:lat].should eql("37.7800000")
+      g.address[:lng].should eql("-122.4200000")    
+    end
+    
     # TODO FIND OUT WHERE THIS DATA COMES FROM AND GET IT WORKING 
     # it "should have a partial address that it's full data doesn't live in WORKS or REGCENTER" do
     #   g = Activity.new(GSA.new(JSON.parse('{"language":"en", "title":"Zumba Punch Card (Adult) - Oct. (5) | Vista, CA, 92084 |", "url":"http://www.active.com/community-services-class/vista-ca/zumba-punch-card-adult-oct-5-2010", "escapedUrl":"http://www.active.com/community-services-class/vista-ca/zumba-punch-card-adult-oct-5-2010", "meta":{"city":"Vista", "assetId":"3ae995d9-5c16-4176-b44e-fa0577644ca4", "substitutionUrl":"vistarecreation/registrationmain.sdi?source=showAsset.sdi&activity_id=4900", "trackbackurl":"http://www.active.com/community-services-class/vista-ca/zumba-punch-card-adult-oct-5-2010", "onlineRegistrationAvailable":"false", "zip":"92084", "sortDate":"2000-10-02", "category":"Activities", "latitude":"33.2000368", "dma":"San Diego", "lastModifiedDate":"2010-09-29", "tags":"2348.321", "lastModifiedDateTime":"2010-09-29 16:46:43.33", "country":"United States of America", "startDate":"2010-10-02", "assetName":"Zumba Punch Card (Adult) -  Oct. (5)", "summary":"People of all ages are falling in love with Zumba, one of the fastest growing dance-based fitness crazes in the country. With Zumbas easy-to-follow dance moves you receive body beautifying benefits while enjoying Latin rhythms including Salsa, Meringue, Cumbia, Reggaeton, even belly dance and hip-hop. Zumba is ", "description":"", "seourl":"http://www.active.com/community-services-class/vista-ca/zumba-punch-card-adult-oct-5-2010", "channel":"Community Services", "splitMediaType":"Class", "mediaType":"Class", "longitude":"-117.2425355", "UpdateDateTime":"8/20/2008 9:03:50 AM", "assetTypeId":"FB27C928-54DB-4ECD-B42F-482FC3C8681F", "state":"California", "keywords":""}, "summary":""}')))

data/spec/gsa_spec.rb

@@ -52,6 +52,11 @@ describe GSA do
     @a.start_time.should_not be_nil
     @a.start_time.should be_an_instance_of(DateTime)
   end
+  it "should have a valid start date when data has meta.startDate" do
+    g = GSA.new(JSON.parse('{"escapedUrl":"http://www.active.com/community-services-class/belmont-ca/modern-teen-adult-2010","language":"en","title":"Modern - Teen Adult | Belmont, CA, 94002 |","url":"http://www.active.com/community-services-class/belmont-ca/modern-teen-adult-2010","summary":"active espn. Active Home | Directory | Community | eteamz | Results | Support |\u003cbr\u003e Event Directors \u0026amp; Organizers. Active.com. New beta search! \u003cb\u003e...\u003c/b\u003e  ","meta":{"summary":"Barefoot dance with emphasis on floor work, release technique, and partnering. Emotion and story line are core elements in this class. Attire is loose fitting clothing any style or color.","startDate":"2010-11-03","tag":"class:10","state":"California","splitMediaType":"Class","lastModifiedDateTime":"2010-09-08 16:32:50.49","mediaType":"Class","city":"Belmont","assetId":"b06cbfb8-ff63-488c-92c6-d060680cc208","description":"","longitude":"-122.2758","substitutionUrl":"belmontparksandrecreation/registrationmain.sdi?source\u003dshowAsset.sdi\u0026activity_id\u003d3722","tags":"1510.306","assetName":"Modern - Teen Adult","zip":"94002","sortDate":"2000-11-03","keywords":"","dma":"San Francisco - Oakland - San Jose","trackbackurl":"http://www.active.com/community-services-class/belmont-ca/modern-teen-adult-2010","seourl":"http://www.active.com/community-services-class/belmont-ca/modern-teen-adult-2010","country":"United States of America","onlineRegistrationAvailable":"true","category":"Activities","assetTypeId":"FB27C928-54DB-4ECD-B42F-482FC3C8681F","lastModifiedDate":"2010-09-08","UpdateDateTime":"8/20/2008 9:03:50 AM","latitude":"37.52021","channel":"Community Services"}}'))
+    g.start_time.should_not be_nil    
+    g.start_time.should eql(DateTime.parse("Wed, 03 Nov 2010 00:00:00"))
+  end
   it "should have nil is no date" do
     g = GSA.new(JSON.parse('{"title":"Calabasas Classic 2010 - 5k \u003cb\u003e10k\u003c/b\u003e Runs | Calabasas, California 91302 \u003cb\u003e...\u003c/b\u003e"}'))
     g.start_time.should be_nil
@@ -119,5 +124,42 @@ describe GSA do
     g.address[:lat].should eql("33.2000368")
     g.address[:lng].should eql("-117.2425355")
   end
-  
+  it "should have a address.address" 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","location":"San Francisco Bay","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.address[:address].should eql("San Francisco Bay")
+    g.address[:name].should eql("San Francisco Bay")
+    g.address[:lat].should eql("37.78")
+    g.address[:zip].should eql("94101")
+    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.address[:address].should be_nil
+  end
+  it "should have an address from this hash with null name and address" do
+    g = 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 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")
+    g.address[:country].should eql("United States")
+    g.address[:lat].should eql("37.7800000")
+    g.address[:lng].should eql("-122.4200000")    
+  end
+  it "should have an address from this hash" 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 Womens Marathon","Nike Womens 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.address[:name].should eql("Union Square")
+    g.address[:address].should eql("Union Square")
+    g.address[:city].should eql("San Francisco")
+    g.address[:state].should eql("California")
+    g.address[:zip].should eql("94102")
+    g.address[:country].should eql("United States")
+    g.address[:lat].should eql("37.77869")
+    g.address[:lng].should eql("-122.4212")    
+  end
 end
+
+
+
+
+
+

data/spec/search_spec.rb

@@ -381,24 +381,12 @@ describe Search do
         }
       end
     end
-
-    it "should find upcoming events" 
-
-    it "should find popular events"
-
-    it "should order by trending with params"
-    #   results = Search.search( {:channels => ['Running'], :sort => 'trending'} )
-    # end
-
-    it "should order by RELEVANCE"
-
-    it "should order by date DATE_ASC"
-
-    it "should order by date DATE_DESC"
-
-    it "should order by the date created" do
-    #   results = Search.search( {:channels => ['Running'], :sort => 'created_at_asc'} )
-      pending
+    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
+      # first.address["address"].should_not be_nil
     end
 
   end

data/version.txt

@@ -1 +1 @@
-0.0.18
+0.0.21

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Active
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - Jonathan Spooner, Brian Levine
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-10-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency