beatport 0.1.1 → 0.1.2

data/spec/catalog/home_spec.rb

@@ -3,14 +3,13 @@ require 'spec_helper'
 module Beatport::Catalog
   describe Home do
     describe '.get' do
-      it "should get the home page" do
-        home = Home.get
-        
-        home.slideshow.header.length.should be >= 1
-        home.slideshow.feature.length.should be > 1
-        home.features.length.should be > 1
-        home.top_downloads.length.should be > 1
-      end
+      subject { Home.get }
+      
+      it { should be_a(Home) }
+      its (:'slideshow.header.length') { should be >= 1 }
+      its (:'slideshow.feature.length') { should be > 1 }
+      its (:'features.length') { should be > 1 }
+      its (:'top_downloads.length') { should be > 1 }
     end
   end
 end

data/spec/catalog/item_type_spec.rb

@@ -3,9 +3,11 @@ require 'spec_helper'
 module Beatport::Catalog
   describe ItemType do
     describe "structure" do
-      before(:all) { @item_type = ItemType.all.first }
-      it { @item_type.id.should == 1 }
-      it { @item_type.name.should == "track" }            
+      subject { ItemType.all.first }
+      
+      it { should be_an(ItemType) }
+      its (:id) { should == 1 }
+      its (:name) { should == "track" }            
     end
   end
 end

data/spec/catalog/label_spec.rb

@@ -4,24 +4,25 @@ module Beatport::Catalog
   describe Label do
 
     describe 'structure' do
-      before(:all) { @label = Label.find(1390) }
-      it { @label.id.should == 1390 }
-      it { @label.type.should == "label" }
-      it { @label.name.should == "Anjunadeep" }
-      it { @label.slug.should == "anjunadeep" }      
-      it { @label.source_type.should == ["store", "mobile", "sushi"] }
-      it { @label.last_publish_date.should == Date.new(2011, 12, 07) }
-      it { @label.biography.should == "" }
-      it { @label.genres.length.should be > 1 }
-      it { @label.sub_genres.length.should be > 0 }      
-      it { @label.display_level.should == 1 }
-      it { @label.images.small.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/0/0/3000/400/0/3406.jpg"}
-      it { @label.images.medium.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/0/0/1000/100/90/1191.jpg"}
-      it { @label.images.banner.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/300000/40000/5000/100/50/345152.jpg"}            
+      subject { Label.find(1390) }
       
-      it { @label.top_downloads.length.should be > 1 }
-      it { @label.featured_releases.length.should be > 1 }
-      it { @label.most_popular_releases.length.should be > 1 }
+      it { should be_a(Label) }
+      its (:id) { should == 1390 }
+      its (:type) { should == "label" }
+      its (:name) { should == "Anjunadeep" }
+      its (:slug) { should == "anjunadeep" }      
+      its (:source_type) { should == ["store", "mobile", "sushi"] }
+      its (:last_publish_date) { should == Date.new(2011, 12, 07) }
+      its (:biography) { should == "" }
+      its (:'genres.length') { should be > 1 }
+      its (:'sub_genres.length') { should be > 0 }      
+      its (:display_level) { should == 1 }
+      its (:'images.small.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/0/0/3000/400/0/3406.jpg"}
+      its (:'images.medium.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/0/0/1000/100/90/1191.jpg"}
+      its (:'images.banner.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/300000/40000/5000/100/50/345152.jpg"}            
+#      its (:'top_downloads.length') { should be > 1 }
+#      its (:'featured_releases.length') { should be > 1 }
+#      its (:'most_popular_releases.length') { should be > 1 }
     end
   
     describe '.find' do
@@ -55,7 +56,7 @@ module Beatport::Catalog
           old_id = nil if old_date.to_s != label.last_publish_date.to_s
         
           # beatport has some bad genre data?
-          # label.genres.map(&:id).should include(5)
+          # label.genres.map(&:id)) { should include(5)
           label.id.should be >= old_id if old_id
           label.last_publish_date.should be >= old_date if old_date
         
@@ -68,7 +69,7 @@ module Beatport::Catalog
         labels = Label.all :return_facets => ['genre_name', 'performer_name']
         
         # no worky
-#        labels.facets['fields']['performer_name'].count.should be > 1
+#        labels.facets['fields']['performer_name'].count) { should be > 1
         labels.facets['fields']['genre_name'].count.should be > 1      
       end
 

data/spec/catalog/mixed_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 module Beatport::Catalog
   describe Mixed do
     describe '.all' do
-      before(:all) do
-        @results = Mixed.all(
+      subject do
+        Mixed.all(
           :label_ids => [804,1390],
           :artist_ids => [7181, 10395],
           :chart_ids => [15722, 29514],
@@ -14,11 +14,11 @@ module Beatport::Catalog
       end
 
       it "should return two of each type" do
-        @results.map(&:type).should == ['label', 'label', 'artist', 'artist', 'chart', 'chart', 'release', 'release', 'track', 'track']
+        subject.map(&:type).should == ['label', 'label', 'artist', 'artist', 'chart', 'chart', 'release', 'release', 'track', 'track']
       end
 
       it "should return the right ids" do
-        @results.map(&:id).should == [804, 1390, 7181, 10395, 15722, 29514, 164808, 385763, 1746687, 1873426]
+        subject.map(&:id).should == [804, 1390, 7181, 10395, 15722, 29514, 164808, 385763, 1746687, 1873426]
       end
 
     end

data/spec/catalog/release_spec.rb

@@ -4,30 +4,32 @@ module Beatport::Catalog
   describe Release do
   
     describe 'structure' do
-      before(:all) { @release = Release.find(164808) }
-      it { @release.id.should == 164808 }
-      it { @release.type.should == 'release' }
-      it { @release.name.should == "Anjunabeats Volume 6 (Unmixed - DJ Ready)" }
-      it { @release.slug.should == 'anjunabeats-volume-6-unmixed-dj-ready'}
-      it { @release.release_date.should == Date.new(2009, 04, 06) }
-      it { @release.publish_date.should == Date.new(2009, 04, 06) }
-      it { @release.exclusive.should == false }
-      it { @release.category.should == 'Album' }
-      it { @release.current_status.should == "General Content"}
-      it { @release.catalog_number.should == "ANJCDCO011D"}
-      it { @release.purchasable.should == true }
-      it { @release.price.to_s.should == "15.99" }
-      it { @release.tracks_price.to_s.should == "43.21" }
-      it { @release.audio_format_fee.wav.to_s.should == '29.00'}
-      it { @release.audio_format_fee.aiff.to_s.should == '29.00'}
-      it { @release.label.id.should == 804 }
-      it { @release.artists.map(&:name).should include("Paul Keeley") }
-      it { @release.genres.map(&:name).should == ["Trance", "Progressive House"]}
-      it { @release.images.small.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/300000/90000/2000/600/90/392699.jpg" }
-      it { @release.images.medium.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/300000/90000/2000/700/0/392700.jpg" }
-      it { @release.images.large.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/300000/90000/2000/700/0/392701.jpg" }      
-      it { @release.discount.to_s.should == "27.22" }
-      it { @release.recommendations.releases.length.should > 1 }
+      subject { Release.find(164808) }
+      
+      it { should be_a(Release) }
+      its (:id) { should == 164808 }
+      its (:type) { should == 'release' }
+      its (:name) { should == "Anjunabeats Volume 6 (Unmixed - DJ Ready)" }
+      its (:slug) { should == 'anjunabeats-volume-6-unmixed-dj-ready'}
+      its (:release_date) { should == Date.new(2009, 04, 06) }
+      its (:publish_date) { should == Date.new(2009, 04, 06) }
+      its (:exclusive) { should == false }
+      its (:category) { should == 'Album' }
+      its (:current_status) { should == "General Content"}
+      its (:catalog_number) { should == "ANJCDCO011D"}
+      its (:purchasable) { should == true }
+      its (:'price.to_s') { should == "15.99" }
+      its (:'tracks_price.to_s') { should == "43.21" }
+      its (:'audio_format_fee.wav.to_s') { should == '29.00'}
+      its (:'audio_format_fee.aiff.to_s') { should == '29.00'}
+      its (:'label.id') { should == 804 }
+      specify { subject.artists.map(&:name).should include("Paul Keeley") }
+      specify { subject.genres.map(&:name).should == ["Trance", "Progressive House"] }
+      its (:'images.small.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/300000/90000/2000/600/90/392699.jpg" }
+      its (:'images.medium.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/300000/90000/2000/700/0/392700.jpg" }
+      its (:'images.large.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/300000/90000/2000/700/0/392701.jpg" }      
+      its (:'discount.to_s') { should == "27.22" }
+#      its (:'recommendations.releases.length') { should > 1 }
     end
   
     describe '.find' do

data/spec/catalog/source_type_spec.rb

@@ -3,9 +3,11 @@ require 'spec_helper'
 module Beatport::Catalog
   describe SourceType do
     describe "structure" do
-      before(:all) { @source_type = SourceType.all.first }
-      it { @source_type.id.should == 1 }
-      it { @source_type.name.should == "store" }            
+      subject { SourceType.all.first }
+      
+      it { should be_a(SourceType) }
+      its (:id) { should == 1 }
+      its (:name) { should == "store" }            
     end
   end
 end

data/spec/catalog/track_spec.rb

@@ -10,38 +10,39 @@ module Beatport::Catalog
     end
 
     describe 'structure' do
-      before(:all) { @track = Track.find(1217790) }
+      subject { Track.find(1217790) }
       
-      it { @track.id.should == 1217790 }
-      it { @track.type.should == 'track' }
-      it { @track.name.should == "Tonight (IMS Anthem 2009)" }
-      it { @track.mix_name.should == "Above & Beyond Remix" }
-      it { @track.slug.should == "tonight-ims-anthem-2009-above-and-beyond-remix" }
-      it { @track.title.should == "Tonight (IMS Anthem 2009) (Above & Beyond Remix)"}
-      it { @track.release_date.should == Date.new(2010,05,17) }
-      it { @track.publish_date.should == Date.new(2010,05,17) }
-      it { @track.sample_url.should == 'http://geo-samples.beatport.com/items/volumes/volume7/items/1000000/200000/10000/7000/700/90/1217790.LOFI.mp3' }
-      it { @track.rtmp_stream_url.should == 'rtmp://geo-rtmp-samples.beatport.com/beatport/_definst_/mp3:lofi_samples/items/volumes/volume7/items/1000000/200000/10000/7000/700/90/1217790.LOFI'}
-      it { @track.exclusive.should be_false }
-      it { @track.price.to_s.should == "1.49" }
-      it { @track.audio_format_fee.wav.to_s.should == "1.00" }
-      it { @track.audio_format_fee.aiff.to_s.should == "1.00" }
+      it { should be_a(Track) }
+      its (:id) { should == 1217790 }
+      its (:type) { should == 'track' }
+      its (:name) { should == "Tonight (IMS Anthem 2009)" }
+      its (:mix_name) { should == "Above & Beyond Remix" }
+      its (:slug) { should == "tonight-ims-anthem-2009-above-and-beyond-remix" }
+      its (:title) { should == "Tonight (IMS Anthem 2009) (Above & Beyond Remix)"}
+      its (:release_date) { should == Date.new(2010,05,17) }
+      its (:publish_date) { should == Date.new(2010,05,17) }
+      its (:sample_url) { should == 'http://geo-samples.beatport.com/items/volumes/volume7/items/1000000/200000/10000/7000/700/90/1217790.LOFI.mp3' }
+      its (:rtmp_stream_url) { should == 'rtmp://geo-rtmp-samples.beatport.com/beatport/_definst_/mp3:lofi_samples/items/volumes/volume7/items/1000000/200000/10000/7000/700/90/1217790.LOFI'}
+      its (:exclusive) { should be_false }
+      its (:'price.to_s') { should == "1.49" }
+      its (:'audio_format_fee.wav.to_s') { should == "1.00" }
+      its (:'audio_format_fee.aiff.to_s') { should == "1.00" }
       # for some reason this doesn't always return the same result
-#      it { @track.current_status.should == nil "General Content" }
-      it { @track.length.should == "07:53" }
-      it { @track.bpm.should == 128 }
-      it { @track.key.standard.letter.should == "D" }
-      it { @track.sale_type.should == "purchase" }
-      it { @track.artists.map(&:name).should == ["Above & Beyond", "Dirty Vegas"] }
-      it { @track.genres.map(&:name).should == ["Trance"]}
-      it { @track.sub_genres.map(&:name).should == ['Progressive']}      
-      it { @track.charts.should == [] }
-      it { @track.release.id.should == 245137 }
-      it { @track.label.id.should == 495}
-      it { @track.images.small.url.should == 'http://geo-media.beatport.com/items/imageCatalog/0/600000/70000/4000/700/50/674759.jpg' }
-      it { @track.images.medium.url.should == 'http://geo-media.beatport.com/items/imageCatalog/0/600000/70000/4000/700/60/674760.jpg' }
-      it { @track.images.large.url.should == 'http://geo-media.beatport.com/items/imageCatalog/0/600000/70000/4000/700/60/674761.jpg' }
-      it { @track.images.waveform.url.should == 'http://geo-media.beatport.com/items/imageCatalog/1000000/200000/60000/8000/200/20/1268229.png' }                  
+#      it { @track.current_status) { should == nil "General Content" }
+      its (:length) { should == "07:53" }
+      its (:bpm) { should == 128 }
+      its (:'key.standard.letter') { should == "D" }
+      its (:sale_type) { should == "purchase" }
+      specify { subject.artists.map(&:name).should == ["Above & Beyond", "Dirty Vegas"] }
+      specify { subject.genres.map(&:name).should == ["Trance"] }
+      specify { subject.sub_genres.map(&:name).should == ['Progressive'] }
+      its (:charts) { should == [] }
+      its (:'release.id') { should == 245137 }
+      its (:'label.id') { should == 495}
+      its (:'images.small.url') { should == 'http://geo-media.beatport.com/items/imageCatalog/0/600000/70000/4000/700/50/674759.jpg' }
+      its (:'images.medium.url') { should == 'http://geo-media.beatport.com/items/imageCatalog/0/600000/70000/4000/700/60/674760.jpg' }
+      its (:'images.large.url') { should == 'http://geo-media.beatport.com/items/imageCatalog/0/600000/70000/4000/700/60/674761.jpg' }
+      its (:'images.waveform.url') { should == 'http://geo-media.beatport.com/items/imageCatalog/1000000/200000/60000/8000/200/20/1268229.png' }                  
     end
     
     describe '.find' do

data/spec/{inflector_spec.rb → support/inflector_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Beatport 
+module Beatport::Support 
   describe Inflector do
     describe '.camelize' do
       it "should camelize an underscored word" do

data/spec/{query_builder_spec.rb → support/query_builder_spec.rb}

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
-module Beatport 
+module Beatport::Support
   describe QueryBuilder do
     describe '#process_sort_by' do
-      it "should handle a string" do
+      it "handles strings" do
         input = 'publish_date desc, chart_id desc'
         output = 'publishDate desc,chartId desc'
         
         QueryBuilder.new.process_sort_by(input).should == output
       end
 
-      it "should handle an array" do
+      it "handles arrays" do
         input = ['publish_date desc', 'chart_id desc']
         output = 'publishDate desc,chartId desc'
         
         QueryBuilder.new.process_sort_by(input).should == output
       end
 
-      it "should handle a hash" do
+      it "handles hashes" do
         input = {'publish_date' => 'desc', 'chart_id' => 'desc'}
         output = 'publishDate desc,chartId desc'
         
@@ -26,21 +26,21 @@ module Beatport
     end
     
     describe '#process_facets' do
-      it "should handle a string" do
+      it "handles strings" do
         input = "genre_name:Trance, genre_name:Progressive House"
         output = "genreName:Trance,genreName:Progressive House"
         
         QueryBuilder.new.process_facets(input).should == output        
       end
 
-      it "should handle an array" do
+      it "handles arrays" do
         input = ["genre_name:Trance", "genre_name:Progressive House"]
         output = "genreName:Trance,genreName:Progressive House"
         
         QueryBuilder.new.process_facets(input).should == output        
       end
 
-      it "should handle a hash with a string value" do
+      it "handles hashes with string values" do
         input = {"genre_name" => "Trance"}
         output = "genreName:Trance"
         
@@ -48,7 +48,7 @@ module Beatport
       end
 
 
-      it "should handle a hash with an array value" do
+      it "handles hashes with array values" do
         input = {"genre_name" => ["Trance", "Progressive House"]}
         output = "genreName:Trance,genreName:Progressive House"
         
@@ -57,7 +57,7 @@ module Beatport
     end
     
     describe '#process_return_facets' do
-      it "should handle a string" do
+      it "handles strings" do
         input = "genre_name, performer_name"
         output = "genreName,performerName"
         
@@ -66,31 +66,25 @@ module Beatport
     end
     
     describe ".process" do
-      it "should handle sort by" do
+      it "handles sort by" do
         h = {:sort_by => ['publishDate asc', 'chartId asc']}
         
         QueryBuilder.process(h).should == {'sortBy'=>"publishDate asc,chartId asc"}
       end
 
-      it "should handle sort by with hash syntax" do
+      it "handles sort by with hash syntax" do
         h = {:sort_by => {'publish_date'=>'asc', 'chart_id'=>'asc'}}
         
         QueryBuilder.process(h).should == {'sortBy'=>"publishDate asc,chartId asc"}
       end
 
-      it "should handle return facets" do
+      it "handles return facets" do
         h = {:return_facets => ['genre_name', 'performer_name']}
         
         QueryBuilder.process(h).should == {'returnFacets'=>"genreName,performerName"}
       end
 
-      it "should handle return facets" do
-        h = {:return_facets => ['genre_name', 'performer_name']}
-        
-        QueryBuilder.process(h).should == {'returnFacets'=>"genreName,performerName"}
-      end
-
-      it "should handle facets" do
+      it "handles facets" do
         h = {:facets => {:genre_name => ['Trance', 'Progessive House']}}
         
         QueryBuilder.process(h).should == {'facets'=>"genreName:Trance,genreName:Progessive House"}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beatport
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mateo Murphy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-18 00:00:00 -05:00
+date: 2011-12-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -185,11 +185,12 @@ files:
 - lib/beatport/catalog/track.rb
 - lib/beatport/client.rb
 - lib/beatport/collection.rb
-- lib/beatport/inflector.rb
 - lib/beatport/item.rb
-- lib/beatport/parser.rb
 - lib/beatport/price.rb
-- lib/beatport/query_builder.rb
+- lib/beatport/support.rb
+- lib/beatport/support/inflector.rb
+- lib/beatport/support/parser.rb
+- lib/beatport/support/query_builder.rb
 - spec/catalog/account_type_spec.rb
 - spec/catalog/artist_spec.rb
 - spec/catalog/audio_format_spec.rb
@@ -209,10 +210,10 @@ files:
 - spec/catalog/source_type_spec.rb
 - spec/catalog/track_spec.rb
 - spec/collection_spec.rb
-- spec/inflector_spec.rb
 - spec/item_spec.rb
-- spec/query_builder_spec.rb
 - spec/spec_helper.rb
+- spec/support/inflector_spec.rb
+- spec/support/query_builder_spec.rb
 has_rdoc: true
 homepage: http://github.com/mateomurphy/beatport
 licenses: 

data/lib/beatport/inflector.rb

@@ -1,44 +0,0 @@
-module Beatport
-  module Inflector
-    def self.constantize(camel_cased_word)
-      names = camel_cased_word.split('::')
-      names.shift if names.empty? || names.first.empty?
-
-      constant = Object
-      names.each do |name|
-        constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-      end
-      constant
-    end
-    
-    def self.camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
-      if first_letter_in_uppercase
-        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-      else
-        lower_case_and_underscored_word.to_s[0].chr.downcase + camelize(lower_case_and_underscored_word)[1..-1]
-      end
-    end    
-    
-    def self.underscore(camel_cased_word)
-      word = camel_cased_word.to_s.dup
-      word.gsub!(/::/, '/')
-      word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      word.tr!("-", "_")
-      word.downcase!
-      word
-    end
-    
-    def self.process_keys(obj, &block)
-      case obj
-      when Hash
-        Hash[obj.map {|k, v| [yield(k), process_keys(v, &block)]}]
-      when Array
-        obj.map {|o| process_keys(o, &block)}
-      else
-        obj
-      end
-    end
-    
-  end
-end