freesound-ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a44df7e389656a0a045268aa1217fe64039453c1
+  data.tar.gz: d226a4e0cd78bfd94aa9fa8f2dd32c02c2e5852b
+SHA512:
+  metadata.gz: a808b2d015f66f653fd2ae59cbfa37c904e8ec5dbc60de2658f2b52d2de7bf646ff750e285d81af097b3a4ac46fd2343fcad68b77c83c1941ae50eaae8f82d0e
+  data.tar.gz: 46d3d5bd4c404dd547abb9ced16855a3cc9bfa9c17ffce806a193c6ae865c8247c2d5fad755d8dbc7a0d1eadaeccdfa0ab53c20c2764a2930bccfd861eadfec2

data/.gitignore

@@ -11,9 +11,6 @@ doc
 # bundler
 .bundle
 
-# jeweler generated
-pkg
-
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #
 # * Create a file at ~/.gitignore
@@ -39,10 +36,12 @@ pkg
 #.\#*
 
 # For vim:
-#*.swp
+*.swp
 
 # For redcar:
 #.redcar
 
 # For rubinius:
 #*.rbc
+
+*.gem

data/README.md

@@ -1,4 +1,4 @@
-# freesound-ruby
-[freesound.org](http://www.freesound.org) api wrapper.
+# DEPRECATED!
 
-###
+### You should use [freesound_ruby](https://github.com/alexgenco/freesound_ruby) (with an underscore) instead.
+### This gem will not be maintained.

data/data/auth_error.json

@@ -0,0 +1,6 @@
+{
+    "status_code": 401, 
+    "explanation": "Please include your api key as the api_key GET parameter", 
+    "type": "AuthenticationError", 
+    "error": true
+}

data/data/auth_error.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<response>
+  <status_code>401</status_code>
+  <explanation>Please include your api key as the api_key GET parameter</explanation>
+  <type>AuthenticationError</type>
+  <error>True</error>
+</response>

data/data/auth_error.yaml

@@ -0,0 +1,4 @@
+error: true,
+explanation: Please include your api key as the api_key GET parameter,
+status_code: 401,
+type: AuthenticationError

data/freesound-ruby.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.version     = Freesound::VERSION
   s.authors     = ["Alex Genco"]
   s.email       = ["alexgenco@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/alexgenco/freesound-ruby"
   s.summary     = %q{Freesound.org API wrapper in Ruby.}
-  s.description = %q{Freesound.org API wrapper in Ruby.}
+  s.description = %q{A wrapper for the Freesound.org API, to provide access to their extensive audio database.}
 
   s.rubyforge_project = "freesound-ruby"
 
@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("bundler", "~> 1.0.0")
   s.add_development_dependency("webmock")
   s.add_runtime_dependency("crack")
+
+  s.post_install_message = "THIS GEM IS NO LONGER MAINTAINED. You should use 'freesound_ruby' (with an underscore) instead."
 end

data/lib/freesound.rb

@@ -1,20 +1,28 @@
 require 'net/http'
 require 'uri'
 require 'crack'
-require 'core_ext'
 
 YAML::ENGINE.yamler = 'syck'
 
 module Freesound
+
+  require 'freesound/core_ext/hash'
+  require 'freesound/core_ext/string'
+  require 'freesound/version'
+  require 'freesound/client'
+  require 'freesound/request'
+  require 'freesound/uri_compiler'
+  require 'freesound/response'
+  require 'freesound/response_parser'
+  require 'freesound/sound'
+
   def self.root_dir
     File.expand_path('..', File.dirname(__FILE__))
   end
 
-  class InvalidConfigurationParameterError < ArgumentError; end
-
   module Configuration
     DEFAULTS = {
-      :api_key    => ENV['FREESOUND_KEY'],
+      :api_key    => nil,
       :base_url   => 'http://www.freesound.org/api',
       :sounds_url => 'http://www.freesound.org/api/sounds'
     }
@@ -31,6 +39,8 @@ module Freesound
       EOS
     end
 
+    class InvalidConfigurationParameterError < ArgumentError; end
+
     def self.method_missing(name, *args)
       raise(InvalidConfigurationParameterError, "#{name} is not a recognized configuration parameter")
     end
@@ -48,11 +58,3 @@ module Freesound
     Configuration
   end
 end # module Freesound
-
-require 'freesound/version'
-require 'freesound/client'
-require 'freesound/request'
-require 'freesound/uri_compiler'
-require 'freesound/response'
-require 'freesound/response_parser'
-require 'freesound/sound'

data/lib/freesound/client.rb

@@ -1,6 +1,4 @@
 module Freesound
-  class InvalidApiKeyError < ArgumentError; end
-
   class Client
     attr_reader :api_key, :requests, :responses
 
@@ -11,16 +9,22 @@ module Freesound
     end
 
     def get_sound(id)
-      request = Request.new(:sound_id => id)
+      request = Request.new(@api_key, {:sound_id => id})
       response = request.get!
+
       @requests << request
       @responses << response
+
       response.sounds.first
     end
 
     def search_sounds(query, options={})
-      request = Request.new(:search => {:q => query})
+      request = Request.new(@api_key, {:search => {:q => query}})
       response = request.get!
+
+      @requests << request
+      @responses << response
+
       response.sounds
     end
   end

data/lib/freesound/core_ext/hash.rb

@@ -0,0 +1,24 @@
+class Hash
+  def symbolize_keys
+    Hash[ map { |k, v| [k.underscore.to_sym, v.is_a?(Hash) ? v.symbolize_keys : v] } ]
+  end
+
+  # converting xml into a hash sometimes gives you things like:
+  # { 'element' => ['just_one_value'] }
+  # this method converts this to the more useful
+  # { 'element' => 'just_one_value' }
+  def flatten_single_element_array_values
+    Hash[ map do |k, v|
+      [k, (v.is_a?(Array) && v.size == 1) ? v[0] : (v.flatten_single_element_array_values rescue v)]
+    end ]
+  end
+
+  # convert to a uri string
+  def to_uri
+    map { |k, v| "#{k}=#{v}" }.join("&")
+  end
+
+  def numberize_values
+    Hash[ map { |k, v| [k, ((v.numberizeable? rescue false) ? v.numberize : v)] } ]
+  end
+end

data/lib/freesound/core_ext/string.rb

@@ -0,0 +1,21 @@
+class String
+  def numberize
+    if numberizeable?
+      float? ? to_f : to_i
+    end
+  end
+
+  def numberizeable?
+    !scan(/^\-?\d*\.?\d*$/).empty?
+  end
+
+  def underscore
+    gsub(/\W/, '_')
+  end
+
+  private
+
+  def float?
+    scan(/\./).size == 1
+  end
+end

data/lib/freesound/request.rb

@@ -1,27 +1,36 @@
 module Freesound
   class InvalidRequestFormatError < ArgumentError; end
+  class InvalidApiKeyError < ArgumentError; end
 
   class Request
-    attr_reader :uri, :params, :response, :format
+    attr_reader :uri, :uri_compiler, :params, :response, :format, :api_key
 
-    def initialize(params={})
+    def initialize(api_key, params={})
       self.format = params[:format] || :json
+      @api_key = api_key
       @params = params
       @response = nil
     end
 
-    def format=(format)
-      raise(InvalidRequestFormatError, "#{format} is not a valid request format") unless [:json, :xml, :yaml, :yml].include?(format.to_sym)
-      @format = format.to_sym
+    def format=(form)
+      raise(InvalidRequestFormatError, "#{form} is not a valid request format") unless [:json, :xml, :yaml, :yml].include?(form.to_sym)
+      @format = form.to_sym
+    end
+
+    def uri_compiler
+      @uri_compiler ||= URICompiler.new(@api_key, @params.dup.merge({:format => @format}))
     end
 
     def uri
-      @uri ||= URICompiler.new(@params.dup.merge({:format => @format})).uri
+      @uri ||= self.uri_compiler.uri
     end
 
     def get!
       response_body = Net::HTTP.get_response(self.uri).body
       @response ||= Response.new(response_body, @format)
+
+      raise(InvalidApiKeyError, "#{@api_key} is not a valid API key") if @response.errors[:error]
+      @response
     end
   end
 end

data/lib/freesound/response.rb

@@ -2,25 +2,35 @@ module Freesound
   class Response
     attr_reader :content, :parser
 
-    def initialize(raw, format=:json)
+    def initialize(raw, form=:json)
       @content = raw
-      @format  = format
-      @parser  = ResponseParser.new(format)
+      @format  = form
+      @parser  = ResponseParser.new(form)
     end
 
     def data
       @data ||= @parser.parse(@content)
     end
 
+    def errors
+      @errors ||= (self.data[:error] rescue false) ? self.data : {}
+    end
+
     def num_results
-      self.data[:num_results] || 1
+      self.data.is_a?(Array) ? self.data.size : 1
     end
 
     def sounds
+      return [] if self.errors[:error]
+
       @sounds ||= if num_results == 1
                     [ Sound.new(*self.data.values) ]
                   else
-                    self.data[:sounds].map { |data| Sound.new(data) }
+                    self.data.map do |sound|
+                      result = Sound.new
+                      sound.each { |k, v| result.send("#{k}=", v) }
+                      result
+                    end
                   end
     end
   end

data/lib/freesound/response_parser.rb

@@ -2,8 +2,8 @@ module Freesound
   class ResponseParser
     attr_reader :format
 
-    def initialize(format)
-      @format = format
+    def initialize(form)
+      @format = form
     end
 
     def parse(raw)
@@ -20,7 +20,13 @@ module Freesound
     private
 
     def parse_json(raw)
-      ::Crack::JSON.parse(raw).underscore_keys.symbolize_keys
+      result = ::Crack::JSON.parse(raw)
+
+      if result["sounds"]
+        result["sounds"].map { |sound| sound.symbolize_keys }
+      else
+        result.symbolize_keys
+      end
     end
 
     # xml gets parsed slightly differently than json and yaml.
@@ -28,16 +34,32 @@ module Freesound
     # convert strings like "2" to their corresponding number object i.e. 2
     # and remove the nesting of the :tags key under "resource"
     def parse_xml(raw)
-      result = ::Crack::XML.parse(raw)["response"].underscore_keys
-      .symbolize_keys
-      .flatten_single_element_array_values
-      .numberize_values
-      result[:tags] = result[:tags]["resource"]
-      result
+      result = ::Crack::XML.parse(raw)["response"]
+
+      # put necessary changes in a lambda
+      fix_sound_hash = lambda do |hash|
+        fixed = hash.symbolize_keys.flatten_single_element_array_values.numberize_values
+        fixed[:tags] = fixed[:tags][:resource]
+        fixed
+      end
+
+      if result["sounds"]
+        result["sounds"].map do |sound|
+          fix_sound_hash.call(sound)
+        end
+      else
+        fix_sound_hash.call(result)
+      end
     end
 
     def parse_yaml(raw)
-      ::YAML::load(raw).underscore_keys.symbolize_keys
+      result = ::YAML::load(raw)
+
+      if result["sounds"]
+        result["sounds"].map { |sound| sound.symbolize_keys }
+      else
+        result.symbolize_keys
+      end
     end
   end
 end

data/lib/freesound/uri_compiler.rb

@@ -1,16 +1,21 @@
 module Freesound
   class Freesound::URICompiler
-    attr_reader :uri
+    attr_reader :uri_string
 
-    def initialize(params)
+    def initialize(api_key, params)
       search_params = params.delete(:search)
       sound_id      = params.delete(:sound_id)
-      format        = params.delete(:format)
-      @uri          = URI.parse(compile_uri_string(search_params, sound_id, format))
+      form          = params.delete(:format)
+      @api_key      = api_key
+      @uri_string   = compile_uri_string(search_params, sound_id, form)
     end
 
-    def compile_uri_string(search_params, sound_id, format)
-      format_string = format ? "&format=#{format}" : ""
+    def uri
+      @uri ||= URI.parse(@uri_string)
+    end
+
+    def compile_uri_string(search_params, sound_id, form)
+      format_string = form ? "&format=#{form}" : ""
 
       if search_params
         search_uri(search_params, format_string)
@@ -22,11 +27,15 @@ module Freesound
     private
 
     def search_uri(search_params, format_string)
-      "#{Freesound.config.sounds_url}/search/?api_key=#{Freesound.config.api_key}#{format_string}&#{search_params.to_uri}"
+      "#{Freesound.config.sounds_url}/search/?#{api_key_string}#{format_string}&#{search_params.to_uri}"
     end
 
     def sound_id_uri(id, format_string)
-      "#{Freesound.config.sounds_url}/#{id}/?api_key=#{Freesound.config.api_key}#{format_string}"
+      "#{Freesound.config.sounds_url}/#{id}/?#{api_key_string}#{format_string}"
+    end
+
+    def api_key_string
+      @api_key.empty? ? "" : "api_key=#{@api_key}"
     end
   end
 end

data/lib/freesound/version.rb

@@ -1,3 +1,3 @@
 module Freesound
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/freesound/client_spec.rb

@@ -8,13 +8,6 @@ describe Client do
   context 'with valid api key' do
     subject { Client.new(Freesound.config.api_key) }
 
-    before do
-      json = File.read("#{Freesound.root_dir}/data/sample.json")
-      path = "http://www.freesound.org/api/sounds/10/?api_key=#{Freesound.config.api_key}&format=json"
-
-      stub_request(:get, path).to_return(:body => json)
-    end
-
     describe '#get_sound' do
       it 'returns a Sound' do
         subject.get_sound(10).should be_a(Sound)
@@ -35,14 +28,21 @@ describe Client do
 
     describe '#search_sounds' do
       before do
-        json = File.read("#{Freesound.root_dir}/data/sample_query.json")
-        path = "http://www.freesound.org/api/sounds/search/?api_key=#{Freesound.config.api_key}&format=json&q=badass"
-        stub_request(:get, path).to_return(:body => json)
       end
 
-      it 'returns a response' do
-        subject.search_sounds("badass").should be_a(Array)
-        subject.search_sounds("badass").first.should be_a(Sound)
+      it 'returns an array of properly parsed sounds' do
+        result = subject.search_sounds("badass")
+        result.should be_a(Array)
+        result.first.should be_a(Sound)
+        result.first.id.should == 80449
+      end
+
+      it 'adds to @requests' do
+        expect { subject.search_sounds("badass") }.to change(subject.requests, :size).by(1)
+      end
+
+      it 'adds to @responses' do
+        expect { subject.search_sounds("badass") }.to change(subject.responses, :size).by(1)
       end
     end
   end

data/spec/{core_ext_spec.rb → freesound/core_ext/hash_spec.rb}

@@ -1,10 +1,15 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Hash do
   describe '#symbolize_keys' do
     it 'symbolizes keys' do
       {"one" => 1, "two" => 2}.symbolize_keys.should == {:one => 1, :two => 2}
     end
+
+    it 'symbolizes keys to an arbitrary level of nestedness' do
+      {"one" => 1, "two" => { "three" => 3, "four" => { "five" => 5}}}.symbolize_keys.should == 
+        {:one => 1, :two => { :three => 3, :four => { :five => 5}}}
+    end
   end
 
   describe '#flatten_single_element_array_values' do
@@ -12,6 +17,11 @@ describe Hash do
       {"one" => [1], "two_and_three" => [2, 3], "four" => 4}
       .flatten_single_element_array_values.should == {"one" => 1, "two_and_three" => [2, 3], "four" => 4}
     end
+
+    it 'does it for nested hashes' do
+      {"one" => [1], :nest => { "two" => [2], "three" => [1,2,3]}, "four" => 4}
+      .flatten_single_element_array_values.should == {"one" => 1, :nest => { "two" => 2, "three" => [1,2,3] }, "four" => 4}
+    end
   end
 
   describe '#to_uri' do
@@ -26,46 +36,4 @@ describe Hash do
         {:one => 1, :one_point_two => 1.2, :negative_three => -3, :something => "anything"}
     end
   end
-
-  describe '#underscore_keys' do
-    it 'underscores keys' do
-      {"one-two" => 12}.underscore_keys.should == {"one_two" => 12}
-    end
-  end
-end
-
-describe String do
-  describe '#numberize' do
-    it 'converts to an integer' do
-      '123'.numberize.should == 123
-    end
-
-    it 'converts to a float' do
-      '123.456'.numberize.should == 123.456
-    end
-
-    it 'returns nil for non-numerical strings' do
-      'abc123'.numberize.should be_nil
-    end
-  end
-
-  describe '#numberizeable?' do
-    it 'returns true' do
-      %w{ 123 -2 1.23 -1.56 .900 23. 023 }.each { |str| str.should be_numberizeable }
-    end
-
-    it 'returns false' do
-      %w{ 1.2.3 12a3 alex 1-23 --345 ..45 98..}.each { |str| str.should_not be_numberizeable }
-    end
-  end
-
-  describe '#underscore' do
-    it 'underscores -s' do
-      'one-two'.underscore.should == 'one_two'
-    end
-
-    it 'underscores whitespace' do
-      'one two'.underscore.should == 'one_two'
-    end
-  end
 end

data/spec/freesound/core_ext/string_spec.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe String do
+  describe '#numberize' do
+    it 'converts to an integer' do
+      '123'.numberize.should == 123
+    end
+
+    it 'converts to a float' do
+      '123.456'.numberize.should == 123.456
+    end
+
+    it 'returns nil for non-numerical strings' do
+      'abc123'.numberize.should be_nil
+    end
+  end
+
+  describe '#numberizeable?' do
+    it 'returns true' do
+      %w{ 123 -2 1.23 -1.56 .900 23. 023 }.each { |str| str.should be_numberizeable }
+    end
+
+    it 'returns false' do
+      %w{ 1.2.3 12a3 alex 1-23 --345 ..45 98..}.each { |str| str.should_not be_numberizeable }
+    end
+  end
+
+  describe '#underscore' do
+    it 'underscores -s' do
+      'one-two'.underscore.should == 'one_two'
+    end
+
+    it 'underscores whitespace' do
+      'one two'.underscore.should == 'one_two'
+    end
+  end
+end

data/spec/freesound/request_spec.rb

@@ -1,26 +1,24 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Request do
-  subject { Request.new({:sound_id => 10}) }
+  subject { Request.new(Freesound.config.api_key, {:sound_id => 10}) }
 
   it 'initializes with a params hash' do
     subject.params.should == {:sound_id => 10}
   end
 
   it 'fails with invalid format' do
-    expect { Request.new({:format => :pdf}) }.to raise_error(InvalidRequestFormatError)
+    expect { Request.new(Freesound.config.api_key, {:format => :pdf}) }.to raise_error(InvalidRequestFormatError)
   end
 
   describe '#get!' do
-    before do
-      json = File.read("#{Freesound.root_dir}/data/sample.json")
-      path = "http://www.freesound.org/api/sounds/10/?api_key=#{Freesound.config.api_key}&format=json"
-
-      stub_request(:get, path).to_return(:body => json)
-    end
-
     it 'returns a Response' do
       subject.get!.should be_a(Response)
     end
+
+    it 'fails with invalid api key' do
+      req = Request.new("invalidapikey", {:sound_id => 10})
+      expect { req.get! }.to raise_error(InvalidApiKeyError)
+    end
   end
 end

data/spec/freesound/response_parser_spec.rb

@@ -2,22 +2,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ResponseParser do
   it 'initializes with a format' do
-    ResponseParser.new(:xml).format.should == :xml
+    ResponseParser.new(:xml).format.should  == :xml
+    ResponseParser.new(:yaml).format.should == :yaml
   end
 
   describe '#parse' do
     before do
-      @json = File.read("#{Freesound.root_dir}/data/sample.json")
-      @xml  = File.read("#{Freesound.root_dir}/data/sample.xml")
-      @yaml = File.read("#{Freesound.root_dir}/data/sample.yaml")
-
       @json_parser = ResponseParser.new(:json)
       @xml_parser  = ResponseParser.new(:xml)
       @yaml_parser = ResponseParser.new(:yaml)
 
-      @json_result = @json_parser.parse(@json)
-      @xml_result  = @xml_parser.parse(@xml)
-      @yaml_result = @yaml_parser.parse(@yaml)
+      @json_result = @json_parser.parse(@sound_json)
+      @xml_result  = @xml_parser.parse(@sound_xml)
+      @yaml_result = @yaml_parser.parse(@sound_yaml)
 
       # these are the expected tags if the above files are parsed correctly
       @tags = [ "transformation", "speech", "voice", "plane", "morph" ]

data/spec/freesound/response_spec.rb

@@ -1,27 +1,40 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Response do
-  before do
-    @single = File.read("#{Freesound.root_dir}/data/sample.json")
-    @multiple = File.read("#{Freesound.root_dir}/data/sample_query.json")
-  end
-
-  let(:single) { Response.new(@single) }
-  let(:multiple) { Response.new(@multiple) }
-
   it 'takes a raw hash' do
     Response.new('{"id": 3}', :json).data.should == {:id => 3}
   end
 
-  it 'has sounds' do
-    [single, multiple].each do |res|
-      res.sounds.should be_a(Array)
-      res.sounds.first.should be_a(Sound)
+  context 'with invalid api key' do
+    before { @error = Response.new(@error_json) }
+
+    it 'contains error information' do
+      @error.errors[:status_code].should == 401
+      @error.errors[:explanation].should == "Please include your api key as the api_key GET parameter"
+      @error.errors[:type].should        == "AuthenticationError"
+      @error.errors[:error].should       == true
     end
   end
 
-  it 'has number of results' do
-    single.num_results.should == 1
-    multiple.num_results.should == 12
+  context 'with valid api key' do
+    before do
+      @single   = Response.new(@sound_json)
+      @multiple = Response.new(@search_json)
+    end
+
+    it 'has no errors' do
+      @single.errors.should == {}
+      @multiple.errors.should == {}
+    end
+
+    it 'has sounds' do
+      @single.sounds.first.should be_a(Sound)
+      @multiple.sounds.first.should be_a(Sound)
+    end
+
+    it 'has number of results' do
+      @single.num_results.should == 1
+      @multiple.num_results.should == 12
+    end
   end
 end

data/spec/freesound/uri_compiler_spec.rb

@@ -3,17 +3,17 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe URICompiler do 
   describe '#compile_uri_string' do
     it 'compiles a proper sound-by-id uri' do
-      URICompiler.new({:sound_id => 12, :format => :json}).uri.should ==
+      URICompiler.new(Freesound.config.api_key, {:sound_id => 12, :format => :json}).uri.should ==
         URI.parse("http://www.freesound.org/api/sounds/12/?api_key=#{Freesound.config.api_key}&format=json")
     end
 
     it 'compiles a proper search uri' do
-      URICompiler.new({:search => {:q => 'bass', :p => 2}, :format => :json}).uri.should ==
+      URICompiler.new(Freesound.config.api_key, {:search => {:q => 'bass', :p => 2}, :format => :json}).uri.should ==
         URI.parse("http://www.freesound.org/api/sounds/search/?api_key=#{Freesound.config.api_key}&format=json&q=bass&p=2")
     end
 
     it 'adds non-default format parameter' do
-      URICompiler.new({:format => :xml, :sound_id => 12}).uri.should ==
+      URICompiler.new(Freesound.config.api_key, {:format => :xml, :sound_id => 12}).uri.should ==
         URI.parse("http://www.freesound.org/api/sounds/12/?api_key=#{Freesound.config.api_key}&format=xml")
     end
   end

data/spec/freesound_spec.rb

@@ -38,8 +38,8 @@ describe Freesound do
     end
 
     it 'fails with unknown configuration parameters' do
-      expect { Freesound.configure(:api_ley => '123') }.to raise_error(Freesound::InvalidConfigurationParameterError)
-      expect { Freesound.configure { |c| c.api_ley = '123' } }.to raise_error(Freesound::InvalidConfigurationParameterError)
+      expect { Freesound.configure(:api_ley => '123') }.to raise_error(Freesound::Configuration::InvalidConfigurationParameterError)
+      expect { Freesound.configure { |c| c.api_ley = '123' } }.to raise_error(Freesound::Configuration::InvalidConfigurationParameterError)
     end
   end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,26 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.before do
-    Freesound::Configuration.api_key = ENV['FREESOUND_KEY'] || fail("Register your app at freesound.org and store your key in the $FREESOUND_KEY variable.")
+    Freesound.config.api_key = ENV['FREESOUND_KEY'] || fail("Register your app at freesound.org and store your key in the $FREESOUND_KEY variable.")
+
+    @sound_json  = File.read("#{Freesound.root_dir}/data/sample.json") 
+    @sound_xml   = File.read("#{Freesound.root_dir}/data/sample.xml") 
+    @sound_yaml  = File.read("#{Freesound.root_dir}/data/sample.yaml") 
+    @search_json = File.read("#{Freesound.root_dir}/data/sample_query.json") 
+    @error_json = File.read("#{Freesound.root_dir}/data/auth_error.json") 
+
+    @json_url   = "http://www.freesound.org/api/sounds/10/?api_key=#{Freesound.config.api_key}&format=json"
+    @xml_url    = "http://www.freesound.org/api/sounds/10/?api_key=#{Freesound.config.api_key}&format=xml"
+    @yaml_url   = "http://www.freesound.org/api/sounds/10/?api_key=#{Freesound.config.api_key}&format=yaml"
+    @search_url = "http://www.freesound.org/api/sounds/search/?api_key=#{Freesound.config.api_key}&format=yaml"
+    @search_url = "http://www.freesound.org/api/sounds/search/?api_key=#{Freesound.config.api_key}&format=json&q=badass"
+    @error_url = "http://www.freesound.org/api/sounds/10/?api_key=invalidapikey&format=json"
+
+    # use web mock to stub http requests
+    stub_request(:get, @json_url).to_return(:body => @sound_json)
+    stub_request(:get, @xml_url).to_return(:body => @sound_xml)
+    stub_request(:get, @yaml_url).to_return(:body => @sound_yaml)
+    stub_request(:get, @search_url).to_return(:body => @search_json)
+    stub_request(:get, @error_url).to_return(:body => @error_json)
   end
 end

metadata

@@ -1,61 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: freesound-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21019320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21019320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21018800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21018800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &21018360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21018360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &21017880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21017880
-description: Freesound.org API wrapper in Ruby.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A wrapper for the Freesound.org API, to provide access to their extensive
+  audio database.
 email:
 - alexgenco@gmail.com
 executables: []
@@ -70,22 +82,27 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- data/auth_error.json
+- data/auth_error.xml
+- data/auth_error.yaml
 - data/sample.json
 - data/sample.xml
 - data/sample.yaml
 - data/sample_query.json
 - freesound-ruby.gemspec
-- lib/core_ext.rb
 - lib/freesound.rb
 - lib/freesound/client.rb
+- lib/freesound/core_ext/hash.rb
+- lib/freesound/core_ext/string.rb
 - lib/freesound/request.rb
 - lib/freesound/response.rb
 - lib/freesound/response_parser.rb
 - lib/freesound/sound.rb
 - lib/freesound/uri_compiler.rb
 - lib/freesound/version.rb
-- spec/core_ext_spec.rb
 - spec/freesound/client_spec.rb
+- spec/freesound/core_ext/hash_spec.rb
+- spec/freesound/core_ext/string_spec.rb
 - spec/freesound/request_spec.rb
 - spec/freesound/response_parser_spec.rb
 - spec/freesound/response_spec.rb
@@ -93,29 +110,28 @@ files:
 - spec/freesound/uri_compiler_spec.rb
 - spec/freesound_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/alexgenco/freesound-ruby
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message: THIS GEM IS NO LONGER MAINTAINED. You should use 'freesound_ruby'
+  (with an underscore) instead.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: freesound-ruby
-rubygems_version: 1.8.11
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Freesound.org API wrapper in Ruby.
 test_files: []
-has_rdoc: 

data/lib/core_ext.rb

@@ -1,50 +0,0 @@
-class Hash
-  def symbolize_keys
-    Hash[ map { |k, v| [k.to_sym, v] } ]
-  end
-
-  # converting xml into a hash sometimes gives you things like:
-  # { 'element' => ['just_one_value'] }
-  # this method converts this to the more useful
-  # { 'element' => 'just_one_value' }
-  def flatten_single_element_array_values
-    Hash[ map do |k, v|
-      [k, (v.is_a?(Array) && v.size == 1) ? v[0] : v]
-    end ]
-  end
-
-  # convert to a uri string
-  def to_uri
-    map { |k, v| "#{k}=#{v}" }.join("&")
-  end
-
-  def numberize_values
-    Hash[ map { |k, v| [k, ( (v.numberizeable? rescue false) ? v.numberize : v )] } ]
-  end
-
-  def underscore_keys
-    Hash[ map { |k, v| [(k.underscore rescue k), v] } ]
-  end
-end
-
-class String
-  def numberize
-    if numberizeable?
-      float? ? to_f : to_i
-    end
-  end
-
-  def numberizeable?
-    !scan(/^\-?\d*\.?\d*$/).empty?
-  end
-
-  def underscore
-    gsub(/\W/, '_')
-  end
-
-  private
-
-  def float?
-    scan(/\./).size == 1
-  end
-end