Active 0.0.34 → 0.0.35

data/lib/services/activity.rb

@@ -9,6 +9,7 @@ module Active
       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"
 
       attr_accessor :primary, :gsa, :ats
       attr_reader :datasources_loaded
@@ -47,6 +48,8 @@ module Active
           return "RegCenter id= #{@gsa.asset_id} type= #{@gsa.asset_type_id}"
         elsif @gsa.asset_type_id == ACTIVE_WORKS_ASSET_TYPE_ID
           return "ActiveWorks id= #{@gsa.asset_id} type= #{@gsa.asset_type_id}"
+        elsif @gsa.asset_type_id == LOCAL_ASSET_TYPE_ID
+          return "Local id= #{@gsa.asset_id} type= #{@gsa.asset_type_id}"
         else
           return "Undefined id= #{@gsa.asset_id} type= #{@gsa.asset_type_id}"
         end 

data/lib/services/gsa.rb

@@ -16,7 +16,6 @@ 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
@@ -79,7 +78,11 @@ module Active
             end
           end
         end
-        return categories.first
+        if categories.nil?# && categories.empty?
+          return "unknown"
+        else
+          return categories.first
+        end
       end
 
       def address

data/lib/services/search.rb

@@ -258,7 +258,8 @@ module Active
             @endIndex        = parsed_json["endIndex"]
             @pageSize        = parsed_json["pageSize"]
             @searchTime      = parsed_json["searchTime"]
-            @numberOfResults = parsed_json["numberOfResults"]
+            # GSA will only return 1000 events but will give us a number larger then 1000.
+            @numberOfResults = (parsed_json["numberOfResults"] <= 1000) ? parsed_json["numberOfResults"] : 1000
             @results         = parsed_json['_results'].collect { |a| Activity.new(GSA.new(a)) }  
 
             begin

data/spec/benchmark/search_bench.rb

@@ -31,8 +31,16 @@ 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 "Local       " + Search.search({:asset_type_id => local_asset_type_id}).results.length.to_s
+
+# loc = Search.search({:facet => "", :asset_type_id => local_asset_type_id, :start_date => Date.new(2008, 1, 1), :end_date => Date.new(2012, 11, 15) })
+# loc = Search.search({:facet => "", :url => "local.active.com", :start_date => Date.new(2000, 1, 1), :end_date => Date.new(2019, 11, 15) })
+# loc = Search.search({:facet => "", :url => "local.active.com"})
+
+# puts "Local       " + loc.results.length.to_s
+# puts loc.results.collect { |r| "#{r.origin}  #{r.title} #{r.url}" }
+
+
 # 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"
@@ -42,5 +50,6 @@ puts "Local       " + Search.search({:asset_type_id => local_asset_type_id, :sta
 # puts r.map(&:url)
 
 
-# r = Search.search({:dma=>"San Francisco - Oakland - San Jose", :num_results => 5}).results
+s = Search.search({:dma=>"San Francisco - Oakland - San Jose", :num_results => 5})
+puts s.numberOfResults
 # puts r.map(&:url)

data/spec/search_spec.rb

@@ -135,7 +135,7 @@ describe Search do
       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 "?????????????????????"
       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

data/version.txt

@@ -1 +1 @@
-0.0.34
+0.0.35

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Active
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 89
   prerelease: false
   segments: 
   - 0
   - 0
-  - 34
-  version: 0.0.34
+  - 35
+  version: 0.0.35
 platform: ruby
 authors: 
 - Jonathan Spooner, Brian Levine
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -08:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency