refile-postgres 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41c4e736cddecfc7074a09729f45beb73a33491b
-  data.tar.gz: cc27187f7e397a82da021f29a1115d73946aaa0c
+  metadata.gz: 8b097fc4b87bee20b25c98ada162adf99147f2c4
+  data.tar.gz: f285a72849806fe2d37ce3bcd928ac42c79b7195
 SHA512:
-  metadata.gz: aee232288904b017f79b68ef199a3d8a4226fa4f21ea9c5dafff39ace386cfa8acdccafb0871d77a88e6cb89e758b15bb42426cc71c853765543c4ac4a41c5b9
-  data.tar.gz: 3aecf0a65e5fc3817d568db0f3dd96caa6f9dafedd5914f3575a0a7774e3b1bdabf52a184750bc66f6c2349903bc99eb6c556807a2667e54918719913ba2eb8a
+  metadata.gz: 9a8a599de65bc5295d7710c55f1f0e4ff7b39e203b209cdea2e57b0745d687f0152cc1db7d910fb287adef0249cf75c1763658a1a8335c73d24da1dfc844905f
+  data.tar.gz: 7c6ece224d86451f0cba3ebb7f3570764f5fcf7c3ed7c64599c732d47edf8fbabce8d12d91ea1c3f6bb54a10bd95e561728824f07de4fe42b10a65032ff04f8d

data/.gitignore

@@ -12,3 +12,7 @@
 *.o
 *.a
 mkmf.log
+.ruby-version
+.ruby-gemset
+.vagrant
+berks-cookbooks

data/Berksfile

@@ -0,0 +1,4 @@
+source "https://supermarket.chef.io"
+
+cookbook 'apt', '~> 2.7.0'
+cookbook 'locale', '~> 1.0.2'

data/Berksfile.lock

@@ -0,0 +1,7 @@
+DEPENDENCIES
+  apt (~> 2.7.0)
+  locale (~> 1.0.2)
+
+GRAPH
+  apt (2.7.0)
+  locale (1.0.2)

data/Rakefile

@@ -1,2 +1 @@
 require "bundler/gem_tasks"
-

data/Vagrantfile

@@ -0,0 +1,24 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  config.vm.box = "chef/ubuntu-14.04"
+
+  config.ssh.forward_agent = true
+  config.vm.synced_folder ".", "/home/vagrant/project"
+
+  config.vm.provider "virtualbox" do |vb|
+    vb.memory = "2048"
+    vb.cpus = 2
+  end
+
+  config.berkshelf.enabled = false
+
+  config.vm.provision "chef_solo" do |chef|
+    chef.cookbooks_path = ["cookbooks", "berks-cookbooks"]
+    chef.log_level = :info
+    chef.add_recipe "dev-essential"
+    chef.add_recipe "ruby"
+    chef.add_recipe "postgresql"
+  end
+end

data/cookbooks/dev-essential/metadata.rb

@@ -0,0 +1,8 @@
+name             'dev-essential'
+maintainer       'Krists Ozols'
+maintainer_email 'krists.ozols@gmail.com'
+license          'MIT'
+description      'Installs/Configures some essentials for development'
+version          '0.1.0'
+
+depends 'locale', '~> 1.0.2'

data/cookbooks/dev-essential/recipes/default.rb

@@ -0,0 +1,9 @@
+include_recipe "locale"
+
+%w{
+  git-core curl vim tmux
+}.each do |p|
+  package p do
+    action :install
+  end
+end

data/cookbooks/postgresql/metadata.rb

@@ -0,0 +1,8 @@
+name             'postgresql'
+maintainer       'Krists Ozols'
+maintainer_email 'krists.ozols@gmail.com'
+license          'MIT'
+description      'Installs/Configures PostgreSQL 9.4'
+version          '0.1.0'
+
+depends 'apt', '~> 2.7.0'

data/cookbooks/postgresql/recipes/default.rb

@@ -0,0 +1,29 @@
+apt_repository 'postgresql' do
+  uri          'http://apt.postgresql.org/pub/repos/apt/'
+  distribution 'trusty-pgdg'
+  components   ['main']
+  key          'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
+  action :add
+end
+
+%w{
+  postgresql-9.4
+  postgresql-client-9.4
+  postgresql-contrib-9.4
+  postgresql-server-dev-9.4
+}.each do |p|
+  package p do
+    action :install
+  end
+end
+
+execute 'Create vagrant postgresql user' do
+  guard = <<-EOH
+    psql -U postgres -c "select * from pg_user where
+    usename='vagrant'" |
+    grep -c vagrant
+  EOH
+  user 'postgres'
+  command %{psql -U postgres -c "CREATE ROLE vagrant PASSWORD 'vagrant' SUPERUSER CREATEDB LOGIN;"}
+  not_if guard, user: 'postgres'
+end

data/cookbooks/ruby/attributes/default.rb

@@ -0,0 +1,2 @@
+default[:ruby_install][:version] = '0.5.0'
+default[:chruby][:version] = '0.3.9'

data/cookbooks/ruby/metadata.rb

@@ -0,0 +1,6 @@
+name             'ruby'
+maintainer       'Krists Ozols'
+maintainer_email 'krists.ozols@gmail.com'
+license          'MIT'
+description      'Installs/Configures ruby-installer and chruby'
+version          '0.1.0'

data/cookbooks/ruby/recipes/default.rb

@@ -0,0 +1,52 @@
+
+remote_file "/tmp/ruby-install-#{node[:ruby_install][:version]}.tar.gz" do
+  source "https://github.com/postmodern/ruby-install/archive/v#{node[:ruby_install][:version]}.tar.gz"
+  action :create
+end
+
+bash "Extract ruby-install source code" do
+  code <<-EOH
+    cd /tmp
+    tar -zxvf ruby-install-#{node[:ruby_install][:version]}.tar.gz
+  EOH
+  not_if { ::File.exists?("/tmp/ruby-install-#{node[:ruby_install][:version]}") }
+end
+
+execute 'Install ruby-install' do
+  cwd "/tmp/ruby-install-#{node[:ruby_install][:version]}"
+  command 'make install'
+  action :run
+  not_if { ::File.exists?("/usr/local/bin/ruby-install") }
+end
+
+remote_file "/tmp/chruby-#{node[:chruby][:version]}.tar.gz" do
+  source "https://github.com/postmodern/chruby/archive/v#{node[:chruby][:version]}.tar.gz"
+  action :create
+end
+
+bash "Extract chruby source code" do
+  code <<-EOH
+    cd /tmp
+    tar -zxvf chruby-#{node[:chruby][:version]}.tar.gz
+  EOH
+  not_if { ::File.exists?("/tmp/chruby-#{node[:chruby][:version]}") }
+end
+
+execute 'Install chruby' do
+  cwd "/tmp/chruby-#{node[:chruby][:version]}"
+  command 'make install'
+  action :run
+  not_if { ::File.exists?("/usr/local/bin/chruby") }
+end
+
+file "/etc/profile.d/chruby.sh" do
+  owner 'root'
+  group 'root'
+  mode '0644'
+  content <<-EOC
+    if [ -n "$BASH_VERSION" ] || [ -n "$ZSH_VERSION" ]; then
+      source /usr/local/share/chruby/chruby.sh
+      source /usr/local/share/chruby/auto.sh
+    fi
+  EOC
+end

data/lib/generators/refile/postgres/initializer/templates/refile.rb

@@ -1,4 +1,4 @@
 require "refile"
 Refile.configure do |config|
-  config.store = Refile::Postgres::Backend.new(ActiveRecord::Base.connection.raw_connection)
+  config.store = Refile::Postgres::Backend.new(proc { ActiveRecord::Base.connection.raw_connection } )
 end

data/lib/refile/postgres/backend.rb

@@ -8,19 +8,17 @@ module Refile
       DEFAULT_NAMESPACE = "default"
       PG_LARGE_OBJECT_TABLE = "pg_largeobject"
       READ_CHUNK_SIZE = 3000
+      INIT_CONNECTION_ARG_ERROR_MSG = "When initializing new Refile::Postgres::Backend first argument should be an instance of PG::Connection or a lambda/proc that returns it. When using ActiveRecord it is available as ActiveRecord::Base.connection.raw_connection"
 
-      def initialize(connection, max_size: nil, namespace: DEFAULT_NAMESPACE, registry_table: DEFAULT_REGISTRY_TABLE)
-        unless connection.is_a?(PG::Connection)
-          raise ArgumentError.new("First argument should be an instance of PG::Connection. When using ActiveRecord it is available as ActiveRecord::Base.connection.raw_connection")
-        end
-        @connection = connection
+      def initialize(connection_or_proc, max_size: nil, namespace: DEFAULT_NAMESPACE, registry_table: DEFAULT_REGISTRY_TABLE)
+        @connection_or_proc = connection_or_proc
         @namespace = namespace.to_s
         @registry_table = registry_table
         @registry_table_validated = false
         @max_size = max_size
       end
 
-      attr_reader :connection, :namespace, :max_size
+      attr_reader :namespace, :max_size
 
       def registry_table
         unless @registry_table_validated
@@ -37,6 +35,14 @@ module Refile
         @registry_table
       end
 
+      def connection
+        if has_active_connection?
+          @connection
+        else
+          obtain_new_connection
+        end
+      end
+
       verify_uploadable def upload(uploadable)
         oid = connection.lo_creat
         ensure_in_transaction do
@@ -122,7 +128,20 @@ module Refile
           connection.exec_params("DELETE FROM #{registry_table} WHERE namespace = $1::varchar;", [namespace])
         end
       end
+
+      private
+
+      def has_active_connection?
+        @connection && !@connection.finished?
+      end
+
+      def obtain_new_connection
+        candidate = @connection_or_proc.is_a?(Proc) ? @connection_or_proc.call : @connection_or_proc
+        unless candidate.is_a?(PG::Connection)
+          raise ArgumentError.new(INIT_CONNECTION_ARG_ERROR_MSG)
+        end
+        @connection = candidate
+      end
     end
   end
 end
-

data/lib/refile/postgres/version.rb

@@ -1,5 +1,5 @@
 module Refile
   module Postgres
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/spec/refile/postgres/backend_spec.rb

@@ -1,8 +1,47 @@
 require "spec_helper"
 
 RSpec.describe Refile::Postgres::Backend do
-  let(:db_connection) { PG.connect(dbname: 'refile_test') }
-  let(:backend) { Refile::Postgres::Backend.new(db_connection, max_size: 100) }
+  let(:connection_or_proc) { PG.connect(dbname: 'refile_test') }
+  let(:backend) { Refile::Postgres::Backend.new(connection_or_proc, max_size: 100) }
   it_behaves_like :backend
-end
 
+  context "Connection tests" do
+    def connection
+      PG.connect(dbname: 'refile_test')
+    end
+
+    context "when using proc" do
+      def connection_or_proc
+        proc { connection }
+      end
+
+      it "reuses the same PG::Connection if connection is ok" do
+        expect(backend.connection).to eq(backend.connection)
+      end
+
+      it "executes proc and obtains new connection if old one is closed" do
+        old = backend.connection
+        old.close
+        expect(backend.connection).not_to eq(old)
+        expect(backend.connection.finished?).to be_falsey
+      end
+    end
+
+    context "when not using procs and providing PG::Connection directly" do
+      def connection_or_proc
+        connection
+      end
+
+      it "reuses the same PG::Connection" do
+        expect(backend.connection).to eq(backend.connection)
+      end
+
+      it "continues to use old connection if the old one is closed" do
+        old = backend.connection
+        old.close
+        expect(backend.connection).to eq(old)
+        expect(backend.connection.finished?).to be_truthy
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,12 +2,12 @@ $LOAD_PATH.unshift(File.join(Gem::Specification.find_by_name("refile").gem_dir,
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require "refile/spec_helper"
 require "pg"
+require "pry"
 require "refile/postgres"
 
 RSpec.configure do |config|
   config.before(:all) do
-    DB_NAME = 'refile_test'
-    connection = PG.connect(dbname: DB_NAME)
+    connection = PG.connect(dbname: 'refile_test')
     connection.exec %{ DROP TABLE IF EXISTS #{Refile::Postgres::Backend::DEFAULT_REGISTRY_TABLE} CASCADE; }
     connection.exec %{
       CREATE TABLE IF NOT EXISTS #{Refile::Postgres::Backend::DEFAULT_REGISTRY_TABLE}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refile-postgres
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Krists Ozols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refile
@@ -145,10 +145,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Berksfile
+- Berksfile.lock
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vagrantfile
+- cookbooks/dev-essential/metadata.rb
+- cookbooks/dev-essential/recipes/default.rb
+- cookbooks/postgresql/metadata.rb
+- cookbooks/postgresql/recipes/default.rb
+- cookbooks/ruby/attributes/default.rb
+- cookbooks/ruby/metadata.rb
+- cookbooks/ruby/recipes/default.rb
 - lib/generators/refile/postgres/initializer/USAGE
 - lib/generators/refile/postgres/initializer/initializer_generator.rb
 - lib/generators/refile/postgres/initializer/templates/refile.rb
@@ -183,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Postgres database as a backend for Refile