mongoid_ext 0.7.1 → 0.9.0

data/Gemfile

@@ -1,21 +1,23 @@
-source :gemcutter
+source "https://rubygems.org"
 
-gem 'mongoid', '~> 2.3'
+gem 'mongoid'
 gem 'uuidtools', '>= 2.1.1'
 gem 'i18n'
 gem 'tzinfo'
 gem 'differ', '>= 0.1.2'
 gem 'encryptor', '~> 1.1.3'
+gem 'rack'
+gem 'mongoid-grid_fs'
 
 group :development do
   gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "jeweler", "~> 1.8.4"
 
   gem "shoulda", "~> 2.11.3"
   gem "jnunemaker-matchy", "~> 0.4"
   gem 'shoulda', '~> 2.11.3'
-  gem 'mocha', '~> 0.9.4'
+  gem 'mocha', '~> 0.11.4'
   gem 'timecop'
+  gem 'pry'
 end
 

data/Gemfile.lock

@@ -1,50 +1,99 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    bson (1.5.2)
-    builder (3.0.0)
+    addressable (2.3.5)
+    builder (3.0.4)
+    coderay (1.0.9)
     differ (0.1.2)
     encryptor (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
+    httpauth (0.2.0)
+    i18n (0.6.5)
+    jeweler (1.8.8)
+      builder
+      bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
+      rdoc
     jnunemaker-matchy (0.4.0)
-    mocha (0.9.12)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    mongoid (2.4.4)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    multi_json (1.0.4)
-    rake (0.9.2.2)
+    json (1.8.1)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    metaclass (0.0.1)
+    method_source (0.8.2)
+    mime-types (1.25)
+    mocha (0.11.4)
+      metaclass (~> 0.0.1)
+    mongoid (3.1.5)
+      activemodel (~> 3.2)
+      moped (~> 1.4)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.29)
+    mongoid-grid_fs (1.9.0)
+      mime-types (~> 1.19)
+      mongoid (~> 3.0)
+    moped (1.5.1)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    origin (1.1.0)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
     shoulda (2.11.3)
-    timecop (0.3.5)
-    tzinfo (0.3.31)
-    uuidtools (2.1.2)
+    slop (3.4.6)
+    timecop (0.6.3)
+    tzinfo (0.3.38)
+    uuidtools (2.1.4)
     yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
   differ (>= 0.1.2)
   encryptor (~> 1.1.3)
   i18n
-  jeweler (~> 1.5.2)
+  jeweler (~> 1.8.4)
   jnunemaker-matchy (~> 0.4)
-  mocha (~> 0.9.4)
-  mongoid (~> 2.3)
+  mocha (~> 0.11.4)
+  mongoid
+  mongoid-grid_fs
+  pry
+  rack
   shoulda (~> 2.11.3)
   timecop
   tzinfo

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.9.0

data/bin/mongoid_console

@@ -18,10 +18,16 @@ irb.context.evaluate("require 'irb/completion'", 0)
 irb.context.evaluate(%@
 include Mongoid
 
-Mongoid.configure do |config|
-  config.master = Mongo::Connection.new.db("test")
+env = ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['PADRINO_ENV'] || 'development'
+
+if File.exist?("config/mongoid.yml")
+  Mongoid.load!("config/mongoid.yml", env)
+elsif File.exist?("test/mongoid.yml")
+  Mongoid.load!("test/mongoid.yml", env)
+elsif File.exist?("spec/mongoid.yml")
+  Mongoid.load!("test/mongoid.yml", env)
 end
-$db = Mongoid.config.database
+$db = Mongoid.session("default")
 
 @, 0)
 

data/lib/mongoid_ext.rb

@@ -1,10 +1,13 @@
 $:.unshift File.dirname(__FILE__)
+require 'bundler/setup'
 
 if RUBY_VERSION =~ /^1\.8/
   $KCODE = 'u'
 end
 
+Bundler.require
 require 'mongoid'
+require 'mongoid-grid_fs'
 require 'uuidtools'
 require 'differ'
 require 'active_support/inflector'
@@ -56,6 +59,8 @@ require 'mongoid_ext/modifiers'
 
 module MongoidExt
   def self.init
+    Mongoid::GridFS.file_model.field :_id, :type => String # to keep backwards compat
+    Mongoid.allow_dynamic_fields = true
     load_jsfiles(::File.dirname(__FILE__)+"/mongoid_ext/js")
   end
 
@@ -65,7 +70,9 @@ module MongoidExt
       name = ::File.basename(js_path, ".js")
 
       # HACK: looks like ruby driver doesn't support this
-      Mongoid.master.eval("db.system.js.save({_id: '#{name}', value: #{code}})")
+      Mongoid.sessions.each do |session_name, _|
+        Mongoid.session(session_name).command(:eval => "db.system.js.save({_id: '#{name}', value: #{code}})")
+      end
     end
   end
 end

data/lib/mongoid_ext/encryptor.rb

@@ -25,7 +25,7 @@ module MongoidExt
           marshaled = Marshal.dump(v)
           enc_value = ::Encryptor.encrypt(marshaled, :key => key).unpack('H*')[0]
 
-          write_attribute(name, enc_value)
+          attributes[name.to_s] = enc_value
         end
       end
     end

data/lib/mongoid_ext/file.rb

@@ -47,16 +47,21 @@ module MongoidExt
       gridfs.put(io, options)
 
       if file = self.get
-        file.send(:get_md5)
-        self['md5'] = file.server_md5
+        self['md5'] = file.md5
       end
     end
 
     def get
       @io ||= begin
-        gridfs.get(grid_filename)
-      rescue Mongo::GridFileNotFound
-        return nil
+        io = nil
+        begin
+          io = gridfs.get(grid_filename)
+          def io.read
+            self.data
+          end
+        rescue Mongoid::Errors::DocumentNotFound => e
+        end
+        io
       end
     end
 
@@ -77,23 +82,45 @@ module MongoidExt
     end
 
     def read(size = nil)
-      self.get.read(size) rescue nil
+      if size != nil
+        puts "#{__FILE__}:#{__LINE__} Passing size to read() is deprecated and will be removed soon. Use .each {} to read in blocks."
+      end
+
+      self.get.data
     end
 
-    def delete
-      @io = nil
-      gridfs.delete(grid_filename)
+    def data
+      if self.get
+        self.get.data
+      else
+        puts "WARNING: the file you are trying to read doesn't exist: #{self.inspect}"
+        nil
+      end
     end
 
-    def method_missing(name, *args, &block)
-      f = self.get
-      if f && f.respond_to?(name)
-        f.send(name, *args, &block)
+    def each(&block)
+      if self.get
+        self.get.each(&block)
       else
-        super(name, *args, &block)
+        puts "WARNING: the file you are trying to read doesn't exist: #{self.inspect}"
+        nil
       end
     end
 
+    def delete
+      @io = nil
+      gridfs.delete(grid_filename)
+    end
+
+    #def method_missing(name, *args, &block)
+      #f = self.get
+      #if f && f.respond_to?(name)
+        #f.send(name, *args, &block)
+      #else
+        #super(name, *args, &block)
+      #end
+    #end
+
     protected
     def gridfs
       _root_document.class.gridfs

data/lib/mongoid_ext/file_list.rb

@@ -44,11 +44,11 @@ module MongoidExt
       end
 
       id = id.to_s.gsub(".", "_")
-      file = self.fetch(id, nil)
+      file = self[id]
 
       if file.nil?
         file = self[id] = MongoidExt::File.new
-      elsif file.class == ::Hash || file.class == BSON::OrderedHash
+      elsif !file.kind_of?(MongoidExt::File) && file.kind_of?(::Hash)
         file = self[id] = MongoidExt::File.new(file)
       end
 
@@ -80,11 +80,13 @@ module MongoidExt
       end
     end
 
-    def serialize(v)
-      v
+    def self.mongoize(v)
+      Hash[v]
     end
 
-    def deserialize(v)
+    def self.demongoize(v)
+      return if v.nil?
+
       doc = self.class.new
       v.each do |k,v|
         doc[k] = MongoidExt::File.new(v)

data/lib/mongoid_ext/file_server.rb

@@ -58,10 +58,8 @@ class FileServer
   end
 
   def each
-    f = @file.get
-    while part = f.read(8192)
+    @file.each do |part|
       yield part
-      break if part.empty?
     end
   end
 end

data/lib/mongoid_ext/filter.rb

@@ -11,7 +11,7 @@ module MongoidExt
         extend ClassMethods
 
         field :_keywords, :type => Set, :default => Set.new
-        index :_keywords
+        index({:_keywords => 1})
 
         before_save :_update_keywords
 
@@ -55,12 +55,27 @@ module MongoidExt
         query = Mongoid::Criteria.new(self)
         conds = query.where(opts).where(conds).selector
 
-        results = self.db.nolock_eval("function(collection, q, config) { return filter(collection, q, config); }", self.collection_name, conds, {:words => parsed_query[:words].to_a, :stemmed => parsed_query[:stemmed].to_a, :limit => limit, :min_score => min_score, :select => select })
-
-        pagination = MongoidExt::Filter::ResultSet.new(results["total_entries"], parsed_query, conds, page, limit)
-
-        pagination.subject = results['results'].map do |result|
+        retval = Mongoid.session(:default).command({
+          :eval => "function(collection, q, config) { return filter(collection, q, config); }", 
+          :args => [
+            self.collection_name, 
+            conds, 
+            {
+              :words => parsed_query[:words].to_a, 
+              :stemmed => parsed_query[:stemmed].to_a, 
+              :limit => limit, 
+              :min_score => min_score, 
+              :select => select 
+            }
+          ]
+        })['retval']
+        results = retval['results']
+
+        pagination = MongoidExt::Filter::ResultSet.new(retval["total_entries"], parsed_query, conds, page, limit)
+
+        pagination.subject = results.map do |result|
           item = self.new(result['doc'])
+          item.id = result['doc']['_id']
           item.search_score = result['score']
 
           item

data/lib/mongoid_ext/modifiers.rb

@@ -50,7 +50,7 @@ module MongoidExt
 
       private
       def _apply_modifier(modifier, conditions, update)
-        collection.update(conditions, {modifier => update}, :multi => true)
+        collection.find(conditions).update_all({modifier => update})
       end
     end
 

data/lib/mongoid_ext/paranoia.rb

@@ -75,7 +75,8 @@ module MongoidExt #:nodoc:
           cattr_accessor :parent_class
           self.parent_class = parent_klass
 
-          self.collection_name = "#{self.parent_class.collection_name}.trash"
+          collection_name = "#{self.parent_class.collection.name}.trash"
+          self.storage_options = {:collection => collection_name}
 
           field :document, :type => Hash
 

data/lib/mongoid_ext/random.rb

@@ -6,8 +6,8 @@ module MongoidExt
       field :_random, :type => Float, :default => lambda{rand}
       field :_random_times, :type => Float, :default => 0.0
 
-      index :_random
-      index :_random_times
+      index({:_random => 1})
+      index({:_random_times => 1})
     end
 
     module ClassMethods
@@ -20,4 +20,4 @@ module MongoidExt
       end
     end
   end
-end
+end

data/lib/mongoid_ext/slugizer.rb

@@ -15,7 +15,8 @@ module MongoidExt
         extend ClassMethods
         extend Finder
 
-        field :slug, :type => String, :index => true
+        field :slug, :type => String
+        index({:slug => 1})
       end
     end
 
@@ -26,7 +27,10 @@ module MongoidExt
     protected
 
     def generate_slug
-      return false if self[self.class.slug_key].blank?
+      if self[self.class.slug_key].blank?
+        Mongoid.logger.warn "Can't generate a slug because the given slug key is blank"
+        return false
+      end
       max_length = self.class.slug_options[:max_length]
       min_length = self.class.slug_options[:min_length] || 0