7d 0.0.1.pre → 0.0.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7acc4174055c750460e82d12d1e552a3cf3d779c
-  data.tar.gz: a69bd246b2eedd669d1f40da71eb418b119a493d
+  metadata.gz: 85bb5d853373dd397e655ebb71b200868a859759
+  data.tar.gz: 6772aedbca22d9961745479e08db50650483730d
 SHA512:
-  metadata.gz: 92b9918e41227b01d02792803e14561239fcaadf60a6f74fe73b72620aa172250d33d47ad684c6e3e449a942565fdee32adafded70ab3f8e4b20151568f3ae4e
-  data.tar.gz: e95fa4aa3ed7bab6a1c5909a61016ac806c1167d5902d86f2208b0778b1c8af8bc242fd7b1bf2cf2714451eba0884f1008f4597450b53620c74f84194d3a5d95
+  metadata.gz: 05a55f41cfb52b49ac4c9aa6bd8f31290d95f248bc5f8a5f8622fc897999932ca84c90fa790bf6afb56ac3ea6d7e8dd1e2a9d2e3c2fb33e378a8c51c2b7a46ce
+  data.tar.gz: 177131681d5419292d68ecbddf6f5f7716e62f79220b8d61e956f06592cbc1b12984d44614157c7fe1051494ab94ccd2c0fe324e259cd57459728f69115a160b

data/bin/7d

@@ -2,16 +2,7 @@
 
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 
-missing_environment_variables = false
-
-%w(SEVENDIGITAL_CONSUMER_KEY SEVENDIGITAL_CONSUMER_SECRET).each do |variable|
-  if ENV[variable].nil?
-    STDERR.puts "#{variable} is not defined"
-    missing_environment_variables = true
-  end
-end
-
-exit if missing_environment_variables
-
 require '7d/cli/app'
-SevenDigital::CLI::App.start(ARGV)
+require '7d/cli/signature_generator_factory'
+
+puts ::SevenDigital::CLI::App.new(::SevenDigital::CLI::SignatureGeneratorFactory.new).run(ARGV)

data/lib/7d/cli/app.rb

@@ -1,11 +1,69 @@
-require 'thor'
-require '7d/cli/subcommands/sign'
+require 'trollop'
 
 module SevenDigital
   module CLI
-    class App < Thor
-      desc 'sign [ENDPOINT]', 'Generate a signed URI for a given endpoint'
-      subcommand 'sign', Sign
+    class App
+      def initialize(signature_generator_factory)
+        @signature_generator_factory = signature_generator_factory
+      end
+
+      def run(args)
+        parse(args)
+      end
+
+      private
+
+      def parse(args)
+        subcommand = args.shift
+
+        case subcommand
+        when 'sign'
+          return sign_subcommand(args)
+        end
+      end
+
+      def sign_subcommand(args)
+        endpoint = args.shift
+
+        case endpoint
+        when 'track/details'
+          opts = Trollop.options args do
+            opt :trackid, 'Track ID', type: :integer, required: true
+            opt :country, 'Country', type: :string, default: 'GB'
+          end
+          @signature_generator_factory.find(endpoint).generate_url(opts[:trackid], opts[:country])
+
+        when 'release/details'
+          opts = Trollop.options args do
+            opt :releaseid, 'Release ID', type: :integer, required: true
+            opt :country, 'Country', type: :string, default: 'GB'
+          end
+          @signature_generator_factory.find(endpoint).generate_url(opts[:releaseid], opts[:country])
+
+        when 'clip'
+          opts = Trollop.options args do
+            opt :trackid, 'Track ID', type: :integer, required: true
+            opt :country, 'Country', type: :string, default: 'GB'
+          end
+          @signature_generator_factory.find(endpoint).generate_url(opts[:trackid], opts[:country])
+
+        when 'stream/subscription'
+          opts = Trollop.options args do
+            opt :trackid, 'Track ID', type: :integer, required: true
+            opt :formatid, 'Format ID', type: :integer, default: 26
+            opt :country, 'Country', type: :string, default: 'GB'
+          end
+          @signature_generator_factory.find(endpoint).generate_url(opts[:trackid], opts[:formatid], opts[:country])
+
+        when 'stream/catalogue'
+          opts = Trollop.options args do
+            opt :trackid, 'Track ID', type: :integer, required: true
+            opt :formatid, 'Format ID', type: :integer, default: 26
+            opt :country, 'Country', type: :string, default: 'GB'
+          end
+          @signature_generator_factory.find(endpoint).generate_url(opts[:trackid], opts[:formatid], opts[:country])
+        end
+      end
     end
   end
 end

data/lib/7d/cli/signature_generator_factory.rb

@@ -0,0 +1,26 @@
+require '7d/endpoints/clip'
+require '7d/endpoints/track_details'
+require '7d/endpoints/release_details'
+require '7d/endpoints/stream_catalogue'
+require '7d/endpoints/stream_subscription'
+
+module SevenDigital
+  module CLI
+    class SignatureGeneratorFactory
+      def find(endpoint)
+        case endpoint
+        when 'track/details'
+          ::SevenDigital::Endpoints::TrackDetails.new ENV['SEVENDIGITAL_CONSUMER_KEY']
+        when 'release/details'
+          ::SevenDigital::Endpoints::ReleaseDetails.new ENV['SEVENDIGITAL_CONSUMER_KEY']
+        when 'clip'
+          ::SevenDigital::Endpoints::Clip.new ENV['SEVENDIGITAL_CONSUMER_KEY'], ENV['SEVENDIGITAL_CONSUMER_SECRET']
+        when 'stream/catalogue'
+          ::SevenDigital::Endpoints::StreamCatalogue.new ENV['SEVENDIGITAL_CONSUMER_KEY'], ENV['SEVENDIGITAL_CONSUMER_SECRET']
+        when 'stream/subscription'
+          ::SevenDigital::Endpoints::StreamSubscription.new ENV['SEVENDIGITAL_CONSUMER_KEY'], ENV['SEVENDIGITAL_CONSUMER_SECRET'], ENV['SEVENDIGITAL_TOKEN'], ENV['SEVENDIGITAL_TOKEN_SECRET']
+        end
+      end
+    end
+  end
+end

data/lib/7d/endpoints/clip.rb

@@ -5,14 +5,12 @@ module SevenDigital
     class Clip
       include Helpers::RequireSigning
 
-      def initialize(consumer_key, consumer_secret)
-        @consumer_key = consumer_key
-        @consumer_secret = consumer_secret
+      def url(parameters = nil)
+        "https://previews.7digital.com/clip/#{parameters[:track_id]}"
       end
 
-      def generate_url(parameters)
-        @url = "https://previews.7digital.com/clip/#{parameters[:track_id]}"
-        super(parameters)
+      def generate_url(track_id, country)
+        sign track_id: track_id, country: country
       end
     end
   end

data/lib/7d/endpoints/helpers/require_consumer_key.rb

@@ -2,12 +2,16 @@ module SevenDigital
   module Endpoints
     module Helpers
       module RequireConsumerKey
-        def generate_url(parameters)
+        def initialize(consumer_key)
+          @consumer_key = consumer_key
+        end
+
+        def sign(parameters)
           qs = parameters.reduce('') do |memo, (key, val)|
-            memo + "&#{key.to_s.sub('_', '')}=#{val}"
+            memo + "&#{key}=#{val}"
           end
 
-          "#{@url}?oauth_consumer_key=#{@consumer_key}#{qs}"
+          "#{url(parameters)}?oauth_consumer_key=#{@consumer_key}#{qs}"
         end
       end
     end

data/lib/7d/endpoints/helpers/require_signing.rb

@@ -4,10 +4,17 @@ module SevenDigital
   module Endpoints
     module Helpers
       module RequireSigning
-        def generate_url(parameters)
-          user_params = parameters.map do |key, val|
-            [key.to_s.sub('_', ''), val]
-          end.to_h
+        def initialize(consumer_key, consumer_secret)
+          @consumer_key = consumer_key
+          @consumer_secret = consumer_secret
+        end
+
+        def sign(parameters)
+          user_params = {}
+
+          parameters.each do |key, val|
+            user_params[key.to_s] = val
+          end
 
           all_params = {
             'oauth_consumer_key' => @consumer_key,
@@ -17,7 +24,7 @@ module SevenDigital
             'oauth_version' => '1.0'
           }.merge(user_params)
 
-          request = OAuth::RequestProxy.proxy('method' => :GET, 'uri' => @url, 'parameters' => all_params)
+          request = OAuth::RequestProxy.proxy('method' => :GET, 'uri' => url(parameters), 'parameters' => all_params)
 
           request.sign! consumer_secret: @consumer_secret
           request.signed_uri

data/lib/7d/endpoints/helpers/require_signing_with_user.rb

@@ -4,10 +4,19 @@ module SevenDigital
   module Endpoints
     module Helpers
       module RequireSigningWithUser
-        def generate_url(parameters)
-          user_params = parameters.map do |key, val|
-            [key.to_s.sub('_', ''), val]
-          end.to_h
+        def initialize(consumer_key, consumer_secret, token_key, token_secret)
+          @consumer_key = consumer_key
+          @consumer_secret = consumer_secret
+          @token_key = token_key
+          @token_secret = token_secret
+        end
+
+        def sign(parameters)
+          user_params = {}
+
+          parameters.each do |key, val|
+            user_params[key.to_s] = val
+          end
 
           all_params = {
             'oauth_consumer_key' => @consumer_key,
@@ -18,7 +27,7 @@ module SevenDigital
             'oauth_version' => '1.0'
           }.merge(user_params)
 
-          request = OAuth::RequestProxy.proxy('method' => :GET, 'uri' => @url, 'parameters' => all_params)
+          request = OAuth::RequestProxy.proxy('method' => :GET, 'uri' => url(parameters), 'parameters' => all_params)
 
           request.sign! consumer_secret: @consumer_secret, token_secret: @token_secret
           request.signed_uri

data/lib/7d/endpoints/release_details.rb

@@ -5,9 +5,12 @@ module SevenDigital
     class ReleaseDetails
       include Helpers::RequireConsumerKey
 
-      def initialize(consumer_key)
-        @consumer_key = consumer_key
-        @url = 'https://api.7digital.com/1.2/release/details'
+      def url(_ = nil)
+        'https://api.7digital.com/1.2/release/details'
+      end
+
+      def generate_url(release_id, country)
+        sign releaseid: release_id, country: country
       end
     end
   end

data/lib/7d/endpoints/stream_catalogue.rb

@@ -5,11 +5,13 @@ module SevenDigital
     class StreamCatalogue
       include Helpers::RequireSigning
 
-      def initialize(consumer_key, consumer_secret)
-        @consumer_key = consumer_key
-        @consumer_secret = consumer_secret
+      def url(_ = nil)
         @url = 'https://stream.svc.7digital.net/stream/catalogue'
       end
+
+      def generate_url(track_id, format_id, country)
+        sign trackid: track_id, formatid: format_id, country: country
+      end
     end
   end
 end

data/lib/7d/endpoints/stream_subscription.rb

@@ -5,12 +5,12 @@ module SevenDigital
     class StreamSubscription
       include Helpers::RequireSigningWithUser
 
-      def initialize(consumer_key, consumer_secret, token_key, token_secret)
-        @consumer_key = consumer_key
-        @consumer_secret = consumer_secret
-        @token_key = token_key
-        @token_secret = token_secret
-        @url = 'https://stream.svc.7digital.net/stream/subscription'
+      def url(_ = nil)
+        'https://stream.svc.7digital.net/stream/subscription'
+      end
+
+      def generate_url(track_id, format_id, country)
+        sign trackid: track_id, formatid: format_id, country: country
       end
     end
   end

data/lib/7d/endpoints/track_details.rb

@@ -5,9 +5,12 @@ module SevenDigital
     class TrackDetails
       include Helpers::RequireConsumerKey
 
-      def initialize(consumer_key)
-        @consumer_key = consumer_key
-        @url = 'https://api.7digital.com/1.2/track/details'
+      def url(_ = nil)
+        'https://api.7digital.com/1.2/track/details'
+      end
+
+      def generate_url(track_id, country)
+        sign trackid: track_id, country: country
       end
     end
   end

data/spec/bin/7d_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe 'bin/7d' do
+  it 'should be able to generate a URI for track/details' do
+    expect(`bin/7d sign track/details --trackid=1234`).to start_with('https')
+  end
+
+  it 'should be able to generate a URI for release/details' do
+    expect(`bin/7d sign release/details --releaseid=12345`).to start_with('https')
+  end
+
+  it 'should be able to able to generate a preview clip' do
+    expect(`bin/7d sign clip --trackid=1234`).to start_with('https')
+  end
+
+  it 'should be able to generate a URI for stream/catalogue' do
+    expect(`bin/7d sign stream/catalogue --trackid=1234`).to start_with('https')
+  end
+
+  it 'should be able to generate a URI for stream/subscription' do
+    expect(`bin/7d sign stream/subscription --trackid=1234`).to start_with('https')
+  end
+end

data/spec/cli/app_spec.rb

@@ -0,0 +1,169 @@
+require 'spec_helper'
+
+describe ::SevenDigital::CLI::App do
+  let(:factory) { double('endpoint_factory') }
+  let(:signature_generator) { double('signature_generator') }
+  subject { ::SevenDigital::CLI::App.new(factory) }
+
+  context 'sign' do
+    context 'track/details' do
+      describe '#run' do
+        before(:each) do
+          allow(factory).to receive(:find).with('track/details').and_return(signature_generator)
+        end
+
+        it 'should pass the correct arguments to the endpoint handler' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 'GB')
+
+          subject.run(%w(sign track/details --trackid=1234))
+        end
+
+        it 'should allow country to be overridden' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 'US')
+
+          subject.run(%w(sign track/details --trackid=1234 --country=US))
+        end
+
+        it 'should not allow someone to specify a non-integer track id' do
+          expect { subject.run(%w(sign track/details --trackid=invalid)) }.to raise_error(SystemExit)
+        end
+
+        it 'should require a track id' do
+          expect { subject.run(%w(sign track/details)) }.to raise_error(SystemExit)
+        end
+      end
+    end
+
+    context 'release/details' do
+      describe '#run' do
+        before(:each) do
+          allow(factory).to receive(:find).with('release/details').and_return(signature_generator)
+        end
+
+        it 'should pass the correct arguments to the endpoint handler' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 'GB')
+
+          subject.run(%w(sign release/details --releaseid=1234))
+        end
+
+        it 'should allow country to be overridden' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 'US')
+
+          subject.run(%w(sign release/details --releaseid=1234 --country=US))
+        end
+
+        it 'should not allow someone to specify a non-integer release id' do
+          expect { subject.run(%w(sign release/details --releaseid=invalid)) }.to raise_error(SystemExit)
+        end
+
+        it 'should require a release id' do
+          expect { subject.run(%w(sign release/details)) }.to raise_error(SystemExit)
+        end
+      end
+    end
+
+    context 'clip' do
+      describe '#run' do
+        before(:each) do
+          allow(factory).to receive(:find).with('clip').and_return(signature_generator)
+        end
+
+        it 'should pass the correct arguments to the endpoint handler' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 'GB')
+
+          subject.run(%w(sign clip --trackid=1234))
+        end
+
+        it 'should allow country to be overridden' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 'US')
+
+          subject.run(%w(sign clip --trackid=1234 --country=US))
+        end
+
+        it 'should not allow someone to specify a non-integer track id' do
+          expect { subject.run(%w(sign clip --trackid=invalid)) }.to raise_error(SystemExit)
+        end
+
+        it 'should require a track id' do
+          expect { subject.run(%w(sign clip)) }.to raise_error(SystemExit)
+        end
+      end
+    end
+
+    context 'stream/subscription' do
+      describe '#run' do
+        before(:each) do
+          allow(factory).to receive(:find).with('stream/subscription').and_return(signature_generator)
+        end
+
+        it 'should pass the correct arguments to the endpoint handler' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 26, 'GB')
+
+          subject.run(%w(sign stream/subscription --trackid=1234))
+        end
+
+        it 'should allow country to be overridden' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 26, 'US')
+
+          subject.run(%w(sign stream/subscription --trackid=1234 --country=US))
+        end
+
+        it 'should allow format id to be overridden' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 55, 'GB')
+
+          subject.run(%w(sign stream/subscription --trackid=1234 --formatid=55))
+        end
+
+        it 'should not allow someone to specify a non-integer format id' do
+          expect { subject.run(%w(sign stream/subscription --trackid=1234 --formatid=invalid)) }.to raise_error(SystemExit)
+        end
+
+        it 'should not allow someone to specify a non-integer track id' do
+          expect { subject.run(%w(sign stream/subscription --trackid=invalid)) }.to raise_error(SystemExit)
+        end
+
+        it 'should require a track id' do
+          expect { subject.run(%w(sign stream/subscription)) }.to raise_error(SystemExit)
+        end
+      end
+    end
+
+    context 'stream/catalogue' do
+      describe '#run' do
+        before(:each) do
+          allow(factory).to receive(:find).with('stream/catalogue').and_return(signature_generator)
+        end
+
+        it 'should pass the correct arguments to the endpoint handler' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 26, 'GB')
+
+          subject.run(%w(sign stream/catalogue --trackid=1234))
+        end
+
+        it 'should allow country to be overridden' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 26, 'US')
+
+          subject.run(%w(sign stream/catalogue --trackid=1234 --country=US))
+        end
+
+        it 'should allow format id to be overridden' do
+          expect(signature_generator).to receive(:generate_url).with(1234, 55, 'GB')
+
+          subject.run(%w(sign stream/catalogue --trackid=1234 --formatid=55))
+        end
+
+        it 'should not allow someone to specify a non-integer format id' do
+          expect { subject.run(%w(sign stream/catalogue --trackid=1234 --formatid=invalid)) }.to raise_error(SystemExit)
+        end
+
+        it 'should not allow someone to specify a non-integer track id' do
+          expect { subject.run(%w(sign stream/catalogue --trackid=invalid)) }.to raise_error(SystemExit)
+        end
+
+        it 'should require a track id' do
+          expect { subject.run(%w(sign stream/catalogue)) }.to raise_error(SystemExit)
+        end
+      end
+    end
+  end
+end

data/spec/cli/signature_generator_factory_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe ::SevenDigital::CLI::SignatureGeneratorFactory do
+  subject { ::SevenDigital::CLI::SignatureGeneratorFactory.new }
+
+  describe '#find' do
+    it 'should return TrackDetails' do
+      expect(subject.find('track/details')).to be_an_instance_of(::SevenDigital::Endpoints::TrackDetails)
+    end
+
+    it 'should return Clip' do
+      expect(subject.find('clip')).to be_an_instance_of(::SevenDigital::Endpoints::Clip)
+    end
+
+    it 'should return ReleaseDetails' do
+      expect(subject.find('release/details')).to be_an_instance_of(::SevenDigital::Endpoints::ReleaseDetails)
+    end
+
+    it 'should return StreamCatalogue' do
+      expect(subject.find('stream/catalogue')).to be_an_instance_of(::SevenDigital::Endpoints::StreamCatalogue)
+    end
+
+    it 'should return StreamSubscription' do
+      expect(subject.find('stream/subscription')).to be_an_instance_of(::SevenDigital::Endpoints::StreamSubscription)
+    end
+  end
+end

data/spec/endpoints/clip_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe ::SevenDigital::Endpoints::Clip do
+  context 'with dummy authorization configuration' do
+    subject { ::SevenDigital::Endpoints::Clip.new(ENV['SEVENDIGITAL_CONSUMER_KEY'], ENV['SEVENDIGITAL_CONSUMER_SECRET']) }
+
+    describe '#generate_url' do
+      it 'should return a signed url' do
+        actual = subject.generate_url(1234, 'GB')
+
+        expect(actual).to start_with('https://previews.7digital.com/clip/1234')
+        expect(actual).to include('country=GB')
+        expect(actual).to include('oauth_signature=')
+        expect(actual).to include('oauth_consumer_key=')
+      end
+    end
+
+    context 'with real authorization configuration' do
+      describe '#generate_url' do
+        it 'should be requestable' do
+          res = Faraday.get(subject.generate_url(1234, 'GB'))
+
+          expect(res.status).to eq(200)
+          expect(res.headers['Content-Type']).to eq('audio/mpeg')
+        end
+      end
+    end
+  end
+end

data/spec/endpoints/release_details_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe ::SevenDigital::Endpoints::ReleaseDetails do
+  context 'with dummy authorization configuration' do
+    subject { ::SevenDigital::Endpoints::ReleaseDetails.new('foo') }
+
+    describe '#generate_url' do
+      it 'should return a signed url' do
+        expect(subject.generate_url(1234, 'GB')).to eq('https://api.7digital.com/1.2/release/details?oauth_consumer_key=foo&releaseid=1234&country=GB')
+      end
+    end
+  end
+
+  context 'with real authorization configuration' do
+    subject { ::SevenDigital::Endpoints::ReleaseDetails.new(ENV['SEVENDIGITAL_CONSUMER_KEY']) }
+
+    describe '#generate_url' do
+      it 'should be requestable' do
+        res = Faraday.get(subject.generate_url(2345, 'GB'))
+
+        expect(res.status).to eq(200)
+        expect(res.headers['Content-Type']).to eq('application/xml; charset=utf-8')
+        expect(res.body).to include('Sound Affects')
+      end
+    end
+  end
+end

data/spec/endpoints/stream_catalogue_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ::SevenDigital::Endpoints::StreamCatalogue do
+  subject { ::SevenDigital::Endpoints::StreamCatalogue.new('foo', 'bar') }
+
+  context 'with dummy authorization configuration' do
+    describe '#generate_url' do
+      it 'should return a signed url' do
+        actual = subject.generate_url(1234, 26, 'GB')
+
+        expect(actual).to start_with('https://stream.svc.7digital.net/stream/catalogue')
+        expect(actual).to include('oauth_signature=')
+        expect(actual).to include('oauth_consumer_key=foo')
+        expect(actual).to include('trackid=1234')
+        expect(actual).to include('formatid=26')
+        expect(actual).to include('country=GB')
+      end
+    end
+  end
+
+  context 'with real authorization configuration', skip: using_demo_key? do
+    subject { ::SevenDigital::Endpoints::StreamCatalogue.new(ENV['SEVENDIGITAL_CONSUMER_KEY'], ENV['SEVENDIGITAL_CONSUMER_SECRET']) }
+
+    describe '#generate_url' do
+      it 'should return a signed url' do
+        res = Faraday.get(subject.generate_url(1234, 26, 'GB'))
+
+        expect(res.status).to eq(200)
+        expect(res.headers['Content-Type']).to eq('audio/mpeg')
+      end
+    end
+  end
+end

data/spec/endpoints/stream_subscription_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe ::SevenDigital::Endpoints::StreamSubscription do
+  context 'with dummy authorization configuration' do
+    describe '#generate_url' do
+      subject { ::SevenDigital::Endpoints::StreamSubscription.new('foo', 'bar', 'baz', 'qux') }
+
+      it 'should return a signed url' do
+        actual = subject.generate_url(1234, 26, 'GB')
+
+        expect(actual).to start_with('https://stream.svc.7digital.net/stream/subscription')
+        expect(actual).to include('trackid=1234')
+        expect(actual).to include('formatid=26')
+        expect(actual).to include('country=GB')
+        expect(actual).to include('oauth_consumer_key=foo')
+        expect(actual).to include('oauth_token=baz')
+        expect(actual).to include('oauth_signature=')
+      end
+    end
+  end
+
+  context 'with real authorization configuration', skip: using_demo_key? do
+    subject do
+      ::SevenDigital::Endpoints::StreamSubscription.new(
+        ENV['SEVENDIGITAL_CONSUMER_KEY'],
+        ENV['SEVENDIGITAL_CONSUMER_SECRET'],
+        ENV['SEVENDIGITAL_TOKEN'],
+        ENV['SEVENDIGITAL_TOKEN_SECRET']
+      )
+    end
+
+    describe '#generate_url' do
+      it 'should be requestable' do
+        res = Faraday.get(subject.generate_url(1234, 26, 'GB'))
+
+        expect(res.status).to eq(200)
+        expect(res.headers['Content-Type']).to eq('audio/mpeg')
+      end
+    end
+  end
+end

data/spec/endpoints/track_details_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe ::SevenDigital::Endpoints::TrackDetails do
+  context 'with dummy authorization configuration' do
+    subject { ::SevenDigital::Endpoints::TrackDetails.new('foo') }
+
+    describe '#generate_url' do
+      it 'should return a signed url' do
+        expect(subject.generate_url(1234, 'GB')).to eq('https://api.7digital.com/1.2/track/details?oauth_consumer_key=foo&trackid=1234&country=GB')
+      end
+    end
+  end
+
+  context 'with real authorization configuration' do
+    subject { ::SevenDigital::Endpoints::TrackDetails.new(ENV['SEVENDIGITAL_CONSUMER_KEY']) }
+
+    describe '#generate_url' do
+      it 'should requestable' do
+        res = Faraday.get(subject.generate_url(1234, 'GB'))
+
+        expect(res.status).to eq(200)
+        expect(res.headers['Content-Type']).to eq('application/xml; charset=utf-8')
+        expect(res.body).to include('Everyday Struggle')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,89 +1,39 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require 'faraday'
+
+require '7d/cli/app'
+require '7d/cli/signature_generator_factory'
+
+require '7d/endpoints/clip'
+require '7d/endpoints/track_details'
+require '7d/endpoints/release_details'
+require '7d/endpoints/stream_catalogue'
+require '7d/endpoints/stream_subscription'
+
+def using_demo_key?
+  ENV['SEVENDIGITAL_CONSUMER_KEY'].nil? || ENV['SEVENDIGITAL_CONSUMER_KEY'] == 'YOUR_KEY_HERE'
+end
+
 RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
   config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+    expectations.syntax = :expect
   end
 
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
     mocks.verify_partial_doubles = true
   end
 
   begin
-    # These two settings work together to allow you to limit a spec run
-    # to individual examples or groups you care about by tagging them with
-    # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-    # get run.
     config.filter_run :focus
     config.run_all_when_everything_filtered = true
+    config.warnings = false
 
-    # Limits the available syntax to the non-monkey patched syntax that is
-    # recommended. For more details, see:
-    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-    #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-    config.disable_monkey_patching!
-
-    # This setting enables warnings. It's recommended, but in some cases may
-    # be too noisy due to issues in dependencies.
-    config.warnings = true
-
-    # Many RSpec users commonly either run the entire suite or an individual
-    # file, and it's useful to allow more verbose output when running an
-    # individual spec file.
     if config.files_to_run.one?
-      # Use the documentation formatter for detailed output,
-      # unless a formatter has already been configured
-      # (e.g. via a command-line flag).
       config.default_formatter = 'doc'
     end
 
-    # Print the 10 slowest examples and example groups at the
-    # end of the spec run, to help surface which specs are running
-    # particularly slow.
-    config.profile_examples = 10
-
-    # Run specs in random order to surface order dependencies. If you find an
-    # order dependency and want to debug it, you can fix the order by providing
-    # the seed, which is printed after each run.
-    #     --seed 1234
     config.order = :random
 
-    # Seed global randomization in this process using the `--seed` CLI option.
-    # Setting this allows you to use `--seed` to deterministically reproduce
-    # test failures related to randomization by passing the same `--seed` value
-    # as the one that triggered the failure.
     Kernel.srand config.seed
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 7d
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1.pre.2
 platform: ruby
 authors:
 - Sam Crang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -25,19 +25,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.7
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +98,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.29.1
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: |2
       Generates signed URLs for the 7digital API. Useful for piping between
       various other command line tools.
@@ -83,7 +123,7 @@ extra_rdoc_files: []
 files:
 - bin/7d
 - lib/7d/cli/app.rb
-- lib/7d/cli/subcommands/sign.rb
+- lib/7d/cli/signature_generator_factory.rb
 - lib/7d/endpoints/clip.rb
 - lib/7d/endpoints/helpers/require_consumer_key.rb
 - lib/7d/endpoints/helpers/require_signing.rb
@@ -92,13 +132,15 @@ files:
 - lib/7d/endpoints/stream_catalogue.rb
 - lib/7d/endpoints/stream_subscription.rb
 - lib/7d/endpoints/track_details.rb
-- spec/integration/bin/7d_spec.rb
+- spec/bin/7d_spec.rb
+- spec/cli/app_spec.rb
+- spec/cli/signature_generator_factory_spec.rb
+- spec/endpoints/clip_spec.rb
+- spec/endpoints/release_details_spec.rb
+- spec/endpoints/stream_catalogue_spec.rb
+- spec/endpoints/stream_subscription_spec.rb
+- spec/endpoints/track_details_spec.rb
 - spec/spec_helper.rb
-- spec/unit/endpoints/clip_spec.rb
-- spec/unit/endpoints/release_details_spec.rb
-- spec/unit/endpoints/stream_catalogue_spec.rb
-- spec/unit/endpoints/stream_subscription_spec.rb
-- spec/unit/endpoints/track_details_spec.rb
 homepage: https://github.com/samcrang/7digital-cli
 licenses:
 - MIT
@@ -111,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/lib/7d/cli/subcommands/sign.rb

@@ -1,52 +0,0 @@
-require 'thor'
-require '7d/endpoints/track_details'
-require '7d/endpoints/release_details'
-require '7d/endpoints/clip'
-require '7d/endpoints/stream_catalogue'
-require '7d/endpoints/stream_subscription'
-
-module SevenDigital
-  module CLI
-    class Sign < Thor
-      desc 'track_details', 'track/details'
-      def track_details(track_id)
-        puts ::SevenDigital::Endpoints::TrackDetails.new(
-          ENV['SEVENDIGITAL_CONSUMER_KEY']
-        ).generate_url(track_id: track_id)
-      end
-
-      desc 'release_details', 'release/details'
-      def release_details(release_id)
-        puts ::SevenDigital::Endpoints::ReleaseDetails.new(
-          ENV['SEVENDIGITAL_CONSUMER_KEY']
-        ).generate_url(release_id: release_id)
-      end
-
-      desc 'clip', 'clip'
-      def clip(track_id)
-        puts ::SevenDigital::Endpoints::Clip.new(
-          ENV['SEVENDIGITAL_CONSUMER_KEY'],
-          ENV['SEVENDIGITAL_CONSUMER_SECRET']
-        ).generate_url(track_id: track_id, country: 'GB')
-      end
-
-      desc 'stream_catalogue', 'stream/catalogue'
-      def stream_catalogue(track_id)
-        puts ::SevenDigital::Endpoints::StreamCatalogue.new(
-          ENV['SEVENDIGITAL_CONSUMER_KEY'],
-          ENV['SEVENDIGITAL_CONSUMER_SECRET']
-        ).generate_url(track_id: track_id)
-      end
-
-      desc 'stream_subscription', 'stream/subscription'
-      def stream_subscription(track_id)
-        puts ::SevenDigital::Endpoints::StreamSubscription.new(
-          ENV['SEVENDIGITAL_CONSUMER_KEY'],
-          ENV['SEVENDIGITAL_CONSUMER_SECRET'],
-          ENV['SEVENDIGITAL_TOKEN'],
-          ENV['SEVENDIGITAL_TOKEN_SECRET']
-        ).generate_url(track_id: track_id)
-      end
-    end
-  end
-end

data/spec/integration/bin/7d_spec.rb

@@ -1,77 +0,0 @@
-require 'spec_helper'
-require 'open3'
-require 'open-uri'
-
-def valid_environment?
-  !ENV['SEVENDIGITAL_CONSUMER_KEY'].nil? && !ENV['SEVENDIGITAL_CONSUMER_SECRET'].nil?
-end
-
-module SevenDigital
-  RSpec.describe 'bin/7d' do
-    context 'with an incorrectly configured environment' do
-      it 'should fail with error message' do
-        skip 'TODO'
-      end
-    end
-
-    context 'with correctly configured environment', skip: !valid_environment? do
-      it 'should invoke thor' do
-        _, stdout, _ = Open3.popen3('bin/7d')
-
-        expect(stdout.gets).to match(/Commands/)
-      end
-
-      it 'should be able to fetch track/details' do
-        _, stdout, _ = Open3.popen3('bin/7d sign track_details 1234')
-
-        uri = stdout.gets
-
-        open(uri) do |r|
-          expect(r.status[0]).to eq('200')
-          expect(r.read).to match(/Everyday Struggle/)
-        end
-      end
-
-      it 'should be able to fetch release/details' do
-        _, stdout, _ = Open3.popen3('bin/7d sign release_details 12345')
-
-        uri = stdout.gets
-
-        open(uri) do |r|
-          expect(r.status[0]).to eq('200')
-          expect(r.read).to match(/Extremoduro/)
-        end
-      end
-
-      it 'should be able to fetch a preview clip' do
-        _, stdout, _ = Open3.popen3('bin/7d sign clip 1234')
-
-        uri = stdout.gets
-
-        open(uri) do |r|
-          expect(r.status[0]).to eq('200')
-        end
-      end
-
-      it 'should be able to fetch stream/catalogue' do
-        _, stdout, _ = Open3.popen3('bin/7d sign stream_catalogue 1234')
-
-        uri = stdout.gets
-
-        open(uri) do |r|
-          expect(r.status[0]).to eq('200')
-        end
-      end
-
-      it 'should be able to fetch stream/subscription' do
-        _, stdout, _ = Open3.popen3('bin/7d sign stream_subscription 1234')
-
-        uri = stdout.gets
-
-        open(uri) do |r|
-          expect(r.status[0]).to eq('200')
-        end
-      end
-    end
-  end
-end

data/spec/unit/endpoints/clip_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-require '7d/endpoints/clip'
-
-module SevenDigital
-  module Endpoints
-    RSpec.describe 'Clip' do
-      describe '#generate_url' do
-        it 'should return a signed url' do
-          subject = Clip.new('foo', 'bar')
-          actual = subject.generate_url(track_id: 1234, country: 'GB')
-
-          expect(actual).to start_with('https://previews.7digital.com/clip/1234')
-          expect(actual).to include('oauth_signature=')
-          expect(actual).to include('country=GB')
-        end
-      end
-    end
-  end
-end

data/spec/unit/endpoints/release_details_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-require '7d/endpoints/release_details'
-
-module SevenDigital
-  module Endpoints
-    RSpec.describe 'ReleaseDetails' do
-      describe '#generate_url' do
-        it 'should return a signed url' do
-          subject = ReleaseDetails.new('foo')
-          actual = subject.generate_url(release_id: 1234)
-
-          expect(actual).to eq('https://api.7digital.com/1.2/release/details?oauth_consumer_key=foo&releaseid=1234')
-        end
-      end
-    end
-  end
-end

data/spec/unit/endpoints/stream_catalogue_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-require '7d/endpoints/stream_catalogue'
-
-module SevenDigital
-  module Endpoints
-    RSpec.describe 'StreamCatalogue' do
-      describe '#generate_url' do
-        it 'should return a signed url' do
-          subject = StreamCatalogue.new('foo', 'bar')
-          actual = subject.generate_url(track_id: 1234)
-
-          expect(actual).to start_with('https://stream.svc.7digital.net/stream/catalogue')
-          expect(actual).to include('trackid=1234')
-          expect(actual).to include('&oauth_signature=')
-        end
-      end
-    end
-  end
-end

data/spec/unit/endpoints/stream_subscription_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-require '7d/endpoints/stream_subscription'
-
-module SevenDigital
-  module Endpoints
-    RSpec.describe 'StreamSubscription' do
-      describe '#generate_url' do
-        it 'should return a signed url' do
-          subject = StreamSubscription.new('foo', 'bar', 'baz', 'qux')
-          actual = subject.generate_url(track_id: 1234)
-
-          expect(actual).to start_with('https://stream.svc.7digital.net/stream/subscription')
-          expect(actual).to include('trackid=1234')
-          expect(actual).to include('oauth_token=baz')
-          expect(actual).to include('&oauth_signature=')
-        end
-      end
-    end
-  end
-end

data/spec/unit/endpoints/track_details_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-require '7d/endpoints/track_details'
-
-module SevenDigital
-  module Endpoints
-    RSpec.describe 'TrackDetails' do
-      describe '#generate_url' do
-        it 'should return a signed url' do
-          subject = TrackDetails.new('foo')
-
-          expect(subject.generate_url(track_id: 1234)).to eq('https://api.7digital.com/1.2/track/details?oauth_consumer_key=foo&trackid=1234')
-        end
-      end
-    end
-  end
-end