mongoid-grid_fs 1.4.0 → 1.7.0

data/lib/app/models/mongoid/grid_fs/fs/chunk.rb

@@ -0,0 +1,2 @@
+require 'mongoid-grid_fs.rb' unless defined?(Mongoid::GridFS::Fs::Chunk)
+Mongoid::GridFS::Fs::Chunk

data/lib/app/models/mongoid/grid_fs/fs/file.rb

@@ -0,0 +1,2 @@
+require 'mongoid-grid_fs.rb' unless defined?(Mongoid::GridFS::Fs::File)
+Mongoid::GridFS::Fs::File

data/lib/app/models/mongoid/grid_fs.rb

@@ -0,0 +1,2 @@
+require 'mongoid-grid_fs.rb' unless defined?(Mongoid::GridFS)
+Mongoid::GridFS

data/lib/mongoid-grid_fs.rb

@@ -2,7 +2,7 @@
 #
   module Mongoid
     class GridFS
-      const_set :Version, '1.4.0'
+      const_set :Version, '1.7.0'
 
       class << GridFS
         def version
@@ -269,6 +269,23 @@
         end
       end
 
+    ##
+    #
+      class Defaults < ::Hash
+        def method_missing(method, *args, &block)
+          case method.to_s
+            when /(.*)=/
+              key = $1
+              val = args.first
+              update(key => val)
+            else
+              key = method.to_s
+              super unless has_key?(key)
+              fetch(key)
+          end
+        end
+      end
+
     ##
     #
       def GridFS.build_file_model_for(namespace)
@@ -283,17 +300,22 @@
 
           singleton_class.instance_eval do
             define_method(:name){ file_model_name }
-            attr_accessor :chunk_model
             attr_accessor :namespace
+            attr_accessor :chunk_model
+            attr_accessor :defaults
           end
 
           self.default_collection_name = "#{ prefix }.files"
+          self.defaults = Defaults.new
+
+          self.defaults.chunkSize = 4 * (mb = 2**20)
+          self.defaults.contentType = 'application/octet-stream'
 
           field(:filename, :type => String)
-          field(:contentType, :type => String, :default => 'application/octet-stream')
+          field(:contentType, :type => String, :default => defaults.contentType)
 
           field(:length, :type => Integer, :default => 0)
-          field(:chunkSize, :type => Integer, :default => (256 * (2 ** 10)))
+          field(:chunkSize, :type => Integer, :default => defaults.chunkSize)
           field(:uploadDate, :type => Date, :default => Time.now.utc)
           field(:md5, :type => String, :default => Digest::MD5.hexdigest(''))
 
@@ -324,6 +346,32 @@
             end
           end
 
+          def slice(*args)
+            case args.first
+              when Range
+                range = args.first
+                first_chunk = (range.min / chunkSize).floor
+                last_chunk = (range.max / chunkSize).ceil
+                offset = range.min % chunkSize
+                length = range.max - range.min + 1
+              when Fixnum
+                start = args.first
+                start = self.length + start if start < 0
+                length = args.size == 2 ? args.last : 1
+                first_chunk = (start / chunkSize).floor
+                last_chunk = ((start + length) / chunkSize).ceil
+                offset = start % chunkSize
+            end
+
+            data = ''
+
+            chunks.where(:n => (first_chunk..last_chunk)).order_by(n: 'asc').each do |chunk|
+              data << chunk
+            end
+
+            data[offset, length]
+          end
+
           def data
             data = ''
             each{|chunk| data << chunk}
@@ -491,3 +539,11 @@
     GridFs = GridFS
     GridFS.init!
   end
+
+##
+#
+  if defined?(Rails)
+    class Mongoid::GridFS::Engine < Rails::Engine
+      paths['app/models'] = File.dirname(__FILE__)
+    end
+  end

data/mongoid-grid_fs.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "mongoid-grid_fs"
-  spec.version = "1.4.0"
+  spec.version = "1.7.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "mongoid-grid_fs"
   spec.description = "a mongoid 3/moped compatible implementation of the grid_fs specification"
@@ -12,6 +12,14 @@ Gem::Specification::new do |spec|
 ["README.md",
  "Rakefile",
  "lib",
+ "lib/app",
+ "lib/app/models",
+ "lib/app/models/mongoid",
+ "lib/app/models/mongoid/grid_fs",
+ "lib/app/models/mongoid/grid_fs.rb",
+ "lib/app/models/mongoid/grid_fs/fs",
+ "lib/app/models/mongoid/grid_fs/fs/chunk.rb",
+ "lib/app/models/mongoid/grid_fs/fs/file.rb",
  "lib/mongoid-grid_fs.rb",
  "mongoid-grid_fs.gemspec",
  "test",

data/test/helper.rb

@@ -1,10 +1,4 @@
 # -*- encoding : utf-8 -*-
-require_relative 'testing'
-require_relative '../lib/mongoid-grid_fs.rb'
-
-Mongoid.configure do |config|
-  config.connect_to('mongoid-grid_fs_test')
-end
 
 require 'stringio'
 
@@ -16,3 +10,15 @@ class SIO < StringIO
     super(*args, &block)
   end
 end
+
+# this triggers mongoid to load rails...
+module Rails; end
+
+require_relative 'testing'
+require_relative '../lib/mongoid-grid_fs.rb'
+
+Mongoid.configure do |config|
+  config.connect_to('mongoid-grid_fs_test')
+end
+
+

data/test/mongoid-grid_fs_test.rb

@@ -107,6 +107,53 @@ Testing Mongoid::GridFs do
 
   end
 
+##
+#
+  context 'slicing and dicing' do
+
+    test 'range' do
+      id = assert { GridFS::File.last.id }
+      g = assert { GridFs.get(id) }
+      assert { g.data[1..3] == g.slice(1..3) }
+    end
+
+    test 'start and length' do
+      id = assert { GridFS::File.last.id }
+      g = assert { GridFs.get(id) }
+      assert { g.data[1, 3] == g.slice(1, 3) }
+    end
+
+    test 'just a single param' do
+      id = assert { GridFS::File.last.id }
+      g = assert {GridFs.get(id) }
+
+      assert {g.data[1] == g.slice(1) }
+    end
+
+    test 'getting the last index' do
+      id = assert { GridFS::File.last.id }
+      g = assert {GridFs.get(id) }
+      assert {g.data[-1] == g.slice(-1) }
+    end
+
+    test 'yanking from the end of the data' do
+      id = assert { GridFS::File.last.id }
+      g = assert {GridFs.get(id) }
+      assert {g.data[-3, 2] == g.slice(-3, 2) }
+    end
+
+    test 'multiple chunks...' do
+      path = 'slice_and_dice.txt'
+
+      assert { GridFs[path] = SIO.new(path, "foobar" * 256 * 1024) }
+
+      g = GridFs[path]
+
+      assert { g.chunks.count > 0 }
+      assert { g.data[10, (256 * 1024 * 2)] == g.slice(10, (256 * 1024 * 2)) }
+    end
+  end
+
 ##
 #
   context 'namespaces' do
@@ -143,6 +190,19 @@ Testing Mongoid::GridFs do
 
 ##
 #
+  context 'rails' do
+    test 'paths' do
+      testdir = File.dirname(__FILE__)
+      gemdir = File.dirname(testdir)
+      libdir = File.join(gemdir, 'lib')
+
+      expanded = proc{|paths| Array(paths).map{|path| File.expand_path(path)}}
+
+      assert{ 
+        expanded[ Mongoid::GridFS::Engine.paths['app/models'] ] == expanded[ libdir ]
+      }
+    end
+  end
 
 protected
   def object_id_re

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-grid_fs
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -51,6 +51,9 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- lib/app/models/mongoid/grid_fs.rb
+- lib/app/models/mongoid/grid_fs/fs/chunk.rb
+- lib/app/models/mongoid/grid_fs/fs/file.rb
 - lib/mongoid-grid_fs.rb
 - mongoid-grid_fs.gemspec
 - test/helper.rb