stringex 2.0.2 → 2.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjk4ZWZjOTA4ODlmMDVmOWQ0YzFkNTc4ZWRiNTkzMzY5MTU3OTVkNA==
+    YmMxOWVlZjNkYzk5YTMyOWM1MGViNWNjZWE3Y2EyYzc4OGNiZTJiNA==
   data.tar.gz: !binary |-
-    YzcwNWY5M2YxYWY3OTZiMDJkOTIyMGM2MDVkNjRkOTU4Y2FjNmU2NQ==
+    NWM2ZjYwODhmZDU3ZDk0MzQzM2U4YmE2MGE5YzE0MzhmYzVmZWI5YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzVkMGNjNTVjMWY1NTk3YTdkYjRkNzdkNjg1Y2U0ZWRkOTJhZDZiYjliZmYx
-    MGU5YTAwZDVkOTIwMWY4NDZjMWQxYzZiMDEwMDY0NDg3ZGI0NmMyMjg4YjE5
-    ZjE3M2Y0MWU5OTJlYzMwMDY4ZmFmMGNiMTIzM2QxOGVlNDlkMzM=
+    MGI1Y2FiMGVhOGNmMjE4MmQwZDMyYjkwNzY2YzA0ZWQwN2I5NjAzZTZiODll
+    ZDRkZTdlOWVhMDkxYmQxOTE2OWYyM2IwZjdjMzk4ZTRmMGE2M2ZjYTBjYjdj
+    MDNhNDExZTIyNGJjMDE3OTk1NjA3NWFjMjFlYzYxMzI5ZDA1MjQ=
   data.tar.gz: !binary |-
-    YzI1YzdjMWMwOGE2OGQ2MWExNzZhYWFmNjVmZTFkOTg1NmI3NTQyMzEzNGIz
-    NmU1ZGM4YmQ4YjZiZDRjZGE0Mzg0OGIxMDUyOTgwOGEyZjEzZGRlOThkNGU1
-    YjYzNmUxMzJkNDFiNDUwZDZjM2Q4YmQwOGYzMzA1OTlkYTZiNTA=
+    NTdlMjBlMWZmOGQ4YzBiNjk1MWExNGQyNTRiOTgxYjUxZjY1OTUwZTg3Mzgy
+    MWNhNzQ2YmQ2NjQ1MjM2YjAwMDBjYmUwZTRiN2JiZGIyZTJhNTlhMGJjNzIy
+    MzYyZGNjNGRiZjNiMDQ4MjA5Yzg5NTk5ZWMyODBjOGY0N2ZhNTM=

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

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

@@ -11,7 +11,7 @@ module Stringex
       private
 
         def klass_previous_instances(&block)
-          klass.find_each(:conditions => {settings.url_attribute => nil}, &block)
+          klass.find_each(:conditions => {settings.url_attribute => [nil, '']}, &block)
         end
 
         def self.orm_class

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

@@ -2,7 +2,7 @@ module Stringex
   module ActsAsUrl
     module Adapter
       class Base
-        attr_accessor :base_url, :configuration, :instance, :klass, :settings
+        attr_accessor :base_url, :callback_options, :configuration, :instance, :klass, :settings
 
         def initialize(configuration)
           ensure_loadable
@@ -12,6 +12,7 @@ module Stringex
 
         def create_callbacks!(klass)
           self.klass = klass
+          self.callback_options = {}
           create_method_to_callback
           create_callback
         end
@@ -68,10 +69,24 @@ module Stringex
         end
 
         def create_callback
-          if settings.sync_url
-            klass.before_validation :ensure_unique_url
-          else
-            klass.before_validation :ensure_unique_url, :on => :create
+          klass.send klass_callback_method, :ensure_unique_url, callback_options
+        end
+
+        def klass_callback_method
+          settings.sync_url ? klass_sync_url_callback_method : klass_non_sync_url_callback_method
+        end
+
+        def klass_sync_url_callback_method
+          configuration.settings.callback_method
+        end
+
+        def klass_non_sync_url_callback_method
+          case configuration.settings.callback_method
+          when :before_save
+            :before_create
+          else # :before_validation
+            callback_options[:on] = :create
+            configuration.settings.callback_method
           end
         end
 

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

@@ -11,14 +11,8 @@ module Stringex
       private
 
         def create_callback
-          if settings.sync_url
-            klass.class_eval do
-              before :save, :ensure_unique_url
-            end
-          else
-            klass.class_eval do
-              before :create, :ensure_unique_url
-            end
+          klass.class_eval do
+            before acts_as_url_configuration.settings.sync_url ? :save : :create, :ensure_unique_url
           end
         end
 
@@ -39,7 +33,7 @@ module Stringex
         end
 
         def klass_previous_instances(&block)
-          klass.all(:conditions => {settings.url_attribute => nil}).each(&block)
+          klass.all(:conditions => {settings.url_attribute => [nil]}).each(&block)
         end
 
         def primary_key

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

@@ -25,7 +25,7 @@ module Stringex
         end
 
         def klass_previous_instances(&block)
-          klass.where(settings.url_attribute => nil).to_a.each(&block)
+          klass.all(settings.url_attribute => [nil]).to_a.each(&block)
         end
 
         def self.orm_class

data/lib/stringex/configuration/acts_as_url.rb

@@ -31,6 +31,7 @@ module Stringex
       def self.default_settings
         @default_settings ||= {
           :allow_duplicates => false,
+          :callback_method => :before_validation,
           :duplicate_count_separator => "-",
           :enforce_uniqueness_on_sti_class => false,
           :only_when_blank => false,

data/lib/stringex/localization.rb

@@ -77,7 +77,7 @@ module Stringex
       end
 
       def convert(string, options = {}, &block)
-        converter = Converter.new(string)
+        converter = Converter.new(string, options)
         converter.instance_exec &block
         converter.smart_strip!
         converter.string

data/lib/stringex/localization/conversion_expressions.rb

@@ -25,7 +25,7 @@ module Stringex
       }
 
       # Things that just get converted to spaces
-      CLEANUP_CHARACTERS = /[\.,:;(){}\[\]\/\?!\^'ʼ"_\|]/
+      CLEANUP_CHARACTERS = /[\.,:;(){}\[\]\?!\^'ʼ"_\|]/
       CLEANUP_HTML_ENTITIES = /&[^;]+;/
 
       CURRENCIES_SUPPORTED_SIMPLE = {
@@ -33,11 +33,13 @@ module Stringex
         :euros   => /€/,
         :pounds  => /£/,
         :yen     => /¥/,
+        :reais   => /R$/
       }
       CURRENCIES_SUPPORTED_COMPLEX = {
         :dollars => :dollars_cents,
         :euros   => :euros_cents,
         :pounds  => :pounds_pence,
+        :reais   => :reais_cents
       }
       CURRENCIES_SUPPORTED = Regexp.new(CURRENCIES_SUPPORTED_SIMPLE.values.join('|'))
       CURRENCIES_SIMPLE = CURRENCIES_SUPPORTED_SIMPLE.inject({}) do |hash, content|

data/lib/stringex/string_extensions.rb

@@ -52,7 +52,7 @@ module Stringex
       # you should run any methods which convert HTML entities (convert_accented_html_entities and convert_miscellaneous_html_entities)
       # before running this method.
       def convert_miscellaneous_characters(options = {})
-        stringex_convert do
+        stringex_convert(options) do
           translate! :ellipses, :currencies, :abbreviations, :characters, :apostrophes
           cleanup_characters!
         end

data/locales/da.yml

@@ -26,6 +26,8 @@ da:
       euros: \1 euro
       euros_cents: \1 euro \2 cent
       yen: \1 yen
+      reais: \1 reais
+      reais_cents: \1 reais \2 cents
     html_entities:
       amp: and
       cent: " cents"

data/locales/en.yml

@@ -26,6 +26,8 @@ en:
       euros: \1 euros
       euros_cents: \1 euros \2 cents
       yen: \1 yen
+      reais: \1 reais
+      reais_cents: \1 reais \2 cents
     html_entities:
       amp: and
       cent: " cents"

data/locales/pt-BR.yml

@@ -0,0 +1,68 @@
+# NOTE: Some translation keys make use of matches from regular expressions
+# to manipulate whitespace and order. Please consult the source code for
+# Stringex::Localization::ConversionExpressions to see what those
+# regular expressions look like if you need to manipulate the order
+# differently than the usage below.
+pt-BR:
+  stringex:
+    characters:
+      and: e
+      at: em
+      divide: dividido por
+      degrees: graus
+      dot: \1 ponto \2
+      ellipsis: reticências
+      equals: igual à
+      number: número
+      percent: porcento
+      plus: mais
+      slash: barra
+      star: estrela
+    currencies:
+      dollars: \1 dólares
+      dollars_cents: \1 dólares \2 cents
+      pounds: \1 libras
+      pounds_pence: \1 libras \2 centavos
+      euros: \1 euros
+      euros_cents: \1 euros \2 cents
+      yen: \1 yen
+      reais: \1 reais
+      reais_cents: \1 reais \2 centavos
+    html_entities:
+      amp: e
+      cent: " centavos"
+      copy: (c)
+      deg: " graus "
+      divide: " dividido por "
+      double_quote: '"'
+      ellipsis: "..."
+      en_dash: "-"
+      em_dash: "--"
+      frac14: um quarto
+      frac12: metade
+      frac34: três quartos
+      gt: ">"
+      lt: <
+      nbsp: " "
+      pound: " libras "
+      reg: (r)
+      single_quote: "'"
+      times: x
+      trade: (tm)
+      yen: " yen "
+    vulgar_fractions:
+      half: metade
+      one_third: um terço
+      two_thirds: dois terços
+      one_fourth: um quarto
+      three_fourths: três quartos
+      one_fifth: um quinto
+      two_fifths: dois quintos
+      three_fifths: três quintos
+      four_fifths: quatro quintos
+      one_sixth: um sexto
+      five_sixths: cinco sextos
+      one_eighth: um oitavo
+      three_eighths: três oitavos
+      five_eighths: cinco oitavos
+      seven_eighths: sete oitavos

data/stringex.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "stringex"
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Russell Norris"]
-  s.date = "2013-06-03"
+  s.date = "2013-06-17"
   s.description = "Some [hopefully] useful extensions to Ruby's String class. Stringex is made up of three libraries: ActsAsUrl [permalink solution with better character translation], Unidecoder [Unicode to ASCII transliteration], and StringExtensions [miscellaneous helper methods for the String class]."
   s.email = "rsl@luckysneaks.com"
   s.extra_rdoc_files = [
@@ -228,6 +228,7 @@ Gem::Specification.new do |s|
     "lib/stringex/version.rb",
     "locales/da.yml",
     "locales/en.yml",
+    "locales/pt-BR.yml",
     "stringex.gemspec",
     "test/acts_as_url/adapter/active_record.rb",
     "test/acts_as_url/adapter/data_mapper.rb",

data/test/acts_as_url_integration_test.rb

@@ -188,6 +188,23 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
     end
   end
 
+  def test_should_mass_initialize_empty_string_urls
+    @doc = Document.create(:title => "Initial")
+    @other_doc = Document.create(:title => "Subsequent")
+    adapter_specific_update @doc, :url => ''
+    adapter_specific_update @other_doc, :url => ''
+    # Just making sure this got unset before the real test
+    assert_equal '', @doc.url
+    assert_equal '', @other_doc.url
+
+    Document.initialize_urls
+
+    @doc.reload
+    @other_doc.reload
+    assert_equal "initial", @doc.url
+    assert_equal "subsequent", @other_doc.url
+  end
+
   def test_should_allow_using_custom_method_for_generating_url
     Document.class_eval do
       acts_as_url :non_attribute_method
@@ -291,4 +308,22 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
     @doc_2 = AnotherSTIChildDocument.create(:title => "Unique")
     assert_equal "unique-1", @doc_2.url
   end
+
+  def test_should_strip_slashes_by_default
+    Document.class_eval do
+      acts_as_url :title
+    end
+
+    @doc = Document.create(:title => "a b/c d")
+    assert_equal "a-b-slash-c-d", @doc.url
+  end
+
+  def test_should_allow_slashes_to_be_allowed
+    Document.class_eval do
+      acts_as_url :title, :allow_slash => true
+    end
+
+    @doc = Document.create(:title => "a b/c d")
+    assert_equal "a-b/c-d", @doc.url
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stringex
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Russell Norris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -386,6 +386,7 @@ files:
 - lib/stringex/version.rb
 - locales/da.yml
 - locales/en.yml
+- locales/pt-BR.yml
 - stringex.gemspec
 - test/acts_as_url/adapter/active_record.rb
 - test/acts_as_url/adapter/data_mapper.rb