Active 0.0.6 → 0.0.7

data/lib/services/activity.rb

@@ -1,38 +1,33 @@
 module Active
   module Services
     class Activity
-      attr_accessor :title, :url, :category, :address, :start_date, :start_time, :end_time, :end_date, :category, :desc,
-                    :asset_id, :asset_type_id,  :data, :endIndex, :pageSize, :searchTime, :numberOfResults
+      attr_accessor :title, :url, :categories, :address, :start_date, :start_time, :end_time, :end_date, :category, :desc,
+                    :asset_id, :asset_type_id,  :data
+
       def initialize data
         @data      = HashWithIndifferentAccess.new(data)  
         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]      
           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]      ||= ""
+          self.categories = @data[:meta][:channel] 
           
           @desc                        = @data[:meta][:description]  ||= ""
           @start_time                  = @data[:meta][:startTime]    ||= ""
           @end_time                    = @data[:meta][:endTime]      ||= ""
           @address = {
             :name    => @data[:meta][:locationName],
-            :address    => @data[:meta][:location],
+            :address => @data[:meta][:location],
             :city    => @data[:meta][:city],
             :state   => @data[:meta][:state],
             :zip     => @data[:meta][:zip],
             :lat     => @data[:meta][:latitude],
             :lng     => @data[:meta][:longitude],
             :country => @data[:meta][:country]
-            
-            # dma?
-            
           }
         end
         @onlineDonationAvailable     = @data[:meta][:onlineDonationAvailable]
@@ -49,9 +44,9 @@ module Active
       end
       
       # TODO add many channels
-      def category=(value)
-        @category = (value.class == Array) ? value[0] : value
-      end
+      # def categories=(value)
+      #   @category = (value.class == Array) ? value : value
+      # end
       
       def asset_id=(value)        
         @asset_id = (value.class==Array) ? value[0] : value

data/lib/services/search.rb

@@ -29,12 +29,174 @@ module Active
     end
 
     class Search
-      # attr_accessor :location, :category, :channels, :daterange, :keywords, :radius, :limit, :sort, :page, :offset,
-      #               :asset_type_id, :api_key, :num_results, :view, :facet, :sort
-      # 
+      attr_accessor :api_key, :start_date, :end_date, :location, :channels, :keywords, :search, :radius, :limit, :sort, :page, :offset,
+                    :view, :facet, :sort, :num_results
+                    
+      attr_reader :results, :endIndex, :pageSize, :searchTime, :numberOfResults, :end_point, :meta
+       
       SEARCH_URL      = "http://search.active.com"
       DEFAULT_TIMEOUT = 5
+      
+      def initialize(data={})
+        self.api_key     = data[:api_key] || ""
+        self.location    = data[:location] || ""
+        self.channels    = data[:channels] || []
+        self.keywords    = data[:keywords] || []
+        self.radius      = data[:radius] || "50"
+        self.limit       = data[:limit] || "10"
+        self.sort        = data[:sort] || Sort.DATE_ASC
+        self.page        = data[:page] || "1"
+        self.offset      = data[:offset] || "0"
+        self.view        = data[:view] || "json"
+        self.facet       = data[:facet] || Facet.ACTIVITIES       
+        self.num_results = data[:num_results] || "10"
+        self.search      = data[:search] || ""
+        self.start_date  = data[:start_date] || "today"
+        self.end_date    = data[:end_date] || "+"
+        
+        # Search.construct_url
+      end
+      
+      def location=(value)
+        @location = CGI.escape(value)
+      end
+      
+      def keywords=(value)
+        if value.class == String
+          @keywords = value.split(",").each { |k| k.strip! }
+        else
+          @keywords = value
+        end
+      end     
+      
+      def channels=(value)
+        if value.class == String
+          @channels = value.split(",").each { |k| k.strip! }
+        else
+          @channels = value
+        end
+      end
+      
+      def end_point
+        meta_data  = ""
+        channel_keys = []
+        @channels.each do |c|
+          c.to_sym
+          if Categories.CHANNELS.include?(c)
+            channel_keys << Categories.CHANNELS[c]
+          end
+        end
+        meta_data = channel_keys.collect { |channel| "meta:channel=#{Search.double_encode_channel(channel)}" }.join("+OR+")
+        puts meta_data
+        
+        
+        # meta_data  = self.channels.join("+OR+")
+        
+        meta_data += "+AND+" unless meta_data == ""
+        if @start_date.class == Date
+          @start_date = URI.escape(@start_date.strftime("%m/%d/%Y")).gsub(/\//,"%2F")
+        end
+        if @end_date.class == Date
+          @end_date = URI.escape(@end_date.strftime("%m/%d/%Y")).gsub(/\//,"%2F")
+        end
+        meta_data += "meta:startDate:daterange:#{@start_date}..#{@end_date}"
 
+        url = "#{SEARCH_URL}/search?api_key=#{@api_key}&num=#{@num_results}&page=#{@page}&l=#{@location}&f=#{@facet}&v=#{@view}&r=#{@radius}&s=#{@sort}&k=#{@keywords.join("+")}&m=#{meta_data}"
+      end
+      
+      def search
+        searchurl         = URI.parse(end_point)
+        req               = Net::HTTP::Get.new(searchurl.path)
+        http              = Net::HTTP.new(searchurl.host, searchurl.port)
+        http.read_timeout = DEFAULT_TIMEOUT
+        
+        puts "#{searchurl.path}?#{searchurl.query}"
+        
+        res = http.start { |http|
+          http.get("#{searchurl.path}?#{searchurl.query}")
+        }
+        
+        if (200..307).include?(res.code.to_i)
+          parsed_json      = JSON.parse(res.body)
+          @endIndex        = parsed_json["endIndex"]
+          @pageSize        = parsed_json["pageSize"]
+          @searchTime      = parsed_json["searchTime"]
+          @numberOfResults = parsed_json["numberOfResults"]
+          @results         = parsed_json['_results'].collect { |a| Activity.new(a) }
+        else
+          raise RuntimeError, "Active Search responded with a #{res.code} for your query."
+        end
+      end
+      
+      # examples
+      #
+      # Search.new({:location => "San Diego"})
+      #
+      # Keywords can be set like this
+      # Search.new({:keywords => "Dog,Cat,Cow"})
+      # Search.new({:keywords => %w(Dog Cat Cow)})
+      # Search.new({:keywords => ["Dog","Cat","Cow"]})
+      #
+      # http://developer.active.com/docs/Activecom_Search_API_Reference
+      # returns an array of results and query info
+      def self.search(data=nil)
+        search = Search.new(data)
+        search.search
+        return search
+      end
+      
+      def self.construct_url(arg_options={})
+        return arg_options[:url] if arg_options.keys.index(:url) #todo use has_key? #a search url was specified - bypass parsing the options (trending)
+        # self.merge!(arg_options)
+
+        # options[:location] = CGI.escape(options[:location]) if options[:location]
+        
+        # if options[:keywords].class == String
+        #           options[:keywords] = options[:keywords].split(",")
+        #           options[:keywords].each { |k| k.strip! }
+        #         end
+
+        # if options[:channels] != nil     
+        #   channel_keys = []
+        #   options[:channels].each do |c|
+        #     c.to_sym
+        #     if self.CHANNELS.include?(c)
+        #       channel_keys << self.CHANNELS[c]
+        #     end
+        #   end
+        #   channels_a = channel_keys.collect { |channel| "meta:channel=#{Search.double_encode_channel(channel)}" }
+        # end
+
+        meta_data  = ""
+        meta_data  = channels_a.join("+OR+") if channels_a
+
+        meta_data += "+AND+" unless meta_data == ""
+        if options[:start_date].class == Date
+          options[:start_date] = URI.escape(options[:start_date].strftime("%m/%d/%Y")).gsub(/\//,"%2F")
+        end
+
+        if options[:end_date].class == Date
+          options[:end_date] = URI.escape(options[:end_date].strftime("%m/%d/%Y")).gsub(/\//,"%2F")
+        end
+        meta_data += "meta:startDate:daterange:#{options[:start_date]}..#{options[:end_date]}"
+
+        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
+        url
+        self.end_point = url
+      end
+      
+      private
+        def self.double_encode_channel str
+          str = URI.escape(str, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+          str = URI.escape(str, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+          str.gsub!(/\-/,"%252D")
+          str
+        end
+      
+    end
+  
+    class Categories
       def self.CHANNELS 
         {
           :active_lifestyle => '',
@@ -160,104 +322,7 @@ module Active
           :wrestling => 'Wrestling'
         }
       end
-
-
-      # http://developer.active.com/docs/Activecom_Search_API_Reference
-      # 
-      def self.search(data=nil)
-        searchurl         = URI.parse(construct_url(data))
-        req               = Net::HTTP::Get.new(searchurl.path)
-        http              = Net::HTTP.new(searchurl.host, searchurl.port)
-        http.read_timeout = DEFAULT_TIMEOUT
-
-        res = http.start { |http|
-          http.get("#{searchurl.path}?#{searchurl.query}")
-        }
-        
-        # if res.code == '200' or res.code == '307'
-        if (200..307).include?(res.code.to_i)
-          parsed_json = JSON.parse(res.body)
-          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
-      end
-      
-      def self.construct_url(arg_options={})
-        options = {
-          :api_key     => "",
-          :view        => "json",
-          :facet       => Facet.ACTIVITIES,
-          :sort        => Sort.DATE_ASC,
-          :radius      => "50",
-          :meta        => "",
-          :num_results => "10",
-          :page        => "1",
-          :location    => "",
-          :search      => "",
-          :keywords    => [],
-          :channels    => nil,
-          :start_date  => "today",
-          :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]
-        
-        if options[:keywords].class == String
-          options[:keywords] = options[:keywords].split(",")
-          options[:keywords].each { |k| k.strip! }
-        end
-        if options[:channels] != nil     
-          
-          channel_keys = []
-          options[:channels].each do |c|
-            c.to_sym
-            if self.CHANNELS.include?(c)
-              channel_keys << self.CHANNELS[c]
-            end
-          end
-          
-          channels_a = channel_keys.collect { |channel| "meta:channel=#{Search.double_encode_channel(channel)}" }
-        end
-
-        meta_data  = ""
-        meta_data  = channels_a.join("+OR+") if channels_a
-
-        meta_data += "+AND+" unless meta_data == ""
-        if options[:start_date].class == Date
-          options[:start_date] = URI.escape(options[:start_date].strftime("%m/%d/%Y")).gsub(/\//,"%2F")
-        end
-
-        if options[:end_date].class == Date
-          options[:end_date] = URI.escape(options[:end_date].strftime("%m/%d/%Y")).gsub(/\//,"%2F")
-        end
-        meta_data += "meta:startDate:daterange:#{options[:start_date]}..#{options[:end_date]}"
-
-        # if @asset_type_id!=nil
-        #   @meta = @meta + "+AND+" if @meta!=""
-        #   @meta = @meta + "inmeta:assetTypeId=#{@asset_type_id}" 
-        # 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 "//////"
-        puts url
-        puts "//////"
-        url
-      end
-      
-      private
-        def self.double_encode_channel str
-          str = URI.escape(str, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-          str = URI.escape(str, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-          str.gsub!(/\-/,"%252D")
-          str
-        end
-      
     end
+  
   end
 end

data/spec/activity_spec.rb

@@ -63,8 +63,12 @@ describe Activity do
   
   it "should strip out unicode from the title"
   
-  it "should use the first group if title contains pipes." do
-    
+  it "should use the first group if title contains pipes." 
+  
+  it "should have 2 channels" do
+    a = Activity.new(@valid_attributes)
+    a.categories.should be_an_instance_of(Array)
+    a.should have(2).categories
   end
   
   it "should be a valid activity" do

data/spec/benchmark/search_bench.rb

@@ -0,0 +1,9 @@
+require 'rubygems'
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib Active]))
+include Active::Services
+
+Benchmark.bm(700) do |x|
+  x.report("string:")   { Search.new({:keywords => "running,swimming,yoga"}) }
+  x.report("array:") { Search.new({:keywords => %w(running swimming yoga)}) }
+  x.report("Array:")  { Search.new({:keywords => ["running","swimming","yoga"]}) }
+end

data/spec/custom_matchers_spec.rb

@@ -0,0 +1,27 @@
+module CustomMatchers
+  
+  class Param
+    def initialize(expected)
+      @expected = expected
+    end
+
+    def matches?(actual)
+      @actual = actual
+      # Satisfy expectation here. Return false or raise an error if it's not met.
+      @actual.include?(@expected)
+    end
+
+    def failure_message_for_should
+      "expected #{@actual.inspect} to have param #{@expected.inspect}, but it didn't"
+    end
+
+    def failure_message_for_should_not
+      "expected #{@actual.inspect} not to have param #{@expected.inspect}, but it did"
+    end
+  end
+
+  def have_param(expected)
+    Param.new(expected)
+  end
+  
+end

data/spec/search_spec.rb

@@ -1,10 +1,9 @@
 require 'fake_web'
 # 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])
-
-# No need to type Britify:: before each call
 include Active::Services
 
 describe  "Set up" do
@@ -13,104 +12,134 @@ 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
-    url = Search.construct_url( {:location => "San Diego, CA, US"} )
-    uri = URI.parse(url)
-    uri.scheme.should eql("http")
-    uri.host.should eql("search.active.com")
-    uri.query.include?("l=#{CGI.escape("San Diego, CA, US")}").should be_true
+  include CustomMatchers
+  it "should escape the location" do
+    s = Search.new()
+    s.location.should eql("")
+    s = Search.new({:location => "San Diego"})
+    s.location.should eql("San+Diego")
   end
   
-  it "should construct a valid url from a zip code" do
-    uri = URI.parse(Search.construct_url( {:zip => "92121"} ))    
-    uri.query.include?("l=#{CGI.escape("92121")}").should be_true
+  it "should have an array of keywords" do
+    s = Search.new()
+    s.should have(0).keywords
+    s = Search.new({:keywords => "Dog,Cat,Cow"})
+    s.should have(3).keywords
+    s = Search.new({:keywords => %w(Dog Cat Cow)})
+    s.should have(3).keywords
+    s = Search.new({:keywords => ["Dog","Cat","Cow"]})
+    s.should have(3).keywords
   end
-  
-  it "should construct a valid url with CSV keywords" do
-    uri = URI.parse( Search.construct_url( {:keywords => "running, tri"} ) )
-    uri.query.include?("k=running+tri").should be_true
-  end
-  
-  it "should construct a valid url with keywords array" do
-    uri = URI.parse( Search.construct_url( {:keywords => ["running","tri","cycling"]} ) )
-    uri.query.include?("k=running+tri+cycling").should be_true
+
+  it "should have an array of channels" do
+    s = Search.new()
+    s.should have(0).channels
+    s = Search.new({:channels => "running,swimming,yoga"})
+    s.should have(3).channels
+    s = Search.new({:channels => %w(running swimming yoga)})
+    s.should have(3).channels
+    s = Search.new({:channels => ["running","swimming","yoga"]})
+    s.should have(3).channels
   end
   
   it "should have defaults set" do
-    uri = URI.parse( Search.construct_url() )
+    s = Search.new()
+    uri = URI.parse( s.end_point )
     uri.query.include?("f=#{Facet.ACTIVITIES}").should be_true    
     uri.query.include?("s=#{Sort.DATE_ASC}").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    
-    uri.query.include?("daterange:today..+").should be_true            
+    uri.query.should have_param("num=10")
+    uri.query.should have_param("daterange:today..+")
+  end
+  
+  it "should construct a valid url with location" do
+    s = Search.new( {:location => "San Diego, CA, US"} )
+    uri = URI.parse(s.end_point)
+    uri.scheme.should eql("http")
+    uri.host.should eql("search.active.com")
+    uri.query.should have_param("l=#{CGI.escape("San Diego, CA, US")}")
+  end
+  
+  # it "should construct a valid url from a zip code" do
+  #   s   = Search.new( {:zip => "92121"} )
+  #   uri = URI.parse(s.end_point)    
+  #   uri.query.should have_param("l=#{CGI.escape("92121")}")
+  # end
+  
+  it "should construct a valid url with CSV keywords" do
+    s   = Search.new( {:keywords => "running, tri"} )
+    uri = URI.parse( s.end_point )
+    uri.query.should have_param("k=running+tri")
+    s   = Search.new( {:keywords => ["running","tri","cycling"]} )
+    uri = URI.parse( s.end_point )
+    uri.query.should have_param("k=running+tri+cycling")    
   end
 
   it "should construct a valid url with channels array" do
-    uri = URI.parse( Search.construct_url( {:channels => [:running, :tri,:cycling, :yoga]} ) )
-    uri.query.include?("m=meta:channel=Running+OR+meta:channel=Cycling+OR+meta:channel=Mind%2520%2526%2520Mody%255CYoga").should be_true            
+    s = Search.new( {:channels => [:running, :tri,:cycling, :yoga]} )
+    uri = URI.parse( s.end_point )
+    uri.query.should have_param("m=meta:channel=Running+OR+meta:channel=Cycling+OR+meta:channel=Mind%2520%2526%2520Body%255CYoga")        
   end
   
   it "should send valid channel info" do
-    uri = URI.parse( Search.construct_url({:channels => [:running,:triathlon]}) )
+    uri = URI.parse( Search.new({:channels => [:running,:triathlon]}).end_point )
     uri.query.include?("meta:channel=Running+OR+meta:channel=Triathlon").should be_true
   end
   
   it "should send the correct channel value for everything in Search.CHANNELS" do
-    Search.CHANNELS.each do |key,value|
-      uri = URI.parse( Search.construct_url({:channels => [key]}) )
+    Categories.CHANNELS.each do |key,value|
+      uri   = URI.parse( Search.new({:channels => [key]}).end_point )
       value = URI.escape(value, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
       value = URI.escape(value, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
       value.gsub!(/\-/,"%252D")
-      uri.query.include?("meta:channel=#{value}").should be_true
+      uri.query.should have_param("meta:channel=#{value}")        
     end
   end
   
   it "should send a valid start and end date" do
-    uri = URI.parse( Search.construct_url() )
-    uri.query.include?("daterange:today..+").should be_true
+    uri = URI.parse( Search.new().end_point )
+    uri.query.should have_param("daterange:today..+")
   end
 
   it "should send a valid start and end date" do
-    uri = URI.parse( Search.construct_url({:start_date => Date.new(2010, 11, 1), :end_date => Date.new(2010, 11, 15)}) )    
+    uri = URI.parse( Search.new({:start_date => Date.new(2010, 11, 1), :end_date => Date.new(2010, 11, 15)}).end_point )    
     uri.query.include?("meta:startDate:daterange:11%2F01%2F2010..11%2F15%2F2010").should be_true                
   end
   
   it "should be valid with date range and channels" do
-    uri = URI.parse( Search.construct_url({:channels => [:running, :triathlon],
+    uri = URI.parse( Search.new({:channels => [:running, :triathlon],
                                            :start_date => Date.new(2010, 11, 1),
-                                           :end_date => Date.new(2010, 11, 15)}) )
-    uri.query.include?("meta:channel=Running+OR+meta:channel=Triathlon").should be_true
-    uri.query.include?("daterange:11%2F01%2F2010..11%2F15%2F2010").should be_true
+                                           :end_date => Date.new(2010, 11, 15)}).end_point )
+    uri.query.should have_param("meta:channel=Running+OR+meta:channel=Triathlon")
+    uri.query.should have_param("daterange:11%2F01%2F2010..11%2F15%2F2010")
   end
   
   it "should pass the search radius" do
-    uri = URI.parse( Search.construct_url({:radius => '666'}) )
-    uri.query.include?("r=666").should be_true                
+    uri = URI.parse( Search.new({:radius => '666'}).end_point )
+    uri.query.should have_param("r=666")
   end
   
 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=50&s=date_asc&k=&m=meta:startDate:daterange:today..+", 
+                         :body => '{"endIndex":3,"numberOfResults":3,"pageSize":3,"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"])
+    s = Search.search( {:location => "San Diego, CA, US"} )
+    s.should have(3).results    
+  end
+  
+end
 
 describe Search do
   after(:each) do 
@@ -118,24 +147,40 @@ describe Search do
   end
   
   it "should have some channels" do
-    Search.CHANNELS.should_not be_nil
+    Categories.CHANNELS.should_not be_nil
+  end
+  
+  it "should describe pagination info on search object" 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=50&s=date_asc&k=&m=meta:startDate:daterange:today..+", 
+                         :body => '{"endIndex":3,"numberOfResults":3,"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 => ["200", "Found"])
+    s = Search.search( {:location => "San Diego, CA, US"} )
+    s.should be_a_kind_of(Search)
+    s.should have(3).results
+    s.endIndex.should == 3
+    s.numberOfResults.should == 3
+    s.pageSize.should == 5
+    s.searchTime.should == 0.600205
   end
   
   it "should raise and error during a 404" 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..+", 
+    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=50&s=date_asc&k=&m=meta:startDate:daterange:today..+", 
                          :body => "Nothing to be found 'round here", :status => ["404", "Not Found"])
     lambda { Search.search( {:location => "San Diego, CA, US"} ) }.should raise_error(RuntimeError)                         
   end
   
   it "should search by location (san diego)" 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"]}},
+    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=50&s=date_asc&k=&m=meta:startDate:daterange:today..+", 
+                         :body => '{"endIndex":3,"numberOfResults":3,"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 => ["200", "Found"])
-    results = Search.search( {:location => "San Diego, CA, US"} )
-    results.should have(3).items
-    results.each do |a|
+    s = Search.search( {:location => "San Diego, CA, US"} )
+    s.should be_a_kind_of(Search)
+    s.should have(3).results
+    s.results.each do |a|
       a.should be_an_instance_of(Activity)
       a.title.should_not be_nil
       a.start_date.should_not be_nil
@@ -160,9 +205,9 @@ end
 describe "Call Live Data" do
   
   it "should find only events in the future" do
-    results = Search.search( { :keywords => ["running"] } )
-    results.should have(10).items
-    results.each do |a|
+    s = Search.search( { :keywords => ["running"] } )
+    s.should have(10).results
+    s.results.each do |a|
       a.start_date.should satisfy { |d|
         d >= Date.today
       }
@@ -170,9 +215,9 @@ describe "Call Live Data" do
   end
 
   it "should find only events with in a range" do
-    results = Search.search( {:start_date => Date.new(2010,1,1), :end_date => Date.new(2010,2,1)} )
-    results.should have(10).items
-    results.each do |a|
+    s = Search.search( {:start_date => Date.new(2010,1,1), :end_date => Date.new(2010,2,1)} )
+    s.should have(10).results
+    s.results.each do |a|
       a.start_date.should satisfy { |d|
         d >= Date.new(2010,1,1) and d <= Date.new(2010,2,1)
       }
@@ -180,9 +225,9 @@ describe "Call Live Data" do
   end
 
   it "should find events after the start date" do
-    results = Search.search( {:start_date => Date.new(2010,1,1), :num_results => 50} )
-    results.should have(50).items
-    results.each do |a|
+    s = Search.search( {:start_date => Date.new(2010,1,1), :num_results => 50} )
+    s.should have(50).results
+    s.results.each do |a|
       a.start_date.should satisfy { |d|
         d >= Date.new(2010,1,1) 
       }
@@ -191,21 +236,21 @@ describe "Call Live Data" do
   
   # our model should be updated to handle multiple categories 
   # I'm sure running is with in all of these events but we're only storing 1.
-  it "should find only running activities" do
-    results = Search.search( {:channels => [:running],
-                              :start_date => Date.new(2010,1,1), :num_results => 20} )
-    results.should have(20).items    
-    results.each do |a|
-      puts "-#{a.category}-"
-      a.category.should satisfy { |d|
-        d.include?('Running' )
-      }
-    end
-  end
+  # it "should find only running activities" do
+  #   s = Search.search( {:channels => [:running],
+  #                             :start_date => Date.new(2010,1,1), :num_results => 20} )
+  #   s.should have(20).results    
+  #   s.results.each do |a|
+  #     puts "-#{a.category}-"
+  #     a.category.should satisfy { |d|
+  #       d.include?('Running' )
+  #     }
+  #   end
+  # end
   
   it "should find yoga activities by channel" do
-    results = Search.search( {:channels => [:yoga]} )
-    results.should have(10).items        
+    s = Search.search( {:channels => [:yoga]} )
+    s.should have(10).results        
   end
     
   it "should find activities that have been recently added" 
@@ -225,3 +270,6 @@ describe "Call Live Data" do
   it "should order by date DATE_DESC"
   
 end
+
+
+

data/version.txt

@@ -1 +1 @@
-0.0.6
+0.0.7

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Active
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jonathan Spooner, Brian Levine
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 -07:00
+date: 2010-09-11 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
@@ -41,7 +44,6 @@ extra_rdoc_files:
 - History.txt
 - README.txt
 - bin/Active
-- lib/.DS_Store
 - version.txt
 files: 
 - .bnsignore
@@ -50,13 +52,14 @@ files:
 - README.txt
 - Rakefile
 - bin/Active
-- lib/.DS_Store
 - lib/Active.rb
 - lib/services/activity.rb
 - lib/services/search.rb
 - spec/.DS_Store
 - spec/Active_spec.rb
 - spec/activity_spec.rb
+- spec/benchmark/search_bench.rb
+- spec/custom_matchers_spec.rb
 - spec/search_spec.rb
 - spec/spec_helper.rb
 - test/test_Active.rb
@@ -72,23 +75,27 @@ 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.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Search api for Active Network