mongoid-slugify 0.0.2 → 0.0.3

data/.travis.yml

@@ -2,6 +2,8 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-2.0
-  - jruby
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
   - ree

data/Gemfile

@@ -4,4 +4,3 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'bson_ext', :platforms => :ruby
-gem 'activesupport', '~> 3.2.0'

data/lib/mongoid/slugify/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Slugify
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/mongoid/slugify.rb

@@ -9,39 +9,9 @@ module Mongoid
     included do
       field :slug
       index :slug, :unique => true
-      before_save :assign_slug
+      before_save :assign_slug, :if => :assign_slug?
     end
 
-    def to_param
-      slug || super
-    end
-
-    private
-      def generate_slug
-        raise NotImplementedError
-      end
-
-      def generate_unique_slug
-        current_slug = generate_slug
-        pattern = /^#{Regexp.escape(current_slug)}(?:-(\d+))?$/
-
-        appropriate_class = self.class
-        while (appropriate_class.superclass.include?(Mongoid::Document))
-          appropriate_class = appropriate_class.superclass
-        end
-
-        existing_slugs = appropriate_class.where(:slug => pattern, :_id.ne => _id).only(:slug).map { |record| record.slug }
-        if existing_slugs.count > 0
-          max_counter = existing_slugs.map { |slug| (pattern.match(slug)[1] || 0).to_i }.max
-          current_slug += "-#{max_counter + 1}"
-        end
-        current_slug
-      end
-
-      def assign_slug
-        self.slug = generate_unique_slug
-      end
-
     module ClassMethods
       def find_by_slug(slug)
         where(:slug => slug).first
@@ -52,12 +22,47 @@ module Mongoid
       end
 
       def find_by_slug_or_id(slug_or_id)
-        find_by_slug(slug_or_id) || where(:id => id).first
+        find_by_slug(slug_or_id) || where(:_id => slug_or_id).first
       end
 
       def find_by_slug_or_id!(slug_or_id)
         find_by_slug(slug_or_id) || find(slug_or_id)
       end
     end
+
+    def to_param
+      slug || super
+    end
+
+    private
+    def assign_slug?
+      true
+    end
+
+    def generate_slug
+      raise NotImplementedError
+    end
+
+    def generate_unique_slug
+      current_slug = generate_slug
+      pattern = /^#{Regexp.escape(current_slug)}(?:-(\d+))?$/
+
+      appropriate_class = self.class
+      while (appropriate_class.superclass.include?(Mongoid::Document))
+        appropriate_class = appropriate_class.superclass
+      end
+
+      existing_slugs = appropriate_class.where(:slug => pattern, :_id.ne => _id).only(:slug).map { |record| record.slug }
+      if existing_slugs.count > 0
+        max_counter = existing_slugs.map { |slug| (pattern.match(slug)[1] || 0).to_i }.max
+        current_slug << "-#{max_counter + 1}"
+      end
+
+      current_slug
+    end
+
+    def assign_slug
+      self.slug = generate_unique_slug
+    end
   end
 end

data/spec/mongoid/slugify_spec.rb

@@ -32,6 +32,13 @@ end
 class ComicBook < Book
 end
 
+class CookBook < Book
+  private
+  def assign_slug?
+    slug.blank?
+  end
+end
+
 class Person
   include Mongoid::Document
   include Mongoid::Slugify
@@ -98,6 +105,36 @@ module Mongoid
       end
     end
 
+    context "when assign_slug? is configured to work only when slug is empty" do
+      let(:book) do
+        CookBook.create(:title => "A Thousand Plateaus")
+      end
+
+      it "generates a slug" do
+        book.to_param.should eql "a-thousand-plateaus"
+      end
+
+      it "does not update the slug" do
+        book.title = "Anti Oedipus"
+        book.save
+        book.to_param.should eql "a-thousand-plateaus"
+      end
+
+      it "updates the slug if it's nil" do
+        book.title = "Anti Oedipus"
+        book.slug = nil
+        book.save
+        book.to_param.should eql "anti-oedipus"
+      end
+
+      it "updates the slug if it's empty" do
+        book.title = "Anti Oedipus"
+        book.slug = ""
+        book.save
+        book.to_param.should eql "anti-oedipus"
+      end
+    end
+
     context "when the slug is composed of multiple fields" do
       let!(:author) do
         Author.create(
@@ -203,29 +240,43 @@ module Mongoid
       end
     end
 
-    describe ".find_by_slug" do
-      let!(:book) { Book.create(:title => "A Thousand Plateaus") }
+    describe 'ClassMethods' do
+      let(:book) { Book.create(:title => "A Thousand Plateaus") }
 
-      it "returns nil if no document is found" do
-        Book.find_by_slug(:title => "Anti Oedipus").should be_nil
-      end
+      describe ".find_by_slug" do
+        it "returns nil if no document is found" do
+          Book.find_by_slug("Anti Oedipus").should be_nil
+        end
 
-      it "returns the document if it is found" do
-        Book.find_by_slug(book.slug).should == book
+        it "returns the document if it is found" do
+          Book.find_by_slug(book.slug).should == book
+        end
       end
-    end
 
-    describe ".find_by_slug!" do
-      let!(:book) { Book.create(:title => "A Thousand Plateaus") }
+      describe ".find_by_slug!" do
+        it "raises a Mongoid::Errors::DocumentNotFound error if no document is found" do
+          lambda {
+            Book.find_by_slug!("Anti Oedipus")
+          }.should raise_error(Mongoid::Errors::DocumentNotFound)
+        end
 
-      it "raises a Mongoid::Errors::DocumentNotFound error if no document is found" do
-        lambda {
-          Book.find_by_slug!(:title => "Anti Oedipus")
-        }.should raise_error(Mongoid::Errors::DocumentNotFound)
+        it "returns the document when it is found" do
+          Book.find_by_slug!(book.slug).should == book
+        end
       end
 
-      it "returns the document when it is found" do
-        Book.find_by_slug!(book.slug).should == book
+      describe ".find_by_slug_or_id" do
+        it "returns nil if no document is found" do
+          Book.find_by_slug_or_id("Anti Oedipus").should be_nil
+        end
+
+        it "returns the document when it is found by slug" do
+          Book.find_by_slug_or_id(book.slug).should == book
+        end
+
+        it "returns the document when it is found by id" do
+          Book.find_by_slug_or_id(book.id).should == book
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,8 +2,7 @@ require "bundler/setup"
 Bundler.require(:default, :development)
 
 Mongoid.configure do |config|
-  name = "mongoid_slugify_test"
-  config.master = Mongo::Connection.new.db(name)
+  config.master = Mongo::Connection.new.db("mongoid_slugify_test")
 end
 
 DatabaseCleaner.strategy = :truncation
@@ -13,7 +12,7 @@ RSpec.configure do |config|
   config.before :each do
     DatabaseCleaner.start
   end
-  
+
   config.after :each do
     DatabaseCleaner.clean
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-slugify
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70152738090960 !ruby/object:Gem::Requirement
+  requirement: &70279909356200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152738090960
+  version_requirements: *70279909356200
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70152738090440 !ruby/object:Gem::Requirement
+  requirement: &70279909355580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152738090440
+  version_requirements: *70279909355580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70152738089980 !ruby/object:Gem::Requirement
+  requirement: &70279909354960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152738089980
+  version_requirements: *70279909354960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70152738089400 !ruby/object:Gem::Requirement
+  requirement: &70279909354460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152738089400
+  version_requirements: *70279909354460
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70152738088960 !ruby/object:Gem::Requirement
+  requirement: &70279909353820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152738088960
+  version_requirements: *70279909353820
 description: Provides a simple way to add slug generation to a Mongoid model
 email:
 - fxposter@gmail.com