leifcr-mm-sluggable 0.2.5 → 0.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dd133368d98c05b9fa8d73ac87002ca30dda856a
+  data.tar.gz: 3b1432df20d7cfdc384161e499e75b41df8f5d26
+SHA512:
+  metadata.gz: da2472198a8721fd551177c05b0f8abb7c8adfb2ad914dad0475bf03d3deef7d416b2b8f6a74ebdd839a770515c5962a100e9ccf926dd5e9ee098382a1ce41fb
+  data.tar.gz: a8f1f65701da020944f23a7eacc7a5155e9c667802a9c522676a2b49644f128bcc6e1277aa108d3850c49addbe4a9b0bb71ae87607567714087f6b66334419e7

data/Gemfile

@@ -1,19 +1,19 @@
-source :rubygems
+source 'https://rubygems.org'
+
 gem 'rake'
 gem 'bson_ext', '>= 1.6.4'
 gem 'multi_json', '>= 1.3.6'
 
 group :test do
-  # gem 'jnunemaker-matchy', '>= 0.4', :require => 'matchy'
-  # gem 'shoulda',           '>= 3.1.1'
-  # gem 'mocha',             '>= 0.12.3'
-  gem 'rspec'
+  gem 'rspec', "~> 2.8"
   gem 'database_cleaner',  '>= 0.8.0'
 end
 
-group :development do
-  gem "wirble"
-  gem "hirb"
-  gem "awesome_print"  
+group :development, :test do
+  gem 'coveralls', :require => false
+  gem 'simplecov', :require => false
 end
-gemspec
+
+gem 'activemodel', "~> 3.2"
+
+gem 'mongo_mapper', '0.13.0.beta2'

data/LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2010 Richard Livsey
-Copyright (c) 2012 Leif Ringstad
+Copyright (c) 2012-2014 Leif Ringstad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/{README.rdoc → README.md}

@@ -1,23 +1,30 @@
-= MongoMapper::Plugins::Sluggable
+# MongoMapper::Plugins::Sluggable
+[![Build Status](https://travis-ci.org/leifcr/mm-sluggable.svg?branch=master)](https://travis-ci.org/leifcr/mm-sluggable) [![Coverage Status](https://coveralls.io/repos/leifcr/mm-sluggable/badge.png)](https://coveralls.io/r/leifcr/mm-sluggable) [![Dependency Status](https://gemnasium.com/leifcr/mm-sluggable.svg)](https://gemnasium.com/leifcr/mm-sluggable)
 
-Add slugs to your fields. And use it for URLS...
+Add slugs to your fields. And use it for nice urls. Difference from other mm-sluggables: This uses regexp query for checking conflicting slugs, so you get only 2 queries even if your collection has 1000 upon 1000 of documents.
 
-== Usage
+## Usage
 
 Either load it into all models, or individual models:
 
 Add to all models
+```ruby
   #initializers/mongo.rb
   MongoMapper::Document.plugin(MongoMapper::Plugins::Sluggable)
+```
 
 Add to a specific model
+```ruby
   #app/models/my_model.rb
   plugin MongoMapper::Plugins::Sluggable
+```
 
 Then call sluggable to configure it
+```ruby
   sluggable :title, :scope => :account_id
+```
 
-NOTE: The slugs will always be updated if you change the field it creates 
+NOTE: The slugs will always be updated if you change the field it creates
 the slugs from. see options to change behaviour
 
 Free slugs will be reused
@@ -25,7 +32,7 @@ Example: you have my-title-1 and my-title-3 creating a new slug will generate my
 
   Why always change slugs? Feels better to have same slug as title...
 
-== Improve performance on your models
+## Improve performance on your models
 
 This is important to get fast queries! (you will regret if you don't add it...)
 
@@ -35,8 +42,8 @@ https://github.com/jnunemaker/mongomapper/issues/337
 Easiest is to add db/indexes.rb to your app, then add this to that file:
   # db/indexes.rb
   MyModel.ensure_index(:slug_key)
-  
-== Options
+
+## Options
 
 Available options are:
 
@@ -48,28 +55,30 @@ Available options are:
 
 Eg.
 
-  sluggable :title, :scope => :account_id, :key => :title_slug, :method => :to_url, :index => false
-  
+```ruby
+  sluggable :title, scope: :account_id, key: :title_slug, method: :to_url, always_update: true
+```
+
 This will slug the title to the title_slug key, scoped to the account, will use String#to_url to slug it and won't add an index to the key
 
-== Versioning
+## Versioning
 
 If an item with the same slug exists, it will add a version number to the slug.
 
 IE assuming we already have an item with the slug of "monkey", the slug will be generated as "monkey-1"
 
-== Note on Patches/Pull Requests
+## Note on Patches/Pull Requests
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it.
 
-== Install
+## Install
 Bundler: (You are most likely using bundler in your app...)
   gem 'mm-sluggable', :git => 'http://github.com/luuf/mm-sluggable.git'
 
-== Thanks
+## Thanks
 * Richard Livsey for creating the original mm-sluggable
 * John Nunemaker, Brandon Keepers & Others for MongoMapper
 
-== Copyright
+## Copyright
 See LICENSE for details.

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
-require File.join(File.dirname(__FILE__), '/lib/sluggable/version')
+require File.join(File.dirname(__FILE__), 'lib', 'sluggable', 'version')
 
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec

data/lib/mm-sluggable.rb

@@ -10,28 +10,39 @@ module MongoMapper
           class_attribute :slug_options
 
           self.slug_options = {
-            :to_slug      => to_slug,
-            :key          => :slug,
-            :method       => :parameterize,
-            :scope        => nil,
-            :max_length   => 256,
-            :always_update => true, # allow always updating slug...
-            :callback      => :before_validation,
-            :callback_on   => nil,            
+            to_slug:          to_slug,
+            key:              :slug,
+            method:           :parameterize,
+            scope:            nil,
+            max_length:       256,
+            start:            1,
+            always_update:    true, # allow always updating slug...
+            callback:         :before_validation,
+            callback_on:      nil,
           }.merge(options)
           key slug_options[:key], String
 
           #before_validation :set_slug
           self.send(slug_options[:callback], :set_slug, {:on => slug_options[:callback_on]}) if slug_options[:callback] && slug_options[:callback_on]
-          self.send(slug_options[:callback], :set_slug) if slug_options[:callback] && slug_options[:callback_on].nil?          
+          self.send(slug_options[:callback], :set_slug) if slug_options[:callback] && slug_options[:callback_on].nil?
         end
       end
 
       def set_slug
-        options = self.class.slug_options
-        
+        klass = self.class
+        while klass.respond_to?(:single_collection_parent)
+          superclass = klass.single_collection_parent
+          if superclass && superclass.respond_to?(:slug_options)
+            klass = superclass
+          else
+            break
+          end
+        end
+
+        options = klass.slug_options
+
         if options[:always_update] == false
-          return unless self.send(options[:key]).blank? 
+          return unless self.send(options[:key]).blank?
         end
 
         to_slug = self[options[:to_slug]]
@@ -52,32 +63,40 @@ module MongoMapper
         conds[options[:scope]] = self.send(options[:scope]) if options[:scope]
 
         # first see if there is a equal slug
-        used_slugs = self.class.where(conds)
+        used_slugs = klass.where(conds).fields(options[:key])
         if (used_slugs.count > 0)
           last_digit = 0 # zero for last one...
           # if we are updating, check if the current slug is same as the one we want
           conds[options[:key]] = /(#{the_slug}-\d+)/
-          used_slugs = self.class.where(conds).sort(options[:key].asc)
-          new_slug_set = false
+          used_slugs = klass.where(conds).fields(options[:key])
+          used_slugs_array = Array.new
           used_slugs.each do |used_slug|
-            # get the last digit through regex
-            next_digit = used_slug.send(options[:key])[/(\d+)$/]
-            if (!next_digit.nil?)
-              # catch any numbers that are in between and free
-              if ((next_digit.to_i - last_digit.to_i) > 1)
-                the_slug = "#{raw_slug}-#{last_digit+1}"
-                new_slug_set = true
-                break # set a new slug, so all is good
+            used_slugs_array << used_slug.send(options[:key])[/(\d+)$/].to_i
+          end
+          used_slugs_array.sort!
+
+          if used_slugs_array.length <= 0
+            next_digit = options[:start]
+          else
+            prev_num = used_slugs_array.shift
+            if used_slugs_array.length == 0
+              next_digit = prev_num + 1
+            else
+              used_slugs_array.each do |slug_num|
+                if ((slug_num - prev_num) > 1)
+                  next_digit = prev_num + 1
+                  break
+                end
+                next_digit = slug_num + 1
+                prev_num = slug_num
               end
-              last_digit = next_digit.to_i
-              # puts last_digit.inspect
             end
           end
-          the_slug = "#{raw_slug}-#{last_digit+1}" if new_slug_set == false
+          the_slug = "#{raw_slug}-#{next_digit}"
         end
 
         self.send(:"#{options[:key]}=", the_slug)
       end
     end
   end
-end
+end

data/lib/sluggable/version.rb

@@ -1,3 +1,3 @@
 module Sluggable
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: leifcr-mm-sluggable
 version: !ruby/object:Gem::Version
-  version: 0.2.5
-  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -55,29 +50,28 @@ files:
 - Gemfile
 - Rakefile
 - LICENSE
-- README.rdoc
+- README.md
 homepage: http://github.com/leifcr/mm-sluggable
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MongoMapper Plugin to store a slugged version of of a field.
 test_files: []