carrierwave-postgresql 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49dae63eba24bc9843965bb2868b89d8538fae5f
-  data.tar.gz: 7704451803cbe91f568ab8c77627b0a9d54aa905
+  metadata.gz: da7812a54694e701a54b68149934790811a5caeb
+  data.tar.gz: aa5c4c93a992ed1de295c096cfa2d4036d34f712
 SHA512:
-  metadata.gz: 1a2108e137c5898a15a47e993ada63e3ed2f8e537c0d25ee1bdea1d199381bd0a668a42ae68ddcca8c38fb106a41bc8bd2a43724bad15df46f8df16c79d38602
-  data.tar.gz: b71412a2b2e4e95d68c3914a1da097a518d13bf76f222e45f025d5d24f7ffe7c0ba7f2f9d8514370723c1524c7be0ecfad59e4b07e281f6be873a2e311dd607d
+  metadata.gz: 810e2920086e32fa9df0676b841a593d7bdc8bff8db7c4358db259fea968c38c843edefdc14ec68deb8064db53c12cb3ed0ff154a2684c65173e3262b954a205
+  data.tar.gz: 662839a07ceac0f44114e9beae89bd9ef7c51f49e134c062e3a3557df74bdd2c34393c17b56d4ed17e3c41b93ec1175f923ba193baf99e0c7a7da6fbad6b9eae

data/README.md

@@ -1,9 +1,14 @@
-# carrierwave-postgresql [![Build Status](https://secure.travis-ci.org/diogob/carrierwave-postgresql.png)](http://travis-ci.org/diogob/carrierwave-postgresql)[![Code Climate](https://codeclimate.com/github/diogob/carrierwave-postgresql.png)](https://codeclimate.com/github/diogob/carrierwave-postgresql)
+# carrierwave-postgresql [![Build Status](https://secure.travis-ci.org/diogob/carrierwave-postgresql.svg)](http://travis-ci.org/diogob/carrierwave-postgresql)[![Code Climate](https://codeclimate.com/github/diogob/carrierwave-postgresql.svg)](https://codeclimate.com/github/diogob/carrierwave-postgresql)
 
 This gem adds to [CarrierWave](https://github.com/jnicklas/carrierwave/) a storage facility which will use the PostgreSQL's oid datatype to reference a large object residing in the databse. It supports up to 2GB files, though it's better suited for smaller ones. Makes life easier for fast prototyping and put all your data in the same place, allows one backup for all your data and file storage in heroku servers.
 
 For more information on PostgreSQL Large Objects you can take a look at the [official docs](http://www.postgresql.org/docs/9.2/static/largeobjects.html)
 
+## Note about 0.2.0
+
+This version drops support for ruby 1.9. If you use this version you should stick to 0.1.5.
+The new adition to 0.2.0 is support to JRuby thanks to [@TheKidCoder](https://github.com/TheKidCoder).
+
 ## Installation
 
 Install the latest release:

data/lib/carrierwave-postgresql.rb

@@ -1,3 +1,2 @@
 # encoding: utf-8
-
 require 'carrierwave/postgresql'

data/lib/carrierwave/postgresql.rb

@@ -1,6 +1,11 @@
 # encoding: utf-8
 
 require 'carrierwave'
+if defined?(JRUBY_VERSION)
+  require 'carrierwave/storage/adapters/jdbc_connection'
+else
+  require 'carrierwave/storage/adapters/pg_connection'
+end
 require 'carrierwave/storage/postgresql_lo'
 
 module CarrierWave

data/lib/carrierwave/storage/adapters/jdbc_connection.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+module CarrierWave
+  module Storage
+    module Adapters
+      module JDBCConnection
+        def identifier
+          @oid ||= connection.connection.getLargeObjectAPI.createLO
+        end
+
+        def read
+          @uploader.model.transaction do
+            lo = lo_manager.java_send :open, [Java::long], identifier
+            bytes = lo.read(lo.size)
+            lo.close
+            String.from_java_bytes(bytes)
+          end
+        end
+
+        def write(file)
+          array_buf = java.nio.file.Files.readAllBytes(java.nio.file.Paths.get(file.path))
+          @uploader.model.transaction do
+            lo = lo_manager.java_send :open, [Java::long, Java::int], identifier, Java::OrgPostgresqlLargeobject::LargeObjectManager::WRITE
+            lo.truncate(0)
+            lo.write(array_buf)
+            size = lo.size
+            lo.close
+            size
+          end
+        end
+
+        def delete
+          lo_manager.java_send :unlink, [Java::long], identifier
+        end
+
+        def file_length
+          @uploader.model.transaction do
+            lo = lo_manager.java_send :open, [Java::long], identifier
+            size = lo.size
+            lo.close
+            size
+          end
+        end
+
+        private
+        def lo_manager
+          @lo_manager ||= connection.connection.getLargeObjectAPI
+        end
+      end
+    end
+  end
+end

data/lib/carrierwave/storage/adapters/pg_connection.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+module CarrierWave
+  module Storage
+    module Adapters
+      module PGConnection
+        def identifier
+          @oid ||= connection.lo_creat
+        end
+        
+        def read
+          @uploader.model.transaction do
+            lo = connection.lo_open(identifier)
+            content = connection.lo_read(lo, file_length)
+            connection.lo_close(lo)
+            content
+          end
+        end
+
+        def write(file)
+          @uploader.model.transaction do
+            lo = connection.lo_open(identifier, ::PG::INV_WRITE)
+            connection.lo_truncate(lo, 0)
+            size = connection.lo_write(lo, file.read)
+            connection.lo_close(lo)
+            size
+          end
+        end
+
+        def delete
+          connection.lo_unlink(identifier)
+        end
+
+        def file_length
+          @uploader.model.transaction do
+            lo = connection.lo_open(identifier)
+            size = connection.lo_lseek(lo, 0, 2)
+            connection.lo_close(lo)
+            size
+          end
+        end
+      end
+    end
+  end
+end

data/lib/carrierwave/storage/postgresql_lo.rb

@@ -3,6 +3,12 @@ module CarrierWave
   module Storage
     class PostgresqlLo < Abstract
       class File
+        if defined?(JRUBY_VERSION)
+          include CarrierWave::Storage::Adapters::JDBCConnection
+        else
+          include CarrierWave::Storage::Adapters::PGConnection
+        end
+
         def initialize(uploader)
           @uploader = uploader
         end
@@ -11,41 +17,9 @@ module CarrierWave
           "/#{@uploader.model.class.name.underscore.gsub('/', '_')}_#{@uploader.mounted_as.to_s.underscore}/#{identifier}"
         end
 
-        def read
-          @uploader.model.transaction do
-            lo = connection.lo_open(identifier)
-            content = connection.lo_read(lo, file_length)
-            connection.lo_close(lo)
-            content
-          end
-        end
-
-        def write(file)
-          @uploader.model.transaction do
-            lo = connection.lo_open(identifier, ::PG::INV_WRITE)
-            connection.lo_truncate(lo, 0)
-            size = connection.lo_write(lo, file.read)
-            connection.lo_close(lo)
-            size
-          end
-        end
-
-        def delete
-          connection.lo_unlink(identifier)
-        end
-
         def content_type
         end
 
-        def file_length
-          @uploader.model.transaction do
-            lo = connection.lo_open(identifier)
-            size = connection.lo_lseek(lo, 0, 2)
-            connection.lo_close(lo)
-            size
-          end
-        end
-
         alias :size :file_length
 
         def connection
@@ -76,12 +50,21 @@ module CarrierWave
       end
 
       def identifier
-        @oid ||= connection.lo_creat
+        @oid ||= create_large_object
       end
 
       def connection
         @connection ||= uploader.model.class.connection.raw_connection
       end
+
+      private
+      def create_large_object
+        if defined?(JRUBY_VERSION)
+          connection.connection.getLargeObjectAPI.createLO
+        else
+          connection.lo_creat
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Diogo Biazus
@@ -14,16 +14,16 @@ dependencies:
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -38,34 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.1
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +96,8 @@ files:
 - Rakefile
 - lib/carrierwave-postgresql.rb
 - lib/carrierwave/postgresql.rb
+- lib/carrierwave/storage/adapters/jdbc_connection.rb
+- lib/carrierwave/storage/adapters/pg_connection.rb
 - lib/carrierwave/storage/postgresql_lo.rb
 homepage: https://github.com/diogob/carrierwave-postgresql
 licenses: []