url_keyed_object 0.2.0 → 0.3.0

data/Rakefile

@@ -1,25 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "url_keyed_object"
-    gem.summary = %Q{Making it easy to work with objects with URL keys}
-    gem.description = %Q{Making it easy to work with Rails objects which use a URL key in their URL instead of their database ID.}
-    gem.email = "matt@reprocessed.org"
-    gem.homepage = "http://github.com/fidothe/url_keyed_object"
-    gem.authors = ["Matt Patterson"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "cucumber", ">= 0.5"
-    gem.add_development_dependency "activerecord", ">= 2.3"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/url_keyed_object.rb

@@ -39,3 +39,8 @@ module UrlKeyedObject
     end
   end
 end
+
+if defined?(Rails::Railtie)
+  require 'url_keyed_object/railtie' 
+end
+

data/lib/url_keyed_object/active_record.rb

@@ -2,13 +2,27 @@ require 'url_keyed_object'
 require 'active_record'
 
 module UrlKeyedObject
+  module ActiveRecordHook
+    def acts_as_url_keyed(opts = {})
+      attr_writer :url_key_length
+      
+      @url_key_column = opts[:url_key_column] if opts.has_key?(:url_key_column)
+      @url_key_length = opts[:url_key_length] if opts.has_key?(:url_key_length)
+      
+      send :include, UrlKeyedObject::ActiveRecord
+      
+      before_create :generate_valid_url_key
+      
+      define_method("#{url_key_column}=") { |value| logger.warn("Attempt to set ##{url_key_column}!"); nil }
+    end
+  end
+  
   module ActiveRecord
     # def url_key=(value)
     #   logger.warn('Attempt to set #url_key!')
     #   nil
     # end
     
-    
     module ClassMethods
       def url_key_column
         @url_key_column ||= :url_key
@@ -17,51 +31,33 @@ module UrlKeyedObject
       def url_key_length
         @url_key_length ||= 5
       end
-      
-      def acts_as_url_keyed(opts = {})
-        attr_writer :url_key_length
-        
-        @url_key_column = opts[:url_key_column] if opts.has_key?(:url_key_column)
-        @url_key_length = opts[:url_key_length] if opts.has_key?(:url_key_length)
-        
-        before_create :generate_valid_url_key
-        
-        include InstanceMethods
-        
-        define_method("#{url_key_column}=") { |value| logger.warn("Attempt to set ##{url_key_column}!"); nil }
-      end
-    end
-    
-    module InstanceMethods
-      protected
-      
-      def generate_valid_url_key
-        new_url_key = UrlKeyedObject.generate_checked_url_key(url_key_length) { |value| self.valid_url_key?(value) }
-        write_attribute(url_key_column, new_url_key)
-      end
-      
-      def valid_url_key?(url_key)
-        self.class.send("find_by_#{url_key_column}", url_key).nil?
-      end
-      
-      def url_key_column
-        self.class.url_key_column
-      end
-      
-      def url_key_length
-        self.class.url_key_length
-      end
-      
-      
-      def to_param
-        send url_key_column
-      end
     end
     
     def self.included(model_class)
       model_class.extend ClassMethods
     end
+    
+    def to_param
+      send url_key_column
+    end
+    
+    protected
+    
+    def generate_valid_url_key
+      new_url_key = UrlKeyedObject.generate_checked_url_key(url_key_length) { |value| self.valid_url_key?(value) }
+      write_attribute(url_key_column, new_url_key)
+    end
+    
+    def valid_url_key?(url_key)
+      self.class.send("find_by_#{url_key_column}", url_key).nil?
+    end
+    
+    def url_key_column
+      self.class.url_key_column
+    end
+    
+    def url_key_length
+      self.class.url_key_length
+    end
   end
-end
-
-ActiveRecord::Base.send :include, UrlKeyedObject::ActiveRecord
+end

data/lib/url_keyed_object/railtie.rb

@@ -0,0 +1,10 @@
+require 'rails'
+require 'url_keyed_object/active_record'
+
+module UrlKeyedObject
+  class Railtie < Rails::Railtie
+    initializer 'url_keyed_object.active_record_hook', :after => :preload_frameworks do
+      ::ActiveRecord::Base.extend UrlKeyedObject::ActiveRecordHook
+    end
+  end
+end

data/rails/init.rb

@@ -0,0 +1,5 @@
+require 'url_keyed_object/active_record'
+
+if defined?(ActiveRecord::Base)
+  ActiveRecord::Base.extend UrlKeyedObject::ActiveRecordHook
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: url_keyed_object
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Matt Patterson
@@ -9,39 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 +00:00
+date: 2010-06-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
         version: "0.5"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
         version: "2.3"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Making it easy to work with Rails objects which use a URL key in their URL instead of their database ID.
 email: matt@reprocessed.org
 executables: []
@@ -52,29 +67,15 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
-- .gitignore
-- LICENSE
+- VERSION
 - README.rdoc
+- LICENSE
 - Rakefile
-- VERSION
 - cucumber.yml
-- features/fixtures/.gitignore
-- features/for_url_key-like_uses.feature
-- features/step_definitions/database_steps.rb
-- features/step_definitions/eval_steps.rb
-- features/step_definitions/feedback_steps.rb
-- features/support/env.rb
-- features/support/hooks.rb
-- features/support/recording_logger.rb
-- features/with_active_record-basic.feature
-- features/with_active_record-more-advanced.feature
-- lib/url_keyed_object.rb
 - lib/url_keyed_object/active_record.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/url_keyed_object/active_record_spec.rb
-- spec/url_keyed_object_spec.rb
+- lib/url_keyed_object/railtie.rb
+- lib/url_keyed_object.rb
+- rails/init.rb
 has_rdoc: true
 homepage: http://github.com/fidothe/url_keyed_object
 licenses: []
@@ -88,22 +89,34 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Making it easy to work with objects with URL keys
 test_files: 
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/url_keyed_object/active_record_spec.rb
 - spec/url_keyed_object_spec.rb
+- features/step_definitions/database_steps.rb
+- features/step_definitions/eval_steps.rb
+- features/step_definitions/feedback_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb
+- features/support/recording_logger.rb
+- features/for_url_key-like_uses.feature
+- features/with_active_record-basic.feature
+- features/with_active_record-more-advanced.feature

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-url_keyed_object.gemspec

data/features/fixtures/.gitignore

@@ -1 +0,0 @@
-*.sqlite3