streamio 0.9.2 → 1.0.2

data/HISTORY.md

@@ -1,3 +1,16 @@
+# 1.0.2 2012-11-26
+
+* Replaced httpclient with net/http + multipart-post to avoid timeouts on file posting.
+
+# 1.0.1 2012-11-23
+
+* Loosend multi_json dependency version to conform with other ruby gems.
+* Updated some development dependencies.
+
+# 1.0.0 2012-11-23
+
+* Replaced rest-client dependency with httpclient to support large file uploads.
+
 # 0.9.2 2012-11-06
 
 * Video#original_video accessor

data/lib/streamio/model.rb

@@ -7,7 +7,7 @@ module Streamio
       #
       # @return [Model] The found model.
       def find(id)
-        parse_response(resource["#{id}"].get)
+        parse_response(resource.get(id))
       end
       
       # Querys for a list of models.
@@ -19,7 +19,8 @@ module Streamio
       # @return [Array] Array of found models.
       def all(parameters = {})
         sanitize_parameters(parameters)
-        parse_response(resource.get(:params => parameters))
+        response = resource.get(nil, parameters)
+        parse_response(response)
       end
       
       # Deletes model with the given id. Raises exception if failing to do so.
@@ -28,7 +29,7 @@ module Streamio
       #
       # @return [Boolean] True if the delete request is successful.
       def destroy(id)
-        resource[id].delete
+        resource.delete(id)
         true
       end
       
@@ -53,12 +54,13 @@ module Streamio
       # @return [Integer] The number of models found.
       def count(parameters = {})
         sanitize_parameters(parameters)
-        MultiJson.decode(resource["count"].get(:params => parameters))["count"]
+        response = resource.get("count", parameters)
+        MultiJson.decode(response.body)["count"]
       end
       
       def resource_name(name)
         define_singleton_method(:resource) do
-          RestClient::Resource.new("#{Streamio.authenticated_api_base}/#{name}", :headers => {:accept => :json})
+          Resource.new(name)
         end
       end
       
@@ -152,9 +154,6 @@ module Streamio
       else  
         persist
       end
-    rescue RestClient::UnprocessableEntity => e
-      @errors = MultiJson.decode(e.response)
-      false
     end
     
     # Deletes the record and freezes this instance to reflect that no changes
@@ -162,7 +161,7 @@ module Streamio
     #
     # @return [Boolean] True if the record was deleted.
     def destroy
-      self.class.resource[id].delete
+      self.class.resource.delete(id)
       @attributes.freeze
       true
     end
@@ -211,8 +210,11 @@ module Streamio
         parameters[key] = @attributes[key] if @attributes.has_key?(key)
       end
 
-      self.class.resource[id].put(parameters)
-      true
+      response = self.class.resource.put(id, parameters)
+
+      @errors = MultiJson.decode(response.body) unless response.code.to_i == 204
+
+      response.code.to_i == 204
     end
     
     def persist
@@ -221,12 +223,16 @@ module Streamio
         parameters[key] = @attributes[key] if @attributes.has_key?(key)
       end
 
-      new_attributes = MultiJson.decode(self.class.resource.post(attributes).body)
+      response = self.class.resource.post(nil, parameters)
+      json = MultiJson.decode(response.body)
 
       (self.class.accessable_attributes + self.class.readable_attributes).each do |attribute|
-        @attributes[attribute] = new_attributes[attribute]
+        @attributes[attribute] = json[attribute]
       end
-      true
+
+      @errors = json unless response.code.to_i == 201
+
+      response.code.to_i == 201
     end
   end
 end

data/lib/streamio/resource.rb

@@ -0,0 +1,58 @@
+module Streamio
+  class Resource
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
+      @resource_path = "/api/v1/#{@name}"
+
+      uri = URI.parse(Streamio.protocol+Streamio.host)
+      @net = Net::HTTP.new(uri.host, uri.port)
+      @net.use_ssl = Streamio.use_ssl
+    end
+
+    def get(path, parameters = {})
+      @net.request(net_request(Net::HTTP::Get, path, parameters))
+    end
+
+    def post(path, parameters = {})
+      request_class = parameters.any? do |key, value|
+        value.is_a?(File)
+      end ? Net::HTTP::Post::Multipart : Net::HTTP::Post
+
+      @net.request(net_request(request_class, path, parameters))
+    end
+
+    def put(path, parameters = {})
+      @net.request(net_request(Net::HTTP::Put, path, parameters))
+    end
+
+    def delete(path)
+      @net.request(net_request(Net::HTTP::Delete, path))
+    end
+
+    private
+    def net_request(request_class, sub_path, parameters = {})
+      path = @resource_path
+      path << "/#{sub_path}" if sub_path
+
+      if request_class == Net::HTTP::Get
+        path << "?#{Rack::Utils.build_query(parameters)}" unless parameters.empty?
+        req = request_class.new(path)
+      elsif request_class == Net::HTTP::Post::Multipart
+        parameters.each do |key, value|
+          parameters[key] = UploadIO.new(value, "application/octet-stream", File.basename(value.path)) if value.is_a?(File)
+          parameters[key] = value.join(", ") if value.is_a?(Array)
+        end
+        req = request_class.new(path, parameters)
+      else
+        req = request_class.new(path)
+        req.body = Rack::Utils.build_query(parameters)
+      end
+
+      req.basic_auth(Streamio.username, Streamio.password)
+      req["Accept"] = "application/json"
+      req
+    end
+  end
+end

data/lib/streamio/version.rb

@@ -1,3 +1,3 @@
 module Streamio
-  VERSION = "0.9.2"
+  VERSION = "1.0.2"
 end

data/lib/streamio/video.rb

@@ -14,11 +14,9 @@ module Streamio
     #
     # @return [Boolean] Indicating wether the transcoding was successfully created.
     def add_transcoding(parameters)
-      self.class.resource["#{id}/transcodings"].post(parameters)
+      response = self.class.resource.post("#{id}/transcodings", parameters)
       reload
-      true
-    rescue RestClient::Exception
-      false
+      response.code.to_i == 201
     end
     
     # Deletes a transcoding from the video and reloads itself to
@@ -28,11 +26,9 @@ module Streamio
     #
     # @return [Boolean] Indicating wether the transcoding was successfully deleted.
     def delete_transcoding(transcoding_id)
-      self.class.resource["#{id}/transcodings/#{transcoding_id}"].delete
+      response = self.class.resource.delete("#{id}/transcodings/#{transcoding_id}")
       reload
-      true
-    rescue RestClient::Exception
-      false
+      response.code.to_i == 200
     end
   end
 end

data/lib/streamio.rb

@@ -1,8 +1,11 @@
-require "rest_client"
+require "rack"
+require "net/https"
+require "net/http/post/multipart"
 require "multi_json"
 require "time"
 
 require "streamio/version"
+require "streamio/resource"
 require "streamio/model"
 require "streamio/video"
 require "streamio/image"

data/streamio.gemspec

@@ -13,10 +13,11 @@ Gem::Specification.new do |s|
 
   s.files       = Dir.glob("lib/**/*") + %w(Gemfile streamio.gemspec HISTORY.md README.md)
   
-  s.add_dependency("rest-client", "~> 1.6.1")
-  s.add_dependency("multi_json", "~> 1.3.0")
+  s.add_dependency("rack", "~> 1.0")
+  s.add_dependency("multipart-post", "~> 1.1")
+  s.add_dependency("multi_json", "~> 1.3")
   
   s.add_development_dependency("rspec", "~> 2.7")
-  s.add_development_dependency("webmock", "~> 1.7.8")
-  s.add_development_dependency("rake", "~> 0.9.2")
+  s.add_development_dependency("webmock", "~> 1.9")
+  s.add_development_dependency("rake", "~> 10.0")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: streamio
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
 description: Ruby wrapper for Streamios API.
 email:
 - david@streamio.com
@@ -104,6 +120,7 @@ files:
 - lib/streamio/model.rb
 - lib/streamio/player.rb
 - lib/streamio/playlist.rb
+- lib/streamio/resource.rb
 - lib/streamio/upload.rb
 - lib/streamio/version.rb
 - lib/streamio/video.rb
@@ -126,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -329781784268787694
+      hash: -3529804903575399490
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -329781784268787694
+      hash: -3529804903575399490
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24