slugs 1.1.0 → 1.2.3

data/test/records_test.rb

@@ -2,12 +2,6 @@ require 'test_helper'
 
 class RecordsTest < ActiveSupport::TestCase
   
-  setup do
-    @without = Without.create(name: 'name')
-    @simple = Simple.create(name: 'name', age: 14)
-    @translatable = Translatable.create(name: 'translatable name', age: 20)
-  end
-
   test "should not break validation" do
     assert Without.new.valid?
     assert Simple.new.valid?
@@ -15,64 +9,97 @@ class RecordsTest < ActiveSupport::TestCase
   end
 
   test "should not break models" do
-    assert_equal 'name', @without.name
-    assert_equal @without, Without.find('1')
-    assert_equal @without, Without.find(1)
+    assert_equal 'name', without.name
+    assert_equal without, Without.find('1')
+    assert_equal without, Without.find(1)
   end
 
   test "should create slug" do
-    assert_equal 'name', @simple.slug
-    assert_equal @simple, Simple.find('name')
-    assert_equal 'translatable-name', @translatable.slug
-    assert_equal @translatable, Translatable.find('translatable-name')
+    assert_equal 'name', simple.slug
+    assert_equal simple, Simple.find('name')
+
+    assert_equal 'translatable-name', translatable.slug
+    assert_equal translatable, Translatable.find('translatable-name')
   end
 
-  test "should edit slug" do
-    @simple.update_attributes name: 'new name'
-    assert_equal 'new-name', @simple.slug
-    assert_equal @simple, Simple.find('new-name')
-    @translatable.update_attributes name: 'new translatable name'
-    assert_equal 'new-translatable-name', @translatable.slug
-    assert_equal @translatable, Translatable.find('new-translatable-name')
+  test "should update slug" do
+    simple.update name: 'new name'
+    assert_equal 'new-name', simple.slug
+    assert_equal simple, Simple.find('new-name')
+
+    translatable.update name: 'new translatable name'
+    assert_equal 'new-translatable-name', translatable.slug
+    assert_equal translatable, Translatable.find('new-translatable-name')
   end
 
   test "should not alter direct assigned slug" do
-    @simple.update_attributes slug: 'direct slug'
-    assert_equal 'direct slug', @simple.slug
-    assert_equal @simple, Simple.find('direct slug')
-    @translatable.update_attributes slug: 'translatable direct slug'
-    assert_equal 'translatable direct slug', @translatable.slug
-    assert_equal @translatable, Translatable.find('translatable direct slug')
+    simple.update slug: 'direct slug'
+    assert_equal 'direct slug', simple.slug
+    assert_equal simple, Simple.find('direct slug')
+
+    translatable.update slug: 'translatable direct slug'
+    assert_equal 'translatable direct slug', translatable.slug
+    assert_equal translatable, Translatable.find('translatable direct slug')
+  end
+
+  test "records should not be readonly" do
+    Simple.create name: 'editable'
+    assert_not Simple.find('editable').readonly?
+
+    Translatable.create name: 'editable'
+    assert_not Translatable.find('editable').readonly?
   end
 
   test "should assign index for same slugs" do
     first = Simple.create(name: 'same', age: 34)
     assert_equal 'same', first.slug
+
+    Simple.create(name: 'same-larger', age: 10) }
+    20.times { Simple.create(name: 'same', age: 10) }
+
     second = Simple.create(name: 'same', age: 45)
-    assert_equal 'same-1', second.slug
+    assert_equal 'same-21', second.slug
     third = Simple.create(name: 'same', age: 234)
-    assert_equal 'same-2', third.slug
+    assert_equal 'same-22', third.slug
 
-    first.update_attributes name: 'other'
-    assert_equal 'other', first.slug
-    second.update_attributes name: 'other'
-    assert_equal 'other-1', second.slug
-    third.update_attributes name: 'other'
-    assert_equal 'other-2', third.slug
+    first.update name: 'same'
+    assert_equal 'same', first.slug
+    second.update name: 'same'
+    assert_equal 'same-23', second.slug
+    third.update name: 'other'
+    assert_equal 'other', third.slug
 
     first = Translatable.create(name: 'same', age: 34)
     assert_equal 'same', first.slug
+
+    Simple.create(name: 'same-larger', age: 10) }
+    20.times { Translatable.create(name: 'same', age: 10) }
+
     second = Translatable.create(name: 'same', age: 45)
-    assert_equal 'same-1', second.slug
+    assert_equal 'same-21', second.slug
     third = Translatable.create(name: 'same', age: 234)
-    assert_equal 'same-2', third.slug
-
-    first.update_attributes name: 'other'
-    assert_equal 'other', first.slug
-    second.update_attributes name: 'other'
-    assert_equal 'other-1', second.slug
-    third.update_attributes name: 'other'
-    assert_equal 'other-2', third.slug
+    assert_equal 'same-22', third.slug
+
+    first.update name: 'same'
+    assert_equal 'same', first.slug
+    second.update name: 'same'
+    assert_equal 'same-23', second.slug
+    third.update name: 'other'
+    assert_equal 'other', third.slug
+  end
+
+  private
+
+  def simple
+    @simple ||= Simple.create(name: 'name', age: 14)
+  end
+
+  def without
+    @without ||= Without.create(name: 'name')
+  end
+
+  def translatable
+    @translatable ||= Translatable.create(name: 'translatable name', age: 20)
   end
 
 end

data/test/test_helper.rb

@@ -1,8 +1,8 @@
 # Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
+ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
+require File.expand_path('../dummy/config/environment.rb',  __FILE__)
+require 'rails/test_help'
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -11,7 +11,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+  ActiveSupport::TestCase.fixture_path = File.expand_path('../fixtures', __FILE__)
 end
 
 # Load database

metadata

@@ -1,60 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: slugs
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.3
 platform: ruby
 authors:
-- Mattways
+- Museways
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: translatable_records
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Inspired in friendly_id but more minimalistic.
 email:
-- contact@mattways.com
+- contact@museways.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- lib/slugs.rb
 - lib/slugs/active_record/base.rb
 - lib/slugs/active_record/non_translatable.rb
 - lib/slugs/active_record/relation.rb
 - lib/slugs/active_record/translatable.rb
 - lib/slugs/railtie.rb
 - lib/slugs/version.rb
-- lib/slugs.rb
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -67,6 +83,7 @@ files:
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -83,25 +100,20 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20130819183013_create_simples.rb
 - test/dummy/db/migrate/20130819183047_create_withouts.rb
 - test/dummy/db/migrate/20130819183119_create_translatables.rb
 - test/dummy/db/migrate/20130819183257_create_translatable_translations.rb
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/records_test.rb
 - test/test_helper.rb
-homepage: https://github.com/mattways/slugs
+homepage: https://github.com/museways/slugs
 licenses:
 - MIT
 metadata: {}
@@ -111,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Slugs for Rails.
@@ -155,13 +167,11 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20130819183013_create_simples.rb
 - test/dummy/db/migrate/20130819183047_create_withouts.rb
 - test/dummy/db/migrate/20130819183119_create_translatables.rb
 - test/dummy/db/migrate/20130819183257_create_translatable_translations.rb
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html