rewritten 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4df6b29c36a9d6da1c0cc658f49a3f9d4a9f4d5
-  data.tar.gz: 4274875b1c6dd086e738f164c33fbf1184684e7a
+  metadata.gz: 34a5c63d94e26e835807498f850cf45eecb6a846
+  data.tar.gz: dc27dfb93fd4a561fde220961a6d1d09c5019268
 SHA512:
-  metadata.gz: 2bc012992fd582dd180b35551a00d0b994069b118cee7d307129939f69670f7fe584c66072aaa6764fbebc647929630110e829e0e664571c8841dd8cb163d0e5
-  data.tar.gz: a7054b44d16800e07edf0261b3e2215a3eabc04252869ed168f01a8142895756f90e6476f519aab3d69c5fbd3e625d2105ae6b05b2fb41bcbb362570abec7f22
+  metadata.gz: afe1017ab7ec13d289b1f2107f4f0931b878c356686aadad6018cf933a646c0b0a7d98696098600bfc2b7ee487a286b7a6906f057d58eead5428394e77163667
+  data.tar.gz: 84c441c885be0a95a9a5e00a5cbdaa068fd24264c8c16c8afe7348ae1f3cbb3d739286a066d7076f5c1d900c2b94a6d21f29c24832da8fe0717ff00b402db749

data/lib/rewritten/document.rb

@@ -1,26 +1,29 @@
 module Rewritten
   module Document
 
-    def rewritten_url=(new_translation)
-      Rewritten.add_translation(new_translation, url_for(self)) 
-    end
 
     def rewritten_url
       return "" unless persisted? 
-      Rewritten.get_current_translation(url_for(self))
+      Rewritten.get_current_translation(polymorphic_url(self, :only_path => true))
+    end
+
+    def rewritten_url=(new_url)
+      if !new_url.nil? && new_url != "" && new_url != rewritten_url
+        Rewritten.add_translation(new_url, polymorphic_url(self, :only_path => true)) 
+      end
     end
 
     def rewritten_urls
       return [] unless persisted? 
-      Rewritten.get_all_translations(url_for(self))
+      Rewritten.get_all_translations(polymorphic_url(self, :only_path => true))
     end
 
     def has_rewritten_url?
-      Rewritten.exist_translation_for?(url_for(self))
+      Rewritten.exist_translation_for?(polymorphic_url(self, :only_path => true))
     end
     
     def remove_rewritten_urls
-      Rewritten.remove_all_translations(url_for(self))
+      Rewritten.remove_all_translations(polymorphic_url(self, :only_path => true))
     end
     
   end

data/lib/rewritten/version.rb

@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end
 

data/test/rewritten/document_test.rb

@@ -7,7 +7,7 @@ describe Rewritten::Document do
       include Rewritten::Document
     end
     @instance = Product.new
-    def @instance.url_for(object); '/products/123'; end
+    def @instance.polymorphic_url(object, options={}); '/products/123'; end
     def @instance.persisted?; true; end
   end
 
@@ -35,7 +35,6 @@ describe Rewritten::Document do
     Rewritten.add_translation('/foo/baz', '/products/123')
 
     @instance.rewritten_urls.must_equal ['/foo/bar', '/foo/baz']         
-
   end
 
   it 'must add a new translation' do
@@ -52,6 +51,17 @@ describe Rewritten::Document do
     @instance.rewritten_urls.must_equal []
   end
 
+  it 'must won\'t add blank and similar translations' do
+    @instance.rewritten_url = '/foo/bar'  
+    @instance.rewritten_urls.must_equal ['/foo/bar']
+    @instance.rewritten_url = nil
+    @instance.rewritten_urls.must_equal ['/foo/bar']
+    @instance.rewritten_url = ""
+    @instance.rewritten_urls.must_equal ['/foo/bar']
+    @instance.rewritten_url = "/foo/bar"
+    @instance.rewritten_urls.must_equal ['/foo/bar']
+  end
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Kai Rubarth