djanowski-permalink_fu 0.1.1 → 0.1.2

data/lib/permalink_fu/spec/matchers.rb

@@ -0,0 +1,43 @@
+module PermalinkFu
+  module Spec
+    module Matchers
+      class PermalinkTo
+        def initialize(permalink, to_param = nil)
+          @expected_permalink = permalink
+          @expected_to_param = to_param
+        end
+
+        def matches?(target)
+          @target = target
+          @permalink, @to_param = target.permalink, target.to_param
+          @permalink == @expected_permalink && @to_param == expected_to_param
+        end
+
+        def failure_message
+          message = []
+
+          message << "to permalink to #{@expected_permalink.inspect} (got #{@permalink.inspect})" if @permalink != @expected_permalink
+          message << "to generate a URL like #{expected_to_param.inspect} (got #{@to_param.inspect})" if @to_param != expected_to_param
+          
+          "expected #{message.join(' and ')}"
+        end
+
+        private
+          def expected_to_param
+            @expected_to_param.blank? ? [@target.id, @permalink].delete_if(&:blank?).join('-') : @expected_to_param
+          end
+      end
+
+      # Provides a matcher for nicer specs:
+      #   
+      #   describe Article do
+      #     it "has a permalink" do
+      #       Article.create(:title => 'Lorem ipsum').should permalink_to('lorem-ipsum')
+      #     end
+      #   end
+      def permalink_to(*args)
+        PermalinkTo.new(*args)
+      end
+    end
+  end
+end

data/lib/permalink_fu.rb

@@ -47,8 +47,9 @@ module PermalinkFu
     #     has_permalink :title, :as => :slug, :scope => :blog_id
     #   end
     #
-    def has_permalink(attr_names = [], options = {})
-      attr_names = :to_s if attr_names.blank?
+    def has_permalink(*args)
+      options = args.extract_options!
+      attr_names = args.first || :to_s
       self.permalink_attributes = Array(attr_names)
       self.permalink_field      = (options.delete(:as) || 'permalink').to_s
       self.permalink_options    = options
@@ -75,7 +76,9 @@ module PermalinkFu
   
   module ToParamWithID
     def to_param
-      "#{id}-#{send(self.class.permalink_field)}"
+      permalink = send(self.class.permalink_field)
+      return super if new_record? || permalink.blank?
+      "#{id}-#{permalink}"
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djanowski-permalink_fu
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Damian Janowski
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
+- lib/permalink_fu/spec/matchers.rb
 - lib/permalink_fu.rb
 - init.rb
 - README.markdown