friendly_id 3.1.1.1 → 3.1.2

data/Changelog.md

@@ -6,6 +6,15 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.1.2 (2010-08-11)
+
+* Fixed records being returned read-only. (Thanks Luis Lavena)
+* Don't assume relations are subclasses of ActiveRecord::Base. This fixes using
+  FriendlyId with [Static Model](http://github.com/quirkey/static_model). (Thanks
+  Luis Lavena)
+* Avoid checking for dependent scopes when no models are using the scopes feature.
+
+
 ## 3.1.1 (2010-07-30)
 
 * Fixed call to method on nil value for failing unfriendly finds (thanks [jlippiner](http://github.com/jlippiner))

data/Guide.md

@@ -159,8 +159,6 @@ accents and other diacritics:
 
 There are special options for some languages:
 
-### German Approximations
-
     class Person < ActiveRecord::Base
       has_friendly_id :name, :use_slug => true, :approximate_ascii => true,
         :ascii_approximation_options => :german
@@ -169,15 +167,9 @@ There are special options for some languages:
     @person.create :name => "Jürgen Müller"
     @person.friendly_id  # will be "juergen-mueller"
 
-### Spanish Approximations
-
-    class Post < ActiveRecord::Base
-      has_friendly_id :title, :use_slug => true, :approximate_ascii => true,
-        :ascii_approximation_options => :spanish
-    end
-
-    @post.create(:title => "¡Feliz año!")
-    @post.title  # will be "feliz-anno"
+FriendlyId supports whatever languages are supported by
+[Babosa](https://github.com/norman/babosa); at the time of writing, this
+includes German, Spanish and Serbian.
 
 ### Unicode Slugs
 

data/README.md

@@ -17,7 +17,7 @@ instead of:
 FriendlyId offers many advanced features, including: slug history and
 versioning, scoped slugs, reserved words, custom slug generators, and
 excellent Unicode support. For complete information on using FriendlyId,
-please see the {http://norman.github.com/friendly_id/file.Guide.html FriendlyId Guide}.
+please see the [FriendlyId Guide](http://norman.github.com/friendly_id/file.Guide.html).
 
 FriendlyId is compatible with Active Record 2.3.x and 3.0.
 
@@ -83,4 +83,12 @@ and add a test that reproduces the error you are experiencing.
 
 FriendlyId was created by Norman Clarke, Adrian Mugnolo, and Emilio Tagua.
 
+If you like FriendlyId, please recommend us on Working With Rails:
+
+* [http://bit.ly/recommend-norman](http://bit.ly/recommend-norman)
+* [http://bit.ly/recommend-emilio](http://bit.ly/recommend-emilio)
+* [http://bit.ly/recommend-adrian](http://bit.ly/recommend-adrian)
+
+Thanks!
+
 Copyright (c) 2008-2010, released under the MIT license.

data/Rakefile

@@ -51,11 +51,10 @@ end
 
 task :pushdocs do
   branch = `git branch | grep "*"`.chomp.gsub("* ", "")
-  sh "git stash"
   sh "git checkout gh-pages"
+  sh "rm -rf FriendlyId ActiveRecord css js *.html"
   sh "cp -rp doc/* ."
   sh 'git commit -a -m "Regenerated docs"'
   sh "git push origin gh-pages"
   sh "git checkout #{branch}"
-  sh "git stash apply"
 end

data/lib/friendly_id/active_record_adapter/configuration.rb

@@ -34,7 +34,9 @@ module FriendlyId
       end
 
       def child_scopes
-        @child_scopes ||= associated_friendly_classes.select { |klass| klass.friendly_id_config.scopes_over?(configured_class) }
+        @child_scopes ||= associated_friendly_classes.select do |klass|
+          klass.friendly_id_config.scopes_over?(configured_class)
+        end
       end
 
       def custom_cache_column?
@@ -56,13 +58,10 @@ module FriendlyId
       end
 
       def associated_friendly_classes
-        configured_class.reflect_on_all_associations.select { |assoc|
-          assoc &&
-          !assoc.options[:polymorphic] &&
-          assoc.klass.uses_friendly_id?
+        configured_class.reflect_on_all_associations.compact.select { |assoc|
+          !assoc.options[:polymorphic] && assoc.klass.respond_to?(:friendly_id_config)
         }.map(&:klass)
       end
-
     end
   end
 end

data/lib/friendly_id/active_record_adapter/finders.rb

@@ -36,7 +36,7 @@ module FriendlyId
           parse_ids!
           scope = some_friendly_scope
           if use_slugs? && @friendly_ids.present?
-            scope = scope.scoped(:joins => Slug.table_name.to_sym)
+            scope = scope.scoped(:include => :slugs)
             if fc.scope?
               scope = scope.scoped(:conditions => {:slugs => {:scope => scope_val}})
             end
@@ -62,9 +62,8 @@ module FriendlyId
 
         def find_one_using_slug
           name, seq = id.to_s.parse_friendly_id
-          slugs = Slug.table_name.to_sym
-          scope = scoped(:conditions => {slugs => {:name => name, :sequence => seq}}, :joins => slugs)
-          scope = scope.scoped(:conditions => {slugs => {:scope => scope_val}}) if fc.scope?
+          scope = scoped(:include => :slugs, :conditions => {:slugs => {:name => name, :sequence => seq}})
+          scope = scope.scoped(:conditions => {:slugs => {:scope => scope_val}}) if fc.scope?
           @result = scope.first(options)
           assign_status
         end

data/lib/friendly_id/active_record_adapter/relation.rb

@@ -87,7 +87,7 @@ module FriendlyId
         elsif unfriendly_ids.present?
           clause = unfriendly
         end
-        use_slugs ? joins(:slugs).where(clause) : where(clause)
+        use_slugs ? includes(:slugs).where(clause) : where(clause)
       end
 
       def slugged_conditions(ids)

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -84,6 +84,7 @@ module FriendlyId
       # Update the slugs for any model that is using this model as its
       # FriendlyId scope.
       def update_dependent_scopes
+        return unless friendly_id_config.class.scopes_used?
         if slugs(true).size > 1 && @new_friendly_id
           friendly_id_config.child_scopes.each do |klass|
             Slug.update_all "scope = '#{@new_friendly_id}'", ["sluggable_type = ? AND scope = ?",

data/lib/friendly_id/configuration.rb

@@ -39,8 +39,7 @@ module FriendlyId
     # Strip diacritics from Western characters.
     attr_accessor :approximate_ascii
 
-    # Locale-type options for ASCII approximations. These currently be
-    # +:german+ or +:spanish+.
+    # Locale-type options for ASCII approximations.
     attr_accessor :ascii_approximation_options
 
     # The class that's using the configuration.
@@ -65,7 +64,7 @@ module FriendlyId
     attr_accessor :reserved_words
 
     # The method or relation to use as the friendly_id's scope.
-    attr_accessor :scope
+    attr_reader :scope
 
     # The string that separates slug names from slug sequences. Defaults to "--".
     attr_accessor :sequence_separator
@@ -103,6 +102,24 @@ module FriendlyId
       [method, reserved_message % word] if reserved? word
     end
 
+    def scope=(scope)
+      self.class.scopes_used = true
+      @scope = scope
+    end
+
+    # This will be set if FriendlyId's scope feature is used in any model. It is here
+    # to provide a way to avoid invoking costly scope lookup methods when the scoped
+    # slug feature is not being used by any models.
+    def self.scopes_used=(val)
+      @scopes_used = !!val
+    end
+
+    # Are scoped slugs being used by any model?
+    # @see Configuration.scoped_used=
+    def self.scopes_used?
+      @scopes_used
+    end
+
     %w[approximate_ascii scope strip_non_ascii use_slug].each do |method|
       class_eval(<<-EOM)
         def #{method}?

data/lib/friendly_id/version.rb

@@ -2,8 +2,8 @@ module FriendlyId
   module Version
     MAJOR = 3
     MINOR = 1
-    TINY = 1
-    BUILD = 1
+    TINY = 2
+    BUILD = nil
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 end

data/test/active_record_adapter/core.rb

@@ -113,6 +113,19 @@ module FriendlyId
             unfriendly_class.find(-1)
           end
         end
+
+        test "instances found by a single id should not be read-only" do
+          i = klass.find(instance.friendly_id)
+          assert !i.readonly?, "expected instance not to be readonly"
+        end
+
+        test "instances found by an array of ids should not be read-only" do
+          second = klass.create!(:name => "second_instance")
+          third = klass.create!(:name => "third_instance")
+          klass.find([instance.friendly_id, second.friendly_id]).each do |record|
+            assert !record.readonly?, "expected instance not to be readonly"
+          end
+        end
       end
     end
   end

data/test/active_record_adapter/scoped_model_test.rb

@@ -107,12 +107,20 @@ module FriendlyId
           assert_match(/scope: badscope/, e.message)
         end
       end
-      
+
       test "should update the sluggable field when a polymorphic relationship exists" do
         @site.update_attributes(:name => "Uptown Venue")
         assert_equal "Uptown Venue", @site.name
       end
 
+      test "should not assume that AR's reflect_on_all_associations with return AR classes" do
+        reflections = Resident.reflect_on_all_associations
+        reflections << Struct.new("Dummy", :options, :klass).new(:options => [], :klass => Struct)
+        Resident.expects(:reflect_on_all_associations).returns(reflections)
+        assert_nothing_raised do
+          Resident.friendly_id_config.send(:associated_friendly_classes)
+        end
+      end
     end
   end
-end
+end

data/test/active_record_adapter/slugged.rb

@@ -31,4 +31,3 @@ module FriendlyId
     end
   end
 end
-

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 1
-  - 1
-  version: 3.1.1.1
+  - 2
+  version: 3.1.2
 platform: ruby
 authors: 
 - Norman Clarke
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -03:00
+date: 2010-08-11 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency