Active 0.0.32 → 0.0.34

data/.bnsignore

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

data/Rakefile

@@ -18,7 +18,7 @@ Bones {
   Welcome to Active Network
   --------------------------
   MSG
-  depend_on  'savon'
+  depend_on  'savon', '0.7.9'
   depend_on  'dalli', '0.9.8'
 }
 

data/lib/services/gsa.rb

@@ -6,6 +6,8 @@ module Active
     class GSA < IActivity
       require 'nokogiri'
       require 'open-uri'
+      # require 'active_support/core_ext/hash/'
+
       attr_accessor :asset_type_id
 
       # EXAMPLE Data hash
@@ -14,6 +16,7 @@ module Active
       def initialize(json={})
         # need to hold on to original data
         @data = HashWithIndifferentAccess.new(json) || HashWithIndifferentAccess.new
+        # @data = HashWithIndifferentAccess.new(json) || HashWithIndifferentAccess.new
         # self.title = @data['meta']['assetName'] || nil
         self.title = @data['title'] || nil
       end

data/lib/services/search.rb

@@ -30,6 +30,7 @@ module Active
 
     class Search
       attr_accessor :api_key, :start_date, :end_date, :location, :channels, :split_media_type, :keywords, :search, :radius, :limit, :sort, :page, :offset, :latitude, :longitude,
+                    :asset_type_id, :url,
                     :view, :facet, :sort, :num_results, :asset_ids, :dma, :city, :state, :country, :bounding_box
                     
       attr_reader :results, :endIndex, :pageSize, :searchTime, :numberOfResults, :end_point, :meta
@@ -38,32 +39,34 @@ module Active
       DEFAULT_TIMEOUT = 60
       
       def initialize(data={})
-        self.api_key     = data[:api_key] || ""
-        self.location    = data[:location]
-        self.zips        = data[:zips] || []
-        self.channels    = data[:channels] || []
-        self.split_media_type= data[:split_media_type] || []
-        self.keywords    = data[:keywords] || []
-        self.radius      = data[:radius] || nil
-        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] || "+"        
-        self.asset_ids   = data[:asset_ids] || []
-        self.asset_id    = data[:asset_id] || ""
-        self.latitude    = data[:latitude]
-        self.longitude   = data[:longitude]
-        self.dma         = data[:dma]
-        self.city        = data[:city]
-        self.state       = data[:state]
-        self.country     = data[:country]
-        self.bounding_box = data[:bounding_box]
+        self.asset_type_id    = data[:asset_type_id]
+        self.url              = data[:url]
+        self.api_key          = data[:api_key] || ""
+        self.location         = data[:location]
+        self.zips             = data[:zips] || []
+        self.channels         = data[:channels] || []
+        self.split_media_type = data[:split_media_type] || []
+        self.keywords         = data[:keywords] || []
+        self.radius           = data[:radius] || nil
+        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] || "+"        
+        self.asset_ids        = data[:asset_ids] || []
+        self.asset_id         = data[:asset_id] || ""
+        self.latitude         = data[:latitude]
+        self.longitude        = data[:longitude]
+        self.dma              = data[:dma]
+        self.city             = data[:city]
+        self.state            = data[:state]
+        self.country          = data[:country]
+        self.bounding_box     = data[:bounding_box]
       end
       
       # Example
@@ -128,14 +131,33 @@ module Active
         # CHANNELS
         channel_keys = []
         @channels.each do |c|
-          c.to_sym
+          c = c.to_sym
           if Categories.CHANNELS.include?(c)
             channel_keys << Categories.CHANNELS[c]
+          else
+            puts "///////////  Channel key not found [#{c}]"
           end
         end
-        meta_data = channel_keys.collect { |channel| "meta:channel=#{Search.double_encode_channel(channel)}" }.join("+OR+")
+        meta_data += channel_keys.collect { |channel| "meta:channel=#{Search.double_encode_channel(channel)}" }.join("+OR+")
         # SPLIT MEDIA TYPE
-        meta_data += split_media_type.collect { |type| "+meta:splitMediaType=#{Search.double_encode_channel(type)}" }.join("+OR+") unless split_media_type.nil?
+        if split_media_type
+          meta_data += "+AND+" unless meta_data == ""
+          meta_data += split_media_type.collect { |type| "meta:splitMediaType=#{Search.double_encode_channel(type)}" }.join("+OR+")           
+        end
+        # ASSET TYPE ID
+        if asset_type_id
+          meta_data += "+AND+" unless meta_data == ""
+          meta_data += "meta:assetTypeId=#{Search.double_encode_channel(asset_type_id)}" 
+        end
+        # url
+        if url
+          meta_data += "+AND+" unless meta_data == ""
+          # url.gsub!(/\-/,"%252D")
+          url.gsub!(/\//,"%2F")
+          # URI.escape(url, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+          meta_data += "site:#{url}"
+          # meta_data += "site:#{Search.double_encode_channel(url)}"
+        end
         # ASSET IDS
         unless asset_ids.empty?
           meta_data += "+AND+" unless meta_data == ""
@@ -154,42 +176,28 @@ module Active
         if @city or @state or @country
           if @city
             meta_data += "+AND+" unless meta_data == ""
-            meta_data += "meta:city=#{Search.double_encode_channel(@city)}" 
+            meta_data += "meta:city=#{Search.double_encode_channel(@city)}"
           end
           if @state
             meta_data += "+AND+" unless meta_data == ""
-            meta_data += "meta:state=#{Search.double_encode_channel(@state)}"             
+            meta_data += "meta:state=#{Search.double_encode_channel(@state)}"         
           end
         elsif !@zips.empty?
-        # if not @zips.empty?
           loc_str = @zips.join(",")          
         elsif @latitude and @longitude
           loc_str = "#{@latitude};#{@longitude}"
         elsif @dma
-          
           meta_data += "+AND+" unless meta_data == ""
           meta_data += "meta:dma=#{Search.double_encode_channel(@dma)}"
         else
           loc_str = @location
         end
         
-        
-        # AND DATE
-        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}"
-        
         # BOUNDING BOX
-        if @bounding_box!=nil
+        unless @bounding_box.nil?
           #The values in the GSA metadata are shifted to  prevent negative values.  This was done b/c lat/long
           # are searched as a number range and the GSA doesn't allow negative values in number ranges.  
           # We shift latitude values by 90 and longitude values by 180.
-          
           if @bounding_box[:sw].class==String
             #String :bounding_box => { :sw => "37.695141,-123.013657", :ne => "37.832371,-122.356979"}
             latitude1 = @bounding_box[:sw].split(",").first.to_f+90
@@ -205,8 +213,18 @@ module Active
           end
           meta_data += "+AND+" unless meta_data == ""
           meta_data += "meta:latitudeShifted:#{latitude1}..#{latitude2}+AND+meta:longitudeShifted:#{longitude1}..#{longitude2}"
-        end
+        end        
         
+        # AND DATE
+        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 += "+AND+" unless meta_data == ""
+        meta_data += "meta:startDate:daterange:#{@start_date}..#{@end_date}"
+                
         # url = "#{SEARCH_URL}/search?api_key=#{@api_key}&num=#{@num_results}&page=#{@page}&l=#{loc_str}&f=#{@facet}&v=#{@view}&r=#{@radius}&s=#{@sort}&k=#{@keywords.join("+")}&m=#{meta_data}"
         urla = ["#{SEARCH_URL}/search?api_key=#{@api_key}"]
         urla << "num=#{@num_results}" if @num_results

data/spec/benchmark/search_bench.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib Active]))
 include Active::Services
 
@@ -25,4 +24,23 @@ include Active::Services
 # puts " "
 # puts arr
 
-puts Search.search(:asset_ids => ["DD8F427F-6188-465B-8C26-71BBA22D2DB7"]).results.inspect
+# puts Search.search(:asset_ids => ["DD8F427F-6188-465B-8C26-71BBA22D2DB7"]).results.inspect
+
+REG_CENTER_ASSET_TYPE_ID   = "EA4E860A-9DCD-4DAA-A7CA-4A77AD194F65"
+REG_CENTER_ASSET_TYPE_ID2  = "3BF82BBE-CF88-4E8C-A56F-78F5CE87E4C6"
+ACTIVE_WORKS_ASSET_TYPE_ID = "DFAA997A-D591-44CA-9FB7-BF4A4C8984F1"
+
+local_asset_type_id = "EC6E96A5-6900-4A0E-8B83-9AA935F45A73"
+puts "Local       " + Search.search({:asset_type_id => local_asset_type_id}).results.length.to_s
+puts "Local       " + Search.search({:asset_type_id => local_asset_type_id, :start_date => Date.new(2010, 1, 1), :end_date => Date.new(2011, 11, 15) }).results.length.to_s
+# puts "ActiveWorks " + Search.search({:asset_type_id => ACTIVE_WORKS_ASSET_TYPE_ID, :start_date => Date.new(2010, 1, 1), :end_date => Date.new(2011, 11, 15) }).results.length.to_s
+
+# url = "www.active.com/running/long-branch-nj/new-jersey-marathon-and-long-branch-half-marathon-2011"
+# r = Search.search({:url => url}).results  # , :start_date => Date.new(2011, 1, 1), :end_date => Date.new(2012, 1, 15)
+# puts url
+# puts "Results: #{r.length}"
+# puts r.map(&:url)
+
+
+# r = Search.search({:dma=>"San Francisco - Oakland - San Jose", :num_results => 5}).results
+# puts r.map(&:url)

data/spec/search_spec.rb

@@ -67,6 +67,9 @@ describe Search do
       s = Search.new()
       s.should have(0).channels
       s = Search.new({:channels => "running,swimming,yoga"})
+      puts s.end_point
+      s.end_point.include?("m=meta:channel=Running+OR+meta:channel=Swimming+OR+meta:channel=Mind%2520%2526%2520Body%255CYoga").should be_true
+      
       s.should have(3).channels
       s = Search.new({:channels => %w(running swimming yoga)})
       s.should have(3).channels
@@ -127,6 +130,17 @@ describe Search do
       uri.query.include?("meta:channel=Running+OR+meta:channel=Triathlon").should be_true
     end
 
+    it "should send valid channel info and a bounding_box" do
+      s = Search.new({:bounding_box => { :sw => "37.695141,-123.013657", :ne => "37.695141,-123.013657"}, :channels => [:running,:triathlon] })
+      s.bounding_box.should_not be_nil
+      # uri = URI.parse( Search.new({:channels => [:running,:triathlon], :bounding_box => { :sw => "37.695141,-123.013657", :ne => "37.695141,-123.013657"} }).end_point )
+      uri = URI.parse( s.end_point )
+      puts "????????????????????? "
+      puts uri
+      uri.query.include?("meta:channel=Running+OR+meta:channel=Triathlon").should be_true
+      uri.query.include?("meta:latitudeShifted:127.695141..127.695141+AND+meta:longitudeShifted:56.986343..56.986343").should be_true
+    end
+
     it "should send the correct channel value for everything in Search.CHANNELS" do
       Categories.CHANNELS.each do |key,value|
         uri   = URI.parse( Search.new({:channels => [key]}).end_point )
@@ -146,6 +160,20 @@ describe Search do
       # SHOULD NOT SEE "++"
       pending
     end
+    
+    it "should pass the assetTypeId" do
+      local_asset_type_id = "EC6E96A5-6900-4A0E-8B83-9AA935F45A73"
+      encoded = "EC6E96A5%252D6900%252D4A0E%252D8B83%252D9AA935F45A73"
+      uri   = URI.parse( Search.new({:asset_type_id => local_asset_type_id}).end_point )
+      uri.query.should have_param("meta:assetTypeId=#{encoded}")
+    end
+    
+    it "should pass a url" do
+      url = "www.active.com/running/pleasant-hill-ca/dont-wine-just-run-5k-fun-runwalk-east-bay-edition-2011"
+      encoded = "site:www.active.com%2Frunning%2Flong-branch-nj%2Fnew-jersey-marathon-and-long-branch-half-marathon-2011"
+      uri   = URI.parse( Search.new({:url => url}).end_point )
+      uri.query.should have_param(encoded)
+    end
 
     it "should send a valid start and end date" do
       uri = URI.parse( Search.new().end_point )
@@ -205,10 +233,12 @@ describe Search do
     end
 
     it "should find 5 items when doing a DMA search" do
-      Search.search({:dma=>"San Francisco - Oakland - San Jose", :limit => 5}).should have(5).results
-      Search.search({:dma=>"San Francisco - Oakland - San Jose", :limit => 2}).should have(2).results        
+      Search.new({:dma=>"San Francisco - Oakland - San Jose", :num_results => 5}).num_results.should eql(5)
+      Search.search({:dma=>"San Francisco - Oakland - San Jose", :num_results => 5}).should have(5).results
+      Search.search({:dma=>"San Francisco - Oakland - San Jose", :num_results => 2}).should have(2).results        
     end
   end
+  
   describe "Handle http server codes" do 
     after(:each) do 
       FakeWeb.clean_registry
@@ -385,18 +415,17 @@ describe Search do
       s = Search.search(  {:sort=>Sort.DATE_DESC})
       s.should be_an_instance_of Search
       s.results.should_not be_empty
-      s.results.each do |a|
-        DateTime.parse(a.gsa.last_modified).should satisfy { |d|
-          d >= DateTime.now-2
-        }
-      end
+      # s.results.each do |a|
+      #   DateTime.parse(a.gsa.last_modified).should satisfy { |d|
+      #     d >= DateTime.now-2
+      #   }
+      # end
     end
     it "should find events that have online regristration"
     it "should find events that do not have online regristration"
     
     it "should have a nil email address from GSA" do
       Search.search(:asset_id => "715ED4EF-E4FF-42F2-B24B-2E4255649676").results.first.user.email.should be_nil
-      # first.address["address"].should_not be_nil
     end
 
   end
@@ -404,24 +433,16 @@ describe Search do
     describe  "Parametric search for running channel" do
       it "should find by splitMediaType for the Running channel" do
         # http://developer.active.com/docs/Activecom_Search_API_Reference
+        s = Search.search({:channels => [:running], :split_media_type => ["5K"]})
+        s.results.each do |result|
+          result.gsa.data['meta']['splitMediaType'].should include("5K")
+        end
+        
       end  
     end
     describe  "Parametric search for triathlon channel" do
     end  
   end
-
-  describe "Find things within X miles to me" do
-    it "should find activities within 20 miles of me" do
-      location = {:latitude=>"37.785895", :longitude=>"-122.40638"}
-      Search.search(location).results.should_not be_empty
-      pending
-    end
-  end
-
-  # describe "Finding assets via a url only" do
-  #   it "should find an asset by seourl" do
-  #   end
-  # end
     
 end
 

data/spec/validators_spec.rb

@@ -16,10 +16,4 @@ describe Validators do
     Validators.email("jspooner@ga").should be_false
   end
   
-end
-
-
-
-
-
-
+end

data/version.txt

@@ -1 +1 @@
-0.0.32
+0.0.34

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Active
 version: !ruby/object:Gem::Version 
+  hash: 91
   prerelease: false
   segments: 
   - 0
   - 0
-  - 32
-  version: 0.0.32
+  - 34
+  version: 0.0.34
 platform: ruby
 authors: 
 - Jonathan Spooner, Brian Levine
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -08:00
+date: 2011-01-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: savon
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 7
@@ -35,9 +38,11 @@ dependencies:
   name: dalli
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -49,9 +54,11 @@ dependencies:
   name: bones
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 3
         - 4
@@ -69,19 +76,16 @@ extra_rdoc_files:
 - History.txt
 - README.txt
 - bin/Active
-- lib/.DS_Store
-- lib/services/.DS_Store
 - lib/services/search.txt
 - version.txt
 files: 
+- .bnsignore
 - Active.gemspec
 - History.txt
 - README.txt
 - Rakefile
 - bin/Active
-- lib/.DS_Store
 - lib/Active.rb
-- lib/services/.DS_Store
 - lib/services/IActivity.rb
 - lib/services/_ats.rb
 - lib/services/active_works.rb
@@ -124,23 +128,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