friendly_id 4.0.3 → 4.0.4

data/Changelog.md

@@ -6,6 +6,11 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 4.0.4 (2012-03-26)
+
+* Fix globalize plugin to avoid issues with asset precompilation (Philip Arndt)
+
+
 ## 4.0.3 (2012-03-14)
 
 * Fix escape for '%' and '_' on SQLite (Norman Clarke and Sergey Petrunin)

data/lib/friendly_id.rb

@@ -45,7 +45,7 @@ with numeric ids:
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.3"
+  VERSION = "4.0.4"
 
   @mutex = Mutex.new
 

data/lib/friendly_id/globalize.rb

@@ -60,13 +60,8 @@ assign a value to the +slug+ field:
         relation_class.send :include, FinderMethods
         include Model
         # Check if slug field is enabled to be translated with Globalize
-        if table_exists?
-          if columns.map(&:name).exclude?(friendly_id_config.query_field)
-            puts "\n[FriendlyId] Missing field '#{friendly_id_config.query_field}' in DB table '#{table_name}'. This is required for FriendlyId to properly function with the :globalize option.\n\n"
-          end
-          unless respond_to?('translated_attribute_names') || translated_attribute_names.exclude?(friendly_id_config.query_field.to_sym)
-            puts "\n[FriendlyId] You need to translate '#{friendly_id_config.query_field}' field with Globalize (add 'translates :#{friendly_id_config.query_field}' in your model '#{self.class.name}')\n\n"
-          end
+        unless respond_to?('translated_attribute_names') || translated_attribute_names.exclude?(friendly_id_config.query_field.to_sym)
+          puts "\n[FriendlyId] You need to translate '#{friendly_id_config.query_field}' field with Globalize (add 'translates :#{friendly_id_config.query_field}' in your model '#{self.class.name}')\n\n"
         end
       end
     end

data/lib/friendly_id/slugged.rb

@@ -197,13 +197,13 @@ issue}[https://github.com/norman/friendly_id/issues/180] for discussion.
     # Sets up behavior and configuration options for FriendlyId's slugging
     # feature.
     def self.included(model_class)
-      model_class.instance_eval do
-        friendly_id_config.class.send :include, Configuration
-        friendly_id_config.defaults[:slug_column]        ||= 'slug'
-        friendly_id_config.defaults[:sequence_separator] ||= '--'
-        friendly_id_config.slug_generator_class          ||= Class.new(SlugGenerator)
-        before_validation :set_slug
+      model_class.friendly_id_config.instance_eval do
+        self.class.send :include, Configuration
+        self.slug_generator_class     ||= Class.new(SlugGenerator)
+        defaults[:slug_column]        ||= 'slug'
+        defaults[:sequence_separator] ||= '--'
       end
+      model_class.before_validation :set_slug
     end
 
     # Process the given value to make it suitable for use as a slug.
@@ -252,10 +252,17 @@ issue}[https://github.com/norman/friendly_id/issues/180] for discussion.
     def should_generate_new_friendly_id?
       base       = send(friendly_id_config.base)
       slug_value = send(friendly_id_config.slug_column)
+
+      # If the slug base is nil, and the slug field is nil, then we're going to
+      # leave the slug column NULL.
       return false if base.nil? && slug_value.nil?
+      # Otherwise, if this is a new record, we're definitely going to try to
+      # create a new slug.
       return true if new_record?
       slug_base = normalize_friendly_id(base)
       separator = Regexp.escape friendly_id_config.sequence_separator
+      # If the slug base (without sequence) is different from either the current
+      # friendly id or the slug value, then we'll generate a new friendly_id.
       slug_base != (current_friendly_id || slug_value).try(:sub, /#{separator}[\d]*\z/, '')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000 Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70135168764860 !ruby/object:Gem::Requirement
+  requirement: &70338516662860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70135168764860
+  version_requirements: *70338516662860
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70135168764100 !ruby/object:Gem::Requirement
+  requirement: &70338516662240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70135168764100
+  version_requirements: *70338516662240
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70135168763460 !ruby/object:Gem::Requirement
+  requirement: &70338516661800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135168763460
+  version_requirements: *70338516661800
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70135171790060 !ruby/object:Gem::Requirement
+  requirement: &70338516694440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135171790060
+  version_requirements: *70338516694440
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70135171789640 !ruby/object:Gem::Requirement
+  requirement: &70338516692760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135171789640
+  version_requirements: *70338516692760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70135171789220 !ruby/object:Gem::Requirement
+  requirement: &70338516724120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135171789220
+  version_requirements: *70338516724120
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70135171788800 !ruby/object:Gem::Requirement
+  requirement: &70338516719100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135171788800
+  version_requirements: *70338516719100
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70135171788380 !ruby/object:Gem::Requirement
+  requirement: &70338516717320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135171788380
+  version_requirements: *70338516717320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70135171787960 !ruby/object:Gem::Requirement
+  requirement: &70338516730820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135171787960
+  version_requirements: *70338516730820
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for