music_xray_api 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/music_xray_api/base.rb

@@ -1,24 +1,3 @@
-class Hash
-  def to_url_params
-    elements = []
-    keys.size.times do |i|
-      elements << "#{CGI::escape(keys[i])}=#{CGI::escape(values[i])}"
-    end
-    elements.join('&')
-  end
-
-  def self.from_url_params(url_params)
-    result = {}.with_indifferent_access
-    url_params.split('&').each do |element|
-      element = element.split('=')
-      result[element[0]] = element[1]
-    end
-    result
-  end
-end
-
-  
-
 module MusicXrayApi
   
   class Base
@@ -31,6 +10,12 @@ module MusicXrayApi
     def self.secret= s
       @@secret = s
     end
+    def self.api_endpoint= apiend
+      @@api_endpoint = apiend
+    end
+    def self.api_endpoint
+      return @@api_endpoint
+    end
     def self.rfc2616(time)
       time.utc.strftime("%a, %d %b %Y %H:%M:%S")+" +0000"
     end
@@ -40,53 +25,16 @@ module MusicXrayApi
     def self.sign_https_requestv3(date) 
       return "{'client_key_id':'#{@@key}', 'algorithm':'HmacSHA256', 'signature':'#{Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new("sha256"), @@secret, date)).strip}'}"
     end
-    def self.make_request(secret,key,postfix,form_hash,method)
-      date = MusicXrayApi::Base.rfc2616(Time.now)
-      uri = URI.parse("https://api.musicxray.com/#{postfix}.xml")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      if method.to_s.downcase=="post"
-        @request = Net::HTTP::Post.new(uri.request_uri)
-        @request.set_form_data(form_hash)
-        @request['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'
-      elsif method.to_s.downcase=="get"
-        @request = Net::HTTP::Get.new("#{uri.request_uri}?#{form_hash.to_url_params}")
-      elsif method.to_s.downcase=="put"
-        @request = Net::HTTP::Put.new(uri.request_uri)
-        @request.set_form_data(form_hash)
-        @request['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'
-      elsif method.to_s.downcase=="delete"
-        @request = Net::HTTP::Delete.new("#{uri.request_uri}?#{form_hash.to_url_params}")
-      end
-      @request.add_field("Date",date)
-      @request.add_field("X-Xray-Authorization",MusicXrayApi::Base.sign_https_request(@request,date,secret,key))  
-      response = http.request(@request)
-      case response
-        when Net::HTTPSuccess then return response
-        when Net::HTTPClientError then raise "#{response.body}"
-        when Net::HTTPServerError then raise "#{response.body}"
-        else raise "#{response.body}"
-      end
-      #return response
-    end
-    def self.objectify_params(outer,params)
-      nar = {}
-      params.each do |key,value|
-        nar["#{outer}[#{key}]"]=value
-      end
-      return nar
-    end
   end
 end
-
 module ResourceMethods
   def self.included(klass)
     klass.extend ClassMethods
   end
   module ClassMethods
     def set_headers
-      self.site = 'https://api.musicxray.com'
+      self.site = MusicXrayApi::Base.api_endpoint
+      self.format = :xml
       date = MusicXrayApi::Base.rfc2616(Time.now)
       headers['Date'] = date.to_s
       headers['X-Xray-Authorization'] = MusicXrayApi::Base.sign_https_requestv3(date)

data/lib/music_xray_api.rb

@@ -8,7 +8,11 @@ require "digest/sha1"
 require "rubygems"
 #require "mail"
 #require "xmlsimple"
-require 'active_resource'
+#gem 'activesupport', '2.3.5'
+#gem 'activeresource', '2.3.5'
+#require 'activesupport'
+require 'activeresource'
+
 
 
 $:.unshift(File.dirname(__FILE__))

data/music_xray_api.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{music_xray_api}
-  s.version = "0.1.0"
+  s.name = "music_xray_api"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jeff durand"]
-  s.date = %q{2011-05-18}
-  s.description = %q{wrapper for music xray api }
-  s.email = %q{jeff.durand@gmail.com}
+  s.date = "2012-05-02"
+  s.description = "wrapper for music xray api "
+  s.email = "jeff.durand@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -32,10 +32,10 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_music_xray_api.rb"
   ]
-  s.homepage = %q{http://github.com/johnnyiller/Music-Xray-Api-Wrapper}
+  s.homepage = "http://github.com/johnnyiller/Music-Xray-Api-Wrapper"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Interface with the music xray api}
+  s.rubygems_version = "1.8.23"
+  s.summary = "Interface with the music xray api"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_music_xray_api.rb

@@ -7,39 +7,105 @@ class TestMusicXrayApi < Test::Unit::TestCase
       YAML.load_file("./test/credentials.yml").each { |key,value| instance_variable_set("@#{key}", value) }
       MusicXrayApi::Base.key = @key
       MusicXrayApi::Base.secret = @secret
+      MusicXrayApi::Base.api_endpoint = @endpoint
       MusicXrayApi::Track.set_headers
       MusicXrayApi::TrackSet.set_headers
       MusicXrayApi::TrackSetMember.set_headers
       MusicXrayApi::TrackMatchRequest.set_headers
       
     end
-    should "Be able to create a track." do
-      tr = MusicXrayApi::Track.create({:mp3_url=>"http://www.google.com", :uri=>"xray/#{Time.now.to_i.to_s}"})
-      puts tr.id
+    should "Find some cached tracks" do 
+      params = {:application_name=>"present",:application_id=>"246458"}
+      puts MusicXrayApi::Track.find(:all,:params=>params).first.inspect
     end
-    should "be able to do crud for track sets" do 
-      ts = MusicXrayApi::TrackSet.new
-      ts.name = "another my new one"
-      puts ts.save
-      puts ts.id
-      unless ts
-        ts.errors
-      end
-      fts = MusicXrayApi::TrackSet.find(ts.id)
-      puts fts.name
-    end
-    should "be able to add a track I create to a track set I also create" do 
-      t1 = MusicXrayApi::Track.create({:mp3_url=>"http://www.google.com", :uri=>"xray/#{Time.now.to_i.to_s}1"})
-      t2 = MusicXrayApi::Track.create({:mp3_url=>"http://www.google.com", :uri=>"xray/#{Time.now.to_i.to_s}2"})
-      t3 = MusicXrayApi::Track.create({:mp3_url=>"http://www.google.com", :uri=>"xray/#{Time.now.to_i.to_s}3"})
-      ts = MusicXrayApi::TrackSet.create({:name=>"whatever it's just a name"})
-      tsm = MusicXrayApi::TrackSetMember.create({:track_id=>t1.id, :track_set_id=>ts.id})
-      tsm = MusicXrayApi::TrackSetMember.create({:track_id=>t2.id, :track_set_id=>ts.id})
-      # testing matching request capable
-      tmr = MusicXrayApi::TrackMatchRequest.create({:track_id=>t3.id, :track_set_id=>ts.id,:result_delivery_method=>'none'})
-      
-    end
-    
+        # 
+        # should "Be able to create a track." do
+        #   tr = MusicXrayApi::Track.create({:mp3_url=>"http://www.google.com", :uri=>"xray/#{Time.now.to_i.to_s}"})
+        #   puts tr.id
+        # end
+        # should "be able to do crud for track sets" do 
+        #   ts = MusicXrayApi::TrackSet.new
+        #   ts.name = "another my new one"
+        #   puts ts.save
+        #   puts ts.id
+        #   unless ts
+        #     ts.errors
+        #   end
+        #   fts = MusicXrayApi::TrackSet.find(ts.id)
+        #   #fts.destroy
+        #   puts fts.name
+        # end
+        # should "be able to add a track I create to a track set I also create" do
+        #   turi1 = "xray/#{Time.now.to_i.to_s}1"
+        #   turi2 = "xray/#{Time.now.to_i.to_s}2"
+        #   turi3 = "xray/#{Time.now.to_i.to_s}3"
+        #   ids = [turi1,turi2]
+        #   t1 = MusicXrayApi::Track.create({:mp3_url=>"http://www.google.com", :uri=>turi1})
+        #   t2 = MusicXrayApi::Track.create({:mp3_url=>"http://www.google.com", :uri=>turi2})
+        #   t3 = MusicXrayApi::Track.create({:mp3_url=>"http://www.google.com", :uri=>turi3})
+        #   ts = MusicXrayApi::TrackSet.create({:name=>"whatever it's just a name"})
+        #   tsm = MusicXrayApi::TrackSetMember.create({:track_id=>t1.id, :track_set_id=>ts.id})
+        #   tsm = MusicXrayApi::TrackSetMember.create({:track_id=>t2.id, :track_set_id=>ts.id})
+        #   # testing matching request capable
+        #   tmr = MusicXrayApi::TrackMatchRequest.create({:track_id=>t3.id, :track_set_id=>ts.id,:result_delivery_method=>'none'})
+        #   #puts tsm.inspect
+        #   tsm.destroy
+        #   puts ids.inspect
+        #   tracks = MusicXrayApi::Track.find :all, :params=>{:uris=>ids.join(",")}
+        #   puts tracks.inspect
+        # end
+        # should "be able to update a track causing it to re-index" do 
+        #   t = MusicXrayApi::Track.find :all
+        #   #puts t.inspect
+        #   f =  t.first
+        #   f.recalcfeatures = true
+        #   f.save
+        #   f.reload
+        #   puts f.inspect
+        # end
+        # 
+        # should "be able to find all tracks that aren't extracted" do 
+        #     @page = 0
+        #     #puts MusicXrayApi::Track.find(:all, params=>{:page=>@page}).inspect
+        #     #while(tracks = MusicXrayApi::Track.find(:all, :params=>{:page=>@page, :extracted=>false})) do
+        #     #  puts @page
+        #     #  puts "found #{tracks.size} tracks"
+        #     #  if tracks.size <= 0 
+        #     #    break
+        #     #  end
+        #     #  puts tracks.first.id
+        #     #  puts tracks.last.id
+        #     #tracks.each do |t|
+        #     #  puts t.id
+        #     #end
+        #     #tracks = nil
+        #     # @page +=1
+        #     #end
+        #     
+        #     #while(track_match_requests = MusicXrayApi::TrackMatchRequest.find(:all,:params=>{:page=>@page,:limit=>50})) do 
+        #     #  puts @page
+        #     #  puts "found matches #{track_match_requests.size}"
+        #     #  if track_match_requests.size <= 0
+        #     #    break
+        #     #  end
+        #     #  puts track_match_requests.first.id
+        #     #  puts track_match_requests.last.id
+        #     #  @page+=1
+        #     #end
+        #     #@trm = MusicXrayApi::TrackMatchRequest.find(:all,:params=>{:limit=>1}).first
+        #     #@trm.put(:rematch)
+        #     #@trm.inspect
+        # end
+        # should "be able to create track and find it later" do 
+        # #  time = Time.now.to_i.to_s
+        # #  t1 = MusicXrayApi::Track.create({:mp3_url=>"http://www.google.com", 
+        # #                                   :uri=>"xray/#{Time.now.to_i.to_s}12", 
+        # #                                   :application_name=>'myxrays', 
+        # #                                   :application_id=>"#{time}"})
+        #   #puts t1.inspect                                  
+        #  # tracks = MusicXrayApi::Track.find :all, :params=>{:application_name=>'myxrays', :application_id=>time}
+        #                
+        # end
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: music_xray_api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - jeff durand
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2012-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Interface with the music xray api