rails_slugs 1.0.8 → 1.0.9

data/lib/rails_slugs/active_record/base.rb

@@ -1,16 +1,60 @@
 module RailsSlugs
   module ActiveRecord
     module Base
-      module NonSluggable
+
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      def to_param
+        self.class.sluggable? ? slug : super
+      end
+
+      protected
+
+      def assign_slug
+        if slug.nil? or not slug_changed?
+          options = self.class.slug
+          case options
+          when Symbol      
+            value = send(options)
+          when Array                     
+            value = options.each.map{|p|send(p)}.join(' ')
+          when Proc                       
+            value = options.call(self)
+          end
+          if value.present?
+            value = value.parameterize
+            previous_value = previous_slug?(value)
+            if previous_value != false
+              if previous_value.present?
+                index = Regexp.new(value + '-(\d+)$').match(previous_value)
+                if index.present?
+                  value << "-#{index[1].to_i + 1}"
+                else
+                  value << '-1'
+                end
+              end
+              self.slug = value
+            end
+          end
+        end
+      end
+
+      module ClassMethods
+
+        def inherited(subclass)
+          subclass.instance_variable_set(:@slug, @slug)
+          super
+        end
         
         def sluggable?
-          not defined?(@slug).nil?
+          @slug.present?
         end
         
         def slug(*args)
           if args.any?
             unless sluggable?
-              include RailsSlugs::ActiveRecord::Base::Sluggable
               if respond_to? :translatable? and translatable?
                 include RailsSlugs::ActiveRecord::Base::Translatable
                 attr_translatable :slug 
@@ -23,93 +67,42 @@ module RailsSlugs
             end
           end
           @slug
-        end    
-      
-      end
-      module Sluggable
-        
-        def to_param
-          slug
         end
-
-        protected
-
-        def assign_slug
-          if slug.nil? or not slug_changed?
-            options = self.class.slug
-            case options
-            when Symbol      
-              value = send(options)
-            when Array                     
-              value = options.each.map{|p|send(p)}.join(' ')
-            when Proc                       
-              value = options.call(self)
-            end
-            if value.present?
-              value = value.parameterize
-              previous_value = previous_slug?(value)
-              if previous_value.present?
-                index = Regexp.new(value + '-(\d+)$').match(previous_value)
-                if index.present?
-                  value << "-#{index[1].to_i + 1}"
-                else
-                  value << '-1'
-                end
-              end
-              self.slug = value
-            end
-          end
-        end
-
+      
       end
       module NonTranslatable
 
         def self.included(base)
-          base.instance_eval do
-        
-            def exists_by_slug(id)
-              exists? :slug => id
-            end
-
-          end
+          base.extend ClassMethods
         end
         
         protected
         
         def previous_slug?(slug)
           r = self.class.where(
-            (new_record? ? '' : "id != #{id} AND ") + "(slug = '#{slug}' OR slug LIKE '#{slug}-_')"
+            "(slug = '#{slug}' OR slug LIKE '#{slug}-_')"
           ).order(
             'slug DESC'
           ).first
-          r.respond_to?(:slug) ? r.slug : nil
+          r.respond_to?(:slug) ? (r == self ? false : r.slug) : nil
         end
 
         def generate_slug
           assign_slug
         end
 
+        module ClassMethods
+
+          def exists_by_slug(id)
+            exists? :slug => id
+          end
+      
+        end
       end
       module Translatable
       
         def self.included(base)
-          base.instance_eval do
-            
-            def find_by_slug(id)
-              t = reflect_on_association(:translations)
-              joins(
-                "INNER JOIN #{t.table_name} t ON t.#{t.foreign_key} = #{table_name}.#{t.active_record_primary_key}"
-              ).where(
-                "t.slug = '#{id}' AND t.locale = '#{I18n.locale.to_s}'"
-              ).readonly(false).first
-            end
-            
-            def exists_by_slug(id)
-              t = reflect_on_association(:translations)
-              joins(:translations).exists?(t.table_name.to_sym => {:slug => id, :locale => I18n.locale})
-            end
-                      
-          end
+          base.extend ClassMethods
         end
         
         protected
@@ -124,11 +117,11 @@ module RailsSlugs
           r = self.class.joins(
             "INNER JOIN #{t.table_name} t ON t.#{t.foreign_key} = #{self.class.table_name}.#{t.active_record_primary_key}"
           ).where(
-            (new_record? ? '' : "#{self.class.table_name}.id != #{id} AND ") + "(t.slug = '#{slug}' OR t.slug LIKE '#{slug}-_') AND t.locale = '#{I18n.locale.to_s}'"
+            "(t.slug = '#{slug}' OR t.slug LIKE '#{slug}-_') AND t.locale = '#{I18n.locale.to_s}'"
           ).order(
             't.slug DESC'
           ).first
-          r.respond_to?(:slug) ? r.slug : nil
+          r.respond_to?(:slug) ? (r == self ? false : r.slug) : nil
         end
 
         def generate_slugs
@@ -139,7 +132,24 @@ module RailsSlugs
           end
           change_locale locale
         end
-      
+
+        module ClassMethods
+
+          def find_by_slug(id)
+            t = reflect_on_association(:translations)
+            joins(
+              "INNER JOIN #{t.table_name} t ON t.#{t.foreign_key} = #{table_name}.#{t.active_record_primary_key}"
+            ).where(
+              "t.slug = '#{id}' AND t.locale = '#{I18n.locale.to_s}'"
+            ).readonly(false).first
+          end
+          
+          def exists_by_slug(id)
+            t = reflect_on_association(:translations)
+            joins(:translations).exists?(t.table_name.to_sym => {:slug => id, :locale => I18n.locale})
+          end
+
+        end      
       end
     end
   end

data/lib/rails_slugs/railtie.rb

@@ -3,7 +3,7 @@ module RailsSlugs
 
     initializer 'rails_slugs' do
       ::ActiveRecord::Relation.send :include, RailsSlugs::ActiveRecord::Relation
-      ::ActiveRecord::Base.send :extend, RailsSlugs::ActiveRecord::Base::NonSluggable
+      ::ActiveRecord::Base.send :include, RailsSlugs::ActiveRecord::Base
     end
 
   end

data/lib/rails_slugs/version.rb

@@ -1,5 +1,5 @@
 module RailsSlugs
 
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 
 end