friendly_id_datamapper 3.1.0.beta1 → 3.2.0

data/ChangeLog.md

@@ -3,6 +3,27 @@
 * Table of Contents
 {:toc}
 
+## 3.2.0 (2011-08-08)
+
+* Release offering compatibility with FriendlyId 3.2.x series.
+* Release provides support for both DataMapper 1.0.x and 1.1.x series:
+  * Silence noisy deprecation warnings on DataMapper 1.1 (11a6dd5).
+* Gemspec compatibility with RubyGems 1.7+:
+  * Fix Rake and RubyGems deprecation warnings (030df1f, 132e4ba).
+* Optimize to use Rails extract_options method. Ignore Array keys when doing
+  lookup ([Josh Huckabee](http://github.com/jhuckabee), f11f206).
+* Fix for orphaned slugs on deletion of a FriendlyId model instance, without
+  using dm-constraints (54d3a9c).
+* Workaround an issue overriding DataMapper::Model#get on 1.9.2 that results in
+  "NotImplementedError - super from singleton method that is defined to multiple
+  classes is not supported" (0cd55ab).
+
+Additionally this release establishes Continuous Integration, using the
+excellent [Travis CI](http://travis-ci.org/) hosted CI service. This should lead
+to more reliable future releases!
+
+## 3.1.0 (not released)
+
 ## 3.1.0.beta1 (2010-09-13)
 
 * Initial beta release.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Norman Clarke, Alex Coles
+Copyright (c) 2010, 2011 Norman Clarke, Alex Coles
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,26 +1,27 @@
 # FriendlyId DataMapper Adapter
 
-This is an pre-release (beta) adapter for
-[FriendlyId](http://norman.github.com/friendly_id) using DataMapper.
+[![Build Status](http://travis-ci.org/myabc/friendly_id_datamapper.png)](http://travis-ci.org/myabc/friendly_id_datamapper)
+
+An adapter for [FriendlyId](http://norman.github.com/friendly_id) using
+DataMapper.
 
 ## FriendlyId Features
 
 It currently supports all of FriendlyId's features except:
 
 * Rails Generator
-* Support for multiple finders
 
-Currently, only finds using `get` is supported.
+Currently, only finds using `get` are supported.
 
     @post = Post.get("this-is-a-title")
     @post.friendly_id # this-is-a-title
 
 ## Compatibility
 
-The FriendlyId DataMapper Adapter keeps in lock-step with major and
-minor versions of the FriendlyId gem, i.e.
-`friendly_id_datamapper 3.1.x` is compatible with `friendly_id 3.1.x series`.
-Patch and build versions are not kept in lock-step.
+The FriendlyId DataMapper Adapter keeps in lock-step with major and minor
+versions of the FriendlyId gem, i.e. `friendly_id_datamapper 3.2.x` is
+compatible with `friendly_id 3.2.x series`. Patch and build versions are not
+kept in lock-step.
 
 ## Usage
 
@@ -42,6 +43,12 @@ Patch and build versions are not kept in lock-step.
 For more information on the available features, please see the
 [FriendlyId Guide](http://norman.github.com/friendly_id/file.Guide.html).
 
+## Known Issues
+
+FriendlyId DataMapper Adapter is not yet compatible with Ruby 1.9.3, because of
+an issue with a dependency `dm-do-adapter` and changes with the DateTime class,
+after its reimplementation in C (namely, `DateTime#new!` no longer exists).
+
 ## Bugs
 
 Please report them on the [Github issue tracker](http://github.com/myabc/friendly_id_datamapper/issues)
@@ -59,5 +66,4 @@ and add a test that reproduces the error you are experiencing.
 
 ## Credits
 
-Copyright (c) 2010, released under the MIT license.
-
+Copyright (c) 2010, 2011, released under the MIT license.

data/Rakefile

@@ -1,11 +1,11 @@
 require "rake"
 require "rake/testtask"
-require "rake/gempackagetask"
+require 'rubygems/package_task'
 require "rake/clean"
 
 CLEAN << "pkg" << "doc" << "coverage" << ".yardoc"
 
-Rake::GemPackageTask.new(eval(File.read("friendly_id_datamapper.gemspec"))) { |pkg| }
+Gem::PackageTask.new(eval(File.read("friendly_id_datamapper.gemspec"))) { |pkg| }
 Rake::TestTask.new(:test) { |t| t.pattern = "test/*_test.rb" }
 
 task :default => :test

data/lib/friendly_id/datamapper_adapter/configuration.rb

@@ -57,11 +57,19 @@ module FriendlyId
       end
 
       def associated_friendly_classes
-        configured_class.relationships.values.select { |relationship|
+        configured_class_relationships.select { |relationship|
           relationship.child_model.respond_to?(:friendly_id_config)
         }.map(&:child_model)
       end
 
+      def configured_class_relationships
+        unless (relationships = configured_class.relationships).is_a?(Hash)
+          relationships         # DataMapper 1.1.x
+        else
+          relationships.values  # DataMapper 1.0.x
+        end
+      end
+
     end
   end
 end

data/lib/friendly_id/datamapper_adapter/slugged_model.rb

@@ -41,63 +41,58 @@ module FriendlyId
 
           after :update, :update_scope
           after :update, :update_dependent_scopes
-        end
 
-        def base.extract_options!(args)
-          options = args.last
-          if options.respond_to?(:to_hash)
-            args.pop
-            options.to_hash.dup
-          else
-            {}
+          before(:destroy) do
+            slugs.destroy!
           end
         end
 
-        def base.get(*key)
-          options = extract_options!(key)
-
-          if key.size == 1
-            return super if key.first.unfriendly_id?
-            name, sequence = key.first.to_s.parse_friendly_id
-
-            if !friendly_id_config.scope? && friendly_id_config.cache_column?
-              result = self.first(friendly_id_config.cache_column => key.first)
+        base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def self.get(*key)
+            options = key.extract_options!
+
+            if key.size == 1
+              return super if key.first.is_a?(Array) || key.first.unfriendly_id?
+              name, sequence = key.first.to_s.parse_friendly_id
+
+              if !friendly_id_config.scope? && friendly_id_config.cache_column?
+                result = self.first(friendly_id_config.cache_column => key.first)
+              end
+
+              conditions = {
+                slugs.name     => name,
+                slugs.sequence => sequence
+              }
+              conditions.merge!({
+                slugs.scope    => (options[:scope].to_param if options[:scope] && options[:scope].respond_to?(:to_param))
+              }) if friendly_id_config.scope?
+
+              result ||= self.first(conditions)
+              return super unless result
+              result.friendly_id_status.name = name
+              result.friendly_id_status.sequence = sequence
+              result
+            else
+              super
             end
-
-            conditions = {
-              slugs.name     => name,
-              slugs.sequence => sequence
-            }
-            conditions.merge!({
-              slugs.scope    => (options[:scope].to_param if options[:scope] && options[:scope].respond_to?(:to_param))
-            }) if friendly_id_config.scope?
-
-            result ||= self.first(conditions)
-            return super unless result
-            result.friendly_id_status.name = name
-            result.friendly_id_status.sequence = sequence
-            result
-          else
-            super
           end
-        end
 
-        def base.get!(*key)
-          return super unless friendly_id_config.scope?
-
-          result = get(*key)
-          if result
-            result
-          else
-            options = extract_options!(key)
-            scope   = options[:scope]
-            message = "Could not find #{self.name} with key #{key.inspect}"
-            message << " and scope #{scope.inspect}" if scope
-            message << ". Scope expected but none given." unless scope
-            raise(::DataMapper::ObjectNotFoundError, message)
+          def self.get!(*key)
+            return super unless friendly_id_config.scope?
+
+            result = get(*key)
+            if result
+              result
+            else
+              options = key.extract_options!
+              scope   = options[:scope]
+              message = "Could not find \#{self.name} with key \#{key.inspect}"
+              message << " and scope \#{scope.inspect}" if scope
+              message << ". Scope expected but none given." unless scope
+              raise(::DataMapper::ObjectNotFoundError, message)
+            end
           end
-        end
-
+        RUBY
       end
 
       def slug

data/lib/friendly_id/datamapper_adapter/version.rb

@@ -2,9 +2,9 @@ module FriendlyId
   module DataMapperAdapter
     module Version
       MAJOR  = 3
-      MINOR  = 1
+      MINOR  = 2
       TINY   = 0
-      BUILD  = 'beta1'
+      BUILD  = nil
       STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
     end
   end

data/test/test_helper.rb

@@ -1,19 +1,12 @@
-# Use Bundler (preferred)
-begin
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  require 'rubygems'
-  require 'bundler'
-  Bundler.setup
-end
-
-require "friendly_id"
-require "friendly_id/test"
-require "logger"
-require "test/unit"
-require "mocha"
+$LOAD_PATH << './lib'
+require 'rubygems'
+require 'bundler/setup'
+require 'test/unit'
+require 'mocha'
 
-require 'forwardable'
+require 'friendly_id'
+require 'friendly_id/datamapper'
+require 'friendly_id/test'
 
 require 'dm-core'
 require 'dm-validations'
@@ -26,12 +19,9 @@ require 'dm-active_model'
 DataMapper::Logger.new('dm.log', :debug)
 DataMapper.setup(:default, 'sqlite3::memory:')
 
-$LOAD_PATH << './lib'
-
-require 'friendly_id_datamapper'
 require File.expand_path('../core',    __FILE__)
 require File.expand_path('../slugged', __FILE__)
-
 require File.expand_path('../support/models', __FILE__)
+
 DataMapper.finalize
 DataMapper.auto_migrate!

metadata

@@ -1,95 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: friendly_id_datamapper
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 3
-  - 1
-  - 0
-  - beta1
-  version: 3.1.0.beta1
+version: !ruby/object:Gem::Version
+  version: 3.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Norman Clarke
 - Alex Coles
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-13 00:00:00 +02:00
+date: 2011-08-08 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: friendly_id
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70132685181020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dm-core
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70132685181020
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: &70132685180520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70132685180520
+- !ruby/object:Gem::Dependency
+  name: dm-validations
+  requirement: &70132685180060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: dm-transactions
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70132685180060
+- !ruby/object:Gem::Dependency
+  name: dm-transactions
+  requirement: &70132685179600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70132685179600
 description: An adapter for using DataMapper::Resource with FriendlyId.
-email: 
+email:
 - norman@njclarke.com
 - alex@alexbcoles.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/friendly_id/datamapper_adapter/configuration.rb
 - lib/friendly_id/datamapper_adapter/simple_model.rb
 - lib/friendly_id/datamapper_adapter/slug.rb
@@ -118,38 +93,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/myabc/friendly_id_datamapper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: "[none]"
-rubygems_version: 1.3.7
+rubyforge_project: ! '[none]'
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A DataMapper adapter for FriendlyId
-test_files: 
+test_files:
 - test/basic_slugged_model_test.rb
 - test/cached_slug_test.rb
 - test/custom_normalizer_test.rb