has_slug 0.2.6 → 0.2.7

data/lib/has_slug.rb

@@ -42,27 +42,27 @@ module HasSlug
       options = DEFAULT_HAS_SLUG_OPTIONS.merge(options).merge(:attribute => attribute)
       
       if defined?(has_slug_options)
-        raise Exception, "has_slug_options is already defined, you can only call has_slug once"
-      end
-      
-      write_inheritable_attribute(:has_slug_options, options)
-      class_inheritable_reader(:has_slug_options)
-      
-      if columns.any? { |column| column.name.to_s == options[:slug_column].to_s }
-        require 'has_slug/sluggable_class_methods'
-        require 'has_slug/sluggable_instance_methods'
-        
-        extend SluggableClassMethods
-        include SluggableInstanceMethods
-        
-        before_save :set_slug,
-                    :if => :new_slug_needed?
+        Rails.logger.error "has_slug_options is already defined, you can only call has_slug once. This call has been ignored."
       else
-        require 'has_slug/not_sluggable_class_methods'
-        require 'has_slug/not_sluggable_instance_methods'
-        
-        extend NotSluggableClassMethods
-        include NotSluggableInstanceMethods
+        write_inheritable_attribute(:has_slug_options, options)
+        class_inheritable_reader(:has_slug_options)
+
+        if columns.any? { |column| column.name.to_s == options[:slug_column].to_s }
+          require 'has_slug/sluggable_class_methods'
+          require 'has_slug/sluggable_instance_methods'
+
+          extend SluggableClassMethods
+          include SluggableInstanceMethods
+
+          before_save :set_slug,
+                      :if => :new_slug_needed?
+        else
+          require 'has_slug/not_sluggable_class_methods'
+          require 'has_slug/not_sluggable_instance_methods'
+
+          extend NotSluggableClassMethods
+          include NotSluggableInstanceMethods
+        end        
       end
     end
   end

data/test/factories.rb

@@ -0,0 +1,16 @@
+begin
+  Factory.define :city do |f|
+    f.name 'New York'
+  end
+
+  Factory.define :kitchen do |f|
+    f.name 'Italian'
+  end
+
+  Factory.define :restaurant do |f|
+    f.name    'Da Marco'
+    f.city    { |city| city.association(:city) }
+    f.kitchen { |kitchen| kitchen.association(:kitchen) }
+  end
+rescue Factory::DuplicateDefinitionError
+end

data/test/models.rb

@@ -0,0 +1,24 @@
+class City < ActiveRecord::Base
+  has_slug :name
+  
+  has_many :restaurants
+  
+  has_many :kitchens,
+           :through => :restaurants
+end
+
+class Kitchen < ActiveRecord::Base
+  has_slug :name
+  
+  belongs_to :restaurant
+end
+
+class Restaurant < ActiveRecord::Base
+  has_slug :name,
+           :scope => :city,
+           :preserve => '.'
+  
+  belongs_to :city
+  
+  belongs_to :kitchen
+end

data/test/test_helper.rb

@@ -6,15 +6,16 @@ require 'shoulda'
 require 'factory_girl'
 
 HAS_SLUG_ROOT = File.dirname(__FILE__) + "/.."
-$:.unshift("#{HAS_SLUG_ROOT}/lib")
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3",
-                                        :dbfile  => "#{HAS_SLUG_ROOT}/test/test.db")
+ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",
+                                        :database => "#{HAS_SLUG_ROOT}/test/test.db")
+
+$:.unshift("#{HAS_SLUG_ROOT}/lib")
 require 'has_slug'
-require "#{HAS_SLUG_ROOT}/test/schema.rb"
 
-Dir["#{HAS_SLUG_ROOT}/test/models/*"].each { |f| require f }
-Dir["#{HAS_SLUG_ROOT}/test/factories/*"].each { |f| require f }
+require "#{HAS_SLUG_ROOT}/test/schema"
+require "#{HAS_SLUG_ROOT}/test/factories"
+require "#{HAS_SLUG_ROOT}/test/models"
 
 [City, Restaurant, Kitchen].each { |c| c.reset_column_information }
 

data/test/unit/has_slug_test.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require "#{File.dirname(__FILE__)}/../test_helper"
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class HasSlugTest < Test::Unit::TestCase
   context 'A model' do

data/test/unit/slug_test.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require "#{File.dirname(__FILE__)}/../test_helper"
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class SlugTest < Test::Unit::TestCase
   context 'A Slug' do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: has_slug
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Tom-Eric Gerritsen
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 +01:00
+date: 2010-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -48,30 +53,28 @@ 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: 
 - unicode_utils or unicode gem install
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A slugging plugin for Ruby on Rails
 test_files: 
 - test/schema.rb
 - test/test_helper.rb
-- test/factories/city_factory.rb
-- test/factories/kitchen_factory.rb
-- test/factories/restaurant_factory.rb
-- test/models/city.rb
-- test/models/kitchen.rb
-- test/models/restaurant.rb
+- test/factories.rb
+- test/models.rb
 - test/unit/has_slug_test.rb
 - rails/init.rb
 - test/unit/slug_test.rb

data/test/factories/city_factory.rb

@@ -1,3 +0,0 @@
-Factory.define :city do |city|
-  city.name 'New York'
-end

data/test/factories/kitchen_factory.rb

@@ -1,3 +0,0 @@
-Factory.define :kitchen do |kitchen|
-  kitchen.name 'Italian'
-end

data/test/factories/restaurant_factory.rb

@@ -1,5 +0,0 @@
-Factory.define :restaurant do |restaurant|
-  restaurant.name 'Da Marco'
-  restaurant.city { |city| city.association(:city) }
-  restaurant.kitchen { |kitchen| kitchen.association(:kitchen) }
-end

data/test/models/city.rb

@@ -1,8 +0,0 @@
-class City < ActiveRecord::Base
-  has_slug :name
-  
-  has_many :restaurants
-  
-  has_many :kitchens,
-           :through => :restaurants
-end

data/test/models/kitchen.rb

@@ -1,5 +0,0 @@
-class Kitchen < ActiveRecord::Base
-  has_slug :name
-  
-  belongs_to :restaurant
-end

data/test/models/restaurant.rb

@@ -1,9 +0,0 @@
-class Restaurant < ActiveRecord::Base
-  has_slug :name,
-           :scope => :city,
-           :preserve => '.'
-  
-  belongs_to :city
-  
-  belongs_to :kitchen
-end