polypaperclip 0.1.8 → 0.1.13

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
-gem "rake", "0.8.7"
+gem "rake", "~> 0.8.7"
 gem "paperclip", "~> 2.3"
 
 gem "rails", "~>3.0.0"
 
 group :development do
-  gem "ruby-debug"
+  gem "ruby-debug19"
   gem "rspec", "~> 2.3.0"
   gem "yard", "~> 0.6.0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -28,9 +28,10 @@ GEM
       activemodel (= 3.0.7)
       activesupport (= 3.0.7)
     activesupport (3.0.7)
+    archive-tar-minitar (0.5.2)
     arel (2.0.10)
     builder (2.1.2)
-    columnize (0.3.2)
+    columnize (0.3.4)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -40,7 +41,8 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    linecache (0.43)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -80,11 +82,16 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -103,9 +110,9 @@ DEPENDENCIES
   mocha
   paperclip (~> 2.3)
   rails (~> 3.0.0)
-  rake (= 0.8.7)
+  rake (~> 0.8.7)
   rcov
   rspec (~> 2.3.0)
-  ruby-debug
+  ruby-debug19
   sqlite3-ruby (~> 1.3.0)
   yard (~> 0.6.0)

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.13

data/lib/polypaperclip.rb

@@ -72,7 +72,7 @@ module Polypaperclip
     #we override Paperclip's each_attachment so that we proxy through the attachments model
     def each_attachment
       self.class.polypaperclip_definitions.each do |name, definition|
-        yield(name, paperclip_attachment_for(name)) rescue nil
+        yield(name, paperclip_attachment_for(name))
       end
     end
     

data/lib/polypaperclip/attachment.rb

@@ -18,6 +18,14 @@ module Polypaperclip
       build_instance if @instance.nil? #we want to replace
       super
     end
+
+    def instance_read(attr)
+      if @instance.nil?
+        nil
+      else
+        super
+      end
+    end
     
     protected
     def build_instance

data/polypaperclip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{polypaperclip}
-  s.version = "0.1.8"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dan Pickett"]
-  s.date = %q{2011-07-13}
+  s.authors = [%q{Dan Pickett}]
+  s.date = %q{2011-07-30}
   s.description = %q{hacks paperclip to have a single repo of attachments}
   s.email = %q{dpickett@enlightsolutions.com}
   s.extra_rdoc_files = [
@@ -36,27 +36,28 @@ Gem::Specification.new do |s|
     "spec/database.yml",
     "spec/fixtures/rails.png",
     "spec/page_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/super_page_spec.rb"
   ]
   s.homepage = %q{http://github.com/dpickett/polypaperclip}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Polymorphic attachments with paperclip}
   s.test_files = [
     "spec/page_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/super_page_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_runtime_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_runtime_dependency(%q<paperclip>, ["~> 2.3"])
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -65,10 +66,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      s.add_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<paperclip>, ["~> 2.3"])
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -78,10 +79,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rake>, ["= 0.8.7"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<paperclip>, ["~> 2.3"])
     s.add_dependency(%q<rails>, ["~> 3.0.0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/spec/page_spec.rb

@@ -57,7 +57,26 @@ describe "Page" do
     subject.primary_image.url.should_not be_nil
     subject.primary_image_attachment.attachment_type.should eql("primary_image")
   end
-  
+
+  it "destroys without error" do
+    attach_primary_image
+    subject.save!
+    lambda { subject.destroy }.should_not raise_error
+  end
+
+  it "destroys without error if I don't have an attachment" do
+    attach_primary_image
+    subject.save!
+    lambda { subject.destroy }.should_not raise_error
+  end
+
+  it "removes the association" do
+    attach_primary_image
+    subject.save!
+    subject.destroy
+    subject.attachments.count.should eql(0)
+  end
+
   PRIMARY_IMAGE_PATH = File.dirname(__FILE__) + "/fixtures/rails.png"
   def attach_primary_image
     subject.primary_image = File.open(PRIMARY_IMAGE_PATH)

data/spec/spec_helper.rb

@@ -41,6 +41,9 @@ RSpec.configure do |config|
         :styles => {:large => "200x200", :thumb => "50x50"}
     end
     
+    class SuperPage < Page
+    end
+    
     Object.const_set(:Rails, stub('Rails', :root => File.dirname(__FILE__), :env => 'test'))
   end
 end

data/spec/super_page_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe "SuperPage" do
+  subject { SuperPage.new(:name => "some page") }
+
+  its(:primary_image) { should_not be_nil }
+  its(:primary_image_attachment) { should be_nil }
+  
+  its(:secondary_image) { should_not be_nil }
+  its(:secondary_image_attachment) { should be_nil }
+  
+  it "does not save an attachment if I did not assign one" do
+    subject.save!
+    subject.primary_image_attachment.should be_nil
+  end
+  
+  it "saves an attachment when I do save one" do
+    attach_primary_image
+    subject.save!
+    subject.primary_image_attachment.should_not be_nil
+  end
+  
+  PRIMARY_IMAGE_PATH = File.dirname(__FILE__) + "/fixtures/rails.png"
+  def attach_primary_image
+    subject.primary_image = File.open(PRIMARY_IMAGE_PATH)
+  end
+end

metadata

@@ -1,202 +1,145 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: polypaperclip
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
+version: !ruby/object:Gem::Version
+  version: 0.1.13
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Dan Pickett
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-13 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-07-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2168810580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  name: rake
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2168810580
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: &2168826480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
-  name: paperclip
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2168826480
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2168826000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  name: rails
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2168826000
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &2168825520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: ruby-debug
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2168825520
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2168825040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
-  name: rspec
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2168825040
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2168824560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  name: yard
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2168824560
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2168824080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  name: bundler
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2168824080
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2168823600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2168823600
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &2168823120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  name: sqlite3-ruby
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2168823120
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2168822640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rcov
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2168822640
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2168822160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: mocha
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *2168822160
 description: hacks paperclip to have a single repo of attachments
 email: dpickett@enlightsolutions.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -217,40 +160,36 @@ files:
 - spec/fixtures/rails.png
 - spec/page_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
+- spec/super_page_spec.rb
 homepage: http://github.com/dpickett/polypaperclip
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -747686627091737760
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Polymorphic attachments with paperclip
-test_files: 
+test_files:
 - spec/page_spec.rb
 - spec/spec_helper.rb
+- spec/super_page_spec.rb