slugged 0.4.0 → 1.0.0

data/Gemfile

@@ -1,20 +1,3 @@
 source :gemcutter
 
-# Setup gems
-gem "activerecord", "= 3.0.0"
-gem "reversible_data"
-gem "uuid"
-gem "sqlite3-ruby", :require => "sqlite3"
-
-gem "shoulda",  :require => nil
-gem "redgreen", :require => nil if RUBY_VERSION < "1.9"
-gem "rcov",     :require => nil
-gem "reek",     :require => nil
-gem "roodi",    :require => nil
-gem "flay",     :require => nil
-gem "flog",     :require => nil
-gem "rake",     :require => nil
-gem "Saikuro",  :require => nil
-gem "jeweler",  :require => nil
-
-gem 'ruby-debug', :require => nil
+gemspec

data/Gemfile.lock

@@ -1,39 +1,47 @@
+PATH
+  remote: .
+  specs:
+    slugged (1.0.0)
+      activerecord (~> 3)
+      activesupport (~> 3)
+      uuid
+
 GEM
   remote: http://rubygems.org/
   specs:
     Saikuro (1.1.0)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    columnize (0.3.1)
-    flay (1.4.1)
+    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.0)
+    flog (2.5.3)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    linecache (0.43)
-    macaddr (1.0.0)
-    rake (0.8.7)
-    rcov (0.9.9)
+    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)
@@ -42,23 +50,24 @@ GEM
     reversible_data (0.1.0)
     roodi (2.1.0)
       ruby_parser
-    ruby-debug (0.10.3)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby2ruby (1.2.5)
+    ruby2ruby (1.3.1)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.5)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    sexp_processor (3.0.5)
+    sexp_processor (3.0.7)
     shoulda (2.11.3)
-    sqlite3-ruby (1.3.1)
-    tzinfo (0.3.23)
-    uuid (2.3.1)
+    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
@@ -66,17 +75,16 @@ PLATFORMS
 
 DEPENDENCIES
   Saikuro
-  activerecord (= 3.0.0)
   flay
   flog
-  jeweler
-  rake
+  rake (> 0.9)
   rcov
+  rdoc
   redgreen
   reek
   reversible_data
   roodi
   ruby-debug
   shoulda
+  slugged!
   sqlite3-ruby
-  uuid

data/Rakefile

@@ -1,39 +1,13 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-Bundler.require
-
-require 'rake'
-
-require File.expand_path('../lib/slugged/version', __FILE__)
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.version     = Slugged::Version::STRING
-    gem.name        = "slugged"
-    gem.summary     = %Q{Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history}
-    gem.description = %Q{Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history}
-    gem.email       = "sutto@sutto.net"
-    gem.homepage    = "http://github.com/Sutto/slugged"
-    gem.authors     = ["Darcy Laycock"]
-    gem.add_dependency "activerecord",  "~> 3.0.0"
-    gem.add_dependency "activesupport", "~> 3.0.0"
-    gem.add_dependency "uuid"
-    gem.add_development_dependency "shoulda", ">= 0"
-    gem.add_development_dependency "reversible_data"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
+task :default => :test
 
 begin
   require 'rcov/rcovtask'
@@ -52,8 +26,6 @@ end
 
 task :metrics => [:rcov, :saikuro, :reek, :flay, :flog, :roodi]
 
-task :test => :check_dependencies
-
 task :flog do
   system "flog lib"
 end
@@ -97,9 +69,7 @@ rescue LoadError
   end
 end
 
-task :default => :test
-
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/lib/slugged/caching.rb

@@ -15,28 +15,25 @@ module Slugged
       after_save :globally_cache_slug
     end
    
-    module InstanceMethods
-      # Automatically called in after_save, will cache this records id
-      # with to match the current records slug / scope
-      def globally_cache_slug
-        return unless send(:"#{self.cached_slug_column}_changed?")
-        value = self.to_slug
-        self.class.cache_slug_lookup!(value, self) if value.present?
-        unless use_slug_history
-          value = send(:"#{self.cached_slug_column}_was")
-          self.class.cache_slug_lookup!(value, nil)
-        end
-      end
-      
-      # Wraps remove_slug_history! to remove each of the slugs
-      # recording in this models slug history.
-      def remove_slug_history!
-        previous_slugs.each { |s| self.class.cache_slug_lookup!(s, nil) }
-        super
+    # Automatically called in after_save, will cache this records id
+    # with to match the current records slug / scope
+    def globally_cache_slug
+      return unless send(:"#{self.cached_slug_column}_changed?")
+      value = self.to_slug
+      self.class.cache_slug_lookup!(value, self) if value.present?
+      unless use_slug_history
+        value = send(:"#{self.cached_slug_column}_was")
+        self.class.cache_slug_lookup!(value, nil)
       end
-      
     end
-   
+    
+    # Wraps remove_slug_history! to remove each of the slugs
+    # recording in this models slug history.
+    def remove_slug_history!
+      previous_slugs.each { |s| self.class.cache_slug_lookup!(s, nil) }
+      super
+    end
+
     module ClassMethods
       
       # Wraps find_using_slug to look in the cache.

data/lib/slugged/slug.rb

@@ -1,6 +1,6 @@
 module Slugged
   class Slug < ActiveRecord::Base
-    set_table_name "slugs"
+    self.table_name = "slugs"
   
     validates_presence_of :record_id, :slug, :scope
   

data/lib/slugged/slug_history.rb

@@ -6,26 +6,22 @@ module Slugged
       after_save :record_slug_changes
       after_destroy :remove_slug_history!
     end
-   
-    module InstanceMethods
-      
-      def previous_slugs
-        Slugged.previous_slugs_for(self)
-      end
-      
-      def remove_slug_history!
-        Slugged.remove_slug_history_for(self)
-      end
-      
-      protected
-      
-      def record_slug_changes
-        slug_column = self.cached_slug_column
-        return unless send(:"#{slug_column}_changed?")
-        value = send(:"#{slug_column}_was")
-        Slugged.record_slug(self, value) if value.present?
-      end
-      
+
+    def previous_slugs
+      Slugged.previous_slugs_for(self)
+    end
+    
+    def remove_slug_history!
+      Slugged.remove_slug_history_for(self)
+    end
+    
+    protected
+    
+    def record_slug_changes
+      slug_column = self.cached_slug_column
+      return unless send(:"#{slug_column}_changed?")
+      value = send(:"#{slug_column}_was")
+      Slugged.record_slug(self, value) if value.present?
     end
     
     module ClassMethods

data/lib/slugged/version.rb

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

data/slugged.gemspec

@@ -1,11 +1,11 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
+$:.push File.expand_path("../lib", __FILE__)
+require 'slugged/version'
+
 Gem::Specification.new do |s|
   s.name = %q{slugged}
-  s.version = "0.4.0"
+  s.version = Slugged::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
@@ -16,77 +16,29 @@ Gem::Specification.new do |s|
     "LICENSE",
      "README.md"
   ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     ".rvmrc",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "lib/generators/slugged/slug_migration/slug_migration_generator.rb",
-     "lib/generators/slugged/slug_migration/templates/migration.erb",
-     "lib/generators/slugged/slugs/slugs_generator.rb",
-     "lib/generators/slugged/slugs/templates/migration.erb",
-     "lib/slugged.rb",
-     "lib/slugged/active_record_methods.rb",
-     "lib/slugged/caching.rb",
-     "lib/slugged/finders.rb",
-     "lib/slugged/memory_cache.rb",
-     "lib/slugged/railtie.rb",
-     "lib/slugged/scopes.rb",
-     "lib/slugged/slug.rb",
-     "lib/slugged/slug_history.rb",
-     "lib/slugged/version.rb",
-     "metrics/.gitignore",
-     "slugged.gemspec",
-     "test/caching_test.rb",
-     "test/editable_test.rb",
-     "test/helper.rb",
-     "test/is_sluggable_test.rb",
-     "test/model_definitions.rb",
-     "test/slug_history_test.rb",
-     "test/slugged_test.rb"
-  ]
+  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.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history}
-  s.test_files = [
-    "test/caching_test.rb",
-     "test/editable_test.rb",
-     "test/helper.rb",
-     "test/is_sluggable_test.rb",
-     "test/model_definitions.rb",
-     "test/slug_history_test.rb",
-     "test/slugged_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<uuid>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<reversible_data>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_dependency(%q<uuid>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<reversible_data>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-    s.add_dependency(%q<uuid>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<reversible_data>, [">= 0"])
-  end
+  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')  
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slugged
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
+  - 1
   - 0
-  - 4
   - 0
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,46 +15,96 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 +08:00
-default_executable: 
+date: 2011-01-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activerecord
   prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
   type: :runtime
-  name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
+        version: "3"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: uuid
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 0
-        version: 3.0.0
-  requirement: *id001
+        version: "0"
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: reversible_data
   prerelease: false
-  type: :runtime
-  name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 3
         - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 0
-        version: 3.0.0
-  requirement: *id002
+        version: "0"
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: redgreen
   prerelease: false
-  type: :runtime
-  name: uuid
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +113,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: rcov
   prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  name: shoulda
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: reek
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +141,54 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  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
-  name: reversible_data
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  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: 
     - - ">="
@@ -91,7 +197,51 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  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: []
@@ -133,7 +283,6 @@ files:
 - test/model_definitions.rb
 - test/slug_history_test.rb
 - test/slugged_test.rb
-has_rdoc: true
 homepage: http://github.com/Sutto/slugged
 licenses: []
 
@@ -163,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history