slugged 1.0.1 → 1.1.0

data/.gitignore

@@ -12,3 +12,4 @@ pkg
 *.gem
 coverage
 metrics/*
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,17 @@
+---
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  # - jruby-18mode
+  # - jruby-19mode
+  - ree
+env:
+  - RAILS_VERSION=""
+  - RAILS_VERSION="~>3.2.0"
+  - RAILS_VERSION="~>3.1.0"
+  - RAILS_VERSION="~>3.0.0"
+notifications:
+  email:
+    - sutto@sutto.net

data/Gemfile

@@ -1,3 +1,12 @@
 source :gemcutter
 
+# Allow testing multiple versions with Travis.
+rails_version = ENV['RAILS_VERSION']
+if rails_version && rails_version.length > 0
+  puts "Testing Rails Version = #{rails_version}"
+  # Override the specific versions
+  gem 'activesupport', rails_version
+  gem 'activerecord',  rails_version
+end
+
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Slugged #
+# Slugged [![Build Status](https://secure.travis-ci.org/sutto/slugged.png?branch=master)](http://travis-ci.org/sutto/slugged)
 
 ## About ###
 
@@ -98,7 +98,7 @@ Generates a slug if not already present.
 When found via Model.find\_using\_slug, it will return try
 if there is a better slug available. Intended for use in redirects etc.
 
-## Working on Slugged ##
+## Working on Slugged
 
 To run tests, simply do the following:
 
@@ -107,13 +107,13 @@ To run tests, simply do the following:
 
 And it's ready!
 
-## Contributors ##
+## Contributors
 
 Thanks to the following who contributed functionality / bug fixes:
 
 * [Matt Pruitt](http://github.com/guitsaru)
 
-## Note on Patches/Pull Requests ##
+## Note on Patches/Pull Requests
  
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -121,6 +121,6 @@ Thanks to the following who contributed functionality / bug fixes:
 * Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-## Copyright ##
+## Copyright
 
 Copyright (c) 2010 Darcy Laycock. See LICENSE for details.

data/Rakefile

@@ -9,66 +9,6 @@ end
 
 task :default => :test
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-    test.rcov_opts << '--exclude /gems/,/Library/,/usr/,lib/tasks,.bundle,config,/lib/rspec/,/lib/rspec-'
-    test.output_dir = "metrics/coverage"
-  end
-rescue LoadError
-  task :rcov do
-    abort "Rcov isn't installed, please run via bundle exec after bundle installing"
-  end
-end
-
-task :metrics => [:rcov, :saikuro, :reek, :flay, :flog, :roodi]
-
-task :flog do
-  system "flog lib"
-end
-
-task :saikuro do
-  system "rm -rf metrics/saikuro && mkdir -p metrics/saikuro && saikuro -c -t -i lib/ -y 0 -w 11 -e 16 -o metrics/saikuro/"
-end
-
-begin
-  require 'flay'
-  require 'flay_task'
-  FlayTask.new
-rescue LoadError
-  task :flay do
-    abort "Flay isn't installed, please run via bundle exec after bundle installing"
-  end
-end
-
-begin
-  require 'reek/rake/task'
-  Reek::Rake::Task.new do |t|
-    t.fail_on_error = true
-    t.verbose = false
-    t.source_files = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort "Reek isn't installed, please run via bundle exec after bundle installing"
-  end
-end
-
-begin
-  require 'roodi'
-  require 'roodi_task'
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort "Roodi isn't installed, please run via bundle exec after bundle installing"
-  end
-end
-
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/lib/slugged/slug.rb

@@ -31,7 +31,12 @@ module Slugged
       scope = Slugged.key_for_scope(record)
       # Clear slug history in this scope before recording the new slug
       for_slug(scope, slug).delete_all
-      create :scope => scope, :record_id => record.id, :slug => slug.to_s
+      new.tap do |history|
+        history.scope     = scope
+        history.record_id = record.id
+        history.slug      = slug.to_s
+        history.save
+      end
     end
     
     def self.remove_history_for(record)

data/lib/slugged/version.rb

@@ -1,8 +1,8 @@
 module Slugged
   module Version
     MAJOR  = 1
-    MINOR  = 0
-    PATCH  = 1
+    MINOR  = 1
+    PATCH  = 0
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end
   

data/slugged.gemspec

@@ -4,41 +4,30 @@ $:.push File.expand_path("../lib", __FILE__)
 require 'slugged/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{slugged}
-  s.version = Slugged::VERSION
-
+  s.name                      = "slugged"
+  s.version                   = Slugged::VERSION
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Darcy Laycock"]
-  s.date = %q{2011-01-01}
-  s.description = %q{Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history}
-  s.email = %q{sutto@sutto.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths = ["lib"]
+  s.authors                   = ["Darcy Laycock"]
+  s.date                      = %q{2011-01-01}
+  s.description               = %q{Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history}
+  s.email                     = %q{sutto@sutto.net}
+  s.extra_rdoc_files          = ["LICENSE", "README.md"]
+  s.files                     = `git ls-files`.split("\n")
+  s.test_files                = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths             = ["lib"]
+  s.homepage                  = %q{http://github.com/Sutto/slugged}
+  s.rdoc_options              = ["--charset=UTF-8"]
+  s.summary                   = %q{Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history}
 
-  s.homepage = %q{http://github.com/Sutto/slugged}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.summary = %q{Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history}
+  s.add_runtime_dependency "activerecord",  "~> 3.0"
+  s.add_runtime_dependency "activesupport", "~> 3.0"
+  s.add_runtime_dependency "uuid"
 
-  s.add_runtime_dependency(%q<activerecord>, ["~> 3"])
-  s.add_runtime_dependency(%q<activesupport>, ["~> 3"])
-  s.add_runtime_dependency(%q<uuid>, [">= 0"])
-  s.add_development_dependency(%q<shoulda>, [">= 0"])
-  s.add_development_dependency(%q<reversible_data>, [">= 0"])
-  s.add_development_dependency(%q<sqlite3-ruby>)
-  s.add_development_dependency(%q<redgreen>) if RUBY_VERSION < "1.9"
-  s.add_development_dependency(%q<rcov>)
-  s.add_development_dependency(%q<reek>)  
-  s.add_development_dependency(%q<roodi>)  
-  s.add_development_dependency(%q<flay>)
-  s.add_development_dependency(%q<flog>)  
-  s.add_development_dependency(%q<Saikuro>)  
-  s.add_development_dependency(%q<ruby-debug>)
-  s.add_development_dependency(%q<rdoc>)
-  s.add_development_dependency(%q<rake>, '> 0.9')  
+  s.add_development_dependency "shoulda"
+  s.add_development_dependency "reversible_data"
+  s.add_development_dependency "sqlite3-ruby"
+  s.add_development_dependency "redgreen"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rdoc"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slugged
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -25,10 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
         - 3
-        version: "3"
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -39,10 +40,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
         - 3
-        version: "3"
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -116,7 +118,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rake
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -130,7 +132,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: reek
+  name: rdoc
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -143,105 +145,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: roodi
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: flay
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: flog
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: Saikuro
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  type: :development
-  version_requirements: *id016
 description: Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history
 email: sutto@sutto.net
 executables: []
@@ -255,8 +158,8 @@ files:
 - .document
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -312,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history

data/Gemfile.lock

@@ -1,90 +0,0 @@
-PATH
-  remote: .
-  specs:
-    slugged (1.0.0)
-      activerecord (~> 3)
-      activesupport (~> 3)
-      uuid
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    Saikuro (1.1.0)
-    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)
-    builder (3.0.0)
-    columnize (0.3.4)
-    flay (1.4.3)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    flog (2.5.3)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    i18n (0.6.0)
-    json (1.6.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    macaddr (1.4.0)
-      systemu (~> 2.2.0)
-    multi_json (1.0.3)
-    rake (0.9.2)
-    rbx-require-relative (0.0.5)
-    rcov (0.9.11)
-    rdoc (3.10)
-      json (~> 1.4)
-    redgreen (1.2.2)
-    reek (1.2.8)
-      ruby2ruby (~> 1.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    reversible_data (0.1.0)
-    roodi (2.1.0)
-      ruby_parser
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby2ruby (1.3.1)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.7)
-    shoulda (2.11.3)
-    sqlite3 (1.3.4)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    systemu (2.2.0)
-    tzinfo (0.3.30)
-    uuid (2.3.4)
-      macaddr (~> 1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  Saikuro
-  flay
-  flog
-  rake (> 0.9)
-  rcov
-  rdoc
-  redgreen
-  reek
-  reversible_data
-  roodi
-  ruby-debug
-  shoulda
-  slugged!
-  sqlite3-ruby