mongomapper_ext 0.0.4 → 0.1.0

data/Rakefile

@@ -11,8 +11,7 @@ begin
     gem.homepage = "http://github.com/dcu/mongomapper_ext"
     gem.authors = ["David A. Cuadrado"]
 
-    gem.add_dependency('mongo_mapper', '>= 0.5.6')
-    gem.add_dependency('ruby-stemmer', '>= 0.5.3')
+    gem.add_dependency('mongo_mapper', '>= 0.6.10')
     gem.add_dependency('uuidtools', '>= 2.0.0')
 
     gem.add_development_dependency("shoulda", ">= 2.10.2")

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/examples/slugizer.rb

@@ -4,7 +4,7 @@ class SlugizerEx
   include MongoMapper::Document
   include MongoMapperExt::Slugizer
 
-  slug_key :title
+  slug_key :title, :unique => true
 
   key :title
 end
@@ -13,3 +13,4 @@ u = SlugizerEx.create(:title => "The title of the blogpost!!!")
 
 puts u.slug
 puts SlugizerEx.by_slug(u.slug).inspect
+

data/lib/mongomapper_ext.rb

@@ -7,7 +7,6 @@ require 'uuidtools'
 # types
 require 'mongomapper_ext/types/open_struct'
 require 'mongomapper_ext/types/timestamp'
-require 'mongomapper_ext/types/set'
 
 # storage
 require 'mongomapper_ext/file'

data/lib/mongomapper_ext/file.rb

@@ -23,9 +23,16 @@ module MongoMapperExt
 
     def self.fetch(owner, filename)
       db = owner.class.database
-      criteria, options = MongoMapper::FinderOptions.new(owner.class, :filename => filename, :metadata => {:_id => owner.id}, :limit => 1).to_a
+      finder = nil
+      if defined?(MongoMapper::FinderOptions)
+        finder = MongoMapper::FinderOptions
+      else
+        finder = MongoMapper::Query
+      end
+
+      criteria, options = finder.new(owner.class, :filename => filename, :metadata => {:_id => owner.id}, :limit => 1).to_a
 
-      obj = db.collection("#{owner.collection.name}.files").find(criteria, options).next_object
+      obj = db.collection("#{owner.collection.name}.files").find(criteria, options).next_document
 
       if obj
         self.new(owner, obj)

data/lib/mongomapper_ext/filter.rb

@@ -1,7 +1,11 @@
 module MongoMapperExt
   module Filter
     def self.included(klass)
-      require 'lingua/stemmer'
+      begin
+        require 'lingua/stemmer'
+      rescue LoadError
+        $stderr.puts "install ruby-stemmer `gem install ruby-stemmer` to activate the full text search support"
+      end
 
       klass.class_eval do
         extend ClassMethods
@@ -32,7 +36,7 @@ module MongoMapperExt
         if opts[:per_page]
           self.paginate(opts.deep_merge(:conditions => {:_keywords => /^(#{q}).*/ }))
         else
-          self.find(:all, opts.deep_merge(:conditions => {:_keywords => /^(#{q}).*/ }))
+          self.all(opts.deep_merge(:conditions => {:_keywords => /^(#{q}).*/ }))
         end
       end
     end
@@ -46,19 +50,26 @@ module MongoMapperExt
         lang = lang.call(self)
       end
 
-      s = Lingua::Stemmer.new(:language => lang)
+      stemmer = nil
+      if defined?(Lingua)
+        stemmer = Lingua::Stemmer.new(:language => lang)
+      end
 
       self._keywords = []
       self.class.filterable_keys.each do |key|
-        self._keywords += keywords_for_value(s, read_attribute(key))
+        self._keywords += keywords_for_value(read_attribute(key), stemmer)
       end
     end
 
     private
-    def keywords_for_value(stemmer, val)
+    def keywords_for_value(val, stemmer=nil)
       if val.kind_of?(String)
         val.downcase.split.map do |word|
-          stem = stemmer.stem(word)
+          stem = word
+          if stemmer
+            stem = stemmer.stem(word)
+          end
+
           if stem != word
             [stem, word]
           else
@@ -66,7 +77,7 @@ module MongoMapperExt
           end
         end.flatten
       elsif val.kind_of?(Array)
-        val.map { |e| keywords_for_value(stemmer, e) }.flatten
+        val.map { |e| keywords_for_value(e, stemmer) }.flatten
       else
         [val]
       end

data/lib/mongomapper_ext/slugizer.rb

@@ -5,33 +5,37 @@ module MongoMapperExt
         extend ClassMethods
         extend Finder
 
-        key :slug, String
-        ensure_index :slug
+        key :slug, String, :index => true
 
         before_validation_on_create :generate_slug
       end
     end
 
     def to_param
-      if self.slug.blank?
-        self.id
-      else
-        self.slug
-      end
+      self.slug.blank? ? self.id : self.slug
     end
 
     protected
     def generate_slug
       if self.slug.blank?
-        key = UUIDTools::UUID.random_create.hexdigest[0,4] #optimize
-        self.slug = key+"-"+self[self.class.slug_key].gsub(/[^A-Za-z0-9\s\-]/, "")[0,20].strip.gsub(/\s+/, "-").downcase
+        slug = self[self.class.slug_key].gsub(/[^A-Za-z0-9\s\-]/, "")[0,20].strip.gsub(/\s+/, "-").downcase
+        if !self.class.slug_options[:unique]
+          key = UUIDTools::UUID.random_create.hexdigest[0,4] #optimize
+          self.slug = key+"-"+slug
+        else
+          self.slug = slug
+        end
       end
     end
 
     module ClassMethods
-      def slug_key(key = :name)
+      def slug_key(key = :name, options = {})
+        @slug_options ||= options
         @slug_key ||= key
       end
+      class_eval do
+        attr_reader :slug_options
+      end
     end
 
     module Finder
@@ -43,4 +47,8 @@ module MongoMapperExt
   end
 end
 
-MongoMapper::Associations::Proxy.send(:include, MongoMapperExt::Slugizer::Finder)
+if defined?(MongoMapper::Associations)
+  MongoMapper::Associations::Proxy.send(:include, MongoMapperExt::Slugizer::Finder)
+else
+  MongoMapper::Plugins::Associations::Proxy.send(:include, MongoMapperExt::Slugizer::Finder)
+end

data/lib/mongomapper_ext/storage.rb

@@ -50,6 +50,7 @@ module MongoMapperExt
 
     module ClassMethods
       def file_key(name)
+        key "_#{name}", String
         define_method("#{name}=") do |file|
           file_id = UUIDTools::UUID.random_create.hexdigest
           filename = name
@@ -65,7 +66,11 @@ module MongoMapperExt
         end
 
         define_method(name) do
-          fetch_file(self["_#{name}"])
+          fetch_file(self["_#{name}"]) if metaclass.keys.has_key?("_#{name}")
+        end
+
+        define_method("has_#{name}?") do
+          !self["_#{name}"].blank?
         end
       end
     end

data/lib/mongomapper_ext/update.rb

@@ -7,4 +7,8 @@ module MongoMapperExt
     end
   end
 end
+
 MongoMapper::EmbeddedDocument.send(:include, MongoMapperExt::Update)
+if !MongoMapper::Document.kind_of?(MongoMapperExt::Update)
+  MongoMapper::Document.send(:include, MongoMapperExt::Update)
+end

data/mongomapper_ext.gemspec

@@ -0,0 +1,101 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{mongomapper_ext}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["David A. Cuadrado"]
+  s.date = %q{2010-02-11}
+  s.description = %q{MongoMapper extensions}
+  s.email = %q{krawek@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "examples/filter.rb",
+     "examples/helper.rb",
+     "examples/slugizer.rb",
+     "examples/storage.rb",
+     "examples/types.rb",
+     "examples/update.rb",
+     "lib/mongomapper_ext.rb",
+     "lib/mongomapper_ext/file.rb",
+     "lib/mongomapper_ext/filter.rb",
+     "lib/mongomapper_ext/slugizer.rb",
+     "lib/mongomapper_ext/storage.rb",
+     "lib/mongomapper_ext/types/open_struct.rb",
+     "lib/mongomapper_ext/types/timestamp.rb",
+     "lib/mongomapper_ext/update.rb",
+     "mongomapper_ext.gemspec",
+     "test/helper.rb",
+     "test/models.rb",
+     "test/support/custom_matchers.rb",
+     "test/test_filter.rb",
+     "test/test_slugizer.rb",
+     "test/test_storage.rb",
+     "test/test_update.rb",
+     "test/types/test_open_struct.rb",
+     "test/types/test_set.rb",
+     "test/types/test_timestamp.rb"
+  ]
+  s.homepage = %q{http://github.com/dcu/mongomapper_ext}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{MongoMapper extensions}
+  s.test_files = [
+    "test/test_slugizer.rb",
+     "test/test_filter.rb",
+     "test/test_storage.rb",
+     "test/test_update.rb",
+     "test/support/custom_matchers.rb",
+     "test/models.rb",
+     "test/helper.rb",
+     "test/types/test_open_struct.rb",
+     "test/types/test_timestamp.rb",
+     "test/types/test_set.rb",
+     "examples/types.rb",
+     "examples/filter.rb",
+     "examples/update.rb",
+     "examples/storage.rb",
+     "examples/helper.rb",
+     "examples/slugizer.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mongo_mapper>, [">= 0.6.10"])
+      s.add_runtime_dependency(%q<uuidtools>, [">= 2.0.0"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
+      s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.4"])
+    else
+      s.add_dependency(%q<mongo_mapper>, [">= 0.6.10"])
+      s.add_dependency(%q<uuidtools>, [">= 2.0.0"])
+      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+      s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.4"])
+    end
+  else
+    s.add_dependency(%q<mongo_mapper>, [">= 0.6.10"])
+    s.add_dependency(%q<uuidtools>, [">= 2.0.0"])
+    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+    s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.4"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongomapper_ext
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 -05:00
+date: 2010-02-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,17 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.6
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ruby-stemmer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.3
+        version: 0.6.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: uuidtools
@@ -100,9 +90,9 @@ files:
 - lib/mongomapper_ext/slugizer.rb
 - lib/mongomapper_ext/storage.rb
 - lib/mongomapper_ext/types/open_struct.rb
-- lib/mongomapper_ext/types/set.rb
 - lib/mongomapper_ext/types/timestamp.rb
 - lib/mongomapper_ext/update.rb
+- mongomapper_ext.gemspec
 - test/helper.rb
 - test/models.rb
 - test/support/custom_matchers.rb

data/lib/mongomapper_ext/types/set.rb

@@ -1,9 +0,0 @@
-class Set
-  def self.to_mongo(value)
-    value.to_a
-  end
-
-  def self.from_mongo(value)
-    Set.new(value)
-  end
-end