stringex 2.0.1 → 2.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzM4MDQ5OGJlOWM2Mzk0NGIxZmYxZDAxYWQ3MDYxYzQyN2VhMGQ5Nw==
+    Mjk4ZWZjOTA4ODlmMDVmOWQ0YzFkNTc4ZWRiNTkzMzY5MTU3OTVkNA==
   data.tar.gz: !binary |-
-    YzcxYjcxMDEyZjZjNmVjZmI0YmU4NDFjZWViNzU4ODRmNDljZTQ0Mg==
+    YzcwNWY5M2YxYWY3OTZiMDJkOTIyMGM2MDVkNjRkOTU4Y2FjNmU2NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODRkZWIxMzdmMzkyYjMwZDU5MjNjNzc2Y2YzYzJjOGEwNzIxZGUyMDA3MjIz
-    NGI4NjBjNzBhZjIxMWRjMWJiOTIyMzJhMThmOGFjYjlhZGFkYmQwY2I4MGJm
-    YzA2OTExNmExNzdiNWZmNzgwMGU1NTgyYTJiMzM4MTQzMjFlM2E=
+    NzVkMGNjNTVjMWY1NTk3YTdkYjRkNzdkNjg1Y2U0ZWRkOTJhZDZiYjliZmYx
+    MGU5YTAwZDVkOTIwMWY4NDZjMWQxYzZiMDEwMDY0NDg3ZGI0NmMyMjg4YjE5
+    ZjE3M2Y0MWU5OTJlYzMwMDY4ZmFmMGNiMTIzM2QxOGVlNDlkMzM=
   data.tar.gz: !binary |-
-    MTc2YmNkNWUzNGVjOWQzMDIzNTQwYjNlZDhkODExMWE4ZTk2Mjc1OWJmZjRh
-    NzhhMjJjODAxZmQwZGRlNDhjZjI4NzNlOTU0YzkzZjQyNGU0NjJmZmE0MTQy
-    ZjhjNWNhYmUwM2EyZmNlYWExZjY4ZTNjOTU2ZDkyZjliYTgwOGI=
+    YzI1YzdjMWMwOGE2OGQ2MWExNzZhYWFmNjVmZTFkOTg1NmI3NTQyMzEzNGIz
+    NmU1ZGM4YmQ4YjZiZDRjZGE0Mzg0OGIxMDUyOTgwOGEyZjEzZGRlOThkNGU1
+    YjYzNmUxMzJkNDFiNDUwZDZjM2Q4YmQwOGYzMzA1OTlkYTZiNTA=

data/README.rdoc

@@ -27,7 +27,6 @@ which will populate the <tt>url</tt> attribute on the object with the converted
                              be guaranteed to lookup the expected record based on a duplicate slug.</em>
 <tt>:limit</tt>:: If set, will limit length of url generated. Default is nil.
 
-
 In order to use the generated url attribute, you will probably want to override <tt>to_param</tt> like so, in your Model:
 
   # Inside your model
@@ -37,7 +36,7 @@ In order to use the generated url attribute, you will probably want to override
 
 Routing called via named routes like <tt>foo_path(@foo)</tt> will automatically use the url. In your controllers you will need to call <tt>Foo.find_by_url(params[:id])</tt> instead of the regular find. Don't look for <tt>params[:url]</tt> unless you set it explicitly in the routing, <tt>to_param</tt> will generate <tt>params[:id]</tt>.
 
-Note that if you add <tt>acts_as_url</tt> to an old model, the <tt>url</tt> database column will inititally be blank. To set this column for your old instances, you can use the <tt>initialize_urls</tt> method. So if your class is <tt>Post</tt>, just say <tt>Post.initialize_urls</tt>.
+Note that if you add <tt>acts_as_url</tt> to an existing model, the <tt>url</tt> database column will initially be blank. To set this column for your existing instances, you can use the <tt>initialize_urls</tt> method. So if your class is <tt>Post</tt>, just say <tt>Post.initialize_urls</tt>.
 
 Unlike other permalink solutions, ActsAsUrl doesn't rely on Iconv (which is inconsistent across platforms and doesn't provide great transliteration as is) but instead uses a transliteration scheme (see the code for Unidecoder) which produces much better results for Unicode characters. It also mixes in some custom helpers to translate common characters into a more URI-friendly format rather than just dump them completely. Examples:
 
@@ -90,17 +89,17 @@ In both the YAML and pure Hash implementation, the end result should be a Hash w
 
 == StringExtensions
 
-A collection of extensions on Ruby's String class. Please see the documentation for StringExtensions module for more information. There's not much to explain about them really.
+A small collection of extensions on Ruby's String class. Please see the documentation for StringExtensions module for more information. There's not much to explain about them really.
 
 == Localization
 
-With Stringex version 2.0 and higher, you can localize the different conversions in Stringex. Read more here[https://github.com/rsl/stringex/wiki/Localization-of-Stringex-conversions]
+With Stringex version 2.0 and higher, you can localize the different conversions in Stringex. Read more here[https://github.com/rsl/stringex/wiki/Localization-of-Stringex-conversions]. If you add a new language, please submit a pull request so we can make it available to other users also.
 
 == Using with Rails
 
 When using Stringex with Ruby on Rails, you automatically get built-in translations for miscellaneous characters, HTML entities, and vulgar fractions.
 
-You can see Stringex's standard translations here: TODO: Insert link to the +locales+ folder.
+You can see Stringex's standard translations here[https://github.com/rsl/stringex/tree/master/locales].
 
 Currently, built-in translations are available for the following languages:
 English (en), Danish (da)

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/stringex/acts_as_url/adapter/base.rb

@@ -56,14 +56,15 @@ module Stringex
 
         def add_new_record_url_owner_conditions
           return if is_new?(instance)
-          @url_owner_conditions.first << " and #{instance.class.primary_key} != ?"
+          @url_owner_conditions.first << " and #{primary_key} != ?"
           @url_owner_conditions << instance.id
         end
 
         def add_scoped_url_owner_conditions
-          return unless settings.scope_for_url
-          @url_owner_conditions.first << " and #{settings.scope_for_url} = ?"
-          @url_owner_conditions << instance.send(settings.scope_for_url)
+          [settings.scope_for_url].flatten.compact.each do |scope|
+            @url_owner_conditions.first << " and #{scope} = ?"
+            @url_owner_conditions << instance.send(scope)
+          end
         end
 
         def create_callback
@@ -145,6 +146,10 @@ module Stringex
           self.class.orm_class
         end
 
+        def primary_key
+          instance.class.primary_key
+        end
+
         def read_attribute(instance, attribute)
           instance.read_attribute attribute
         end

data/lib/stringex/acts_as_url/adapter/data_mapper.rb

@@ -42,6 +42,10 @@ module Stringex
           klass.all(:conditions => {settings.url_attribute => nil}).each(&block)
         end
 
+        def primary_key
+          instance.class.key.first.instance_variable_get '@name'
+        end
+
         def read_attribute(instance, attribute)
           instance.attributes[attribute]
         end

data/lib/stringex/acts_as_url/adapter/mongoid.rb

@@ -15,8 +15,9 @@ module Stringex
         end
 
         def add_scoped_url_owner_conditions
-          return unless settings.scope_for_url
-          @url_owner_conditions.merge! settings.scope_for_url => instance.send(settings.scope_for_url)
+          [settings.scope_for_url].flatten.compact.each do |scope|
+            @url_owner_conditions.merge! scope => instance.send(scope)
+          end
         end
 
         def get_base_url_owner_conditions

data/lib/stringex/unidecoder.rb

@@ -1,10 +1,12 @@
 # encoding: UTF-8
 
+require 'yaml'
+
 module Stringex
   module Unidecoder
     # Contains Unicode codepoints, loading as needed from YAML files
     CODEPOINTS = Hash.new{|h, k|
-      h[k] = YAML.load_file(File.join(File.expand_path(File.dirname(__FILE__)), "unidecoder_data", "#{k}.yml"))
+      h[k] = ::YAML.load_file(File.join(File.expand_path(File.dirname(__FILE__)), "unidecoder_data", "#{k}.yml"))
     } unless defined?(CODEPOINTS)
 
     class << self

data/stringex.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "stringex"
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Russell Norris"]

data/test/acts_as_url/adapter/active_record.rb

@@ -14,11 +14,11 @@ ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":me
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Schema.define do
   create_table :documents, :force => true do |t|
-    t.string :title, :other, :url
+    t.string :title, :other, :another, :url
   end
 
   create_table :sti_base_documents, :force => true do |t|
-    t.string :title, :other, :url, :type
+    t.string :title, :other, :another, :url, :type
   end
 end
 ActiveRecord::Migration.verbose = true

data/test/acts_as_url/adapter/data_mapper.rb

@@ -22,21 +22,23 @@ DataMapper.setup :default, 'sqlite::memory:'
 DefineTestClasses = proc do
   class Document
     include DataMapper::Resource
-    property :id,    Serial
-    property :title, String
-    property :other, String
-    property :url,   String, :lazy => false
+    property :id,      Serial
+    property :title,   String
+    property :other,   String
+    property :another, String
+    property :url,     String, :lazy => false
 
     acts_as_url :title
   end
 
   class STIBaseDocument
     include DataMapper::Resource
-    property :id,    Serial
-    property :title, String
-    property :other, String
-    property :url,   String, :lazy => false
-    property :type,  String
+    property :id,      Serial
+    property :title,   String
+    property :other,   String
+    property :another, String
+    property :url,     String, :lazy => false
+    property :type,    String
 
     # This gets redefined in the only test that uses it but I want to be uniform
     # in setting configuration details in the tests themselves

data/test/acts_as_url/adapter/mongoid.rb

@@ -15,19 +15,21 @@ end
 
 class Document
   include Mongoid::Document
-  field :title, :type => String
-  field :other, :type => String
-  field :url,   :type => String
+  field :title,   :type => String
+  field :other,   :type => String
+  field :another, :type => String
+  field :url,     :type => String
 
   acts_as_url :title
 end
 
 class STIBaseDocument
   include Mongoid::Document
-  field :title, :type => String
-  field :other, :type => String
-  field :url,   :type => String
-  field :type,  :type => String
+  field :title,   :type => String
+  field :other,   :type => String
+  field :another, :type => String
+  field :url,     :type => String
+  field :type,    :type => String
 
   # This gets redefined in the only test that uses it but I want to be uniform
   # in setting configuration details in the tests themselves

data/test/acts_as_url_integration_test.rb

@@ -89,6 +89,29 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
     assert_not_equal @doc.url, @other_doc.url
   end
 
+  def test_should_allow_multiple_scopes
+    Document.class_eval do
+      acts_as_url :title, :scope => [:other, :another]
+    end
+
+    @doc = Document.create(:title => "Mocumentary", :other => "I don't care if I'm unique for some reason",
+      :another => "Whatever")
+    @other_doc = Document.create(:title => "Mocumentary", :other => "Me either", :another => "Whatever")
+    assert_equal @doc.url, @other_doc.url
+  end
+
+  def test_should_only_create_unique_urls_for_multiple_scopes_if_both_attributes_are_same
+    Document.class_eval do
+      acts_as_url :title, :scope => [:other, :another]
+    end
+
+    @doc = Document.create(:title => "Mocumentary", :other => "Suddenly, I care if I'm unique",
+      :another => "Whatever")
+    @other_doc = Document.create(:title => "Mocumentary", :other => "Suddenly, I care if I'm unique",
+      :another => "Whatever")
+    assert_not_equal @doc.url, @other_doc.url
+  end
+
   def test_should_allow_setting_url_attribute
     Document.class_eval do
       # Manually undefining the url method on Document which, in a real class not reused for tests,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stringex
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Russell Norris