mongoid_ext 0.7.1 → 0.9.0

data/lib/mongoid_ext/storage.rb

@@ -41,22 +41,29 @@ module MongoidExt
 
     module ClassMethods
       def gridfs
-        @gridfs ||= Mongo::Grid.new(self.db)
+        @gridfs ||= Mongoid::GridFS
       end
 
       def file_list(name)
         field name, :type => MongoidExt::FileList
+
         define_method(name) do
+          varname = "@file_list_#{name}"
+
+          return instance_variable_get(varname) if instance_variable_get(varname)
+
           list = self[name]
 
           if list.nil?
             list = self[name] = MongoidExt::FileList.new
-          elsif list.class == BSON::OrderedHash || list.class == ::Hash
+          elsif list.kind_of?(::Hash)
             list = self[name] = MongoidExt::FileList.new(list)
           end
 
           list.parent_document = self
           list.list_name = name
+
+          instance_variable_set(varname, list)
           list
         end
 
@@ -66,7 +73,7 @@ module MongoidExt
 
           query = doc._updates
           if !query.blank?
-            doc.collection.update({:_id => doc.id}, query)
+            doc.collection.find(:_id => doc.id).update(query, {:multi => true})
           end
         end
 

data/lib/mongoid_ext/tags.rb

@@ -4,22 +4,53 @@ module MongoidExt
       klass.class_eval do
         extend ClassMethods
 
-        field :tags, :type => Array, :index => true, :default => []
+        field :tags, :type => Array, :default => []
+        index({:tags => 1})
       end
     end
 
     module ClassMethods
       def tag_cloud(conditions = {}, limit = 30)
-        self.db.nolock_eval("function(collection, q,l) { return tag_cloud(collection, q,l); }", self.collection_name, conditions, limit)
+        pipeline = []
+        if !conditions.blank?
+          match = {:$match => conditions }
+          pipeline << match
+        end
+
+        pipeline <<  {:$project => {:tags => 1}}
+        pipeline <<  {:$unwind => "$tags"}
+        pipeline <<  {:$group => {:_id => "$tags", :count => { :$sum => 1}}}
+        pipeline <<  {:$project => {:_id => 0, :name => '$_id', :count => 1}}
+        pipeline <<  {:$sort => {:count => -1}}
+        pipeline <<  {:$limit => limit}
+        self.collection.aggregate(pipeline)
       end
 
       # Model.find_with_tags("budget", "big").limit(4)
       def find_with_tags(*tags)
-        self.all(:conditions => {:tags.in => tags})
+        self.where({:tags.in => tags})
       end
 
       def find_tags(regex, conditions = {}, limit = 30)
-        self.db.nolock_eval("function(collection, a,b,c) { return find_tags(collection, a,b,c); }", self.collection_name, regex, conditions, limit)
+        pipeline = []
+        if regex.is_a? String
+          regex = /#{Regexp.escape(regex)}/
+        end
+        match = {:$match => {:tags => {:$in => [regex]}}}
+
+        if !conditions.blank?
+          match[:$match].merge! conditions
+        end
+        pipeline << match
+
+        pipeline <<  {:$project => {:tags => 1}}
+        pipeline <<  {:$unwind => "$tags"}
+        pipeline <<  {:$match => {:tags => regex}}
+        pipeline <<  {:$group => {:_id => "$tags", :count => { :$sum => 1}}}
+        pipeline <<  {:$project => {:_id => 0, :name => '$_id', :count => 1}}
+        pipeline <<  {:$sort => {:count => -1}}
+        pipeline <<  {:$limit => limit}
+        self.collection.aggregate(pipeline)
       end
     end
   end

data/lib/mongoid_ext/types/embedded_hash.rb

@@ -1,5 +1,4 @@
 class EmbeddedHash < Hash
-  include Mongoid::Fields::Serializable
   include ActiveModel::Validations
 
   def initialize(other = {})
@@ -40,12 +39,12 @@ class EmbeddedHash < Hash
   end
   alias :_id :id
 
-  def serialize(v)
+  def self.mongoize(v)
     v
   end
 
-  def deserialize(v)
-    self.class.new(v)
+  def self.demongoize(v)
+    self.new(v)
   end
 
 #   def method_missing(name, *args, &block)
@@ -54,7 +53,7 @@ class EmbeddedHash < Hash
 
   def assign_id
     if fetch("_id", nil).nil?
-      self["_id"] = BSON::ObjectId.new.to_s
+      self["_id"] = Moped::BSON::ObjectId.new.to_s
     end
   end
 end

data/lib/mongoid_ext/types/open_struct.rb

@@ -2,18 +2,22 @@ require 'ostruct'
 
 module MongoidExt
   class OpenStruct < ::OpenStruct
-    include Mongoid::Fields::Serializable
-
-    def serialize(value)
-      value.nil? ? nil : value.to_hash
+    def mongoize
+      send(:table)
     end
 
-    def deserialize(value)
-      value.nil? ? nil : OpenStruct.new(value || {})
+    def self.demongoize(value)
+      value.nil? ? nil : OpenStruct.new(value)
     end
 
-    def to_hash
-      send(:table)
+    def self.mongoize(value)
+      if value.kind_of?(self)
+        value.mongoize
+      elsif value.kind_of?(Hash)
+        value
+      else
+        nil
+      end
     end
   end
 end

data/lib/mongoid_ext/types/timestamp.rb

@@ -1,7 +1,5 @@
 class Timestamp
-  include Mongoid::Fields::Serializable
-
-  def deserialize(value)
+  def self.demongoize(value)
     if value.nil? || value == ''
       nil
     else
@@ -9,7 +7,7 @@ class Timestamp
     end
   end
 
-  def serialize(value)
+  def self.mongoize(value)
     value.to_i
   end
 end

data/lib/mongoid_ext/types/translation.rb

@@ -1,6 +1,4 @@
 class Translation < String
-  include Mongoid::Fields::Serializable
-
   attr_accessor :keys
 
   def initialize(*args)
@@ -35,13 +33,13 @@ class Translation < String
     tr
   end
 
-  def serialize(value)
+  def self.mongoize(value)
     return value.keys if value.kind_of?(self)
 
     @keys
   end
 
-  def deserialize(value)
+  def self.demongoize(value)
     return value if value.kind_of?(self)
 
     result = self.new

data/lib/mongoid_ext/versioning.rb

@@ -112,15 +112,16 @@ module Versioning
         cattr_accessor :parent_class
         self.parent_class = parent_klass
 
-        self.collection_name = "#{self.parent_class.collection_name}.versions"
+        self.storage_options = {
+          :collection => "#{self.parent_class.collection_name}.versions"
+        }
 
-        identity :type => String
         field :message, :type => String
         field :data, :type => Hash
 
-        referenced_in :owner, :class_name => parent_klass.versionable_options[:user_class]
+        belongs_to :owner, :class_name => parent_klass.versionable_options[:user_class]
 
-        referenced_in :target, :polymorphic => true
+        belongs_to :target, :polymorphic => true
 
         after_create :add_version
 
@@ -180,7 +181,7 @@ module Versioning
         end
 
         uuser_id = send(self.versionable_options[:owner_field]+"_was")||send(self.versionable_options[:owner_field])
-        if !self.new? && !data.empty? && uuser_id
+        if !self.new_record? && !data.empty? && uuser_id
           max_versions = self.versionable_options[:max_versions].to_i
           if max_versions > 0 && self.version_ids.size >= max_versions
             old = self.version_ids.slice!(0, max_versions-1)
@@ -190,7 +191,7 @@ module Versioning
             self.class.set_callback(:save, :before, :save_version)
           end
 
-          self.version_klass.create({
+          self.version_klass.create!({
             'data' => data,
             'owner_id' => uuser_id,
             'target' => self,

data/lib/mongoid_ext/voteable.rb

@@ -15,31 +15,36 @@ module MongoidExt
       if self[:votes] && !self[:votes].empty?
         self[:votes].include?(voter_id)
       else
-        self.class.exists?(:conditions => {:_id => self.id, :"votes.#{voter_id}".exists => true})
+        self.class.where({:_id => self.id, :"votes.#{voter_id}".exists => true}).exists?
       end
     end
 
     def vote!(value, voter_id, &block)
+      value = value.to_i
+      voter_id = voter_id.to_s
+
       old_vote = self.votes[voter_id]
       if !old_vote
         self.votes[voter_id] = value
-        self.save(:validate => false)
-
-        add_vote!(value, voter_id, &block)
-        return :created
+        if self.save
+          add_vote!(value, voter_id, &block)
+          return :created
+        end
       else
         if(old_vote != value)
           self.votes[voter_id] = value
-          self.save
-          self.remove_vote!(old_vote, voter_id, &block)
-          self.add_vote!(value, voter_id, &block)
+          if self.save
+            self.remove_vote!(old_vote, voter_id, &block)
+            self.add_vote!(value, voter_id, &block)
 
-          return :updated
+            return :updated
+          end
         else
           self.votes.delete(voter_id)
-          self.save(:validate => false)
-          remove_vote!(value, voter_id, &block)
-          return :destroyed
+          if self.save
+            remove_vote!(value, voter_id, &block)
+            return :destroyed
+          end
         end
       end
     end

data/mongoid_ext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mongoid_ext"
-  s.version = "0.7.1"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = "2012-07-27"
+  s.date = "2013-11-03"
   s.description = "mongoid plugins"
   s.email = "krawek@gmail.com"
   s.executables = ["mongoid_console"]
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "mongoid_ext.gemspec",
     "test/helper.rb",
     "test/models.rb",
+    "test/mongoid.yml",
     "test/support/custom_matchers.rb",
     "test/test_encryptor.rb",
     "test/test_filter.rb",
@@ -82,51 +83,57 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.3"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
       s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.1"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
       s.add_runtime_dependency(%q<differ>, [">= 0.1.2"])
       s.add_runtime_dependency(%q<encryptor>, ["~> 1.1.3"])
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid-grid_fs>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
       s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9.4"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.11.4"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
-      s.add_dependency(%q<mongoid>, ["~> 2.3"])
+      s.add_dependency(%q<mongoid>, [">= 0"])
       s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<differ>, [">= 0.1.2"])
       s.add_dependency(%q<encryptor>, ["~> 1.1.3"])
+      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<mongoid-grid_fs>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
       s.add_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
       s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
-      s.add_dependency(%q<mocha>, ["~> 0.9.4"])
+      s.add_dependency(%q<mocha>, ["~> 0.11.4"])
       s.add_dependency(%q<timecop>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongoid>, ["~> 2.3"])
+    s.add_dependency(%q<mongoid>, [">= 0"])
     s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<differ>, [">= 0.1.2"])
     s.add_dependency(%q<encryptor>, ["~> 1.1.3"])
+    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<mongoid-grid_fs>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
     s.add_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
     s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
-    s.add_dependency(%q<mocha>, ["~> 0.9.4"])
+    s.add_dependency(%q<mocha>, ["~> 0.11.4"])
     s.add_dependency(%q<timecop>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -7,6 +7,7 @@ require 'shoulda'
 require 'timecop'
 require 'mocha'
 require 'pp'
+require 'pry'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -14,16 +15,14 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'support/custom_matchers'
 require 'mongoid_ext'
 
-Mongoid.configure do |config|
-  config.master = Mongo::Connection.new.db("test")
-end
-
+Mongoid.load!("test/mongoid.yml", "test")
 require 'models'
 
+
 class Test::Unit::TestCase
   include CustomMatchers
 end
 
 MongoidExt.init
 
-$VERBOSE=nil
+$VERBOSE=nil

data/test/models.rb

@@ -69,7 +69,7 @@ class BlogPost # for Slug and Filter
   field :tags, :type => Array
   field :date, :type => Time
 
-  referenced_in :updated_by, :class_name => "User"
+  belongs_to :updated_by, :class_name => "User"
 
   versionable_keys :title, :body, :tags, :owner_field => "updated_by_id", :max_versions => 2
 

data/test/mongoid.yml

@@ -0,0 +1,19 @@
+test:
+  sessions:
+    default:
+      hosts:
+        - localhost:27017
+      database: mongoidext-test
+      options:
+        safe: true
+  options:
+    allow_dynamic_fields: false
+    identity_map_enabled: true
+    include_root_in_json: false
+    include_type_for_serialization: true
+    preload_models: false
+    scope_overwrite_exception: true
+    raise_not_found_error: false
+    skip_version_check: false
+    use_activesupport_time_zone: true
+    use_utc: true

data/test/test_encryptor.rb

@@ -24,7 +24,7 @@ class StorageTest < Test::Unit::TestCase
     should "not fail with nil values" do
       @cc.data = nil
       @cc.save
-      @cc.reload
+      @cc = CreditCard.find(@cc.id)
       @cc.data.should == nil
     end
   end