rstreamor 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 581d9a126b6ea78ee0ce602daf8adf61363a7890
-  data.tar.gz: e0924a5564245385bd116ac100245bf5e82109b9
+SHA256:
+  metadata.gz: c7df72d8583a6fa7d9e7e148ee53a883fe7e17f032d8449a89c1267583d3f2e3
+  data.tar.gz: 5783b2aaf45cee46fde0fa042d0199c2f71a9efb687940c0c877263b13d7c2d1
 SHA512:
-  metadata.gz: 380b203fa6028d3523a41aba632bc95c0868df61205ad3a5bdbd70bd0cc622816be8205e859983797e4be42db1a8eeeaede4217468df8dee69b913e55259a6e9
-  data.tar.gz: 081bfd93d9b5b621316bd8f86d0eca8753651b5e6ba45d6ecec99a8ce2694540fc544ad29c6d241409449b7451c984b70b6585ec7c57c912c494d856cc4a0eec
+  metadata.gz: 94b976e8190708b118349cf554b2445dac5d6d3414537fbb81d92c322fd9235999b7a1ef51d7afaee86c76243b347f6960302afa8d46b5ab01a2fab453be3878
+  data.tar.gz: 4cf6027f281d1f60274b250af071c60d08c8b1faa64fe9dd7ee6159b73dc7d99be0285870f2820ba108258f3d78b14a12da1b8a1c8c61599e5945c651b4f165b

data/README.md

@@ -8,7 +8,7 @@ gem 'rstreamor', git: 'https://github.com/ndea/rstreamor.git', branch: 'master'
 ```
 ###### Rubygems
 ```ruby
-gem 'rstreamor', '~> 0.2.4'
+gem 'rstreamor', '~> 0.2.6'
 ```
 # Install
 ```ruby
@@ -34,6 +34,16 @@ If you dont use Carrierwave as a file make sure your file method has the followi
 - #data
 - #content_type
 
+Optionally, you could send some params to the `stream` method like the following example:
+```ruby
+class VideosController < ApplicationController
+  include Rstreamor
+  def show
+    stream @resource.image_file, { x_sendfile: true, stream: true }
+  end
+end
+```
+
 Please note that if you don't specify any range request headers Rstreamor will return the whole file from byte 0 to EOF with status code *200*
 
 # What is a range request?
@@ -94,4 +104,3 @@ Content-Type:application/mp4
 - Bugfixes
 - Codestyle
 - Anything that improves this gem
-

data/lib/rstreamor/file.rb

@@ -1,26 +1,29 @@
 module Rstreamor
   class File
-    attr_accessor :file
+    attr_reader :file
 
     def initialize(file)
-      self.file = file
+      @file = file
     end
 
     def data
-      if self.file.respond_to? :data
-        self.file.data
+      @data ||= if file.respond_to? :data
+        file.data
       else
-        self.file.read
+        file.read
       end
     end
 
     def content_type
-      self.file.content_type
+      file.content_type
     end
 
     def size
-      data.size
+      # Because of encoding, the string size might not match the stream size,
+      # and that may lead to files being truncated when served (i.e. this happens
+      # often for MP3 files, were the last few seconds of files longer than a minute
+      # gets trimmed).
+      @size ||= data.bytesize
     end
-
   end
-end
+end

data/lib/rstreamor/request.rb

@@ -1,18 +1,18 @@
 module Rstreamor
   class Request
-    attr_accessor :request, :file
+    attr_reader :request, :file
 
     def initialize(request, file)
-      self.request = request
-      self.file = file
+      @request = request
+      @file = file
     end
 
     def ranges
-      self.request.headers['HTTP_RANGE'].gsub('bytes=', '').split('-') if self.request.headers['HTTP_RANGE']
+      request.headers['HTTP_RANGE'].gsub('bytes=', '').split('-') if request.headers['HTTP_RANGE']
     end
 
     def upper_bound
-      ranges[1] ? ranges[1].to_i : self.file.data.size
+      ranges[1] ? ranges[1].to_i : (file.size - 1)
     end
 
     def lower_bound
@@ -20,24 +20,23 @@ module Rstreamor
     end
 
     def range_header?
-      self.request.headers['HTTP_RANGE'].present?
+      request.headers['HTTP_RANGE'].present?
     end
 
     def file_content_type
-      self.file.content_type
+      file.content_type
     end
 
     def slice_file
-      if self.request.headers['HTTP_RANGE'].present?
-        self.file.data.byteslice(lower_bound, upper_bound)
+      if request.headers['HTTP_RANGE'].present?
+        file.data.byteslice(lower_bound..upper_bound)
       else
-        self.file.data
+        file.data
       end
     end
 
     def file_size
-      self.file.size
+      file.size
     end
-
   end
-end
+end

data/lib/rstreamor/response.rb

@@ -1,25 +1,25 @@
 module Rstreamor
   class Response
-    attr_accessor :request
+    attr_reader :request
 
     def initialize(request)
-      self.request = request
+      @request = request
     end
 
     def response_code
-      self.request.range_header? ? 206 : 200
+      request.range_header? ? 206 : 200
     end
 
     def content_length
-      if self.request.range_header?
-        (self.request.upper_bound - self.request.lower_bound).to_s
+      if request.range_header?
+        (request.upper_bound - request.lower_bound + 1).to_s
       else
-        self.request.file.data.size
+        request.file_size
       end
     end
 
     def content_range
-      "bytes #{self.request.lower_bound}-#{self.request.upper_bound - 1}/#{self.request.file.data.size}"
+      "bytes #{request.lower_bound}-#{request.upper_bound}/#{request.file_size}"
     end
 
     def accept_ranges
@@ -29,6 +29,5 @@ module Rstreamor
     def cache_control
       'no-cache'
     end
-
   end
-end
+end

data/lib/rstreamor/stream.rb

@@ -1,17 +1,22 @@
 module Rstreamor
   module Stream
-    def stream(file)
+    def stream(file, options = {})
       request_builder = Rstreamor::Request.new(request, Rstreamor::File.new(file))
       response_builder = Rstreamor::Response.new(request_builder)
       set_response_header(request_builder, response_builder)
-      stream_file(request_builder, response_builder)
+      stream_file(request_builder, response_builder, options)
     end
 
     private
 
-    def stream_file(request_builder, response_builder)
+    def stream_file(request_builder, response_builder, options)
       content = request_builder.slice_file
-      send_data content, type: request_builder.file_content_type, disposition: 'inline', status: response_builder.response_code
+
+      send_data(content, {
+        type: request_builder.file_content_type,
+        disposition: 'inline',
+        status: response_builder.response_code
+      }.merge(options))
     end
 
     def set_response_header(request_builder, response_builder)

data/lib/rstreamor/version.rb

@@ -1,3 +1,3 @@
 module Rstreamor
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rstreamor
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Erwin Schens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Stream files using HTTP range requests.