tangerine 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/tangerine/backlot.rb

@@ -13,8 +13,9 @@ module Tangerine
     class API
 
       def self.authenticate!(credentials)
-        @secret = credentials[:secret]
-        HTTP.default_params :pcode => credentials[:provider_code]
+        creds = HashWithIndifferentAccess.new credentials
+        @secret = creds[:secret]
+        HTTP.default_params :pcode => creds[:provider_code]
       end
 
       def self.get(request_type, params={})

data/lib/tangerine/backlot/channel.rb

@@ -22,9 +22,10 @@ class Tangerine::Channel < Tangerine::Base
     Tangerine::Video.where(:embed_code => embed_codes)
   end
 
-  def to_json(options = {})
+  def as_json(options = {})
     # TODO: Figure out why rails needs this to be called so badly
     vids = videos
+
     {:size => size,
      :title => title,
      :thumbnail => thumbnail,
@@ -35,6 +36,6 @@ class Tangerine::Channel < Tangerine::Base
      :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 as_json(options = {})
+    {:channels => channels}
+  end
+
   def to_json(options = {})
     {:channels => channels}.to_json
   end

data/lib/tangerine/backlot/video.rb

@@ -48,7 +48,7 @@ class Tangerine::Video < Tangerine::Base
     items.collect { |item| Tangerine::Video.new(item) }
   end
 
-  def to_json(options = {})
+  def as_json(options = {})
     {:size => size,
      :title => title,
      :thumbnail => thumbnail,
@@ -65,7 +65,7 @@ class Tangerine::Video < Tangerine::Base
      :labels => labels,
      :metadata => metadata,
      :stat => stat
-    }.to_json
+    }
   end
 
   protected

data/tangerine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tangerine}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   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-17}
+  s.date = %q{2011-03-23}
   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 = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tangerine
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Anthony Navarre
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -06:00
+date: 2011-03-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency