tangerine 0.3.1 → 0.4.0

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "httparty", "0.7.4"
 gem "activesupport", "3.0.5"
+gem "i18n", "0.5.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -9,6 +9,7 @@ GEM
     git (1.2.5)
     httparty (0.7.4)
       crack (= 0.1.8)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -41,6 +42,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   fakeweb (= 1.3.0)
   httparty (= 0.7.4)
+  i18n (= 0.5.0)
   jeweler (~> 1.5.2)
   rcov
   rspec (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/tangerine.rb

@@ -1,5 +1,6 @@
 require 'active_support/inflector'
 require 'tangerine/backlot'
+require 'tangerine/backlot/base'
+require 'tangerine/backlot/channel'
 require 'tangerine/backlot/channel_set'
-require 'tangerine/backlot/query'
 require 'tangerine/backlot/video'

data/lib/tangerine/backlot.rb

@@ -4,6 +4,7 @@ require 'digest/sha2'
 
 module Tangerine
   module Backlot
+
     class HTTP
       include HTTParty
       base_uri 'http://api.ooyala.com/partner'
@@ -17,17 +18,22 @@ module Tangerine
       end
 
       def self.get(request_type, params={})
-        HTTP.default_params :signature => self.signature(params)
-        HTTP.default_params :pcode => @provider_code
+        set_params(params)
         HTTP.get(request_type)
       end
 
-      # TODO: Refactor this method since it's doing double-duty ... not sure why Ooyala API doesn't like
-      # it if we assign some values to params instead of default params
-      def self.signature(params)
+      def self.set_params(params)
+        HTTP.default_params.clear
+
         params['expires'] ||= (Time.now.to_i + 10).to_s
+        HTTP.default_params params
+
+        HTTP.default_params :pcode => @provider_code
+        HTTP.default_params :signature => self.signature(params)
+      end
+
+      def self.signature(params)
         string_to_sign = params.keys.sort.inject(@secret) do |memo, key|
-          HTTP.default_params key => params[key]
           memo += "#{key}=#{params[key]}"
         end
         digest = Digest::SHA256.digest(string_to_sign)
@@ -37,5 +43,9 @@ module Tangerine
     end
 
   end
+
+  def self.query(options)
+    Tangerine::Backlot::API.get('/query', options)
+  end
 end
 

data/lib/tangerine/backlot/base.rb

@@ -0,0 +1,27 @@
+class Tangerine::Base
+
+  def initialize(options)
+    options.delete('content_type')
+    options.each do |k,v|
+      # TODO: Look into using Crack gem for reliably undercoring these
+      attr = k.to_s.underscore
+      self.send("#{attr}=", v)
+    end
+  end
+
+  def self.prepare_items(items)
+    # Yes, we are fully aware that type-checking sucks. Move along now, nothing to see here.
+    items.is_a?(Array) ? items : [items]
+  end
+
+  def self.finder(&block)
+    @finder = block
+  end
+
+  def self.find(embed_code)
+    results = @finder.call
+    results = self.prepare_items(results)
+    found_item = results.select { |item| item['embedCode'] == embed_code }.first
+  end
+
+end

data/lib/tangerine/backlot/channel.rb

@@ -0,0 +1,14 @@
+class Tangerine::Channel < Tangerine::Base
+
+  attr_accessor :size,
+    :title,
+    :content_type,
+    :thumbnail,
+    :updated_at,
+    :embed_code,
+    :description,
+    :length,
+    :status,
+    :uploaded_at
+
+end

data/lib/tangerine/backlot/channel_set.rb

@@ -1,4 +1,4 @@
-class Tangerine::ChannelSet
+class Tangerine::ChannelSet < Tangerine::Base
 
   attr_accessor :embed_code,
                 :title,
@@ -12,19 +12,22 @@ class Tangerine::ChannelSet
                 :height,
                 :stat
 
-  def initialize(options)
-    options.delete('content_type')
-    options.each do |k,v|
-      # TODO: Look into using Crack gem for reliably undercoring these
-      attr = k.to_s.underscore
-      self.send("#{attr}=", v)
-      # TODO: move into Base class
-    end
+  finder do
+    response = Tangerine.query('contentType' => 'MultiChannel')
+    response.parsed_response['list']['item']
   end
 
   def self.find(embed_code)
-    result = Tangerine::Query.new('contentType' => 'MultiChannel')
-    meh = result.response.parsed_response['list']['item'].first
-    Tangerine::ChannelSet.new(meh)
+    found = super(embed_code)
+    Tangerine::ChannelSet.new(found)
   end
+
+  def channels
+    result = Tangerine::Backlot::API.get('/channel_sets', 'mode' => 'list', 'channelSetEmbedCode' => embed_code)
+    items = result.parsed_response['channelSet']['channel']
+    items = Tangerine::Base.prepare_items(items)
+    items.collect {|item| Tangerine::Channel.new(item) }
+  end
+
 end
+

data/lib/tangerine/backlot/video.rb

@@ -1,6 +1,6 @@
 class Tangerine::Video
   def self.all
-    Tangerine::Query.new('contentType' => 'Video').response
+    Tangerine.query('contentType' => 'Video')
   end
 end
 

data/spec/support/tangerine_girl.rb

@@ -0,0 +1,53 @@
+module TangerineGirl
+
+  @@definitions = {}
+
+  def self.create(template_name, overrides={})
+    @@definitions[template_name].create(overrides)
+  end
+
+  def self.define(template_name)
+    template = TangerineGirl::Template.new(template_name)
+    yield template
+    @@definitions[template_name] = template
+  end
+
+  class Template
+
+    def initialize(name)
+      @name = name
+      @defaults = {}
+    end
+
+    def create(overrides)
+      options = @defaults.dup.merge(overrides)
+      subject = "Tangerine::#{@name.to_s.classify}".constantize
+      subject.new(options)
+    end
+
+    def method_missing(method, *args, &block)
+      if method.to_s =~ /=$/
+        attr_name = method.to_s.gsub(/=$/, '').to_sym
+        @defaults[attr_name] = *args
+      else
+        super(method, *args, &block)
+      end
+    end
+  end
+
+end
+
+TangerineGirl.define(:channel_set) do |cs|
+  cs.embed_code = "BLABLABLALBLABLABLBAHHH!!!!"
+  cs.title = "an ode to channelsets"
+  # cs.description = nil
+  # cs.flight_start_time = "1294087113"
+  # cs.height = "3"
+  # cs.size = nil
+  # cs.stat = nil
+  # cs.status = "live"
+  # cs.updated_at = "1294087113"
+  # cs.uploaded_at = "1294087113"
+  # cs.width = "4"
+end
+

data/spec/support/vcr_cassettes/Tangerine_Backlot_API_get_channel_sets_list_.yml

@@ -0,0 +1,47 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://api.ooyala.com:80/partner/channel_sets?channelSetEmbedCode=85aTdiMjoYR5K26Fp8TMgGtGQUCEC2Y1&pcode=lsNTrbQBqCQbH-VA6ALCshAHLWrV&signature=awYsnC3RpS4PN%2BXZGuFZTizUi5VAXTsAngkuuFwyoSg&expires=1325437210&mode=list
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      last-modified: 
+      - Thu, 10 Mar 2011 21:02:45 GMT
+      content-type: 
+      - application/xml; charset=utf-8
+      date: 
+      - Thu, 10 Mar 2011 21:02:45 GMT
+      content-length: 
+      - "659"
+      set-cookie: 
+      - ooyala-web-rails-session=BAh7CDoPdXBkYXRlZF9hdEl1OglUaW1lDVXJG4DkXtQKBjofQG1hcnNoYWxfd2l0aF91dGNfY29lcmNpb25UOg9zZXNzaW9uX2lkIiVlMjM0ZjgwNjRiMGM2NWNjNzk5ZjVkNGNjNjE1OGVmNToSY3JlYXRpb25fdGltZUAG--1930e6d8333b31d5ee4bb86dc935478d6db5b4bd; path=/; HttpOnly
+      vary: 
+      - Accept-Encoding,User-Agent
+      cache-control: 
+      - private, max-age=0
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <channelSet>
+        <embedCode>85aTdiMjoYR5K26Fp8TMgGtGQUCEC2Y1</embedCode>
+        <title>Brand Site Video Gallery</title>
+        <status>live</status>
+        <channel>
+          <embedCode>9haTdiMjoVHPey7H15JCroS9tJ25Xzw2</embedCode>
+          <title><%= title %></title>
+          <description></description>
+          <status>live</status>
+          <content_type>Channel</content_type>
+          <uploadedAt>1299603290</uploadedAt>
+          <length>258007</length>
+          <thumbnail>http://cdn.videos.thenorthface.com/I3MHB2MTqP5zvA8dYvzbvGlPJdg7DxRK/M_-lZjo5g2zgfr_H5hMDoxOjA0O88asB</thumbnail>
+          <size>0</size>
+          <updatedAt>1299603448</updatedAt>
+        </channel>
+      </channelSet>
+
+    http_version: "1.1"

data/spec/support/vcr_cassettes/Tangerine_Query_new_contentType_MultiChannel_.yml

@@ -28,8 +28,8 @@
       <?xml version="1.0" encoding="UTF-8"?>
       <list totalResults="5" size="5" pageID="0" statistics-as-of_text="Wed Mar 09 21:40:01 UTC 2011" limit="500" statistics-as-of="1299706801">
         <item>
-          <embedCode><%= mock_channel_set.embed_code %></embedCode>
-          <title><%= mock_channel_set.title %></title>
+          <embedCode>x5b214MTomu6ISJSgohKKZbNuR9bdUJ8</embedCode>
+          <title>Pitchfork Live</title>
           <description></description>
           <status>live</status>
           <content_type>MultiChannel</content_type>
@@ -43,8 +43,8 @@
           </stat>
         </item>
         <item>
-          <embedCode>x5b214MTomu6ISJSgohKKZbNuR9bdUJ8</embedCode>
-          <title>Pitchfork Live</title>
+          <embedCode><%= mock_channel_set.embed_code %></embedCode>
+          <title><%= mock_channel_set.title %></title>
           <description></description>
           <status>live</status>
           <content_type>MultiChannel</content_type>

data/spec/tangerine/backlot_spec.rb

@@ -11,17 +11,32 @@ describe Tangerine::Backlot do
   describe Tangerine::Backlot::API do
     context 'class methods' do
       subject { Tangerine::Backlot::API }
-      let(:params) { {'some_key' => 'some_value'} }
 
-      # it { puts subject.get('/query', 'contentType' => 'MultiChannel').inspect }
       describe '.get' do
+
         let(:response) { mock }
         let(:request) { '/some-request-path' }
-        before { Tangerine::Backlot::HTTP.should_receive(:get).with(request).and_return(response) }
 
         it 'returns the HTTP response' do
-          subject.get(request, params).should == response
+          Tangerine::Backlot::HTTP.should_receive(:get).with(request).and_return(response)
+          subject.get(request).should == response
+        end
+
+        context 'when making subsequent requests' do
+
+          let(:original_params) { { 'contentType' => 'Channel' } }
+          before do
+            Tangerine::Backlot::HTTP.stub(:get)
+            Tangerine::Backlot::API.get('/query', original_params)
+          end
+          subject { Tangerine::Backlot::HTTP }
+
+          it 'clears parameters before the new request' do
+            Tangerine::Backlot::API.get('/channel_sets', 'mode' => 'list')
+            subject.default_params.keys.should_not include('contentType')
+          end
         end
+
       end
 
     end

data/spec/tangerine/base_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Tangerine::Base do
+
+  context
+
+end

data/spec/tangerine/channel_set_spec.rb

@@ -3,41 +3,51 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Tangerine::ChannelSet do
   authenticate!
 
+  let(:embed_code) { 'My Awesome Embed Code' }
+  let(:title) { 'My Awesome Title' }
+  let(:mock_channel_set) { double(:embed_code => embed_code, :title => title) }
+  let(:vcr_erb) { {:mock_channel_set => mock_channel_set} }
+  let(:channel_set) do
+    TangerineGirl.create(:channel_set, :embed_code => embed_code, :title => title)
+  end
+
   context 'retreiving a specific channelset' do
 
     describe '.find' do
 
-      let(:title) { 'My Awesome Title' }
-      let(:embed_code) { 'My Awesome Embed Code' }
-      let(:mock_channel_set) { double(:embed_code => embed_code, :title => title) }
-      let(:vcr_erb) { {:mock_channel_set => mock_channel_set} }
-
-      # TODO: find a better way to build these up ala FactoryGirl sans ActiveRecord
-      let(:channel_set) do
-        Tangerine::ChannelSet.new(
-          :embed_code => embed_code,
-          :title => title,
-          :description => nil,
-          :flight_start_time => "1294087113",
-          :height => "3",
-          :size => nil,
-          :stat => nil,
-          :status => "live",
-          :title => "My Awesome Title",
-          :updated_at => "1294087113",
-          :uploaded_at => "1294087113",
-          :width => "4"
-        )
-      end
-
       subject { Tangerine::ChannelSet.find(embed_code) }
       before do
         pause_vcr "Tangerine::Query.new('contentType' => 'MultiChannel')", vcr_erb
       end
+
+      after { play_vcr }
+      # it { should be_functionally_equivalent_to(channel_set) }
+      its(:embed_code) { should == embed_code }
+      its(:title) { should == title }
+
+    end
+  end
+
+  context 'retreiving its channels' do
+    describe '#channels' do
+
+      let(:embed_code) { '85aTdiMjoYR5K26Fp8TMgGtGQUCEC2Y1' }
+      let(:title) { 'Snowboarding' }
+      let(:vcr_erb) { {:title => title} }
+
+      before do
+        Tangerine::ChannelSet.stub(:find).with(embed_code).and_return(channel_set)
+        pause_vcr "Tangerine::Backlot::API.get('channel_sets', 'list')", vcr_erb
+      end
       after { play_vcr }
-      it { should be_functionally_equivalent_to(channel_set) }
+      subject { Tangerine::ChannelSet.find(embed_code) }
+
+      it 'returns a list of channels belonging to the channelset' do
+        subject.channels.first.title.should == title
+      end
 
     end
   end
+
 end
 

data/spec/tangerine/video_spec.rb

@@ -9,10 +9,9 @@ describe Tangerine::Video do
     describe '.all' do
 
       let(:mock_response) { mock }
-      let(:query_double) { double(:response => mock_response) }
       let(:params) { {'contentType' => 'Video'} }
       subject { Tangerine::Video.all }
-      before { Tangerine::Query.should_receive(:new).with(params).and_return(query_double) }
+      before { Tangerine.should_receive(:query).with(params).and_return(mock_response) }
 
       it 'returns the response of the query' do
         subject.should == mock_response

data/tangerine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tangerine}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Navarre"]
-  s.date = %q{2011-03-09}
+  s.date = %q{2011-03-10}
   s.description = %q{Ooyala Backlot API Wrapper. Read more about the Ooyala Backlot API at http://www.ooyala.com/support/docs/backlot_api}
   s.email = %q{anthony.navarre@factorylabs.com}
   s.extra_rdoc_files = [
@@ -30,16 +30,20 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/tangerine.rb",
     "lib/tangerine/backlot.rb",
+    "lib/tangerine/backlot/base.rb",
+    "lib/tangerine/backlot/channel.rb",
     "lib/tangerine/backlot/channel_set.rb",
-    "lib/tangerine/backlot/query.rb",
     "lib/tangerine/backlot/video.rb",
     "spec/spec_helper.rb",
     "spec/support/authentication.rb",
     "spec/support/functionally_equivalent.rb",
+    "spec/support/tangerine_girl.rb",
+    "spec/support/vcr_cassettes/Tangerine_Backlot_API_get_channel_sets_list_.yml",
     "spec/support/vcr_cassettes/Tangerine_Query_new_contentType_MultiChannel_.yml",
     "spec/support/vcr_cassettes/Tangerine_Video_all.yml",
     "spec/support/vcr_support.rb",
     "spec/tangerine/backlot_spec.rb",
+    "spec/tangerine/base_spec.rb",
     "spec/tangerine/channel_set_spec.rb",
     "spec/tangerine/video_spec.rb",
     "tangerine.gemspec"
@@ -53,8 +57,10 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/authentication.rb",
     "spec/support/functionally_equivalent.rb",
+    "spec/support/tangerine_girl.rb",
     "spec/support/vcr_support.rb",
     "spec/tangerine/backlot_spec.rb",
+    "spec/tangerine/base_spec.rb",
     "spec/tangerine/channel_set_spec.rb",
     "spec/tangerine/video_spec.rb"
   ]
@@ -65,6 +71,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, ["= 0.7.4"])
       s.add_runtime_dependency(%q<activesupport>, ["= 3.0.5"])
+      s.add_runtime_dependency(%q<i18n>, ["= 0.5.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -78,6 +85,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<httparty>, ["= 0.7.4"])
       s.add_dependency(%q<activesupport>, ["= 3.0.5"])
+      s.add_dependency(%q<i18n>, ["= 0.5.0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -92,6 +100,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<httparty>, ["= 0.7.4"])
     s.add_dependency(%q<activesupport>, ["= 3.0.5"])
+    s.add_dependency(%q<i18n>, ["= 0.5.0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tangerine
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Anthony Navarre
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -07:00
+date: 2011-03-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,22 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  version_requirements: *id003
+  name: i18n
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +78,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id003
+  version_requirements: *id004
   name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +94,12 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  version_requirements: *id004
+  version_requirements: *id005
   name: yard
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +110,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id005
+  version_requirements: *id006
   name: bundler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,12 +126,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id006
+  version_requirements: *id007
   name: jeweler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,12 +140,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  version_requirements: *id008
   name: rcov
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -140,12 +156,12 @@ dependencies:
         - 7
         - 0
         version: 1.7.0
-  version_requirements: *id008
+  version_requirements: *id009
   name: vcr
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -156,12 +172,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  version_requirements: *id009
+  version_requirements: *id010
   name: fakeweb
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -172,12 +188,12 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  version_requirements: *id010
+  version_requirements: *id011
   name: timecop
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -188,12 +204,12 @@ dependencies:
         - 10
         - 4
         version: 0.10.4
-  version_requirements: *id011
+  version_requirements: *id012
   name: ruby-debug
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -202,7 +218,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id012
+  version_requirements: *id013
   name: httparty
   prerelease: false
   type: :runtime
@@ -229,16 +245,20 @@ files:
 - VERSION
 - lib/tangerine.rb
 - lib/tangerine/backlot.rb
+- lib/tangerine/backlot/base.rb
+- lib/tangerine/backlot/channel.rb
 - lib/tangerine/backlot/channel_set.rb
-- lib/tangerine/backlot/query.rb
 - lib/tangerine/backlot/video.rb
 - spec/spec_helper.rb
 - spec/support/authentication.rb
 - spec/support/functionally_equivalent.rb
+- spec/support/tangerine_girl.rb
+- spec/support/vcr_cassettes/Tangerine_Backlot_API_get_channel_sets_list_.yml
 - spec/support/vcr_cassettes/Tangerine_Query_new_contentType_MultiChannel_.yml
 - spec/support/vcr_cassettes/Tangerine_Video_all.yml
 - spec/support/vcr_support.rb
 - spec/tangerine/backlot_spec.rb
+- spec/tangerine/base_spec.rb
 - spec/tangerine/channel_set_spec.rb
 - spec/tangerine/video_spec.rb
 - tangerine.gemspec
@@ -280,7 +300,9 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/authentication.rb
 - spec/support/functionally_equivalent.rb
+- spec/support/tangerine_girl.rb
 - spec/support/vcr_support.rb
 - spec/tangerine/backlot_spec.rb
+- spec/tangerine/base_spec.rb
 - spec/tangerine/channel_set_spec.rb
 - spec/tangerine/video_spec.rb

data/lib/tangerine/backlot/query.rb

@@ -1,9 +0,0 @@
-class Tangerine::Query
-  attr_reader :response
-
-  def initialize(options)
-    @response = Tangerine::Backlot::API.get('/query', options)
-  end
-
-end
-