stringex 2.2.0 → 2.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGQxMmNjMmIwMzU1MzY0YzdmMWEzZjhiYjI0MTk5ZGE4M2ZiODY0Mg==
+    YmQxN2VlYWQ5NTVlYTI2YTdmNjM0OGQyMzQ0YjNhNDJkM2RmNDAwZg==
   data.tar.gz: !binary |-
-    YzkxMzZiYTBmZWM0YWUyYTMyYWY0MDgzNDRhM2IxNmJjZWM2MDZmOQ==
+    YWExNjcyZGNlNjc3MTM3ZjFkNzNhY2Q1ZTVlMTdjYmU4NDg0OTM1Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmMxMmRmNTg3NGY0Nzg1M2Q2MWM4NTk5M2I0NjAxMjgwNmIwZjljZmEzZmNj
-    MGE4MWYwOGNjYTRkMzM5NzRhMTdjMzI3MWVhNzY4NzBkNTQ2ZTM0YWEzYzE1
-    ZmM1YWY2NmY0MzM5ZDk4MTc2MjQzNWVkZTU5NDNmNjZkZmNlMDM=
+    NmVmMTdlMTA0Y2IxMDMxMmZhYzlmYzkwYzk3YTcxM2U3MmM5MDdkZTYxNGU2
+    NWVhMTE1OWIxYWVlNGZlNmVhYmE3NTQ2YjU5ODViMWZkMTI5NGYwMjVlNmYw
+    ZTdjMGQzODE4NGY4NTdkYmM5MDMwNTRkYjgwN2M2YmMyYWNiOWY=
   data.tar.gz: !binary |-
-    MTA2MjBkMTVkYWVlMzM0MDA4Y2JmODNjMGM4NWM5MjBkZjM3YmJiMmFkZjA4
-    YjQyNDBkOWMwMDE3YmI4ZDkwNjE1ZWQ2ODdjMzMzZTU4OTBmZjE1NDU2NTQ0
-    OGY4ZDA2MWU2MjUyYWM1NTZhNTNjZDRmOTk5NDYwZjcxNTQyMzY=
+    MzQ2ZDk1NTZhZDRmNjIyMTUxNzVjYjIzMjZhYWYyZjA5M2VmMzQ0MmQ3ODUz
+    ODFlNWQyNjI0NWQyMzM1YjY1MjQzMDk1OTdjMDU4NDJkYjVhMDAzZGE0NzVm
+    ZTdmMTk4YjZhNDkzYTM1MGVjNWZkZDViZTQ5Njg2ZTg0NGExNDI=

data/Gemfile

@@ -1,26 +1,51 @@
 # A sample Gemfile
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-group :development do
-  gem "activerecord", "3.2.13"
-  gem "dm-core", "1.2.0"
-  gem "dm-migrations", "1.2.0"
-  gem "dm-sqlite-adapter", "1.2.0"
-  gem "dm-validations", "1.2.0"
-  gem "jeweler", "1.8.4"
-  if RUBY_VERSION > "1.8.x"
-    gem "mongoid", "3.1.4"
+def activerecord?
+  adapter.nil? || adapter == 'activerecord'
+end
+
+def datamapper?
+  adapter == 'datamapper'
+end
+
+def mongoid?
+  if RUBY_VERSION > '1.8.x'
+    adapter == 'mongoid'
   else
-    puts "Mongoid requires Ruby higher than 1.8.x"
+    puts 'Mongoid requires Ruby higher than 1.8.x'
+  end
+end
+
+def adapter
+  ENV['ADAPTER']
+end
+
+group :development do
+  # Standard gems across gemfiles
+  gem 'jeweler', '1.8.4'
+  gem 'travis-lint', '1.7.0'
+  # Can I state that I really dislike camelcased gem names?
+  gem 'RedCloth', '4.2.9'
+  gem 'sqlite3', '1.3.7'
+
+  if activerecord?
+    gem 'activerecord', '4.0.3'
+    gem 'i18n', '0.6.9'
   end
-  gem "RedCloth", "4.2.9" # Can I state that I really dislike camelcased gem names?
-  gem "travis-lint", "1.7.0"
-  gem "i18n", "0.6.1"
-  # For non-Jruby...
-  gem "sqlite3", "1.3.7", :platform => [:ruby, :mswin, :mingw]
-  # And for Jruby...
-  platform :jruby do
-    # gem "jdbc-sqlite3"
-    # gem "activerecord-jdbcsqlite3-adapter"
+
+  if datamapper?
+    gem 'dm-core', '1.2.1'
+    gem 'dm-migrations', '1.2.0'
+    gem 'dm-sqlite-adapter', '1.2.0'
+    gem 'dm-validations', '1.2.0'
+  end
+
+  if mongoid?
+    gem 'mongoid', '3.1.6'
+    gem 'i18n', '0.6.1'
+  else
+    # Everyone else can get the most up-to-date I18n
+    gem 'i18n', '0.6.9'
   end
 end

data/Rakefile

@@ -41,35 +41,7 @@ namespace :test do
   end
 end
 
-desc 'Default: Run Stringex test suite using ActiveRecord as the ORM'
-task :default => [:setup_active_record_suite, :test]
-
-task :setup_active_record_suite do
-  ENV['ADAPTER'] = 'active_record'
-end
-
-desc 'Run Stringex test suite using ActiveRecord as the ORM'
-namespace :test do
-  task :active_record => [:setup_active_record_suite]
-end
-
-task :setup_mongoid_suite do
-  ENV['ADAPTER'] = 'mongoid'
-end
-
-desc 'Run Stringex test suite using Mongoid as the ORM'
-namespace :test do
-  task :mongoid => [:setup_mongoid_suite, :test]
-end
-
-task :setup_data_mapper_suite do
-  ENV['ADAPTER'] = 'data_mapper'
-end
-
-desc 'Run Stringex test suite using DataMapper as the ORM'
-namespace :test do
-  task :data_mapper => [:setup_data_mapper_suite, :test]
-end
+task :default => :test
 
 desc 'Generate RDoc for Stringex'
 Rake::RDocTask.new(:rdoc) do |rdoc|

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/lib/stringex/acts_as_url.rb

@@ -72,11 +72,13 @@ module Stringex
 
       # Some ORMs function as mixins not base classes and need to have a hook to reinclude
       # and re-extend ActsAsUrl methods
-      def included(base)
+      def included(base = nil, &block)
         super
 
-        base.send :include, Stringex::ActsAsUrl::ActsAsUrlInstanceMethods
-        base.send :extend, Stringex::ActsAsUrl::ActsAsUrlClassMethods
+        if base
+          base.send :include, Stringex::ActsAsUrl::ActsAsUrlInstanceMethods
+          base.send :extend, Stringex::ActsAsUrl::ActsAsUrlClassMethods
+        end
       end
 
       # Initialize the url fields for the records that need it. Designed for people who add

data/stringex.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "stringex"
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Russell Norris"]
-  s.date = "2014-02-03"
+  s.date = "2014-03-03"
   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 = [
@@ -237,8 +237,8 @@ Gem::Specification.new do |s|
     "stringex.gemspec",
     "test/performance/localization_performance_test.rb",
     "test/test_helper.rb",
-    "test/unit/acts_as_url/adapter/active_record.rb",
-    "test/unit/acts_as_url/adapter/data_mapper.rb",
+    "test/unit/acts_as_url/adapter/activerecord.rb",
+    "test/unit/acts_as_url/adapter/datamapper.rb",
     "test/unit/acts_as_url/adapter/mongoid.rb",
     "test/unit/acts_as_url_configuration_test.rb",
     "test/unit/acts_as_url_integration_test.rb",
@@ -272,42 +272,30 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<activerecord>, ["= 3.2.13"])
-      s.add_development_dependency(%q<dm-core>, ["= 1.2.0"])
-      s.add_development_dependency(%q<dm-migrations>, ["= 1.2.0"])
-      s.add_development_dependency(%q<dm-sqlite-adapter>, ["= 1.2.0"])
-      s.add_development_dependency(%q<dm-validations>, ["= 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["= 1.8.4"])
-      s.add_development_dependency(%q<mongoid>, ["= 3.1.4"])
-      s.add_development_dependency(%q<RedCloth>, ["= 4.2.9"])
       s.add_development_dependency(%q<travis-lint>, ["= 1.7.0"])
-      s.add_development_dependency(%q<i18n>, ["= 0.6.1"])
+      s.add_development_dependency(%q<RedCloth>, ["= 4.2.9"])
       s.add_development_dependency(%q<sqlite3>, ["= 1.3.7"])
+      s.add_development_dependency(%q<activerecord>, ["= 4.0.3"])
+      s.add_development_dependency(%q<i18n>, ["= 0.6.9"])
+      s.add_development_dependency(%q<i18n>, ["= 0.6.9"])
     else
-      s.add_dependency(%q<activerecord>, ["= 3.2.13"])
-      s.add_dependency(%q<dm-core>, ["= 1.2.0"])
-      s.add_dependency(%q<dm-migrations>, ["= 1.2.0"])
-      s.add_dependency(%q<dm-sqlite-adapter>, ["= 1.2.0"])
-      s.add_dependency(%q<dm-validations>, ["= 1.2.0"])
       s.add_dependency(%q<jeweler>, ["= 1.8.4"])
-      s.add_dependency(%q<mongoid>, ["= 3.1.4"])
-      s.add_dependency(%q<RedCloth>, ["= 4.2.9"])
       s.add_dependency(%q<travis-lint>, ["= 1.7.0"])
-      s.add_dependency(%q<i18n>, ["= 0.6.1"])
+      s.add_dependency(%q<RedCloth>, ["= 4.2.9"])
       s.add_dependency(%q<sqlite3>, ["= 1.3.7"])
+      s.add_dependency(%q<activerecord>, ["= 4.0.3"])
+      s.add_dependency(%q<i18n>, ["= 0.6.9"])
+      s.add_dependency(%q<i18n>, ["= 0.6.9"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["= 3.2.13"])
-    s.add_dependency(%q<dm-core>, ["= 1.2.0"])
-    s.add_dependency(%q<dm-migrations>, ["= 1.2.0"])
-    s.add_dependency(%q<dm-sqlite-adapter>, ["= 1.2.0"])
-    s.add_dependency(%q<dm-validations>, ["= 1.2.0"])
     s.add_dependency(%q<jeweler>, ["= 1.8.4"])
-    s.add_dependency(%q<mongoid>, ["= 3.1.4"])
-    s.add_dependency(%q<RedCloth>, ["= 4.2.9"])
     s.add_dependency(%q<travis-lint>, ["= 1.7.0"])
-    s.add_dependency(%q<i18n>, ["= 0.6.1"])
+    s.add_dependency(%q<RedCloth>, ["= 4.2.9"])
     s.add_dependency(%q<sqlite3>, ["= 1.3.7"])
+    s.add_dependency(%q<activerecord>, ["= 4.0.3"])
+    s.add_dependency(%q<i18n>, ["= 0.6.9"])
+    s.add_dependency(%q<i18n>, ["= 0.6.9"])
   end
 end
 

data/test/unit/acts_as_url/adapter/mongoid.rb

@@ -23,6 +23,14 @@ class Document
   acts_as_url :title
 end
 
+begin
+  # Let's make sure we can connect to mongodb before we run our tests!
+  Mongoid::Sessions.default.databases
+rescue Moped::Errors::ConnectionFailure => err
+  puts 'Cannot connect to mongodb. Aborting.'
+  exit
+end
+
 class STIBaseDocument
   include Mongoid::Document
   field :title,   :type => String

data/test/unit/acts_as_url_integration_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-adapter = ENV['ADAPTER'] || 'active_record'
+adapter = ENV['ADAPTER'] || 'activerecord'
 require File.join(File.expand_path(File.dirname(__FILE__)), "acts_as_url/adapter/#{adapter}.rb")
 
 class ActsAsUrlIntegrationTest < Test::Unit::TestCase

metadata

@@ -1,169 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: stringex
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Russell Norris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: dm-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: dm-migrations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: dm-validations
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: travis-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 4.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 4.2.9
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 1.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
-  name: travis-lint
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 4.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 0.6.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 0.6.9
 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
@@ -395,8 +339,8 @@ files:
 - stringex.gemspec
 - test/performance/localization_performance_test.rb
 - test/test_helper.rb
-- test/unit/acts_as_url/adapter/active_record.rb
-- test/unit/acts_as_url/adapter/data_mapper.rb
+- test/unit/acts_as_url/adapter/activerecord.rb
+- test/unit/acts_as_url/adapter/datamapper.rb
 - test/unit/acts_as_url/adapter/mongoid.rb
 - test/unit/acts_as_url_configuration_test.rb
 - test/unit/acts_as_url_integration_test.rb