pseudocephalopod 0.2.2 → 0.2.3

data/Gemfile

@@ -1,7 +1,7 @@
 source :gemcutter
 
 # Setup gems
-gem "activerecord", "= 3.0.0.beta2"
+gem "activerecord", "= 3.0.0.beta4"
 gem "reversible_data"
 gem "uuid"
 gem "sqlite3-ruby", :require => "sqlite3"
@@ -15,4 +15,4 @@ gem "flay",     :require => nil
 gem "flog",     :require => nil
 gem "rake",     :require => nil
 gem "Saikuro",  :require => nil
-gem "jeweler",  :require => nil
+gem "jeweler",  :require => nil

data/README.md

@@ -104,6 +104,12 @@ To run tests, simply do the following:
 
 And it's ready!
 
+## Contributors ##
+
+Thanks to the following who contributed functionality / bug fixes:
+
+* [Matt Pruitt](http://github.com/guitsaru)
+
 ## Note on Patches/Pull Requests ##
  
 * Fork the project.

data/Rakefile

@@ -18,6 +18,7 @@ begin
     gem.homepage    = "http://github.com/Sutto/pseudocephalopod"
     gem.authors     = ["Darcy Laycock"]
     gem.add_dependency "activerecord", ">= 3.0.0.beta2"
+    gem.add_dependency "activesupport", ">= 3.0.0.beta2"
     gem.add_dependency "uuid"
     gem.add_development_dependency "shoulda", ">= 0"
     gem.add_development_dependency "reversible_data"

data/lib/pseudocephalopod/caching.rb

@@ -5,22 +5,14 @@ module Pseudocephalopod
   # Usually included by passing the :cache option as true (by default it is
   # true, you can disable by passing :cache as false or nil).
   module Caching
+    extend ActiveSupport::Concern
     
-    class << self
-      attr_accessor :cache_expires_in
-    end
-    
+    mattr_accessor :cache_expires_in
     # Cache for 10 minutes by default.
     self.cache_expires_in = 600
    
-    def self.included(parent)
-      parent.extend ClassMethods
-      
-      parent.class_eval do
-        include InstanceMethods
-        extend  ClassMethods
-        after_save :globally_cache_slug
-      end
+    included do
+      after_save :globally_cache_slug
     end
    
     module InstanceMethods

data/lib/pseudocephalopod/slug_history.rb

@@ -1,13 +1,10 @@
 module Pseudocephalopod
   module SlugHistory
-   
-    def self.included(parent)
-      parent.class_eval do
-        include InstanceMethods
-        extend  ClassMethods
-        after_save :record_slug_changes
-        after_destroy :remove_slug_history!
-      end
+    extend ActiveSupport::Concern
+    
+    included do
+      after_save :record_slug_changes
+      after_destroy :remove_slug_history!
     end
    
     module InstanceMethods

data/lib/pseudocephalopod/version.rb

@@ -2,7 +2,7 @@ module Pseudocephalopod
   module Version
     MAJOR  = 0
     MINOR  = 2
-    PATCH  = 2
+    PATCH  = 3
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end
-end
+end

data/lib/pseudocephalopod.rb

@@ -1,11 +1,18 @@
+require 'active_support'
+require 'active_record'
 require 'uuid'
 
+require 'active_support/dependencies/autoload'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/concern'
+
 module Pseudocephalopod
+  extend ActiveSupport::Autoload
+  
+  mattr_accessor :cache_key_prefix, :cache
   
   class << self
     
-    attr_accessor :cache_key_prefix, :cache
-    
     def with_counter(prefix, counter = 0)
       counter < 1 ? prefix : "#{prefix}--#{counter}"
     end
@@ -15,7 +22,7 @@ module Pseudocephalopod
       slug    = self.with_counter(prefix, counter)
       while scope.with_cached_slug(slug).exists?
         counter += 1
-        slug = self.with_counter(prefix, counter)
+        slug     = self.with_counter(prefix, counter)
       end
       slug
     end
@@ -58,12 +65,12 @@ module Pseudocephalopod
   
   self.cache_key_prefix ||= "cached-slugs"
   
-  autoload :Caching,     'pseudocephalopod/caching'
-  autoload :Scopes,      'pseudocephalopod/scopes'
-  autoload :Finders,     'pseudocephalopod/finders'
-  autoload :SlugHistory, 'pseudocephalopod/slug_history'
-  autoload :Slug,        'pseudocephalopod/slug'
-  autoload :MemoryCache, 'pseudocephalopod/memory_cache'
+  autoload :Caching
+  autoload :Scopes
+  autoload :Finders
+  autoload :SlugHistory
+  autoload :Slug
+  autoload :MemoryCache
   
   require 'pseudocephalopod/active_record_methods'
   ActiveRecord::Base.extend Pseudocephalopod::ActiveRecordMethods

data/pseudocephalopod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pseudocephalopod}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-04-29}
+  s.date = %q{2010-06-11}
   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 = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/Sutto/pseudocephalopod}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  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",
@@ -64,19 +64,22 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0.beta2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta2"])
       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.beta2"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta2"])
       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.beta2"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta2"])
     s.add_dependency(%q<uuid>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<reversible_data>, [">= 0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pseudocephalopod
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -14,60 +15,85 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 +08:00
+date: 2010-06-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  prerelease: false
   type: :runtime
+  name: activerecord
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: -1848230022
         segments: 
         - 3
         - 0
         - 0
         - beta2
         version: 3.0.0.beta2
-  prerelease: false
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: uuid
+  prerelease: false
   type: :runtime
+  name: activesupport
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: -1848230022
         segments: 
+        - 3
         - 0
-        version: "0"
-  prerelease: false
+        - 0
+        - beta2
+        version: 3.0.0.beta2
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  type: :development
+  prerelease: false
+  type: :runtime
+  name: uuid
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: reversible_data
+  prerelease: false
   type: :development
+  name: shoulda
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id004
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: reversible_data
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
 description: Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history
 email: sutto@sutto.net
 executables: []
@@ -116,23 +142,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history