youpy-ruby-echonest 0.0.2 → 0.0.3

data/README.rdoc

@@ -17,7 +17,7 @@ A Ruby interface for Echo Nest Developer API
 
 == Features/Problems
 
-Supports only API for Track http://developer.echonest.com/pages/overview
+Only supports the API for Track http://developer.echonest.com/pages/overview
 
 == Synopsis
 

data/Rakefile

@@ -60,7 +60,7 @@ spec = Gem::Specification.new do |s|
   s.require_path      = "lib"
   s.test_files        = Dir["test/test_*.rb"]
 
-  #s.add_dependency('activesupport', '>=1.3.1')
+  s.add_dependency('libxml-ruby')
   #s.required_ruby_version = '>= 1.8.2'
 
   s.files = %w(README.rdoc ChangeLog Rakefile) +

data/lib/echonest/api.rb

@@ -17,7 +17,7 @@ module Echonest
     def get_bars(filename)
       get_analysys(:get_bars, filename) do |analysis|
         analysis.map do |bar|
-          Bar.new(bar.text.to_f, bar.attributes['confidence'].to_f)
+          Bar.new(bar.content.to_f, bar['confidence'].to_f)
         end
       end
     end
@@ -25,7 +25,7 @@ module Echonest
     def get_beats(filename)
       get_analysys(:get_beats, filename) do |analysis|
         analysis.map do |beat|
-          Beat.new(beat.text.to_f, beat.attributes['confidence'].to_f)
+          Beat.new(beat.content.to_f, beat['confidence'].to_f)
         end
       end
     end
@@ -35,25 +35,25 @@ module Echonest
         analysis.map do |segment|
           max_loudness = loudness = nil
 
-          segment.elements['loudness'].map do |db|
-            if db.attributes['type'] == 'max'
-              max_loudness = Loudness.new(db.attributes['time'].to_f, db.text.to_f)
+          segment.find('loudness/dB').map do |db|
+            if db['type'] == 'max'
+              max_loudness = Loudness.new(db['time'].to_f, db.content.to_f)
             else
-              loudness = Loudness.new(db.attributes['time'].to_f, db.text.to_f)
+              loudness = Loudness.new(db['time'].to_f, db.content.to_f)
             end
           end
 
-          pitches = segment.elements['pitches'].map do |pitch|
-            pitch.text.to_f
+          pitches = segment.find('pitches/pitch').map do |pitch|
+            pitch.content.to_f
           end
 
-          timbre = segment.elements['timbre'].map do |coeff|
-            coeff.text.to_f
+          timbre = segment.find('timbre/coeff').map do |coeff|
+            coeff.content.to_f
           end
 
           Segment.new(
-            segment.attributes['start'].to_f,
-            segment.attributes['duration'].to_f,
+            segment['start'].to_f,
+            segment['duration'].to_f,
             loudness,
             max_loudness,
             pitches,
@@ -65,7 +65,7 @@ module Echonest
 
     def get_tempo(filename)
       get_analysys(:get_tempo, filename) do |analysis|
-        analysis[0].text.to_f
+        analysis.first.content.to_f
       end
     end
 
@@ -73,8 +73,8 @@ module Echonest
       get_analysys(:get_sections, filename) do |analysis|
         analysis.map do |section|
           Section.new(
-            section.attributes['start'].to_f,
-            section.attributes['duration'].to_f
+            section['start'].to_f,
+            section['duration'].to_f
           )
         end
       end
@@ -82,32 +82,32 @@ module Echonest
 
     def get_duration(filename)
       get_analysys(:get_duration, filename) do |analysis|
-        analysis[0].text.to_f
+        analysis.first.content.to_f
       end
     end
 
     def get_end_of_fade_in(filename)
       get_analysys(:get_end_of_fade_in, filename) do |analysis|
-        analysis[0].text.to_f
+        analysis.first.content.to_f
       end
     end
 
     def get_key(filename)
       get_analysys(:get_key, filename) do |analysis|
-        ValueWithConfidence.new(analysis[0].text.to_i, analysis[0].attributes['confidence'].to_f)
+        ValueWithConfidence.new(analysis.first.content.to_i, analysis.first['confidence'].to_f)
       end
     end
 
     def get_loudness(filename)
       get_analysys(:get_loudness, filename) do |analysis|
-        analysis[0].text.to_f
+        analysis.first.content.to_f
       end
     end
 
     def get_metadata(filename)
       get_analysys(:get_metadata, filename) do |analysis|
         analysis.inject({}) do |memo, key|
-          memo[key.name] = key.text
+          memo[key.name] = key.content
           memo
         end
       end
@@ -115,27 +115,27 @@ module Echonest
 
     def get_mode(filename)
       get_analysys(:get_mode, filename) do |analysis|
-        ValueWithConfidence.new(analysis[0].text.to_i, analysis[0].attributes['confidence'].to_f)
+        ValueWithConfidence.new(analysis.first.content.to_i, analysis.first['confidence'].to_f)
       end
     end
 
     def get_start_of_fade_out(filename)
       get_analysys(:get_start_of_fade_out, filename) do |analysis|
-        analysis[0].text.to_f
+        analysis.first.content.to_f
       end
     end
 
     def get_tatums(filename)
       get_analysys(:get_tatums, filename) do |analysis|
         analysis.map do |tatum|
-          Tatum.new(tatum.text.to_f, tatum.attributes['confidence'].to_f)
+          Tatum.new(tatum.content.to_f, tatum['confidence'].to_f)
         end
       end
     end
 
     def get_time_signature(filename)
       get_analysys(:get_time_signature, filename) do |analysis|
-        ValueWithConfidence.new(analysis[0].text.to_i, analysis[0].attributes['confidence'].to_f)
+        ValueWithConfidence.new(analysis.first.content.to_i, analysis.first['confidence'].to_f)
       end
     end
 
@@ -147,7 +147,7 @@ module Echonest
 
     def get_analysys(method, filename)
       get_trackinfo(method, filename) do |response|
-        yield response.xml.elements['response/analysis']
+        yield response.xml.find('/response/analysis').first
       end
     end
 

data/lib/echonest/response.rb

@@ -1,11 +1,11 @@
-require "rexml/document"
+require "xml"
 
 module Echonest
   class Response
     attr_reader :xml
 
     def initialize(body)
-      @xml = REXML::Document.new(body)
+      @xml = XML::Document.string(body)
     end
 
     def status
@@ -32,8 +32,8 @@ module Echonest
       attr_reader :code, :message
 
       def initialize(xml)
-        @code = xml.elements['response/status/code'][0].to_s.to_i
-        @message = xml.elements['response/status/message'][0].to_s
+        @code = xml.find('/response/status/code').first.content.to_s.to_i
+        @message = xml.find('/response/status/message').first.content.to_s
       end
     end
 
@@ -41,8 +41,8 @@ module Echonest
       def initialize(xml)
         @parameters = {}
 
-        xml.elements.each('response/query/parameter') do |parameter|
-          @parameters[parameter.attributes['name'].to_sym] = parameter.text
+        xml.find('/response/query/parameter').each do |parameter|
+          @parameters[parameter['name'].to_sym] = parameter.content
         end
       end
 

data/lib/echonest/version.rb

@@ -1,3 +1,3 @@
 module Echonest
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/response_spec.rb

@@ -46,7 +46,7 @@ EOM
     @success.status.code.should eql(0)
     @success.status.message.should eql('Success')
     @success.success?.should be_true
-    @success.xml.elements['response/artist/name'][0].to_s.should eql('Radiohead')
+    @success.xml.find('/response/artist/name').first.content.should eql('Radiohead')
 
     @failure.status.code.should eql(1)
     @failure.status.message.should eql('Invalid API key')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-ruby-echonest
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - youpy
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2009-07-06 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: An Ruby interface for Echo Nest Developer API
 email: youpy@buycheapviagraonlinenow.com
 executables: []