carrierwave-postgresql-table 1.0.2 → 1.1.0

data/gemfiles/carrierwave_1.x_rails_5.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "carrierwave", "~> 1.0"
+gem "rails", "~> 5.2.0"
+
+gemspec path: "../"

data/gemfiles/carrierwave_1.x_rails_5.2.gemfile.lock

@@ -0,0 +1,166 @@
+PATH
+  remote: ..
+  specs:
+    carrierwave-postgresql-table (1.1.0)
+      activerecord
+      carrierwave
+      pg
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.1)
+      actionpack (= 5.2.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.1)
+      actionview (= 5.2.1)
+      activesupport (= 5.2.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.1)
+      activesupport (= 5.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.1)
+      activesupport (= 5.2.1)
+      globalid (>= 0.3.6)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activerecord (5.2.1)
+      activemodel (= 5.2.1)
+      activesupport (= 5.2.1)
+      arel (>= 9.0)
+    activestorage (5.2.1)
+      actionpack (= 5.2.1)
+      activerecord (= 5.2.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    ast (2.4.0)
+    builder (3.2.3)
+    carrierwave (1.2.3)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    concurrent-ruby (1.1.3)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    erubi (1.7.1)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.1)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
+    mimemagic (0.3.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
+    pg (1.1.3)
+    powerpack (0.1.2)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.1)
+      actioncable (= 5.2.1)
+      actionmailer (= 5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
+      activemodel (= 5.2.1)
+      activerecord (= 5.2.1)
+      activestorage (= 5.2.1)
+      activesupport (= 5.2.1)
+      bundler (>= 1.3.0)
+      railties (= 5.2.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.1)
+      actionpack (= 5.2.1)
+      activesupport (= 5.2.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rubocop (0.60.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.4.0)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 2.2.0)
+  bundler (>= 1.0)
+  carrierwave (~> 1.0)
+  carrierwave-postgresql-table!
+  database_cleaner (~> 1.7.0)
+  minitest (~> 5.11)
+  rack-test (>= 0.6)
+  rails (~> 5.2.0)
+  rake (~> 12.3)
+  rubocop (>= 0.60)
+
+BUNDLED WITH
+   1.17.1

data/lib/carrierwave-postgresql-table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record"
 require "pg"
 require "carrierwave"

data/lib/carrierwave/postgresql_table/rack_app.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module CarrierWave
   module PostgresqlTable
     class RackApp
-      READ_CHUNK_SIZE = 16384
+      READ_CHUNK_SIZE = 16_384
 
       def call(env)
         request = Rack::Request.new(env)
 
         strip_prefix = "/"
-        if(defined?(Rails) && Rails.application && Rails.application.config.relative_url_root)
+        if (defined?(Rails) && Rails.application && Rails.application.config.relative_url_root)
           strip_prefix = File.join(Rails.application.config.relative_url_root, "/")
         end
         path = request.path.sub(/^#{Regexp.escape(strip_prefix)}/, "")
         file = CarrierWave::Storage::PostgresqlTable::File.new(path)
 
-        unless(file.exists?)
+        unless file.exists?
           return [404, { "Content-Type" => "text/plain" }, ["Not Found"]]
         end
 
@@ -23,12 +25,12 @@ module CarrierWave
           "Content-Disposition" => "inline",
         }
 
-        if(request.params["download"] == "true")
+        if (request.params["download"] == "true")
           headers["Content-Disposition"] = "attachment; filename=#{file.filename}"
         end
 
         body = Enumerator.new do |response_body|
-          while(chunk = file.read(READ_CHUNK_SIZE)) do
+          while (chunk = file.read(READ_CHUNK_SIZE))
             response_body << chunk
           end
         end

data/lib/carrierwave/postgresql_table/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module CarrierWave
   module PostgresqlTable
-    VERSION = "1.0.2"
+    VERSION = "1.1.0".freeze
   end
 end

data/lib/carrierwave/storage/postgresql_table.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module CarrierWave
   module Storage
     class PostgresqlTable < Abstract
       def store!(file)
-        if(uploader.move_to_store && file.kind_of?(CarrierWave::Storage::PostgresqlTable::File))
+        if (uploader.move_to_store && file.kind_of?(CarrierWave::Storage::PostgresqlTable::File))
           file.move_to(uploader.store_path)
           file
         else
@@ -33,7 +35,7 @@ module CarrierWave
 
       def clean_cache!(seconds)
         time = Time.now - seconds.seconds
-        CarrierWaveFile.delete_all_files("path LIKE #{CarrierWaveFile.sanitize(::File.join(uploader.cache_dir, "%"))} AND updated_at < #{CarrierWaveFile.sanitize(time)}")
+        CarrierWaveFile.delete_all_files("path LIKE #{CarrierWaveFile.connection.quote(::File.join(uploader.cache_dir, "%"))} AND updated_at < #{CarrierWaveFile.connection.quote(time)}")
       end
 
       class CarrierWaveFile < ::ActiveRecord::Base
@@ -48,8 +50,8 @@ module CarrierWave
       end
 
       class File
-        READ_CHUNK_SIZE = 16384
-        STREAM_CHUNK_SIZE = 16384
+        READ_CHUNK_SIZE = 16_384
+        STREAM_CHUNK_SIZE = 16_384
 
         attr_reader :path
 
@@ -66,7 +68,7 @@ module CarrierWave
 
             begin
               lo = raw_connection.lo_open(@record.pg_largeobject_oid)
-              if(length)
+              if length
                 raw_connection.lo_lseek(lo, @read_pos, PG::SEEK_SET)
                 data = raw_connection.lo_read(lo, length)
                 @read_pos = raw_connection.lo_tell(lo)
@@ -74,11 +76,11 @@ module CarrierWave
                 data = raw_connection.lo_read(lo, self.size)
               end
             ensure
-              raw_connection.lo_close(lo) if(lo)
+              raw_connection.lo_close(lo) if lo
             end
           end
 
-          if(buffer && data)
+          if (buffer && data)
             buffer.replace(data)
           end
 
@@ -122,7 +124,7 @@ module CarrierWave
           @record.update_attribute(:content_type, new_content_type)
         end
 
-        def url(options = {})
+        def url(_options = {})
           ::File.join("/", @path)
         end
 
@@ -131,7 +133,7 @@ module CarrierWave
             connection = CarrierWaveFile.connection
             raw_connection = connection.raw_connection
             oid = nil
-            if(new_file.kind_of?(CarrierWave::Storage::PostgresqlTable::File))
+            if new_file.kind_of?(CarrierWave::Storage::PostgresqlTable::File)
               file = new_file
             else
               file = new_file.to_file
@@ -141,7 +143,7 @@ module CarrierWave
               oid = @record.pg_largeobject_oid || raw_connection.lo_creat
               handle = raw_connection.lo_open(oid, PG::INV_WRITE)
               raw_connection.lo_truncate(handle, 0)
-              buffer = ""
+              buffer = String.new # rubocop:disable Style/EmptyLiteral
               until file.eof?
                 file.read(READ_CHUNK_SIZE, buffer)
                 raw_connection.lo_write(handle, buffer)
@@ -160,9 +162,9 @@ module CarrierWave
 
               # Cleanup old, unused largeobject OIDs if we're updating the
               # record with a new OID reference.
-              if(old_oid && old_oid != oid)
-                old_references = connection.select_value("SELECT COUNT(*) FROM #{CarrierWaveFile.table_name} WHERE pg_largeobject_oid = #{CarrierWaveFile.sanitize(old_oid)}").to_i
-                if(old_references == 0)
+              if (old_oid && old_oid != oid)
+                old_references = connection.select_value("SELECT COUNT(*) FROM #{CarrierWaveFile.table_name} WHERE pg_largeobject_oid = #{CarrierWaveFile.connection.quote(old_oid)}").to_i
+                if (old_references == 0)
                   raw_connection.lo_unlink(old_oid)
                 end
               end
@@ -180,7 +182,7 @@ module CarrierWave
         def move_to(new_path)
           CarrierWaveFile.transaction do
             # Remove any existing files at the current path.
-            CarrierWaveFile.delete_all_files("path = #{CarrierWaveFile.sanitize(new_path)} AND id != #{CarrierWaveFile.sanitize(@record.id)}")
+            CarrierWaveFile.delete_all_files("path = #{CarrierWaveFile.connection.quote(new_path)} AND id != #{CarrierWaveFile.connection.quote(@record.id)}")
 
             # Change the current record's path to the new path.
             @record.update_attribute(:path, new_path)
@@ -188,7 +190,7 @@ module CarrierWave
         end
 
         def delete
-          CarrierWaveFile.delete_all_files("id = #{CarrierWaveFile.sanitize(@record.id)}")
+          CarrierWaveFile.delete_all_files("id = #{CarrierWaveFile.connection.quote(@record.id)}")
         end
 
         private

data/lib/generators/carrierwave_postgresql_table/migration/migration_generator.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require "rails/generators/active_record"
 
 module CarrierwavePostgresqlTable
   class MigrationGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
-    source_root(File.expand_path("../templates", __FILE__))
+    source_root(File.expand_path("templates", __dir__))
 
-    def self.next_migration_number(dirname)
+    def self.next_migration_number(_dirname)
       Time.now.utc.strftime("%Y%m%d%H%M%S")
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-postgresql-table
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Muerdter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,98 +58,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.60'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.60'
 description: 
 email:
 - nick.muerdter@nrel.gov
@@ -157,7 +171,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -167,13 +183,22 @@ files:
 - bin/console
 - bin/setup
 - carrierwave-postgresql-table.gemspec
-- circle.yml
 - gemfiles/carrierwave_0.11_rails_4.2.gemfile
 - gemfiles/carrierwave_0.11_rails_4.2.gemfile.lock
-- gemfiles/carrierwave_1.0.0_rails_4.2.gemfile
-- gemfiles/carrierwave_1.0.0_rails_4.2.gemfile.lock
-- gemfiles/carrierwave_1.0.0_rails_5.0.gemfile
-- gemfiles/carrierwave_1.0.0_rails_5.0.gemfile.lock
+- gemfiles/carrierwave_1.0_rails_4.2.gemfile
+- gemfiles/carrierwave_1.0_rails_4.2.gemfile.lock
+- gemfiles/carrierwave_1.1_rails_4.2.gemfile
+- gemfiles/carrierwave_1.1_rails_4.2.gemfile.lock
+- gemfiles/carrierwave_1.2_rails_4.2.gemfile
+- gemfiles/carrierwave_1.2_rails_4.2.gemfile.lock
+- gemfiles/carrierwave_1.x_rails_4.2.gemfile
+- gemfiles/carrierwave_1.x_rails_4.2.gemfile.lock
+- gemfiles/carrierwave_1.x_rails_5.0.gemfile
+- gemfiles/carrierwave_1.x_rails_5.0.gemfile.lock
+- gemfiles/carrierwave_1.x_rails_5.1.gemfile
+- gemfiles/carrierwave_1.x_rails_5.1.gemfile.lock
+- gemfiles/carrierwave_1.x_rails_5.2.gemfile
+- gemfiles/carrierwave_1.x_rails_5.2.gemfile.lock
 - lib/carrierwave-postgresql-table.rb
 - lib/carrierwave/postgresql_table/rack_app.rb
 - lib/carrierwave/postgresql_table/version.rb
@@ -193,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -201,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Store CarrierWave files in PostgreSQL (supporting multiple versions per uploader).