tangerine 0.5.0 → 0.5.1

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "httparty", "0.7.4"
 gem "activesupport", "3.0.5"
+gem "json", "1.5.1"
 gem "i18n", "0.5.0"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -15,6 +15,7 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.5.1)
     linecache (0.43)
     rake (0.8.7)
     rcov (0.9.9)
@@ -46,6 +47,7 @@ DEPENDENCIES
   httparty (= 0.7.4)
   i18n (= 0.5.0)
   jeweler (~> 1.5.2)
+  json (= 1.5.1)
   rcov
   rspec (~> 2.3.0)
   ruby-debug (= 0.10.4)

data/Rakefile

@@ -21,6 +21,8 @@ Jeweler::Tasks.new do |gem|
 
   # Dependencies
   gem.add_dependency 'httparty'
+  gem.add_dependency 'activesupport'
+  gem.add_dependency 'json'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/tangerine.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'active_support/inflector'
 require 'tangerine/backlot'
 require 'tangerine/backlot/base'

data/lib/tangerine/backlot/base.rb

@@ -5,7 +5,9 @@ class Tangerine::Base
     options.each do |k,v|
       # TODO: Look into using Crack gem for reliably undercoring these
       attr = k.to_s.underscore
-      self.send("#{attr}=", v)
+      method = "#{attr}="
+
+      self.send(method, v) if self.class.instance_methods(false).include?(method)
     end
   end
 

data/lib/tangerine/backlot/channel.rb

@@ -10,6 +10,10 @@ class Tangerine::Channel < Tangerine::Base
     :status,
     :uploaded_at
 
+  finder do
+    Tangerine.query('contentType' => 'Channel').parsed_response['list']['item']
+  end
+
   def videos
     channel = Tangerine::Backlot::API.get('/channels', 'mode' => 'list', 'channelEmbedCode' => embed_code)
     items = channel.parsed_response['channel']['item']
@@ -17,4 +21,20 @@ class Tangerine::Channel < Tangerine::Base
     embed_codes = items.collect { |item| item['embedCode'] }
     Tangerine::Video.where(:embed_code => embed_codes)
   end
+
+  def to_json(options = {})
+    # TODO: Figure out why rails needs this to be called so badly
+    vids = videos
+    {:size => size,
+     :title => title,
+     :thumbnail => thumbnail,
+     :updated_at => updated_at,
+     :embed_code => embed_code,
+     :description => description,
+     :length => length,
+     :status => status,
+     :uploaded_at => uploaded_at,
+     :videos => vids
+    }.to_json
+  end
 end

data/lib/tangerine/backlot/channel_set.rb

@@ -17,6 +17,10 @@ class Tangerine::ChannelSet < Tangerine::Base
     response.parsed_response['list']['item']
   end
 
+  def to_json(options = {})
+    {:channels => channels}.to_json
+  end
+
   def channels
     result = Tangerine::Backlot::API.get('/channel_sets', 'mode' => 'list', 'channelSetEmbedCode' => embed_code)
     items = result.parsed_response['channelSet']['channel']

data/lib/tangerine/backlot/video.rb

@@ -17,10 +17,14 @@ class Tangerine::Video < Tangerine::Base
     :metadata,
     :stat
 
-  def self.all
-    Tangerine.query('contentType' => 'Video')
+  finder do
+    Tangerine.query('contentType' => 'Video').parsed_response['list']['item']
   end
 
+  # def self.all
+    # Tangerine.query('contentType' => 'Video')
+  # end
+
   def initialize(options={})
     @options = options
     add_metadata
@@ -44,6 +48,26 @@ class Tangerine::Video < Tangerine::Base
     items.collect { |item| Tangerine::Video.new(item) }
   end
 
+  def to_json(options = {})
+    {:size => size,
+     :title => title,
+     :thumbnail => thumbnail,
+     :content => content,
+     :updated_at => updated_at,
+     :embed_code => embed_code,
+     :description => description,
+     :length => length,
+     :status => status,
+     :uploaded_at => uploaded_at,
+     :flight_start_time => flight_start_time,
+     :width => width,
+     :height => height,
+     :labels => labels,
+     :metadata => metadata,
+     :stat => stat
+    }.to_json
+  end
+
   protected
 
   def add_labels

data/tangerine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tangerine}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Navarre", "Craig Williams"]
-  s.date = %q{2011-03-15}
+  s.date = %q{2011-03-16}
   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 = [
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/factorylabs/tangerine}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Ooyala Backlot API Wrapper}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -77,6 +77,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<json>, ["= 1.5.1"])
       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"])
@@ -89,9 +90,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<factory_girl>, ["= 1.3.3"])
       s.add_development_dependency(%q<ruby-debug>, ["= 0.10.4"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<httparty>, ["= 0.7.4"])
       s.add_dependency(%q<activesupport>, ["= 3.0.5"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
       s.add_dependency(%q<i18n>, ["= 0.5.0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -104,10 +108,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<factory_girl>, ["= 1.3.3"])
       s.add_dependency(%q<ruby-debug>, ["= 0.10.4"])
       s.add_dependency(%q<httparty>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
     s.add_dependency(%q<httparty>, ["= 0.7.4"])
     s.add_dependency(%q<activesupport>, ["= 3.0.5"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
     s.add_dependency(%q<i18n>, ["= 0.5.0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -120,6 +127,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<factory_girl>, ["= 1.3.3"])
     s.add_dependency(%q<ruby-debug>, ["= 0.10.4"])
     s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tangerine
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Anthony Navarre
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -06:00
+date: 2011-03-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: httparty
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -32,12 +31,12 @@ dependencies:
         - 7
         - 4
         version: 0.7.4
+  version_requirements: *id001
+  name: httparty
   prerelease: false
   type: :runtime
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -48,12 +47,28 @@ dependencies:
         - 0
         - 5
         version: 3.0.5
+  version_requirements: *id002
+  name: activesupport
   prerelease: false
   type: :runtime
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: i18n
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  version_requirements: *id003
+  name: json
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -64,12 +79,12 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
+  version_requirements: *id004
+  name: i18n
   prerelease: false
   type: :runtime
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,12 +95,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
+  version_requirements: *id005
+  name: rspec
   prerelease: false
   type: :development
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: yard
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,12 +111,12 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
+  version_requirements: *id006
+  name: yard
   prerelease: false
   type: :development
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,12 +127,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  version_requirements: *id007
+  name: bundler
   prerelease: false
   type: :development
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,12 +143,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
+  version_requirements: *id008
+  name: jeweler
   prerelease: false
   type: :development
-  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,12 +157,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id009
+  name: rcov
   prerelease: false
   type: :development
-  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: vcr
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -158,12 +173,12 @@ dependencies:
         - 7
         - 0
         version: 1.7.0
+  version_requirements: *id010
+  name: vcr
   prerelease: false
   type: :development
-  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -174,12 +189,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
+  version_requirements: *id011
+  name: fakeweb
   prerelease: false
   type: :development
-  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: timecop
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -190,12 +205,12 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
+  version_requirements: *id012
+  name: timecop
   prerelease: false
   type: :development
-  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: factory_girl
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -206,12 +221,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
+  version_requirements: *id013
+  name: factory_girl
   prerelease: false
   type: :development
-  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -222,12 +237,40 @@ dependencies:
         - 10
         - 4
         version: 0.10.4
+  version_requirements: *id014
+  name: ruby-debug
   prerelease: false
   type: :development
-  requirement: *id013
 - !ruby/object:Gem::Dependency 
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id015
   name: httparty
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id016
+  name: activesupport
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -236,9 +279,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id017
+  name: json
   prerelease: false
   type: :runtime
-  requirement: *id014
 description: Ooyala Backlot API Wrapper. Read more about the Ooyala Backlot API at http://www.ooyala.com/support/docs/backlot_api
 email: anthony.navarre@factorylabs.com
 executables: []
@@ -313,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Ooyala Backlot API Wrapper