parameterize 0.2.0 → 0.3.0

data/Rakefile

@@ -1,7 +1,5 @@
 task :default => :spec
 
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new

data/lib/parameterize.rb

@@ -1,5 +1,4 @@
 require 'active_record'
-require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/string/inflections'
 
 module Parameterize
@@ -7,26 +6,37 @@ module Parameterize
   # with the parameterized version of the given source field.
   #
   # @param [Symbol, String] source The field to parameterize
-  def parameterize(source = :title)
+  def parameterize(source = :title, options = {})
     include InstanceMethods
 
-    class_attribute   :param_source_field
-    before_validation :update_param
+    class_attribute :parameterize_config, :instance_writer => false
+    before_validation :parameterize, :if => :parameterize?
 
-    self.param_source_field = source
+    self.parameterize_config = {
+      :source => source,
+      :target => :param,
+      :update => false
+    }.merge(options)
   end
 
   module InstanceMethods
-    # Overwrite #to_param to return the generated param.
+    # Overwrite #to_param to return the parameterize target attribute. Falls
+    # back to the original implementation if for some reason the target
+    # attribute does not exist
     def to_param
-      self.param
+      __send__(parameterize_config[:target]) || super
     end
 
     protected
 
-    # Updates the param field with the parameterized version of the source field.
-    def update_param
-      self.param = __send__(self.class.param_source_field).to_s.parameterize
+    # Updates the target attribute with the parameterized version of the source attribute.
+    def parameterize
+      __send__(:"#{parameterize_config[:target]}=", __send__(parameterize_config[:source]).to_s.parameterize)
+    end
+
+    # Returns true if the source attribute should be parameterized.
+    def parameterize?
+      parameterize_config[:update] || __send__(parameterize_config[:target]).nil?
     end
   end
 end

data/lib/parameterize/matcher.rb

@@ -2,9 +2,9 @@ require 'rspec/matchers'
 
 RSpec::Matchers.define :parameterize do |source|
   match do |model|
-    model.class.include?(Parameterize::InstanceMethods) && model.class.param_source_field == source
+    model.class.include?(Parameterize::InstanceMethods) && model.class.parameterize_config[:source] == source
   end
-  
+
   failure_message_for_should do |model|
     "expected #{model.class} to parameterize #{source}"
   end

data/lib/parameterize/version.rb

@@ -1,3 +1,3 @@
 module Parameterize
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/parameterize.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency             'activerecord',  '~> 3.0'
   s.add_dependency             'activesupport', '~> 3.0'
   s.add_development_dependency 'rake',          '>= 0.8.7'
-  s.add_development_dependency 'rspec',         '~> 2.6'
+  s.add_development_dependency 'rspec',         '~> 2.11'
   s.add_development_dependency 'sqlite3',       '~> 1.3'
 
   s.files         = `git ls-files`.split("\n")

data/spec/parameterize_spec.rb

@@ -1,33 +1,63 @@
 require 'spec_helper'
 
 describe Parameterize do
-  it 'parameterizes the source field' do
-    post = Post.new :title => "Hey Ho, Let's Go!"
+  it 'parameterizes the source attribute' do
+    post = Post.new title: "Hey Ho, Let's Go!"
     post.valid?
-    post.param.should == 'hey-ho-let-s-go'
+    expect(post.param).to eq('hey-ho-let-s-go')
   end
-  
-  context 'with a different source field' do
-    it 'parameterizes the source field' do
-      user = User.new :name => 'Donald E. Knuth'
+
+  context 'with a custom source attribute and target attribute' do
+    it 'parameterizes the source attribute' do
+      user = User.new name: 'Donald E. Knuth'
       user.valid?
-      user.param.should == 'donald-e-knuth'
+      expect(user.slug).to eq('donald-e-knuth')
     end
   end
-  
-  describe '#to_param' do
-    it 'returns the param' do
-      post = Post.new :title => "Hey Ho, Let's Go!"
+
+  context 'with an existing target attribute' do
+    it 'does not parameterize the source attribute' do
+      post = Post.new title: "Hey Ho, Let's Go!", param: 'hello-world'
       post.valid?
-      post.to_param.should == 'hey-ho-let-s-go'
+      expect(post.param).to eq('hello-world')
+    end
+
+    context 'with :update set to true' do
+      it 'parameterizes the source attribute' do
+        user = User.new name: 'Donald E. Knuth', slug: 'john-doe'
+        user.valid?
+        expect(user.slug).to eq('donald-e-knuth')
+      end
     end
   end
-  
+
+  describe '#to_param' do
+    it 'returns the target attribute' do
+      post = Post.new param: 'hello-world'
+      expect(post.to_param).to eq('hello-world')
+    end
+
+    context 'with a custom target attribute' do
+      it 'returns the custom target attribute' do
+        user = User.new slug: 'john-doe'
+        expect(user.to_param).to eq('john-doe')
+      end
+    end
+
+    context 'without a param' do
+      it 'returns the id' do
+        post = Post.new
+        post.id = 1
+        expect(post.to_param).to eq('1')
+      end
+    end
+  end
+
   describe 'matcher' do
     it 'checks if Post parameterized :title' do
       Post.new.should parameterize(:title)
     end
-    
+
     it 'checks if User parameterized :name' do
       User.new.should parameterize(:name)
     end

data/spec/spec_helper.rb

@@ -4,9 +4,9 @@ require 'active_record'
 require 'parameterize'
 require 'parameterize/matcher'
 
-ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
 ActiveRecord::Migration.verbose = false
-ActiveRecord::Schema.define :version => 1 do
+ActiveRecord::Schema.define version: 1 do
   create_table :posts do |t|
     t.string :title
     t.string :param
@@ -14,7 +14,7 @@ ActiveRecord::Schema.define :version => 1 do
 
   create_table :users do |t|
     t.string :name
-    t.string :param
+    t.string :slug
   end
 end
 
@@ -23,5 +23,5 @@ class Post < ActiveRecord::Base
 end
 
 class User < ActiveRecord::Base
-  parameterize :name
+  parameterize :name, target: :slug, update: true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parameterize
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70213142072060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213142072060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70213142071520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213142071520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70213142071040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70213142071040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213142070540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70213142070540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70213142070040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70213142070040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: It uses ActiveSupport's String#parameterize to create the slug. There
   are no validations. No slug history. No extra tables or models.
 email:
@@ -102,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2472796874914442581
+      hash: 1014365171
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,10 +136,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2472796874914442581
+      hash: 1014365171
 requirements: []
 rubyforge_project: parameterize
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The simplest permalink/slug solution for ActiveRecord >= 3.0