postgresql_lo_streamer 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b15445e68664011f4a6c5004276249dfc86c5dc
-  data.tar.gz: 65d66610979783285de42eb754f81bd1724d1fde
+  metadata.gz: 9ed951b55d69c47c78e0bb532c588d767f103001
+  data.tar.gz: 6d459d8a27c0fdbc555c2969ff85bad967e22ad7
 SHA512:
-  metadata.gz: 339e58f1db995b003206e860a20c29649e9d1b90059372d99cec8bef585ac39e6b423d04675c7b4a02349f11deb4e6f6f4aa3d86613f770f23d4eca0cd2fd54c
-  data.tar.gz: ff139796cfc79a93b34c0cd12129845629ff0a721672072bf7385bf6f76445ad22174d7a3347fd0128bbfffbf5f6b8bb7baea85492c89f11f28bebacf898e63a
+  metadata.gz: bca54aa210afd1b84ceb633e1a9c8ef90e53daa4419a1590ea23bdd2de148047d2b14ebdaa41c48d6dc92fb96a97f85df35404de001f0d2b913cb2aed962bec3
+  data.tar.gz: 22c17d889d92c8f1b42d981597155ecde4587d224d67c17be35075fcee2c5d228abe30fb43384df96b8217184698f432c128092c4d5a45152d57f1025e22fe63

data/app/controllers/postgresql_lo_streamer/lo_controller.rb

@@ -2,25 +2,21 @@
 
 module PostgresqlLoStreamer
   class LoController < ActionController::Base
+
     def stream
-      send_file_headers!(headers_for_extension_or_default)
 
-      object_identifier = params[:id].to_i
-      if !object_exists?(object_identifier)
-        self.status = 404
-        render :nothing => true and return
+      streamer = PostgresqlLoStreamer::Streamer.new(
+        connection,
+        params[:id].to_i
+      )
+      send_file_headers!(default_headers_for(params[:format]))
+      if !streamer.object_exists?
+        head 404, default_headers_for(params[:format])
+        return
       end
-
       self.status = 200
-      self.response_body = Enumerator.new do |y|
-        connection.transaction do
-          lo = connection.lo_open(object_identifier, ::PG::INV_READ)
-          while data = connection.lo_read(lo, 4096) do
-            y << data
-          end
-          connection.lo_close(lo)
-        end
-      end
+      self.response_body = streamer.stream
+
     end
 
     def connection
@@ -29,29 +25,9 @@ module PostgresqlLoStreamer
 
     private
 
-    def object_exists?(identifier)
-      begin
-        connection.lo_open(identifier, ::PG::INV_READ)
-      rescue PG::Error => e
-        if e.to_s.include? "does not exist"
-          return false
-        end
-
-        raise
-      end
-
-      return true
-    end
-
-    def configuration
-      PostgresqlLoStreamer.configuration
-    end
-
-    def headers_for_extension_or_default
-      #extension provided and recognized
-      #Mime is built into rails
-      if params[:format].present? && Mime::Type.lookup_by_extension(params[:format]).present?
-        type = Mime::Type.lookup_by_extension(params[:format]).to_s
+    def default_headers_for(extension)
+      if extension.present? && Mime::Type.lookup_by_extension(extension).present?
+        type = Mime::Type.lookup_by_extension(extension).to_s
         {type: type, disposition: disposition_from_type(type) }
       else
         configuration.options #fallback
@@ -75,5 +51,9 @@ module PostgresqlLoStreamer
       end
     end
 
+    def configuration
+      PostgresqlLoStreamer.configuration
+    end
+
   end
 end

data/lib/postgresql_lo_streamer.rb

@@ -1,5 +1,6 @@
 require "postgresql_lo_streamer/engine"
 require "postgresql_lo_streamer/configuration"
+require "postgresql_lo_streamer/streamer"
 
 module PostgresqlLoStreamer
   class << self

data/lib/postgresql_lo_streamer/streamer.rb

@@ -0,0 +1,33 @@
+class PostgresqlLoStreamer::Streamer
+  attr_accessor :connection, :object_identifier
+
+  def initialize(connection, object_identifier)
+    @connection = connection
+    @object_identifier = object_identifier
+  end
+
+  def object_exists?
+    begin
+      @connection.lo_open(@object_identifier, ::PG::INV_READ)
+    rescue PG::Error => e
+      if e.to_s.include? "does not exist"
+        return false
+      end
+      raise
+    end
+    return true
+  end
+
+  def stream
+    return Enumerator.new do |y|
+      @connection.transaction do
+        lo = @connection.lo_open(@object_identifier, ::PG::INV_READ)
+        while data = connection.lo_read(lo, 4096) do
+          y << data
+        end
+        @connection.lo_close(lo)
+      end
+    end
+  end
+
+end

data/lib/postgresql_lo_streamer/version.rb

@@ -1,3 +1,3 @@
 module PostgresqlLoStreamer
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgresql_lo_streamer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Diogo Biazus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,6 +82,7 @@ files:
 - lib/postgresql_lo_streamer.rb
 - lib/postgresql_lo_streamer/configuration.rb
 - lib/postgresql_lo_streamer/engine.rb
+- lib/postgresql_lo_streamer/streamer.rb
 - lib/postgresql_lo_streamer/version.rb
 - lib/tasks/postgresql_lo_streamer_tasks.rake
 homepage: https://github.com/diogob/postgresql_lo_streamer