paperclip_database 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfe008fb0a854193ec05d861183921b701c39792
-  data.tar.gz: 96c9078fbc881ffb26a84025a8cec507ada14bba
+  metadata.gz: e61f9497eb7f63600507677ed812ec06d73b91f3
+  data.tar.gz: f7d6a7b6078a95793d1c2f5ed28f72aed0b95930
 SHA512:
-  metadata.gz: bf69777dec19e8c447b8be26339910658059643f535c864859b9b9c1426b682653e8a6e2c917a4bd982524c6947cf989d8e6ed0e938a02c6093bc9d5418ac656
-  data.tar.gz: 52b37c509f81772b957e1b72cb727b6f2d531c85e63c22a13d61081b107647e7e7e7f3fb05c29a79322edf95a0cd9ae37342ec2cc5f798464dd4de50a9625a39
+  metadata.gz: 2b2763dd5d3b108329f2ab1b22c9ee364881ce27e7dfb2b0e0c30e3530569a2fbb2af2e31ce5511200a16701864a291193e80628a1c065ce2086d39fc7342e63
+  data.tar.gz: 79cbf57c646fc0e96e853625f9e3d7777b1f5a870000117c0b2424cb3e2a51b795e67be37eadbb4d266bd186de81c2897edcf286b3f787c4689503a14d08eb98

data/lib/paperclip/storage/database.rb

@@ -82,7 +82,7 @@ module Paperclip
       end
 
       def setup_paperclip_files_association
-        @paperclip_files_association_name = 'paperclip_files'
+        @paperclip_files_association_name = @paperclip_file_model.name.demodulize.tableize
         @database_table = @paperclip_file_model.table_name
         #FIXME: This fails when using  set_table_name "<myname>" in your model
         #FIXME: This should be fixed in ActiveRecord...
@@ -170,6 +170,10 @@ module Paperclip
       end
       alias_method :to_io, :to_file
 
+      def files
+        instance.send("#{@paperclip_files_association_name}")
+      end
+
       def file_for(style)
         db_result = instance.send("#{@paperclip_files_association_name}").send(:file_for, style.to_s)
         raise RuntimeError, "More than one result for #{style}" if db_result.size > 1

data/lib/paperclip_database/version.rb

@@ -1,3 +1,3 @@
 module PaperclipDatabase
-  VERSION = "2.3.0" unless defined? PaperclipDatabase::VERSION
+  VERSION = "2.3.1" unless defined? PaperclipDatabase::VERSION
 end

data/spec/default_options_spec.rb

@@ -24,7 +24,7 @@ describe "PaperclipDatabase" do
     end
 
     it "has association name" do
-      expect(@model.avatar.instance_variable_get(:@paperclip_files_association_name)).to eq 'paperclip_files'
+      expect(@model.avatar.instance_variable_get(:@paperclip_files_association_name)).to eq 'user_avatar_paperclip_files'
     end
 
     it "has model constant" do
@@ -32,7 +32,7 @@ describe "PaperclipDatabase" do
     end
 
     it "has association" do
-      expect(@model.methods.include?(:paperclip_files)).to be_truthy
+      expect(@model.methods.include?(:user_avatar_paperclip_files)).to be_truthy
     end
   end
   describe "Namespaced model" do
@@ -59,7 +59,7 @@ describe "PaperclipDatabase" do
       end
 
       it "has association name" do
-        expect(@model.avatar.instance_variable_get(:@paperclip_files_association_name)).to eq 'paperclip_files'
+        expect(@model.avatar.instance_variable_get(:@paperclip_files_association_name)).to eq 'user_avatar_paperclip_files'
       end
 
       it "has model constant" do
@@ -67,7 +67,7 @@ describe "PaperclipDatabase" do
       end
 
       it "has association" do
-        expect(@model.methods.include?(:paperclip_files)).to be_truthy
+        expect(@model.methods.include?(:user_avatar_paperclip_files)).to be_truthy
       end
     end
   end

data/spec/major_version_API_spec.rb

@@ -1,21 +1,35 @@
 require 'spec_helper'
 
 ##
-## named subject 'association' is the SUT
+## named subject 'attachment' is the SUT
 # args can be
 # [:table_name] The table name
 #
 shared_examples_for "major version API compatible" do |args|
   table_name = args[:table_name]
   describe "Major version compatible with table name '#{table_name}'" do
+    subject{attachment}
     it "has table name '#{table_name}'" do
-      expect(association.instance_variable_get(:@database_table)).to eq table_name
+      expect(subject.instance_variable_get(:@database_table)).to eq table_name
     end
+    ##Basic (common)
+    it { is_expected.to respond_to(:exists?).with(1).argument }
+    it { is_expected.to respond_to(:flush_writes).with(0).argument }
+    it { is_expected.to respond_to(:flush_deletes).with(0).argument }
+    it { is_expected.to respond_to(:copy_to_local_file).with(2).arguments }
+
+    ##Database specific
+    it { is_expected.to respond_to(:files).with(0).arguments }
+    it { is_expected.to respond_to(:database_path).with(1).argument }
+    it { is_expected.to respond_to(:to_file).with(1).argument }
+    it { is_expected.to respond_to(:to_io).with(1).argument }
+    it { is_expected.to respond_to(:file_for).with(1).argument }
+    it { is_expected.to respond_to(:file_contents).with(1).argument }
   end
 end
 
 ## named subject 'namespace' is the SUT
-shared_examples_for "model in namespace" do |args|
+shared_examples_for "model" do |args|
   describe "with default options" do
     let!(:model_name){"#{namespace}User"}
     let!(:attachment_name){'avatar'}
@@ -43,43 +57,33 @@ shared_examples_for "model in namespace" do |args|
 end
 
 describe "PaperclipDatabase" do
-  describe "backward compatibility" do
-    before(:example) do
-      @attachment_table_name = defined?(attachment_table_name) ? attachment_table_name : attachment_name.tableize
-      extra_paperclip_options = defined?(attachment_table_name)? {:database_table => attachment_table_name.to_sym} : {}
+  before(:example) do
+    @attachment_table_name = defined?(attachment_table_name) ? attachment_table_name : attachment_name.tableize
+    extra_paperclip_options = defined?(attachment_table_name)? {:database_table => attachment_table_name.to_sym} : {}
 
-      build_model model_name, (defined?(model_table_name)? model_table_name: nil), attachment_name.to_sym, extra_paperclip_options
-      @model_table_name = model_name.constantize.table_name
-      create_model_tables @model_table_name, @attachment_table_name, attachment_name
-      @model = model_name.constantize.new
-      file = File.open(fixture_file('5k.png'))
+    build_model model_name, (defined?(model_table_name)? model_table_name: nil), attachment_name.to_sym, extra_paperclip_options
+    @model_table_name = model_name.constantize.table_name
+    create_model_tables @model_table_name, @attachment_table_name, attachment_name
+    @model = model_name.constantize.new
+    file = File.open(fixture_file('5k.png'))
 
-      @model.send(:"#{attachment_name}=",file)
-      @model.save
-    end
-    subject(:association){@model.avatar}
-    after(:example) do
-      reset_activerecord
-      reset_database @model_table_name, @attachment_table_name
-    end
+    @model.send(:"#{attachment_name}=",file)
+    @model.save
+  end
+  subject(:attachment){@model.avatar}
+  after(:example) do
+    reset_activerecord
+    reset_database @model_table_name, @attachment_table_name
+  end
 
-    describe "no namespace" do
-      subject(:namespace){''}
-      it_behaves_like "model in namespace"
-    end
-    describe "namespace '::'" do
-      subject(:namespace){'::'}
-      it_behaves_like "model in namespace"
-    end
-    describe "namespace 'Object::'" do
-      subject(:namespace){'Object::'}
-      it_behaves_like "model in namespace"
-    end
-    describe "namespace 'Namespace::'" do
-      before(:context) { Object.const_set('Namespace', Module.new()) }
-      after(:context) { Object.send(:remove_const, 'Namespace') }
-      subject(:namespace){'Namespace::'}
-      it_behaves_like "model in namespace"
-    end
+  describe "model with no namespace" do
+    subject(:namespace){''}
+    it_behaves_like "model"
+  end
+  describe "model in namespace 'Namespace::'" do
+    before(:context) { Object.const_set('Namespace', Module.new()) }
+    after(:context) { Object.send(:remove_const, 'Namespace') }
+    subject(:namespace){'Namespace::'}
+    it_behaves_like "model"
   end
 end

data/spec/namespaced_models_spec.rb

@@ -21,7 +21,7 @@ describe "PaperclipDatabase" do
     end
 
     it "has correct association name" do
-      expect(@model.avatar.instance_variable_get(:@paperclip_files_association_name)).to eq 'paperclip_files'
+      expect(@model.avatar.instance_variable_get(:@paperclip_files_association_name)).to eq 'namespace_model_avatar_paperclip_files'
     end
 
     it "has correct model constant" do
@@ -33,7 +33,7 @@ describe "PaperclipDatabase" do
     end
 
     it "has association" do
-      expect(@model.methods.include?(:paperclip_files)).to be_truthy
+      expect(@model.methods.include?(:namespace_model_avatar_paperclip_files)).to be_truthy
     end
   end
 end

data/spec/single_table_inheritance_spec.rb

@@ -21,7 +21,7 @@ describe "PaperclipDatabase" do
     end
 
     it "has correct association name" do
-      expect(@model.avatar.instance_variable_get(:@paperclip_files_association_name)).to eq 'paperclip_files'
+      expect(@model.avatar.instance_variable_get(:@paperclip_files_association_name)).to eq 'user_avatar_paperclip_files'
     end
 
     it "has correct model constant" do
@@ -33,7 +33,7 @@ describe "PaperclipDatabase" do
     end
 
     it "has association" do
-      expect(@model.methods.include?(:paperclip_files)).to be_truthy
+      expect(@model.methods.include?(:user_avatar_paperclip_files)).to be_truthy
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_database
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Jarl Friis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip