glebtv-mongoid-paperclip 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGM0YjAxZjY2ODU1ODFkYjAxZmU0ZWIyYTkwOWUxMWNhNjhmOWQ4Ng==
-  data.tar.gz: !binary |-
-    ODM4NjBiYjk2NDMwYjYzZDgyZDViNzc5NTA1MWJiMzFkNWUyOGRiMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MDQ3NjQzMjU3NmM3YzBjNzdjMjM1Mjg3OTg4YzhhNjgzNDkyODlhNjZkZmVi
-    YzFiMTk2MTdjNjM1YmU2MTZhMWJiZDQ2NjBkY2FmMzI0NTI5OTU2ODhjYTY1
-    NWRiOGE3ZWJmN2Y3MWMwZTU2ZTAwODU2NGQ5ZDlmYTQ2MDdhYmY=
-  data.tar.gz: !binary |-
-    ZGMwMmE0ZTA0NDMwNjMyY2EyNDZkZGMyMmU2NWE5MDI0YzJmMThiNDNkNzk1
-    Y2RlOGVkNzlmYTdmMjUwODlkMmMxODc0ZjNkM2M3MDU4YjY2OTYzOGY5MzUx
-    NDI3OWVmYzc1NmRmOTdmNjkwYTNiYzA4ODU3MmNjNjVjNzFkN2I=
+SHA1:
+  metadata.gz: 7ceed3a9c17c2536f40a9a0ae4c49bf625e4a38c
+  data.tar.gz: b313778d936567e35b839781f2c4e19aa774b9be
+SHA512:
+  metadata.gz: 8de6e40f0576aea85b5e07d6b0aee30d351ab18408c3094491fd8dfe6d969285c4d7dfac55bee32e426017719616eaee9966fe8221ec4670b1b8da00555ad366
+  data.tar.gz: cbef77213caf0bf2dc9d663b5e4ccc8a19f3c10a6286ed9ce21fc603c0ef8ef485e018c33aff38f12d7e4774b1bb1cbdb36c88da13114f1124ee5db3a41dc45d

data/.gitignore

@@ -1,4 +1,17 @@
-.DS_Store
-mongoid-paperclip-*.gem
-.*swp
-.*swo
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.travis.yml

@@ -0,0 +1,19 @@
+services: mongodb
+
+notifications:
+  email: false
+
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode
+
+gemfile:
+  - Gemfile
+  - gemfiles/carrierwave-0.8.gemfile
+  - gemfiles/carrierwave-master.gemfile
+  - gemfiles/mongoid-3.0.gemfile
+  - gemfiles/mongoid-3.1.gemfile
+  - gemfiles/mongoid-4.0.gemfile

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem "mongoid", github: "mongoid/mongoid", branch: "master"
+
 # Specify your gem's dependencies in mongoid_rating.gemspec
 gemspec

data/Gemfile.lock

@@ -1,37 +1,66 @@
+GIT
+  remote: git://github.com/mongoid/mongoid.git
+  revision: 5b0f031992cbec66d68c6cb288a4edb952ed5336
+  branch: master
+  specs:
+    mongoid (4.0.0.beta1)
+      activemodel (>= 4.0.0)
+      moped (~> 2.0.beta6)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+
 PATH
   remote: .
   specs:
     glebtv-mongoid-paperclip (0.1.0)
+      mongoid (>= 3.0, < 5.0)
       paperclip (>= 2.3.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
-    activesupport (4.0.0)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     atomic (1.1.14)
+    bson (2.2.0)
     builder (3.1.4)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.2)
+    cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
-    i18n (0.6.5)
-    mime-types (1.25)
+    connection_pool (1.2.0)
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
+    mime-types (2.1)
     minitest (4.7.5)
-    multi_json (1.8.2)
-    paperclip (3.5.1)
+    moped (2.0.0.beta6)
+      bson (~> 2.2)
+      connection_pool (~> 1.2)
+      optionable (~> 0.2.0)
+    multi_json (1.8.4)
+    optionable (0.2.0)
+    origin (2.1.0)
+    paperclip (4.0.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
+      cocaine (~> 0.5.3)
       mime-types
-    rake (10.1.0)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.5)
     thread_safe (0.1.3)
       atomic
     tzinfo (0.3.38)
@@ -40,6 +69,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler
   glebtv-mongoid-paperclip!
+  mongoid!
   rake
+  rspec

data/README.md

@@ -1,6 +1,10 @@
 Mongoid::Paperclip - Making Paperclip play nice with Mongoid ODM
 ================================================================
 
+## WARN
+
+.destroy_all on embedded relations DOES NOT WORK, you have to use .destroy
+
 As the title suggests: `Mongoid::Paperclip` makes it easy to hook up [Paperclip](https://github.com/thoughtbot/paperclip) with [Mongoid](http://mongoid.org/).
 
 This is actually easier and faster to set up than when using Paperclip and the ActiveRecord ORM.
@@ -14,7 +18,7 @@ Simply define the `mongoid-paperclip` gem inside your `Gemfile`. Additionally, y
 
 **Rails.root/Gemfile - Just define the following:**
 
-    gem "mongoid-paperclip", :require => "mongoid_paperclip"
+    gem "glebtv-mongoid-paperclip"
     gem 'aws-sdk', '~> 1.3.4'
 
 Next let's assume we have a User model and we want to allow our users to upload an avatar.

data/gemfiles/mongoid-3.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "3.1.0-stable"
+
+gemspec path: "../"

data/gemfiles/mongoid-4.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "master"
+
+gemspec path: "../"

data/glebtv-mongoid-paperclip.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'paperclip', ['>= 2.3.6']
-  gem.add_development_dependency "bundler", "~> 1.3"
+  gem.add_dependency "mongoid", [">= 3.0", "< 5.0"]
+  gem.add_development_dependency "bundler"
+  gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
 end
 

data/lib/glebtv-mongoid-paperclip.rb

@@ -1,105 +1 @@
-# encoding: utf-8
-
-require "mongoid-paperclip/version"
-
-begin
-  require "paperclip"
-rescue LoadError
-  puts "Mongoid::Paperclip requires that you install the Paperclip gem."
-  exit
-end
-
-##
-# the id of mongoid is not integer, correct the id_partitioin.
-Paperclip.interpolates :id_partition do |attachment, style|
-  attachment.instance.id.to_s.scan(/.{4}/).join("/")
-end
-
-##
-# mongoid criteria uses a different syntax.
-module Paperclip
-  module Helpers
-    def each_instance_with_attachment(klass, name)
-      class_for(klass).unscoped.where("#{name}_file_name".to_sym.ne => nil).each do |instance|
-        yield(instance)
-      end
-    end
-  end
-end
-
-##
-# The Mongoid::Paperclip extension
-# Makes Paperclip play nice with the Mongoid ODM
-#
-# Example:
-#
-#  class User
-#    include Mongoid::Document
-#    include Mongoid::Paperclip
-#
-#    has_mongoid_attached_file :avatar
-#  end
-#
-# The above example is all you need to do. This will load the Paperclip library into the User model
-# and add the "has_mongoid_attached_file" class method. Provide this method with the same values as you would
-# when using "vanilla Paperclip". The first parameter is a symbol [:field] and the second parameter is a hash of options [options = {}].
-#
-# Unlike Paperclip for ActiveRecord, since MongoDB does not use "schema" or "migrations", Mongoid::Paperclip automatically adds the neccesary "fields"
-# to your Model (MongoDB collection) when you invoke the "#has_mongoid_attached_file" method. When you invoke "has_mongoid_attached_file :avatar" it will
-# automatially add the following fields:
-#
-#  field :avatar_file_name,    :type => String
-#  field :avatar_content_type, :type => String
-#  field :avatar_file_size,    :type => Integer
-#  field :avatar_updated_at,   :type => DateTime
-#  field :avatar_fingerprint,  :type => String
-#
-module Mongoid
-  module Paperclip
-
-    ##
-    # Extends the model with the defined Class methods
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-
-      ##
-      # Adds Mongoid::Paperclip's "#has_mongoid_attached_file" class method to the model
-      # which includes Paperclip and Paperclip::Glue in to the model. Additionally
-      # it'll also add the required fields for Paperclip since MongoDB is schemaless and doesn't
-      # have migrations.
-      def has_mongoid_attached_file(field, options = {})
-
-        ##
-        # Include Paperclip and Paperclip::Glue for compatibility
-        unless self.ancestors.include?(::Paperclip)
-          include ::Paperclip
-          include ::Paperclip::Glue
-        end
-
-        ##
-        # Invoke Paperclip's #has_attached_file method and passes in the
-        # arguments specified by the user that invoked Mongoid::Paperclip#has_mongoid_attached_file
-        has_attached_file(field, options)
-
-        ##
-        # Define the necessary collection fields in Mongoid for Paperclip
-        field(:"#{field}_file_name",    :type => String)
-        field(:"#{field}_content_type", :type => String)
-        field(:"#{field}_file_size",    :type => Integer)
-        field(:"#{field}_updated_at",   :type => DateTime)
-        field(:"#{field}_fingerprint",  :type => String)
-      end
-
-      ##
-      # This method is deprecated
-      def has_attached_file(field, options = {})
-        raise "Mongoid::Paperclip#has_attached_file is deprecated, " +
-              "Use 'has_mongoid_attached_file' instead"
-      end
-    end
-
-  end
-end
+require 'mongoid-paperclip'

data/lib/mongoid-paperclip/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Paperclip
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/mongoid-paperclip.rb

@@ -0,0 +1,125 @@
+# encoding: utf-8
+
+require "mongoid-paperclip/version"
+require "active_support/concern"
+
+begin
+  require "paperclip"
+rescue LoadError
+  puts "Mongoid::Paperclip requires that you install the Paperclip gem."
+  exit
+end
+
+##
+# the id of mongoid is not integer, correct the id_partitioin.
+Paperclip.interpolates :id_partition do |attachment, style|
+  attachment.instance.id.to_s.scan(/.{4}/).join("/")
+end
+
+Paperclip.interpolates :id_partition_in_8 do |attachment, style|
+  attachment.instance.id.to_s.scan(/.{8}/).join("/")
+end
+
+##
+# mongoid criteria uses a different syntax.
+module Paperclip
+  module Helpers
+    # Find all instances of the given Active Record model +klass+ with attachment +name+.
+    # This method is used by the refresh rake tasks.
+    def each_instance_with_attachment(klass, name)
+      if defined?(Mongoid::Document) && class_for(klass) < Mongoid::Document
+        class_for(klass).unscoped.where("#{name}_file_name" => {:$exists => true}).to_a.map do |instance|
+          yield(instance)
+        end
+      else
+        class_for(klass).unscoped.where("#{name}_file_name IS NOT NULL").find_each do |instance|
+          yield(instance)
+        end
+      end
+    end
+  end
+end
+
+##
+# The Mongoid::Paperclip extension
+# Makes Paperclip play nice with the Mongoid ODM
+#
+# Example:
+#
+#  class User
+#    include Mongoid::Document
+#    include Mongoid::Paperclip
+#
+#    has_mongoid_attached_file :avatar
+#  end
+#
+# The above example is all you need to do. This will load the Paperclip library into the User model
+# and add the "has_mongoid_attached_file" class method. Provide this method with the same values as you would
+# when using "vanilla Paperclip". The first parameter is a symbol [:field] and the second parameter is a hash of options [options = {}].
+#
+# Unlike Paperclip for ActiveRecord, since MongoDB does not use "schema" or "migrations", Mongoid::Paperclip automatically adds the neccesary "fields"
+# to your Model (MongoDB collection) when you invoke the "#has_mongoid_attached_file" method. When you invoke "has_mongoid_attached_file :avatar" it will
+# automatially add the following fields:
+#
+#  field :avatar_file_name,    :type => String
+#  field :avatar_content_type, :type => String
+#  field :avatar_file_size,    :type => Integer
+#  field :avatar_updated_at,   :type => DateTime
+#  field :avatar_fingerprint,  :type => String
+
+module Mongoid
+  module Paperclip
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      
+      # https://github.com/meskyanichi/mongoid-paperclip/pull/45
+      def after_commit(*args, &block)
+        options = args.pop if args.last.is_a? Hash
+        if options
+          case options[:on]
+          when :create
+            after_create(*args, &block)
+          when :update
+            after_update(*args, &block)
+          when :destroy
+            after_destroy(*args, &block)
+          else
+            after_save(*args, &block)
+          end
+        else
+          after_save(*args, &block)
+        end
+      end
+      
+      # Adds Mongoid::Paperclip's "#has_mongoid_attached_file" class method to the model
+      # which includes Paperclip and Paperclip::Glue in to the model. Additionally
+      # it'll also add the required fields for Paperclip since MongoDB is schemaless and doesn't
+      # have migrations.
+      def has_mongoid_attached_file(field_name, options = {})
+        # Include Paperclip and Paperclip::Glue for compatibility
+        unless self.ancestors.include?(::Paperclip)
+          include ::Paperclip
+          include ::Paperclip::Glue
+        end
+        
+        # Invoke Paperclip's #has_attached_file method and passes in the
+        # arguments specified by the user that invoked Mongoid::Paperclip#has_mongoid_attached_file
+        has_attached_file(field_name, options)
+
+        # Define the necessary collection fields in Mongoid for Paperclip
+        field :"#{field_name}_file_name",    type: String, default: nil
+        field :"#{field_name}_content_type", type: String, default: nil
+        field :"#{field_name}_file_size",    type: Integer, default: nil
+        field :"#{field_name}_updated_at",   type: Time, default: nil
+        field :"#{field_name}_fingerprint",  type: String, default: nil
+        
+        # convenience attr (RailsAdmin uses this naming)
+        attr_accessor :"delete_#{field_name}"
+        before_validation do
+           self.send(field).clear if self.send(:"delete_#{field_name}").present?
+        end
+      end
+    end
+  end
+end

data/spec/mongoid_paperclip_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+
+describe 'Normal' do  
+  it 'saves file' do
+    t = MyTest.create!(test: @file)
+  end
+end
+
+describe 'Embedded' do
+  it 'deletion works wo paperclip' do
+    pr = MyTest.create!
+    2.times do |t|
+      pr.examples.create!(name: t.to_s)
+    end
+    pr.examples.length.should eq 2
+    pr.examples.destroy_all
+    pr.reload
+    pr.examples.length.should eq 0
+    MyTest.destroy_all
+  end
+  
+  it 'deletion works with ts' do
+    pr = MyTest.create!
+    2.times do |t|
+      pr.t_tests.create!
+    end
+    pr.t_tests.length.should eq 2
+    pr.t_tests.destroy_all.should eq 2
+    pr.reload
+    pr.t_tests.length.should eq 0
+  end
+  
+  it 'deletion works' do
+    pr = MyTest.create!
+    2.times do |t|
+      pr.examples.create!(name: t.to_s, test: @file)
+    end
+    pr.examples.length.should eq 2
+    pr.examples.destroy.should eq 2
+    pr.examples.length.should eq 0
+    pr.reload
+    pr.examples.length.should eq 0
+  end
+  
+  it 'deletion works' do
+    pr = MyTest.create!
+    2.times do |t|
+      pr.examples.create!(name: t.to_s, test: @file)
+    end
+    pr.examples.first.destroy
+    pr.reload
+    pr.examples.length.should eq 1
+  end
+  
+  pending 'deletion works' do
+    pr = MyTest.create!
+    2.times do |t|
+      pr.examples.create!(name: t.to_s, test: @file)
+    end
+    pr.examples.destroy_all.should eq 2
+    pr.reload
+    pr.examples.length.should eq 1
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,53 @@
+ROOT = File.join(File.dirname(__FILE__), "..")
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(ROOT, "lib"))
+
+require "rubygems"
+require "rspec"
+require "mongoid"
+require "mongoid-paperclip"
+
+Paperclip::Attachment.default_options.merge!({
+  path: "#{ROOT}/tmp/:attachment/:id/:style/:filename",
+  url: "/tmp/:attachment/:id/:style/:filename"
+})
+
+Mongoid.configure do |config|
+  config.connect_to "mongoid-paperclip"
+end
+Paperclip.options[:log] = false
+
+#Mongoid.logger = Logger.new($stdout)
+#Moped.logger = Logger.new($stdout)
+#Moped.logger.level = Logger::DEBUG
+
+class MyTest
+  include Mongoid::Document
+  include Mongoid::Paperclip
+  has_mongoid_attached_file :test
+  validates_attachment_content_type :test, :content_type => ['image/gif']
+  
+  embeds_many :examples
+  embeds_many :t_tests
+end
+
+class TTest
+  include Mongoid::Document
+  include Mongoid::Timestamps::Short
+  embedded_in :my_test
+end
+
+class Example
+  include Mongoid::Document
+  include Mongoid::Paperclip
+  embedded_in :my_test
+  field :name
+  has_mongoid_attached_file :test
+  do_not_validate_attachment_file_type :test
+end
+
+RSpec.configure do |config|
+  config.before(:all) do
+    @file = File.open(File.join(File.dirname(__FILE__), "support", '1024x768.gif'))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-mongoid-paperclip
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - GlebTV
@@ -9,48 +9,82 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.6
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Mongoid::Paperclip enables you to use Paperclip with the Mongoid ODM
@@ -63,14 +97,21 @@ files:
 - .gitignore
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/mongoid-3.1.gemfile
+- gemfiles/mongoid-4.0.gemfile
 - glebtv-mongoid-paperclip.gemspec
 - lib/glebtv-mongoid-paperclip.rb
+- lib/mongoid-paperclip.rb
 - lib/mongoid-paperclip/version.rb
+- spec/mongoid_paperclip_spec.rb
+- spec/spec_helper.rb
+- spec/support/1024x768.gif
 homepage: https://github.com/glebtv/mongoid-paperclip
 licenses: []
 metadata: {}
@@ -80,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Fork of Mongoid::Paperclip