Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ source "http://rubygems.org"

gem 'addressable'
gem 'signet'
gem 'faraday', '~> 0.8.8'
gem 'faraday', '~> 0.9'
gem 'money', '~> 6.8' # https://github.com/RubyMoney/money

# Add dependencies to develop your gem here.
# Include everything needed to run rake, tests, features, etc.
group :development do
gem 'bundler', '~> 1.14.6'
gem 'bundler', '~> 1.15.4'
gem 'webmock', '~> 1.20.4'
gem 'jeweler', '~> 2.3.3'
gem 'log_buddy', '~> 0.7.0'
Expand Down
94 changes: 47 additions & 47 deletions beatport.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
# stub: beatport 0.4.0 ruby lib

Gem::Specification.new do |s|
s.name = "beatport"
s.name = "beatport".freeze
s.version = "0.4.0"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.require_paths = ["lib"]
s.authors = ["Mateo Murphy"]
s.date = "2017-03-20"
s.description = "A ruby gem for accessing the beatport api"
s.email = "mateo.murphy@gmail.com"
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
s.require_paths = ["lib".freeze]
s.authors = ["Mateo Murphy".freeze]
s.date = "2017-08-31"
s.description = "A ruby gem for accessing the beatport api".freeze
s.email = "mateo.murphy@gmail.com".freeze
s.extra_rdoc_files = [
"LICENSE.txt",
"README.md"
Expand Down Expand Up @@ -100,54 +100,54 @@ Gem::Specification.new do |s|
"spec/support/inflector_spec.rb",
"spec/support/query_builder_spec.rb"
]
s.homepage = "http://github.com/mateomurphy/beatport"
s.licenses = ["MIT"]
s.rubygems_version = "2.4.8"
s.summary = "ruby gem for accessing the beatport api"
s.homepage = "http://github.com/mateomurphy/beatport".freeze
s.licenses = ["MIT".freeze]
s.rubygems_version = "2.6.12".freeze
s.summary = "ruby gem for accessing the beatport api".freeze

if s.respond_to? :specification_version then
s.specification_version = 4

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<addressable>, [">= 0"])
s.add_runtime_dependency(%q<signet>, [">= 0"])
s.add_runtime_dependency(%q<faraday>, ["~> 0.8.8"])
s.add_runtime_dependency(%q<money>, ["~> 6.8"])
s.add_development_dependency(%q<bundler>, ["~> 1.14.6"])
s.add_development_dependency(%q<webmock>, ["~> 1.20.4"])
s.add_development_dependency(%q<jeweler>, ["~> 2.3.3"])
s.add_development_dependency(%q<log_buddy>, ["~> 0.7.0"])
s.add_development_dependency(%q<rspec>, ["~> 3.5.0"])
s.add_development_dependency(%q<rspec-its>, ["~> 1.2.0"])
s.add_development_dependency(%q<yard>, ["~> 0.8.7"])
s.add_development_dependency(%q<vcr>, ["~> 2.9.3"])
s.add_runtime_dependency(%q<addressable>.freeze, [">= 0"])
s.add_runtime_dependency(%q<signet>.freeze, [">= 0"])
s.add_runtime_dependency(%q<faraday>.freeze, ["~> 0.9"])
s.add_runtime_dependency(%q<money>.freeze, ["~> 6.8"])
s.add_development_dependency(%q<bundler>.freeze, ["~> 1.15.4"])
s.add_development_dependency(%q<webmock>.freeze, ["~> 1.20.4"])
s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.3"])
s.add_development_dependency(%q<log_buddy>.freeze, ["~> 0.7.0"])
s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
s.add_development_dependency(%q<rspec-its>.freeze, ["~> 1.2.0"])
s.add_development_dependency(%q<yard>.freeze, ["~> 0.8.7"])
s.add_development_dependency(%q<vcr>.freeze, ["~> 2.9.3"])
else
s.add_dependency(%q<addressable>, [">= 0"])
s.add_dependency(%q<signet>, [">= 0"])
s.add_dependency(%q<faraday>, ["~> 0.8.8"])
s.add_dependency(%q<money>, ["~> 6.8"])
s.add_dependency(%q<bundler>, ["~> 1.14.6"])
s.add_dependency(%q<webmock>, ["~> 1.20.4"])
s.add_dependency(%q<jeweler>, ["~> 2.3.3"])
s.add_dependency(%q<log_buddy>, ["~> 0.7.0"])
s.add_dependency(%q<rspec>, ["~> 3.5.0"])
s.add_dependency(%q<rspec-its>, ["~> 1.2.0"])
s.add_dependency(%q<yard>, ["~> 0.8.7"])
s.add_dependency(%q<vcr>, ["~> 2.9.3"])
s.add_dependency(%q<addressable>.freeze, [">= 0"])
s.add_dependency(%q<signet>.freeze, [">= 0"])
s.add_dependency(%q<faraday>.freeze, ["~> 0.9"])
s.add_dependency(%q<money>.freeze, ["~> 6.8"])
s.add_dependency(%q<bundler>.freeze, ["~> 1.15.4"])
s.add_dependency(%q<webmock>.freeze, ["~> 1.20.4"])
s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.3"])
s.add_dependency(%q<log_buddy>.freeze, ["~> 0.7.0"])
s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
s.add_dependency(%q<rspec-its>.freeze, ["~> 1.2.0"])
s.add_dependency(%q<yard>.freeze, ["~> 0.8.7"])
s.add_dependency(%q<vcr>.freeze, ["~> 2.9.3"])
end
else
s.add_dependency(%q<addressable>, [">= 0"])
s.add_dependency(%q<signet>, [">= 0"])
s.add_dependency(%q<faraday>, ["~> 0.8.8"])
s.add_dependency(%q<money>, ["~> 6.8"])
s.add_dependency(%q<bundler>, ["~> 1.14.6"])
s.add_dependency(%q<webmock>, ["~> 1.20.4"])
s.add_dependency(%q<jeweler>, ["~> 2.3.3"])
s.add_dependency(%q<log_buddy>, ["~> 0.7.0"])
s.add_dependency(%q<rspec>, ["~> 3.5.0"])
s.add_dependency(%q<rspec-its>, ["~> 1.2.0"])
s.add_dependency(%q<yard>, ["~> 0.8.7"])
s.add_dependency(%q<vcr>, ["~> 2.9.3"])
s.add_dependency(%q<addressable>.freeze, [">= 0"])
s.add_dependency(%q<signet>.freeze, [">= 0"])
s.add_dependency(%q<faraday>.freeze, ["~> 0.9"])
s.add_dependency(%q<money>.freeze, ["~> 6.8"])
s.add_dependency(%q<bundler>.freeze, ["~> 1.15.4"])
s.add_dependency(%q<webmock>.freeze, ["~> 1.20.4"])
s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.3"])
s.add_dependency(%q<log_buddy>.freeze, ["~> 0.7.0"])
s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
s.add_dependency(%q<rspec-its>.freeze, ["~> 1.2.0"])
s.add_dependency(%q<yard>.freeze, ["~> 0.8.7"])
s.add_dependency(%q<vcr>.freeze, ["~> 2.9.3"])
end
end

4 changes: 4 additions & 0 deletions lib/beatport/catalog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module Catalog
autoload :DynamicImage, 'beatport/catalog/dynamic_image'
autoload :DynamicImages, 'beatport/catalog/dynamic_images'
autoload :Feature, 'beatport/catalog/feature'
autoload :FeaturedPage, 'beatport/catalog/featured_page'
autoload :Genre, 'beatport/catalog/genre'
autoload :Home, 'beatport/catalog/home'
autoload :ItemType, 'beatport/catalog/item_type'
Expand All @@ -25,10 +26,13 @@ module Catalog
autoload :Mix, 'beatport/catalog/mix'
autoload :Mixed, 'beatport/catalog/mixed'
autoload :Part, 'beatport/catalog/part'
autoload :Pack, 'beatport/catalog/pack'
autoload :Recommendations, 'beatport/catalog/recommendations'
autoload :Release, 'beatport/catalog/release'
autoload :Search, 'beatport/catalog/search'
autoload :State, 'beatport/catalog/state'
autoload :Stem, 'beatport/catalog/stem'
autoload :StemPack, 'beatport/catalog/stem_pack'
autoload :Slide, 'beatport/catalog/slide'
autoload :Slideshow, 'beatport/catalog/slideshow'
autoload :SourceType, 'beatport/catalog/source_type'
Expand Down
6 changes: 6 additions & 0 deletions lib/beatport/catalog/featured_page.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module Beatport
module Catalog
class FeaturedPage < Item
end
end
end
2 changes: 1 addition & 1 deletion lib/beatport/catalog/item_type.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module Catalog
class ItemType < Item
def self.all
Client.retrieve 'item-types', ItemType
end
end
end
end
end
7 changes: 7 additions & 0 deletions lib/beatport/catalog/pack.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module Beatport
module Catalog
class Pack < Item

end
end
end
7 changes: 7 additions & 0 deletions lib/beatport/catalog/stem.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module Beatport
module Catalog
class Stem < Item

end
end
end
7 changes: 7 additions & 0 deletions lib/beatport/catalog/stem_pack.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module Beatport
module Catalog
class StemPack < Item

end
end
end
3 changes: 2 additions & 1 deletion lib/beatport/collection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ def initialize(klass, data)

@results = if klass == :auto
data['results'].map do |r|
item_klass = Support::Inflector.constantize("Beatport::Catalog::#{r['type'].capitalize}")
type = Support::Inflector.camelize(r['type'])
item_klass = Support::Inflector.constantize("Beatport::Catalog::#{type}")
item_klass.new(r)
end
else
Expand Down
13 changes: 11 additions & 2 deletions lib/beatport/item.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,17 @@ def initialize(data = {})

data.each do |k, v|
next unless v
@table[k.to_sym] = Date.parse(v) if k =~ /_date$/
@table[k.to_sym] = Regexp.new(v.to_s) if k =~ /_regex$/
# TODO: remove when Invalid date error solved.
begin
@table[k.to_sym] = Date.strptime("#{v}, %y-%m-%d") if k =~ /_date$/
@table[k.to_sym] = Regexp.new(v.to_s) if k =~ /_regex$/
rescue ArgumentError => e
puts "="*100
puts "{#{k} => #{v}}"
puts "="*100

raise e
end
end

@table['id'] = id if id
Expand Down