permalink 1.1.2 → 1.2.0

data/.rspec

@@ -1 +1 @@
---colour --format documentation
+--colour --format documentation --profile

data/Gemfile.lock

@@ -1,70 +1,67 @@
 PATH
   remote: .
   specs:
-    permalink (1.1.2)
+    permalink (1.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.5)
-    archive-tar-minitar (0.5.2)
-    arel (2.0.9)
-    bson (1.2.4)
-    bson_ext (1.2.4)
-    builder (2.1.2)
-    columnize (0.3.2)
-    diff-lcs (1.1.2)
-    i18n (0.5.0)
-    jnunemaker-validatable (1.8.4)
-      activesupport (>= 2.3.4)
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
-    mongo (1.2.2)
-      bson (>= 1.2.2)
-    mongo_mapper (0.8.6)
-      activesupport (>= 2.3.4)
-      jnunemaker-validatable (~> 1.8.4)
-      plucky (~> 0.3.6)
-    mongoid (2.0.0.rc.7)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bson (1.4.1)
+    bson_ext (1.4.1)
+    builder (3.0.0)
+    coderay (0.9.8)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    method_source (0.6.6)
+      ruby_parser (~> 2.0.5)
+    mongo (1.4.1)
+      bson (= 1.4.1)
+    mongo_mapper (0.9.2)
       activemodel (~> 3.0)
-      mongo (~> 1.2)
+      activesupport (~> 3.0)
+      plucky (~> 0.3.8)
+    mongoid (2.3.2)
+      activemodel (~> 3.1)
+      mongo (~> 1.4)
       tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    plucky (0.3.6)
-      mongo (~> 1.1)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    multi_json (1.0.3)
+    plucky (0.3.8)
+      mongo (~> 1.3)
+    pry (0.9.6.2)
+      coderay (~> 0.9.8)
+      method_source (~> 0.6.5)
+      ruby_parser (~> 2.0.5)
+      slop (~> 2.1.0)
+    rake (0.9.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
-    sqlite3 (1.3.3)
+    rspec-mocks (2.7.0)
+    ruby_parser (2.0.6)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.7)
+    slop (2.1.0)
+    sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    test-unit (2.2.0)
-    tzinfo (0.3.24)
-    will_paginate (3.0.pre2)
+    test-unit (2.4.0)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
@@ -72,10 +69,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   bson_ext
-  mongo_mapper (~> 0.8.6)
-  mongoid (~> 2.0.0.rc.7)
+  mongo_mapper (~> 0.9)
+  mongoid (~> 2.3)
   permalink!
-  rspec (~> 2.5.0)
-  ruby-debug19
+  pry
+  rake
+  rspec (~> 2.7)
   sqlite3-ruby
   test-unit

data/README.markdown

@@ -4,7 +4,7 @@ Permalink
 Instalation
 -----------
 
-	gem install permalink
+    gem install permalink
 
 Usage
 -----
@@ -40,15 +40,21 @@ The above settings will generate something link `100-some-title-page`. By overri
 
 If you want to generate unique permalink, use the `:unique` option:
 
-	class Page < ActiveRecord::Base
-	  permalink :title, :unique => true, :to_param => :permalink
-	end
+    class Page < ActiveRecord::Base
+      permalink :title, :unique => true, :to_param => :permalink
+    end
 
 The permalink is generated using `ActiveSupport::Multibyte::Chars` class; this means that characters will properly replaced from `áéíó` to `aeio`, for instance.
 
 The permalink is created when `before_validation` callback is evaluated. This plugin also tries
 to generate a permalink when `before_save` callback is evaluated and the instance has no permalink set.
 
+You can force the permalink generation by setting the `:force` option.
+
+    class Page < ActiveRecord::Base
+      permalink :title, :force => true
+    end
+
 ## License
 
 Copyright (c) 2011 Nando Vieira, released under the MIT license

data/lib/permalink/orm/base.rb

@@ -5,15 +5,17 @@ module Permalink
         def setup_permalink(orm_options, from, options)
           options.reverse_merge!(orm_options)
           options.reverse_merge!({
-            :to       => :permalink,
-            :unique   => false
+            :to     => :permalink,
+            :unique => false,
+            :force  => false
           })
 
           self.permalink_options = {
             :from_column_name => from,
             :to_column_name   => options[:to],
             :to_param         => [options[:to_param]].flatten,
-            :unique           => options[:unique]
+            :unique           => options[:unique],
+            :force            => options[:force]
           }
 
           before_validation :create_permalink
@@ -66,8 +68,12 @@ module Permalink
           read_attribute(to_permalink_name)
         end
 
+        def update_permalink?
+          self.class.permalink_options[:force] || to_permalink_value.blank?
+        end
+
         def create_permalink
-          unless from_permalink_value.blank? || !to_permalink_value.blank?
+          if update_permalink?
             write_attribute(to_permalink_name, next_available_permalink(from_permalink_value.to_s.to_permalink))
           end
         end

data/lib/permalink/version.rb

@@ -1,8 +1,8 @@
 module Permalink
   module Version
     MAJOR = 1
-    MINOR = 1
-    PATCH = 2
+    MINOR = 2
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/permalink.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "activerecord"
   s.add_development_dependency "sqlite3-ruby"
   s.add_development_dependency "test-unit"
-  s.add_development_dependency "rspec", "~> 2.5.0"
-  s.add_development_dependency "mongoid", "~> 2.0.0.rc.7"
-  s.add_development_dependency "mongo_mapper", "~> 0.8.6"
+  s.add_development_dependency "rspec", "~> 2.7"
+  s.add_development_dependency "mongoid", "~> 2.3"
+  s.add_development_dependency "mongo_mapper", "~> 0.9"
   s.add_development_dependency "bson_ext"
-  s.add_development_dependency "ruby-debug19" if RUBY_VERSION >= "1.9"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "rake"
 end

data/spec/permalink/mongoid_spec.rb

@@ -1,8 +1,6 @@
 require "spec_helper"
 
 describe Permalink::Orm::Mongoid do
-  before { pending }
-
   let(:model) { Article }
   it_should_behave_like "orm"
 

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require "mongo_mapper"
-# require "mongoid"
+require "mongoid"
 require "rspec"
 require "active_record"
 require "permalink"
@@ -8,19 +8,17 @@ require "permalink"
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 # Setup MongoMapper
-MongoMapper.connection = Mongo::Connection.new("localhost")
+MongoMapper.connection = Mongo::Connection.new
 MongoMapper.database = "permalink"
 
 # Setup Mongoid
-# Mongoid.configure do |config|
-#   name = "permalink"
-#   host = "localhost"
-#   config.master = Mongo::Connection.new.db(name)
-#   config.persist_in_safe_mode = false
-# end
+Mongoid.configure do |config|
+  config.master = Mongo::Connection.new.db("permalink")
+  config.persist_in_safe_mode = false
+end
 
 load("support/schema.rb")
 require "support/page"
 require "support/shared"
 require "support/post"
-# require "support/article"
+require "support/article"

data/spec/support/shared.rb

@@ -61,7 +61,6 @@ shared_examples_for "orm" do
     model.permalink :title, :to_param => [:id, "    ", nil, "\t", :permalink]
 
     record = model.create(:title => "Some nice post")
-    record.reload
     record.to_param.should == "#{record.id}-some-nice-post"
   end
 
@@ -84,4 +83,13 @@ shared_examples_for "orm" do
     record = model.create(:title => "Rails 3")
     record.permalink.should == "rails-3-2"
   end
+
+  it "should force permalink" do
+    model.permalink :title, :force => true
+
+    record = model.create(:title => "Some nice post")
+    record.update_attributes :title => "Awesome post"
+
+    record.permalink.should == "awesome-post"
+  end
 end

metadata

@@ -1,116 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: permalink
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-21 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70099538008620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70099538008620
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &70099537997320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70099537997320
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70099538001440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70099538001440
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70099537985380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
+      - !ruby/object:Gem::Version
+        version: '2.7'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mongoid
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70099537985380
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &70099537969500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.0.0.rc.7
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70099537969500
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: &70099537975840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.6
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70099537975840
+- !ruby/object:Gem::Dependency
   name: bson_ext
+  requirement: &70099537055460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70099537055460
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70099537034980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70099537034980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70099537034280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *70099537034280
 description: Generate permalink attributes on ActiveRecord
-email: 
+email:
 - fnando.vieira@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -135,35 +141,37 @@ files:
 - spec/support/post.rb
 - spec/support/schema.rb
 - spec/support/shared.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/permalink
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 232250411774848879
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 232250411774848879
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Generate permalink attributes on ActiveRecord
-test_files: 
+test_files:
 - spec/permalink/active_record_spec.rb
 - spec/permalink/mongo_mapper_spec.rb
 - spec/permalink/mongoid_spec.rb