paperclip-time-stamped 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/paperclip-time-stamped.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'active_record'
+require 'paperclip'
 
 ActiveRecord::Base.class_eval do
 
@@ -22,7 +23,7 @@ ActiveRecord::Base.class_eval do
     end
 
     define_method("#{name}?") do |*style|
-      style.empty? ? send(name).exists? : File.file?(send("#{name}_path", style.first))
+      send(name).exists? && (style.empty? || File.file?(send("#{name}_path", style.first)))
     end
 
   end

data/paperclip-time-stamped.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paperclip-time-stamped}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcin Nowicki"]

data/spec/paperclip-time-stamped_spec.rb

@@ -1,8 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'active_record_connectionless'
 
+Paperclip::Attachment::RAILS_ROOT = '/'
+
 class PaperclipTimeStamped < ActiveRecord::Base
 
+  has_attached_file :name, :styles => {:thumbnail=> "80x80>", :small => "180x180>"}, :path => '/'
   has_timestamped_paperclip_attachment :name
 
 end
@@ -28,17 +31,33 @@ describe "PaperclipTimeStamped" do
   end
 
   describe 'name?' do
-    it 'should be delegated to name.exists? when there is no style given' do
-      @name.should_receive(:exists?).and_return(true)
+    it 'should be true when name.exists? is true and no style given' do
       @paperclip_time_stamped.should_receive(:name).and_return(@name)
+      @name.should_receive(:exists?).and_return(true)
       @paperclip_time_stamped.name?.should be_true
     end
 
-    it 'should return File.file? on given file with style when style given' do
+    it 'should be true when name.exists? is true and File.file? on given file with style is true' do
+      @paperclip_time_stamped.should_receive(:name).and_return(@name)
+      @name.should_receive(:exists?).and_return(true)
       File.should_receive(:file?).with('path').and_return(true)
       @paperclip_time_stamped.should_receive(:name_path).with(:small).and_return('path')
       @paperclip_time_stamped.name?(:small).should be_true
     end
+
+    it 'should be false when name.exists? is false' do
+      @paperclip_time_stamped.should_receive(:name).and_return(@name)
+      @name.should_receive(:exists?).and_return(false)
+      @paperclip_time_stamped.name?(:small).should be_false
+    end
+
+    it 'should be false when name.exists? is true but File.file? on given file with style is false' do
+      @name.should_receive(:exists?).and_return(true)
+      @paperclip_time_stamped.should_receive(:name).and_return(@name)
+      File.should_receive(:file?).with('path').and_return(false)
+      @paperclip_time_stamped.should_receive(:name_path).with(:small).and_return('path')
+      @paperclip_time_stamped.name?(:small).should be_false
+    end
   end
 
   describe 'name_timestamp' do
@@ -61,4 +80,8 @@ describe "PaperclipTimeStamped" do
     @paperclip_time_stamped.timestamped_name_url(:small).should == 'name_url?1000000000'
   end
 
+  it 'should work in normal environment' do
+    @paperclip_time_stamped.timestamped_name_url(:thumbnail)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip-time-stamped
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Marcin Nowicki