populate-me 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5046f2abc8d311d2dedd3c31fac2ac90f6ae0f36
-  data.tar.gz: 2df84aed8c576a8a2908977fde658f2ad85ae2e7
+  metadata.gz: 95deb6a0aa3778df73490932b2db67e8bb9fddc1
+  data.tar.gz: e441c164c3e24d703ec2acd0567a8f3715393915
 SHA512:
-  metadata.gz: 0f4d57c7dfc72de5c4dc08e027c498e7cee4bd4de3fa2b3cc5facb74c28aaa006e8270d5f79baa1fc0af2b48aec0b297bb0dd9ecc211a28018d37b1ca415c109
-  data.tar.gz: 71dd5a2221caa8d1e9d3761c2651e2542f1182ea30f00d50f4b0bb9d5e010d1d8f46df5695b941544aac4af5f83a306cd27243ba03e28a6a2cb4018619446081
+  metadata.gz: 80488dcf9765e65444649d32f3c92a03d49258cef876a41a97377b65c42f1aa5a6078acedcae69459c031963efe3994e4737d7b44ac49b4ea707c56a9e3493c1
+  data.tar.gz: eb032cdedacdc1dcdcf7d04d7a0e8572d4eea30f9e918c55767c7ae0fe148310fb26730642e76b5e3f24efc7db083bbfd7cfdd19a694ed3c4177d050461a1430

data/lib/populate_me/document_mixins/persistence.rb

@@ -13,7 +13,7 @@ module PopulateMe
       end
 
       def attachment f
-        attacher = Utils.resolve_class_name self.class.fields[f][:class_name]
+        attacher = WebUtils.resolve_class_name self.class.fields[f][:class_name]
         attacher.new self, f
       end
 

data/lib/populate_me/grid_fs_attachment.rb

@@ -1,6 +1,6 @@
 require 'populate_me/attachment'
 require 'mongo'
-require 'rack/gridfs'
+require 'rack/grid_serve'
 
 module PopulateMe
 
@@ -10,14 +10,6 @@ module PopulateMe
 
     # set :url_prefix, '/attachment'
 
-    def grid
-      self.class.grid
-    end
-
-    def gridfs
-      self.class.gridfs
-    end
-
     # Attachee_prefix is moved on field_value for gridfs
     def url variation_name=:original
       return nil if WebUtils.blank?(self.field_filename(variation_name))
@@ -31,16 +23,6 @@ module PopulateMe
       )
     end
 
-    def deletable? variation_name=:original
-      !WebUtils.blank? self.field_filename(variation_name)
-      # Fine since deleting a non-existent file does not raise an error in mongo
-    end
-
-    def perform_delete variation_name=:original
-      # gridfs works with names instead of IDs
-      gridfs.delete self.field_filename(variation_name)
-    end
-
     def next_available_filename filename
       ext = File.extname(filename)
       base = "#{attachee_prefix}/#{File.basename(filename,ext)}"
@@ -48,7 +30,7 @@ module PopulateMe
       loop do
         suffix = i==0 ? '' : "-#{i}"
         potential_filename = [base,suffix,ext].join
-        if grid.exist?(filename: potential_filename)
+        if settings.db.fs.find(filename: potential_filename).count>0
           i += 1
         else
           filename = potential_filename
@@ -68,9 +50,9 @@ module PopulateMe
         file = File.open(hash[:variation_path])
         type = Rack::Mime.mime_type ".#{hash[:variation].ext}"
       end
-      attachment_id = grid.put(
+      settings.db.fs.upload_from_stream(
+        fn,
         file, {
-          filename: fn, 
           content_type: type,
           metadata: {
             parent_collection: (self.document.class.respond_to?(:collection) ? self.document.class.collection.name : self.attachee_prefix),
@@ -81,30 +63,24 @@ module PopulateMe
       fn
     end
 
+    def deletable? variation_name=:original
+      !WebUtils.blank? self.field_filename(variation_name)
+      # Fine since deleting a non-existent file does not raise an error in mongo
+    end
+
+    def perform_delete variation_name=:original
+      gridfile = settings.db.fs.find(filename: self.field_filename(variation_name)).first
+      settings.db.fs.delete(gridfile['_id']) unless gridfile.nil?
+    end
+
     class << self
 
       def ensure_db
         raise MissingMongoDBError, "Attachment class #{self.name} does not have a Mongo database." if settings.db.nil?
       end
 
-      def grid
-        ensure_db
-        unless settings.grid.is_a?(::Mongo::Grid)
-          set :grid, ::Mongo::Grid.new(settings.db) 
-        end
-        settings.grid
-      end
-
-      def gridfs
-        ensure_db
-        unless settings.gridfs.is_a?(::Mongo::GridFileSystem)
-          set :gridfs, ::Mongo::GridFileSystem.new(settings.db) 
-        end
-        settings.gridfs
-      end
-
       def middleware
-        Rack::GridFS
+        Rack::GridServe
       end
 
       def middleware_options

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 

data/populate-me.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'web-utils', '~> 0'
-  s.add_dependency 'sinatra', '~> 1.0'
+  s.add_dependency 'sinatra', '~> 1.4'
   s.add_dependency 'json', '~> 2.1'
 
   s.add_development_dependency 'bundler', '~> 1.13'
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test', '~> 0.6'
   s.add_development_dependency 'rack-cerberus', '~> 1.0'
   s.add_development_dependency 'mongo', '~> 2.0'
+  s.add_development_dependency 'rack-grid-serve', '~> 0.0.5'
   s.add_development_dependency 'racksh', '~> 1.0'
   s.add_development_dependency 'rake', '~> 10.1'
 end

data/test/test_grid_fs_attachment.rb

@@ -0,0 +1,237 @@
+require 'helper'
+require 'populate_me/mongo'
+require 'populate_me/grid_fs_attachment'
+
+GRIDMONGO = Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'populate-me-grid-test')
+GRIDDB = GRIDMONGO.database
+GRIDDB.drop
+PopulateMe::Mongo.set :db, GRIDDB
+PopulateMe::Mongo.set :default_attachment_class, PopulateMe::GridFS
+PopulateMe::GridFS.set :db, GRIDDB
+
+describe 'PopulateMe::GridFS' do
+  # parallelize_me!
+
+  class GridBook < PopulateMe::Mongo
+    field :cover, type: :attachment, variations: [
+      PopulateMe::Variation.new_image_magick_job(:thumb, :gif, "-resize '300x'")
+    ]
+    field :content, type: :attachment, variations: [
+      PopulateMe::Variation.new(:upcase, :txt, lambda{ |src,dst|
+        Kernel.system "cat \"#{src}\" | tr 'a-z' 'A-Z' > \"#{dst}\""
+      })
+    ]
+  end
+
+  before do
+    GRIDDB.drop
+  end
+
+  # Utils
+
+  it 'Returns URL with attachee_prefix' do
+    book = GridBook.new cover: "candy.jpg"
+    assert_equal '/attachment/candy.jpg', book.attachment(:cover).url
+    assert_equal '/attachment/candy.thumb.gif', book.attachment(:cover).url(:thumb)
+  end
+
+  it 'Has nil URL when field is blank' do
+    book = GridBook.new
+    assert_nil book.attachment(:cover).url
+  end
+
+  it 'Has location root without attachee prefix' do
+    book = GridBook.new
+    refute_match book.attachment(:cover).attachee_prefix, book.attachment(:cover).location_root
+  end
+
+  # Create
+
+  it "Saves attachments on create with variations" do
+    book = GridBook.new
+
+    file = Tempfile.new('foo')
+    file.write('hello')
+    file.rewind
+
+    assert_equal 0, GRIDDB['fs.files'].count
+    field_value = book.attachment(:content).create({
+      tempfile: file,
+      filename: 'story.txt',
+      type: 'text/plain'
+    })
+    assert_equal 2, GRIDDB['fs.files'].count
+    assert_equal 'grid-book/story.txt', field_value
+
+    gridfile = GRIDDB.fs.find(filename: 'grid-book/story.txt').first
+    assert_equal 'text/plain', gridfile['contentType']
+    assert_equal 'grid-book', gridfile['metadata']['parent_collection']
+    GRIDDB.fs.open_download_stream(gridfile['_id']) do |stream|
+      assert_equal 'hello', stream.read
+    end
+
+    vargridfile = GRIDDB.fs.find(filename: 'grid-book/story.upcase.txt').first
+    assert_equal 'text/plain', vargridfile['contentType']
+    assert_equal 'grid-book', vargridfile['metadata']['parent_collection']
+    GRIDDB.fs.open_download_stream(vargridfile['_id']) do |stream|
+      assert_equal 'HELLO', stream.read
+    end
+
+    file.close
+    file.unlink
+  end
+
+  it 'Does not create 2 files with the same name' do
+    file = Tempfile.new('foo')
+
+    book = GridBook.new
+
+    field_value = book.attachment(:content).create({
+      tempfile: file,
+      filename: 'story.txt',
+      type: 'text/plain'
+    })
+
+    assert_equal 'grid-book/story.txt', field_value
+
+    field_value = book.attachment(:content).create({
+      tempfile: file,
+      filename: 'story.txt',
+      type: 'text/plain'
+    })
+
+    assert_equal 'grid-book/story-1.txt', field_value
+
+    field_value = book.attachment(:content).create({
+      tempfile: file,
+      filename: 'story.txt',
+      type: 'text/plain'
+    })
+
+    assert_equal 'grid-book/story-2.txt', field_value
+
+    file.close
+    file.unlink
+  end
+
+  # Delete
+
+  it 'Is deletable when field is not blank' do
+    book = GridBook.new cover: "candy.jpg"
+    assert book.attachment(:cover).deletable?
+  end
+
+  it 'Is not deletable when field is blank' do
+    book = GridBook.new
+    refute book.attachment(:cover).deletable?
+  end
+
+  it 'Deletes all attachments' do
+    file = Tempfile.new('foo')
+
+    book = GridBook.new
+
+    field_value = book.attachment(:content).create({
+      tempfile: file,
+      filename: 'story.txt',
+      type: 'text/plain'
+    })
+    book.content = field_value
+
+    refute_nil GRIDDB.fs.find(filename: 'grid-book/story.txt').first
+    refute_nil GRIDDB.fs.find(filename: 'grid-book/story.upcase.txt').first
+
+    book.attachment(:content).delete_all
+
+    assert_nil GRIDDB.fs.find(filename: 'grid-book/story.txt').first
+    assert_nil GRIDDB.fs.find(filename: 'grid-book/story.upcase.txt').first
+
+    file.close
+    file.unlink
+  end
+
+  it 'Deletes one attachment at a time' do
+    file = Tempfile.new('foo')
+
+    book = GridBook.new
+
+    field_value = book.attachment(:content).create({
+      tempfile: file,
+      filename: 'story.txt',
+      type: 'text/plain'
+    })
+    book.content = field_value
+
+    refute_nil GRIDDB.fs.find(filename: 'grid-book/story.txt').first
+    refute_nil GRIDDB.fs.find(filename: 'grid-book/story.upcase.txt').first
+
+    book.attachment(:content).delete
+
+    assert_nil GRIDDB.fs.find(filename: 'grid-book/story.txt').first
+    refute_nil GRIDDB.fs.find(filename: 'grid-book/story.upcase.txt').first
+
+    book.attachment(:content).delete :upcase
+
+    assert_nil GRIDDB.fs.find(filename: 'grid-book/story.upcase.txt').first
+
+    file.close
+    file.unlink
+  end
+
+  # Update
+
+  it 'Deletes previous attachment when saving a new one' do
+    file = Tempfile.new('foo')
+    file.write('hello')
+    file.rewind
+
+    book = GridBook.new
+
+    field_value = book.attachment(:content).create({
+      tempfile: file,
+      filename: 'story.txt',
+      type: 'text/plain'
+    })
+    book.content = field_value
+
+    refute_nil GRIDDB.fs.find(filename: 'grid-book/story.txt').first
+    refute_nil GRIDDB.fs.find(filename: 'grid-book/story.upcase.txt').first
+
+    file.rewind
+    file.write('world')
+    file.rewind
+
+    field_value = book.attachment(:content).create({
+      tempfile: file,
+      filename: 'history.md',
+      type: 'text/markdown'
+    })
+    book.content = field_value
+
+    assert_nil GRIDDB.fs.find(filename: 'grid-book/story.txt').first
+    assert_nil GRIDDB.fs.find(filename: 'grid-book/story.upcase.txt').first
+    refute_nil GRIDDB.fs.find(filename: 'grid-book/history.md').first
+    refute_nil GRIDDB.fs.find(filename: 'grid-book/history.upcase.txt').first
+
+    gridfile = GRIDDB.fs.find(filename: 'grid-book/history.md').first
+    assert_equal 'text/markdown', gridfile['contentType']
+    assert_equal 'grid-book', gridfile['metadata']['parent_collection']
+    GRIDDB.fs.open_download_stream(gridfile['_id']) do |stream|
+      assert_equal 'world', stream.read
+    end
+
+    gridfile = GRIDDB.fs.find(filename: 'grid-book/history.upcase.txt').first
+    assert_equal 'text/plain', gridfile['contentType']
+    assert_equal 'grid-book', gridfile['metadata']['parent_collection']
+    GRIDDB.fs.open_download_stream(gridfile['_id']) do |stream|
+      assert_equal 'WORLD', stream.read
+    end
+
+    file.close
+    file.unlink
+  end
+
+end
+
+GRIDDB.drop
+

data/test/test_mongo.rb

@@ -8,7 +8,6 @@ DB.drop
 OTHER_MONGO = Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'populate-me-test-other')
 OTHER_DB = OTHER_MONGO.database
 OTHER_DB.drop
-class NoMongoDB < PopulateMe::Mongo; end
 PopulateMe::Mongo.set :db, DB
 
 
@@ -44,6 +43,8 @@ describe 'PopulateMe::Mongo' do
 
   describe 'Database connection' do 
 
+    class NoMongoDB < PopulateMe::Mongo; set :db, nil; end
+
     it 'Should raise if db is not set' do 
       assert_raises(PopulateMe::MissingMongoDBError) do
         NoMongoDB.collection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rack-grid-serve
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: racksh
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +212,7 @@ files:
 - test/test_document_callbacks.rb
 - test/test_document_persistence.rb
 - test/test_document_typecasting.rb
+- test/test_grid_fs_attachment.rb
 - test/test_mongo.rb
 - test/test_variation.rb
 - test/test_version.rb
@@ -235,6 +250,7 @@ test_files:
 - test/test_document_callbacks.rb
 - test/test_document_persistence.rb
 - test/test_document_typecasting.rb
+- test/test_grid_fs_attachment.rb
 - test/test_mongo.rb
 - test/test_variation.rb
 - test/test_version.rb