next-big-sound 0.3.5 → 0.4.0

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 test/credentials.yml
+playing.rb

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.4.0

data/lib/artist.rb

@@ -1,6 +1,6 @@
 module NBS
   class Artist
-  
+    
     attr_accessor :artist_id, :name, :xml, :options
       
     PROFILES = %w(all myspace lastfm ilike facebook twitter youtube reverbnation ourstage soundcloud purevolume bebo virb amiestreet jamlegend vimeo)
@@ -37,6 +37,6 @@ module NBS
       metrics = prof.metrics(args[0],args[1])
       return metrics[splits[1].downcase.to_s].data_points
     end
-    
+
   end
 end

data/lib/memoize.rb

@@ -0,0 +1,30 @@
+require 'memcache'
+module NBS  
+  module MemcachedMemoize
+    def remember(name)
+     
+     original_method = instance_method(name)
+     define_method(name) do |*args|
+      
+      if defined?(KEYSTORE)
+       key = args.collect {|c| c.to_s }.join("_").gsub(" ","_")
+       key+=name.to_s
+       puts key
+       if KEYSTORE.get(key)!=nil
+         puts "it was memorized" 
+         Marshal.restore(KEYSTORE.get(key))
+       else
+         puts "it had to be memorized"  
+         bound_method = original_method.bind(self)
+         #puts Marshal.dump(bound_method.call(*args))
+         KEYSTORE.set(key,Marshal.dump(bound_method.call(*args)))
+         return Marshal.restore(KEYSTORE.get(key))
+       end
+     else
+       bound_method = original_method.bind(self)
+       bound_method.call(*args)
+     end
+     end
+    end   
+  end
+end

data/lib/metric.rb

@@ -1,8 +1,11 @@
 module NBS
   
   class Metric
-
+    extend NBS::MemcachedMemoize
+    
     attr_accessor :artist_id,:service_type,:metric,:sdate,:edate, :xml
+    
+   
     def initialize(artist_id,service_type,metric,sdate,edate)
       self.artist_id = artist_id
       self.service_type = service_type
@@ -10,7 +13,7 @@ module NBS
       self.sdate = Date.parse(sdate.to_s)
       self.edate = Date.parse(edate.to_s)  
     end
-    def fetch
+    def fetch(myopts_test={})
       options = {"service"=>self.service_type,"metric"=>self.metric,"start"=>self.sdate.to_s,"end"=>self.edate.to_s,"artistID"=>self.artist_id,"apiKey"=>$nbs_api_key,"format"=>"xml"}
       puts "#{NBS::NBS_CONFIG["base_url"]}getDataForArtist?#{options.to_url_params}"
       statsxml = Net::HTTP.get(URI.parse("#{NBS::NBS_CONFIG["base_url"]}getDataForArtist?#{options.to_url_params}")).to_s
@@ -27,14 +30,18 @@ module NBS
         return []
       end
     end
+    # delivers the datapoints as a Date keyed hash.
+    #def date_points_hash
+    #end
     #def xml_data_points
       #to_hash["Profiles"][0]["Profile"][0]["DataPoint"].to_xml
     #end
     def to_xml
-      self.xml ||= fetch
+      self.xml ||= fetch({"service"=>self.service_type,"metric"=>self.metric,"start"=>self.sdate.to_s,"end"=>self.edate.to_s,"artistID"=>self.artist_id,"apiKey"=>$nbs_api_key,"format"=>"xml"})
     end
     def to_hash
       Hash.from_xml(to_xml)
     end
+    remember :fetch 
   end
 end

data/lib/next-big-sound.rb

@@ -2,7 +2,8 @@ module NBS
   
   $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib','config'))
   $LOAD_PATH.unshift(File.dirname(__FILE__))
-  
+  require 'rubygems'
+  require 'memoize'
   require 'yaml'
   require 'hash_extension'
   require 'search'
@@ -11,13 +12,22 @@ module NBS
   require 'metric'
   require 'datapoint'
   
+  
+  
   #puts "#{File.dirname(__FILE__)}/config.yml"
   NBS_CONFIG = YAML.load_file("#{File.dirname(__FILE__)}/config.yml")
   
+  #CACHE_ENABLED
+  #KEYSTORE = nil
+  
+  
   class Base
-     
+    
+    extend NBS::MemcachedMemoize
+    
     def initialize(api_key)
       $nbs_api_key = api_key
+      #puts CACHE_ENABLED
     end
     # return a search object that you can manipulate
     # if you prefer to just use the xml simply type to_xml
@@ -27,5 +37,6 @@ module NBS
       search.fetch
       return search
     end
+    remember :search
   end
 end

data/lib/search.rb

@@ -4,7 +4,10 @@ module NBS
   require 'uri'
   
   class Search
-  
+    
+    #extend NBS::MemcachedMemoize
+    
+    
     attr_accessor :options, :query, :api_key,:base_url, :xml
       
     def initialize(query, options={})
@@ -27,5 +30,7 @@ module NBS
     def to_xml
       self.xml ||=fetch
     end
+    
+    #remember :fetch
   end
 end

data/next-big-sound.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{next-big-sound}
-  s.version = "0.3.5"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jeff durand"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-04-05}
   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 = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/config.yml",
      "lib/datapoint.rb",
      "lib/hash_extension.rb",
+     "lib/memoize.rb",
      "lib/metric.rb",
      "lib/next-big-sound.rb",
      "lib/search.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 5
-  version: 0.3.5
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - jeff durand
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -04:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - lib/config.yml
 - lib/datapoint.rb
 - lib/hash_extension.rb
+- lib/memoize.rb
 - lib/metric.rb
 - lib/next-big-sound.rb
 - lib/search.rb