streamio 0.8.0 → 0.9.0

data/{HISTORY → HISTORY.md}

@@ -1,14 +1,18 @@
-== 0.8.0 2011-11-22
+# 0.9.0 2011-12-01
+
+* Use `multi_json` gem to handle JSON parsing for maximum backend compatibility.
+
+# 0.8.0 2011-11-22
 
 * Player model
 * Playlist model
 * All models got .count action
 
-== 0.7.0 2011-06-17
+# 0.7.0 2011-06-17
 
 * Upload model
 
-== 0.6.0 2011-06-17
+# 0.6.0 2011-06-17
 
 * Model.create
 * Model.destroy
@@ -16,10 +20,10 @@
 * Video #add_transcoding and #delete_transcoding now reloads the video instance
 * Some refactoring behind the scenes
 
-== 0.5.1 2011-06-16
+# 0.5.1 2011-06-16
 
 * Added lots of (YARD style) documentation and updated README
 
-== 0.5.0 2011-06-15
+# 0.5.0 2011-06-15
 
 * Basic api functionality for Videos, Images and Encoding Profiles

data/README.md

@@ -0,0 +1,65 @@
+The Streamio Gem
+================
+
+Official ruby wrapper for the http://streamio.com API. Integrating video in your application has never been more awesome.
+
+Installation
+------------
+
+``` bash
+gem install streamio
+```
+    
+Usage
+-----
+
+Load it.
+
+``` ruby
+require 'rubygems'
+require 'streamio'
+```
+  
+Configure it.
+
+``` ruby
+Streamio.configure do |config|
+  config.username = "your_account_name"
+  config.password = "your_api_private_key"
+end
+```
+
+Use it.
+
+``` ruby
+# Fetch an array of videos
+videos = Streamio::Video.all
+
+# Pass in parameters as specified in the API docs
+# This fetches the 5 most played videos tagged with Nature or Sports
+videos = Streamio::Video.all(:tags => ["Nature", "Sports"], :limit => 5, :order => "plays.desc")
+
+# Find a video by id
+video = Streamio::Video.find("4c57f3975412901427000005")
+
+# Create a video
+video = Streamio::Video.new
+video.save # false
+video.errors # {:file => ["can't be blank"]}
+video.file = File.new("my_awesome_video.mov")
+video.save # true
+
+Video.count # 23
+Video.count(:tags => "Awesome") # 12
+```
+
+Same principles work for the other available models (Image, EncodingProfile, Player, Playlist and Upload).
+
+More Documentation
+------------------
+
+YARDoc is avaible here:
+http://rubydoc.info/gems/streamio
+
+Please refer to the official Streamio API Documentation for details on parameters etc:
+http://streamio.com/api/docs

data/lib/streamio/model.rb

@@ -53,7 +53,7 @@ module Streamio
       # @return [Integer] The number of models found.
       def count(parameters = {})
         sanitize_parameters(parameters)
-        JSON.parse(resource["count"].get(:params => parameters))["count"]
+        MultiJson.decode(resource["count"].get(:params => parameters))["count"]
       end
       
       def resource_name(name)
@@ -103,7 +103,7 @@ module Streamio
       end
       
       def parse_response(response)
-        response = JSON.parse(response.body)
+        response = MultiJson.decode(response.body)
         if response.instance_of?(Array)
           response.collect do |attributes|
             new(attributes)
@@ -153,7 +153,7 @@ module Streamio
         persist
       end
     rescue RestClient::UnprocessableEntity => e
-      @errors = JSON.parse(e.response)
+      @errors = MultiJson.decode(e.response)
       false
     end
     
@@ -221,7 +221,7 @@ module Streamio
         parameters[key] = @attributes[key] if @attributes.has_key?(key)
       end
 
-      new_attributes = JSON.parse(self.class.resource.post(attributes).body)
+      new_attributes = MultiJson.decode(self.class.resource.post(attributes).body)
 
       (self.class.accessable_attributes + self.class.readable_attributes).each do |attribute|
         @attributes[attribute] = new_attributes[attribute]

data/lib/streamio/version.rb

@@ -1,3 +1,3 @@
 module Streamio
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/lib/streamio.rb

@@ -1,5 +1,5 @@
 require "rest_client"
-require "json"
+require "multi_json"
 require "time"
 
 require "streamio/version"

data/streamio.gemspec

@@ -11,12 +11,12 @@ Gem::Specification.new do |s|
   s.summary     = %q{Ruby wrapper for the Streamio API.}
   s.description = %q{Ruby wrapper for Streamios API.}
 
-  s.files       = Dir.glob("lib/**/*") + %w(Gemfile streamio.gemspec HISTORY README.rdoc)
+  s.files       = Dir.glob("lib/**/*") + %w(Gemfile streamio.gemspec HISTORY.md README.md)
   
   s.add_dependency("rest-client", "~> 1.6.1")
-  s.add_dependency("json", ">= 1.4", "< 1.6")
+  s.add_dependency("multi_json", "~> 1.0.4")
   
-  s.add_development_dependency("rspec", "~> 2.6.0")
-  s.add_development_dependency("webmock", "~> 1.6.4")
+  s.add_development_dependency("rspec", "~> 2.7")
+  s.add_development_dependency("webmock", "~> 1.7.8")
   s.add_development_dependency("rake", "~> 0.9.2")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: streamio
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2011-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70225441866580 !ruby/object:Gem::Requirement
+  requirement: &70359592889380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,46 +21,43 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70225441866580
+  version_requirements: *70359592889380
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70225441865500 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &70359592888660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70225441865500
+  version_requirements: *70359592888660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225441864700 !ruby/object:Gem::Requirement
+  requirement: &70359592888000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70225441864700
+  version_requirements: *70359592888000
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70225441864100 !ruby/object:Gem::Requirement
+  requirement: &70359592887540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.7.8
   type: :development
   prerelease: false
-  version_requirements: *70225441864100
+  version_requirements: *70359592887540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70225441863560 !ruby/object:Gem::Requirement
+  requirement: &70359592887080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,7 +65,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70225441863560
+  version_requirements: *70359592887080
 description: Ruby wrapper for Streamios API.
 email:
 - david@streamio.se
@@ -87,8 +84,8 @@ files:
 - lib/streamio.rb
 - Gemfile
 - streamio.gemspec
-- HISTORY
-- README.rdoc
+- HISTORY.md
+- README.md
 homepage: http://github.com/streamio/streamio-rb
 licenses: []
 post_install_message: 

data/README.rdoc

@@ -1,53 +0,0 @@
-= The Streamio Gem
-
-Official ruby wrapper for the http://streamio.com API. Integrating video in your application has never been more awesome.
-
-== Installation
-
-  gem install streamio
-    
-== Usage
-
-Load it.
-
-  require 'rubygems'
-  require 'streamio'
-  
-Configure it.
-  
-  Streamio.configure do |config|
-    config.username = "your_account_name"
-    config.password = "your_api_private_key"
-  end
-
-Use it.
-
-  # Fetch an array of videos
-  videos = Streamio::Video.all
-  
-  # Pass in parameters as specified in the API docs
-  # This fetches the 5 most played videos tagged with Nature or Sports
-  videos = Streamio::Video.all(:tags => ["Nature", "Sports"], :limit => 5, :order => "plays.desc")
-  
-  # Find a video by id
-  video = Streamio::Video.find("4c57f3975412901427000005")
-  
-  # Create a video
-  video = Streamio::Video.new
-  video.save # false
-  video.errors # {:file => ["can't be blank"]}
-  video.file = File.new("my_awesome_video.mov")
-  video.save # true
-  
-  Video.count # 23
-  Video.count(:tags => "Awesome") # 12
-
-Same principles work for the other availible models (Image, EncodingProfile, Player, Playlist and Upload).
-
-== More Documentation
-
-YARDoc is avaible here:
-http://rubydoc.info/gems/streamio
-
-Please refer to the official Streamio API Documentation for details on parameters etc:
-http://streamio.com/api/docs