next-big-sound 0.6.1 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/config.yml

@@ -1 +1 @@
-base_url: "http://api.nextbigsound.com/v1_1/"
+base_url: ""

data/lib/next-big-sound/artist.rb

@@ -1,28 +1,68 @@
 module NBS
   class Artist
     
-    attr_accessor :artist_id, :name, :xml, :options
+    attr_accessor :artist_id, :name, :xml, :options, :post_params
       
     PROFILES = %w(all myspace lastfm ilike facebook twitter youtube reverbnation ourstage soundcloud purevolume bebo virb amiestreet jamlegend vimeo)
       
     def initialize(artist_id, name="",options={})
       self.artist_id=artist_id
       self.name = name
-      self.options = {"artistID"=>self.artist_id,"apiKey"=>$nbs_api_key,"format"=>"xml"}.merge(options)
+      self.options = {"artistID"=>self.artist_id,"format"=>"xml"}.merge(options)
+      self.post_params={}
+      puts options.inspect
+      if options.has_key?("start_date") && options.has_key?("end_date")
+        self.post_params["data[start]"] = Time.parse(options["start_date"])
+        self.post_params["date[end]"] = Time.parse(options["end_date"])
+      end
     end
     
     def fetch_profiles
-      self.xml=Net::HTTP.get(URI.parse("#{NBS::NBS_CONFIG["base_url"]}getProfilesForArtist?#{self.options.to_url_params}")).to_s
+      if self.post_params.empty?
+        puts "not doing expected action"
+        puts self.post_params
+        self.xml=Net::HTTP.get(URI.parse("#{$nbs_api_key}metrics/artist/#{self.artist_id}.xml")).to_s
+      else
+        puts "doing expected action"
+        resp =  Net::HTTP.post_form(URI.parse("#{$nbs_api_key}metrics/artist/#{self.artist_id}.xml"),self.post_params)
+        #puts resp.body
+        self.xml = resp.body
+      end
     end
     
     # return a hash of urls keyed by the service.
     def profiles
       ####
-      puts self.to_xml
+      #puts self.to_xml
+      #puts self.to_xml
       profs = {}
       begin
-        self.to_hash["Profiles"][0]["Profile"].each do |item|
-          profs[item["service"].to_s]=NBS::ArtistProfile.new(self.artist_id, item["service"] ,item["url"])
+        startd = NBS::Base.t_to_d(self.to_hash["data"][0]["criteria"][0]["start"][0]["content"])
+        endd = NBS::Base.t_to_d(self.to_hash["data"][0]["criteria"][0]["end"][0]["content"])
+        #puts startd.inspect
+        #puts endd.inspect
+        #puts startd.inspect
+        #endd = 
+        self.to_hash["data"][0]["profiles"][0]["profile"].each do |item|
+          profile = NBS::ArtistProfile.new(self.artist_id, item["service"] ,item["url"]) 
+          metric_hash = {}
+          if defined?(item["metrics"][0]["metric"]) && item["metrics"][0]["metric"]!=nil && !item["metrics"][0]["metric"].empty?
+           item["metrics"][0]["metric"].each do |mdata|
+            #puts mdata["name"]
+            metric = NBS::Metric.new(self.artist_id,item["service"],mdata["name"],startd,endd)
+             dps = []
+             if defined?(mdata["value"]) && mdata["value"]!=nil
+              mdata["value"].each do |dp|
+                #puts "got here"
+               dps << NBS::DataPoint.new(NBS::Base.t_to_d(dp["timestamp"]),dp["content"])
+              end
+             end
+             metric.load_datapoints(dps)
+             metric_hash[mdata["name"]]=metric
+           end
+          end 
+          profile.set_metrics(metric_hash)
+          profs[item["service"][0]["content"].to_s]=profile
         end
       rescue
       end
@@ -35,12 +75,12 @@ module NBS
       Hash.from_xml(self.to_xml)
     end
     
-    def method_missing(method_name,*args)
-      splits = method_name.to_s.split("_")
-      prof = self.profiles[splits[0].upcase]
-      metrics = prof.metrics(args[0],args[1])
-      return metrics[splits[1].downcase.to_s].data_points
-    end
+    #def method_missing(method_name,*args)
+    #  splits = method_name.to_s.split("_")
+    #  prof = self.profiles[splits[0].upcase]
+    #  metrics = prof.metrics(args[0],args[1])
+    #  return metrics[splits[1].downcase.to_s].data_points
+    #end
 
   end
 end

data/lib/next-big-sound/artist_profile.rb

@@ -5,16 +5,17 @@ module NBS
 
       attr_accessor :service_type,:url, :artist_id, :options
 
-      def initialize(artist_id,service_type, url="" ,options={})
+      def initialize(artist_id,service_type, url="",options={})
         self.service_type = service_type 
         self.artist_id = artist_id 
         self.url = url
       end
-
       def metrics(sdate,edate)
         @metrics ||= load_metrics(sdate,edate)
       end
-
+      def set_metrics(metrics_array={})
+        @metrics = metrics_array
+      end
       def load_metrics(sdate,edate)
         metrics ={}
         METRICS.each do |metric_string|

data/lib/next-big-sound/base.rb

@@ -18,6 +18,9 @@ module NBS
       search.fetch
       return search
     end
+    def self.t_to_d(string_timestamp)
+      return Date.parse(Time.at(string_timestamp.to_i).to_s)
+    end
     remember :search
   end
 end

data/lib/next-big-sound/metric.rb

@@ -19,6 +19,9 @@ module NBS
       statsxml = Net::HTTP.get(URI.parse("#{NBS::NBS_CONFIG["base_url"]}getDataForArtist?#{options.to_url_params}")).to_s
     end
     def data_points
+      unless @data_points.empty?
+        return @data_points
+      end
       begin
         points = to_hash["Profiles"][0]["Profile"][0]["DataPoint"]
         dps = []
@@ -30,6 +33,10 @@ module NBS
         return []
       end
     end
+    # this will allow me to load the data that I previously fetched.
+    def load_datapoints(data_points)
+      @data_points = data_points
+    end
     # delivers the datapoints as a Date keyed hash.
     #def date_points_hash
     #end

data/lib/next-big-sound/search.rb

@@ -8,22 +8,23 @@ module NBS
     attr_accessor :options, :query, :api_key,:base_url, :xml
       
     def initialize(query, options={})
-      self.options = {"query"=>query,"apiKey"=>$nbs_api_key,"format"=>"xml"}.merge(options)
+      self.options = {"q"=>query,"format"=>"xml"}.merge(options)
       self.query = query
       self.api_key = api_key
       self.base_url = base_url
     end
     def fetch
-      puts "#{NBS::NBS_CONFIG["base_url"]}search?#{self.options.to_url_params}"
-      self.xml=Net::HTTP.get(URI.parse("#{NBS::NBS_CONFIG["base_url"]}search?#{self.options.to_url_params}")).to_s
+      puts "#{$nbs_api_key}artists/search?#{self.options.to_url_params}"
+      self.xml=Net::HTTP.get(URI.parse("#{$nbs_api_key}artists/search.#{self.options["format"]}?#{self.options.to_url_params}")).to_s
       #puts self.xml
     end
-    def artists
+    def artists(options={})
       hash = Hash.from_xml(self.to_xml)
       a = []
+      #puts hash.inspect    
       begin
-        hash["Results"][0]["Result"].each do |item|
-          a << NBS::Artist.new(item["NBSArtistID"][0],item["NBSArtistName"][0])
+        hash["data"][0]["artists"][0]["artist"].each do |item|
+          a << NBS::Artist.new(item["id"],item["name"][0],options)
         end
       rescue
       end

data/next-big-sound.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{next-big-sound}
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jeff durand"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-06-08}
   s.description = %q{A simple wrapper class for the Next Big Sound api.  docs for the api can be found at api.nextbigsound.com}
   s.email = %q{jeff.durand@gmail.com}
   s.extra_rdoc_files = [

data/test/test_search.rb

@@ -14,7 +14,7 @@ class TestNextBigSound < Test::Unit::TestCase
          @searchobj = @nbs.search("The Killers")
       end
 	    should "Be able to find The Killers ArtistID" do
-        assert_match /<NBSArtistID>\d+<\/NBSArtistID>/i, @searchobj.to_xml
+        assert_match /<artist id=\"\d+\">/i, @searchobj.to_xml
     	end
     	should "have an array of results" do 
   	    assert !@searchobj.artists.empty?

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - jeff durand
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -04:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency