Active 0.0.5 → 0.0.6

data/README.txt

@@ -14,6 +14,13 @@ Search api for Active Network
 
 	Search.search( {:location => "San Diego, CA, US"} )
 
+	List all categories
+	Active::Services::Search.CHANNELS.each do |key, value| 
+		puts key.to_s.humanize
+	end 
+	
+	
+
 == REQUIREMENTS:
 
 * none

data/lib/services/activity.rb

@@ -2,17 +2,21 @@ module Active
   module Services
     class Activity
       attr_accessor :title, :url, :category, :address, :start_date, :start_time, :end_time, :end_date, :category, :desc,
-                    :asset_id, :data
+                    :asset_id, :asset_type_id,  :data, :endIndex, :pageSize, :searchTime, :numberOfResults
       def initialize data
         @data      = HashWithIndifferentAccess.new(data)  
-        self.title    = @data[:title]
-        @url      = @data[:url]
+        self.title = @data[:title]
+        @url       = @data[:url]
+        @pageSize = @data[:pageSize]
+        @searchTime = @data[:searchTime]
+        @numberOfResults = @data[:numberOfResults]
   
         unless @data[:meta].nil?  
-          self.asset_id                    = @data[:meta][:assetId]      
-          @start_date                  = Date.parse(@data[:meta][:startDate])    
-          @end_date                    = Date.parse(@data[:meta][:endDate])  if @data[:meta][:endDate]
-          self.category                    = @data[:meta][:channel]      ||= ""
+          self.asset_id = @data[:meta][:assetId]      
+          self.asset_type_id = @data[:meta][:assetTypeId]      
+          @start_date   = Date.parse(@data[:meta][:startDate])    
+          @end_date     = Date.parse(@data[:meta][:endDate])  if @data[:meta][:endDate]
+          self.category = @data[:meta][:channel]      ||= ""
           
           @desc                        = @data[:meta][:description]  ||= ""
           @start_time                  = @data[:meta][:startTime]    ||= ""
@@ -37,7 +41,14 @@ module Active
 
       end
       
-      # ahhh... just use the first channel if it's an array.
+      def title=(value)
+        @title = value.gsub(/<\/?[^>]*>/, "") 
+        if value.include?("|")
+          @title = @title.split("|")[0].strip!
+        end
+      end
+      
+      # TODO add many channels
       def category=(value)
         @category = (value.class == Array) ? value[0] : value
       end

data/lib/services/search.rb

@@ -174,9 +174,12 @@ module Active
           http.get("#{searchurl.path}?#{searchurl.query}")
         }
         
-        if res.code == '200'
+        # if res.code == '200' or res.code == '307'
+        if (200..307).include?(res.code.to_i)
           parsed_json = JSON.parse(res.body)
-          parsed_json['_results'].collect { |a| Activity.new(a) }          
+          return parsed_json["numberOfResults"] if data.has_key?(:show_number_of_results)
+          query_addl_info= {:endIndex=>parsed_json["endIndex"], :pageSize=>parsed_json["pageSize"], :searchTime=>parsed_json["searchTime"], :numberOfResults=>parsed_json["numberOfResults"]}
+          parsed_json['_results'].collect { |a| Activity.new(a.merge query_addl_info) }          
         else
           raise RuntimeError, "Active Search responded with a #{res.code} for your query."
         end
@@ -188,7 +191,7 @@ module Active
           :view        => "json",
           :facet       => Facet.ACTIVITIES,
           :sort        => Sort.DATE_ASC,
-          :radius      => "10",
+          :radius      => "50",
           :meta        => "",
           :num_results => "10",
           :page        => "1",
@@ -200,6 +203,8 @@ module Active
           :end_date    => "+"
         }
         options.merge!(arg_options)
+
+        return arg_options[:url] if arg_options.keys.index(:url) #a search url was specified - bypass parsing the options (trending)
         
         options[:location] = CGI.escape(options[:location]) if options[:location]
         
@@ -239,7 +244,9 @@ module Active
         # end
         # 
         url = "#{SEARCH_URL}/search?api_key=#{options[:api_key]}&num=#{options[:num_results]}&page=#{options[:page]}&l=#{options[:location]}&f=#{options[:facet]}&v=#{options[:view]}&r=#{options[:radius]}&s=#{options[:sort]}&k=#{options[:keywords].join("+")}&m=#{meta_data}"
-        # puts url
+        puts "//////"
+        puts url
+        puts "//////"
         url
       end
       

data/spec/activity_spec.rb

@@ -9,7 +9,7 @@ include Active::Services
 describe Activity do
   before(:each) do 
     @valid_attributes = {
-      :title => "2011 Walt Disney World\xAE Marathon | Lake Buena Vista, Florida <b>...</b>",
+      :title => "<b>2011 Walt Disney World\xAE Marathon \u003cb\u003e...\u003c/b\u003e | Lake Buena Vista, Florida <b>...</b>",
       :url => "http://www.active.com/running/lake-buena-vista-fl/walt-disney-world-marathon-2011",
       :language => "en",
       :meta => {
@@ -56,6 +56,17 @@ describe Activity do
       }
   end
   
+  it "should strip out html from the title" do
+    a = Activity.new(@valid_attributes)
+    a.title.should eql("2011 Walt Disney World Marathon")
+  end
+  
+  it "should strip out unicode from the title"
+  
+  it "should use the first group if title contains pipes." do
+    
+  end
+  
   it "should be a valid activity" do
     a = Activity.new(@valid_attributes)
     a.url.should eql("http://www.active.com/running/lake-buena-vista-fl/walt-disney-world-marathon-2011")

data/spec/search_spec.rb

@@ -13,6 +13,23 @@ describe  "Set up" do
   it "should call search.active.com when told to"
 end
 
+describe "Handle http server codes" do 
+  after(:each) do 
+    FakeWeb.clean_registry
+  end
+  
+  it "should follow a 302" do
+    FakeWeb.register_uri(:get, "http://search.active.com/search?api_key=&num=10&page=1&l=San+Diego%2C+CA%2C+US&f=activities&v=json&r=10&s=date_asc&k=&m=meta:startDate:daterange:today..+", 
+                         :body => '{"endIndex":5,"numberOfResults":2,"pageSize":5,"searchTime":0.600205,"_results":[{"escapedUrl": "http://www.active.com/running/calabasas-ca/calabasas-classic-5k-10k-runs-2010","language": "en","title": "Calabasas Classic 2010 - 5k \u003cb\u003e10k\u003c/b\u003e Runs | Calabasas, California 91302 \u003cb\u003e...\u003c/b\u003e","url": "http://www.active.com/running/calabasas-ca/calabasas-classic-5k-10k-runs-2010","summary": "\u003cb\u003e...\u003c/b\u003e Calabasas Classic 2010 - 5k \u003cb\u003e10k\u003c/b\u003e Runs. Based on 0 reviews. \u003cb\u003e...\u003c/b\u003e Recent Reviews Calabasas\u003cbr\u003e Classic 2010 - 5k \u003cb\u003e10k\u003c/b\u003e Runs reviews. Get Directions. Start Address. End Address \u003cb\u003e...\u003c/b\u003e  ","meta": {"startDate": "2010-11-14","eventDate": "2010-11-14T08:00:00-08:00","location": "Calabasas Park Centre","tag": ["event:10", "Green:10", "Running:10"],"state": "California","eventLongitude": "-118.6789","endDate": "2010-11-14","locationName": "Calabasas Park Centre","splitMediaType": ["Event", "1 mile", "10K", "5K"],"endTime": "8:00:00","mediaType": ["Event", "Event\\1 mile", "Event\\10K", "Event\\5K"],"google-site-verification": "","city": "Calabasas","startTime": "8:00:00","assetId": ["11B01475-8C65-4F9C-A4AC-2A3FA55FE8CD", "11b01475-8c65-4f9c-a4ac-2a3fa55fe8cd"],"eventId": "1810531","participationCriteria": "All","description": "","longitude": "-118.6789","onlineDonationAvailable": "false","substitutionUrl": "1810531","assetName": ["Calabasas Classic 2010 -  5k 10k Runs", "Calabasas Classic 2010 -  5k 10k Runs"],"zip": "91302","contactPhone": "818-715-0428","sortDate": "2000-11-14","eventState": "California","eventLatitude": "34.12794","keywords": "Event","eventAddress": "23975 Park Sorrento","contactEmail": "rot10kd@yahoo.com","onlineMembershipAvailable": "false","trackbackurl": "http://www.active.com/running/calabasas-ca/calabasas-classic-5k-10k-runs-2010","country": "United States","onlineRegistrationAvailable": "true","category": "Activities","image1": "http://www.active.com/images/events/hotrace.gif","assetTypeId": "EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65","lastModifiedDate": "2010-03-04 07:30:26.307","eventZip": "91302","latitude": "34.12794","UpdateDateTime": "8/18/2010 10:16:26 AM","channel": ["Running", "Walking"]}},
+                         {"escapedUrl": "http://www.active.com/10k-race/seattle-wa/fitness-for-vitality-5k10k-3race-series-919-2010","language": "en","title": "Fitness For Vitality 5k/\u003cb\u003e10k\u003c/b\u003e 3-Race Series (9/19, 10/17, 11/21) \u003cb\u003e...\u003c/b\u003e","url": "http://www.active.com/10k-race/seattle-wa/fitness-for-vitality-5k10k-3race-series-919-2010","summary": "\u003cb\u003e...\u003c/b\u003e Fitness For Vitality 5k/\u003cb\u003e10k\u003c/b\u003e 3-Race Series (9/19, 10/17, 11/21). Based on 0 reviews. \u003cb\u003e...\u003c/b\u003e\u003cbr\u003e Reviews of Fitness For Vitality 5k/\u003cb\u003e10k\u003c/b\u003e 3-Race Series (9/19, 10. \u003cb\u003e...\u003c/b\u003e  ","meta": {"summary": "\u003cp style\u003dtext-align:left\u003e\u003cfont style\u003dfont-family:UniversEmbedded;font-size:12;color:#000000; LETTERSPACING\u003d0 KERNING\u003d0\u003eRace or walk on a flat, fast, and fun course! The entire event is along the Puget Sound. Do all 3 events in the series and watch your time and fitness improve! Oatmeal post-race. 10% proceeds sh","startDate": "2010-09-19","eventDate": "2010-09-19","location": "Alki Beach Park, Seattle","tag": ["event:10", "Running:10"],"state": "Washington","endDate": "2010-11-22","locationName": "1702 Alki Ave. SW","splitMediaType": ["5K", "difficulty:Beginner", "difficulty:Advanced", "Event", "difficulty:Intermediate", "10K"],"lastModifiedDateTime": "2010-08-19 23:35:50.117","endTime": "07:59:59","mediaType": ["5K", "difficulty:Beginner", "difficulty:Advanced", "Event", "difficulty:Intermediate", "10K"],"google-site-verification": "","city": "Seattle","startTime": "07:00:00","assetId": ["39e8177e-dd0e-42a2-8a2b-24055e5325f3", "39e8177e-dd0e-42a2-8a2b-24055e5325f3"],"eventId": "E-000NGFS9","participationCriteria": "Kids,Family","description": "","longitude": "-122.3912","substitutionUrl": "E-000NGFS9","assetName": ["Fitness For Vitality 5k/10k 3-Race Series (9/19, 10/17, 11/21)", "Fitness For Vitality 5k/10k 3-Race Series (9/19, 10/17, 11/21)"],"zip": "98136","contactPhone": "n/a","eventState": "WA","sortDate": "2000-09-19","keywords": "Event","eventAddress": "1702 Alki Ave. SW","contactEmail": "n/a","dma": "Seattle - Tacoma","trackbackurl": "http://www.active.com/10k-race/seattle-wa/fitness-for-vitality-5k10k-3race-series-919-2010","seourl": "http://www.active.com/10k-race/seattle-wa/fitness-for-vitality-5k10k-3race-series-919-2010","country": "United States","onlineRegistrationAvailable": "true","category": "Activities","image1": "http://photos-images.active.com/file/3/1/optimized/9015e50d-3a2e-4ce4-9ddc-80b05b973b01.jpg","allText": "\u003cp style\u003dtext-align:left\u003e\u003cfont style\u003dfont-family:UniversEmbedded;font-size:12;color:#000000; LETTERSPACING\u003d0 KERNING\u003d0\u003eRace or walk on a flat, fast, and fun course! The entire event is along the Puget Sound. Do all 3 events in the series and watch your time and fitness improve! Oatmeal post-race. 10% proceeds sh","address": "1702 Alki Ave. SW","assetTypeId": "DFAA997A-D591-44CA-9FB7-BF4A4C8984F1","lastModifiedDate": "2010-08-19","eventZip": "98136","latitude": "47.53782","UpdateDateTime": "8/18/2010 10:16:08 AM","channel": "Running"}},
+                         {"escapedUrl": "http://www.active.com/running/calabasas-ca/calabasas-classic-5k-10k-runs-2010","language": "en","title": "Calabasas Classic 2010 - 5k \u003cb\u003e10k\u003c/b\u003e Runs | Calabasas, California 91302 \u003cb\u003e...\u003c/b\u003e","url": "http://www.active.com/running/calabasas-ca/calabasas-classic-5k-10k-runs-2010","summary": "\u003cb\u003e...\u003c/b\u003e Calabasas Classic 2010 - 5k \u003cb\u003e10k\u003c/b\u003e Runs. Based on 0 reviews. \u003cb\u003e...\u003c/b\u003e Recent Reviews Calabasas\u003cbr\u003e Classic 2010 - 5k \u003cb\u003e10k\u003c/b\u003e Runs reviews. Get Directions. Start Address. End Address \u003cb\u003e...\u003c/b\u003e  ","meta": {"startDate": "2010-11-14","eventDate": "2010-11-14T08:00:00-08:00","location": "Calabasas Park Centre","tag": ["event:10", "Green:10", "Running:10"],"state": "California","eventLongitude": "-118.6789","endDate": "2010-11-14","locationName": "Calabasas Park Centre","splitMediaType": ["Event", "1 mile", "10K", "5K"],"endTime": "8:00:00","mediaType": ["Event", "Event\\1 mile", "Event\\10K", "Event\\5K"],"google-site-verification": "","city": "Calabasas","startTime": "8:00:00","assetId": ["11B01475-8C65-4F9C-A4AC-2A3FA55FE8CD", "11b01475-8c65-4f9c-a4ac-2a3fa55fe8cd"],"eventId": "1810531","participationCriteria": "All","description": "","longitude": "-118.6789","onlineDonationAvailable": "false","substitutionUrl": "1810531","assetName": ["Calabasas Classic 2010 -  5k 10k Runs", "Calabasas Classic 2010 -  5k 10k Runs"],"zip": "91302","contactPhone": "818-715-0428","sortDate": "2000-11-14","eventState": "California","eventLatitude": "34.12794","keywords": "Event","eventAddress": "23975 Park Sorrento","contactEmail": "rot10kd@yahoo.com","onlineMembershipAvailable": "false","trackbackurl": "http://www.active.com/running/calabasas-ca/calabasas-classic-5k-10k-runs-2010","country": "United States","onlineRegistrationAvailable": "true","category": "Activities","image1": "http://www.active.com/images/events/hotrace.gif","assetTypeId": "EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65","lastModifiedDate": "2010-03-04 07:30:26.307","eventZip": "91302","latitude": "34.12794","UpdateDateTime": "8/18/2010 10:16:26 AM","channel": ["Running", "Walking"]}}]}',
+                         :status => ["302", "Found"])
+    results = Search.search( {:location => "San Diego, CA, US"} )
+    results.should have(3).items    
+  end
+  
+end
+
 describe  "Search URL Construction" do
 
   it "should construct a valid url with location" do
@@ -42,7 +59,7 @@ describe  "Search URL Construction" do
     uri = URI.parse( Search.construct_url() )
     uri.query.include?("f=#{Facet.ACTIVITIES}").should be_true    
     uri.query.include?("s=#{Sort.DATE_ASC}").should be_true    
-    uri.query.include?("r=10").should be_true    
+    uri.query.include?("r=50").should be_true    
     uri.query.include?("v=json").should be_true    
     uri.query.include?("page=1").should be_true    
     uri.query.include?("num=10").should be_true    
@@ -141,8 +158,9 @@ describe Search do
 end
 
 describe "Call Live Data" do
+  
   it "should find only events in the future" do
-    results = Search.search( { :keywords => ["swim"]} )
+    results = Search.search( { :keywords => ["running"] } )
     results.should have(10).items
     results.each do |a|
       a.start_date.should satisfy { |d|
@@ -189,7 +207,6 @@ describe "Call Live Data" do
     results = Search.search( {:channels => [:yoga]} )
     results.should have(10).items        
   end
-  
     
   it "should find activities that have been recently added" 
   

data/version.txt

@@ -1 +1 @@
-0.0.5
+0.0.6

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: Active
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jonathan Spooner, Brian Levine
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -07:00
+date: 2010-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bones
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 3
         - 4
@@ -44,6 +41,7 @@ extra_rdoc_files:
 - History.txt
 - README.txt
 - bin/Active
+- lib/.DS_Store
 - version.txt
 files: 
 - .bnsignore
@@ -52,6 +50,7 @@ files:
 - README.txt
 - Rakefile
 - bin/Active
+- lib/.DS_Store
 - lib/Active.rb
 - lib/services/activity.rb
 - lib/services/search.rb
@@ -73,27 +72,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