tenacity 0.5.4 → 0.5.5

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 John Wood
+Copyright (c) 2012 John Wood
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/history.txt

@@ -1,3 +1,9 @@
+== 0.5.5
+
+* Bug fixes
+
+  * Modify association code to support qualified class names (Foo::Bar)
+
 == 0.5.4
 
 * Bug fixes

data/lib/tenacity/association.rb

@@ -68,9 +68,9 @@ module Tenacity
     # Get the associated class
     def associate_class(object=nil)
       if @type == :t_belongs_to && polymorphic?
-        Kernel.const_get(object.send(polymorphic_type))
+        qualified_const_get(object.send(polymorphic_type))
       else
-        @clazz ||= Kernel.const_get(@class_name)
+        @clazz ||= qualified_const_get(@class_name)
       end
     end
 
@@ -109,11 +109,39 @@ module Tenacity
 
     private
 
+    # Shamelessly copied from http://redcorundum.blogspot.com/2006/05/kernelqualifiedconstget.html
+    def qualified_const_get(clazz)
+      path = clazz.to_s.split('::')
+      from_root = path[0].empty?
+
+      if from_root
+        from_root = []
+        path = path[1..-1]
+      else
+        start_ns = ((Class === self) || (Module === self)) ? self : self.class
+        from_root = start_ns.to_s.split('::')
+      end
+
+      until from_root.empty?
+        begin
+          return (from_root + path).inject(Object) { |ns,name| ns.const_get(name) }
+        rescue NameError
+          from_root.delete_at(-1)
+        end
+      end
+
+      path.inject(Object) { |ns,name| ns.const_get(name) }
+    end
+
+    def unqualified_class_name(clazz)
+      clazz.to_s.split('::').last
+    end
+
     def belongs_to_foreign_key
       if polymorphic?
         (name.to_s + "_id").to_sym
       else
-        @class_name.underscore + "_id"
+        unqualified_class_name(@class_name).underscore + "_id"
       end
     end
 
@@ -122,7 +150,7 @@ module Tenacity
       if polymorphic?
         (@as.to_s + "_id").to_sym
       else
-        "#{ActiveSupport::Inflector.underscore(clazz)}_id"
+        "#{ActiveSupport::Inflector.underscore(unqualified_class_name(clazz))}_id"
       end
     end
   end

data/lib/tenacity/version.rb

@@ -1,3 +1,3 @@
 module Tenacity
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tenacity
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000Z
+date: 2012-04-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2166742780 !ruby/object:Gem::Requirement
+  requirement: &2156358940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2166742780
+  version_requirements: *2156358940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2166741660 !ruby/object:Gem::Requirement
+  requirement: &2156355320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2166741660
+  version_requirements: *2156355320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2166740640 !ruby/object:Gem::Requirement
+  requirement: &2156353760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2166740640
+  version_requirements: *2156353760
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2166740020 !ruby/object:Gem::Requirement
+  requirement: &2156339720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2166740020
+  version_requirements: *2156339720
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2166739380 !ruby/object:Gem::Requirement
+  requirement: &2156338680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *2166739380
+  version_requirements: *2156338680
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2166738740 !ruby/object:Gem::Requirement
+  requirement: &2156337580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *2166738740
+  version_requirements: *2156337580
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2166738120 !ruby/object:Gem::Requirement
+  requirement: &2156336420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *2166738120
+  version_requirements: *2156336420
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2166737440 !ruby/object:Gem::Requirement
+  requirement: &2156335080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2166737440
+  version_requirements: *2156335080
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2166736600 !ruby/object:Gem::Requirement
+  requirement: &2156333400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2166736600
+  version_requirements: *2156333400
 - !ruby/object:Gem::Dependency
   name: datamapper
-  requirement: &2166731420 !ruby/object:Gem::Requirement
+  requirement: &2156325060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2166731420
+  version_requirements: *2156325060
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &2166728920 !ruby/object:Gem::Requirement
+  requirement: &2156316080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2166728920
+  version_requirements: *2156316080
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2166728280 !ruby/object:Gem::Requirement
+  requirement: &2156314280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 3.19.0
   type: :development
   prerelease: false
-  version_requirements: *2166728280
+  version_requirements: *2156314280
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &2166727680 !ruby/object:Gem::Requirement
+  requirement: &2156313060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2166727680
+  version_requirements: *2156313060
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2166727060 !ruby/object:Gem::Requirement
+  requirement: &2156311420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2166727060
+  version_requirements: *2156311420
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2166726400 !ruby/object:Gem::Requirement
+  requirement: &2156293240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2166726400
+  version_requirements: *2156293240
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &2166725820 !ruby/object:Gem::Requirement
+  requirement: &2156291780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2166725820
+  version_requirements: *2156291780
 - !ruby/object:Gem::Dependency
   name: couchrest_model
-  requirement: &2166725080 !ruby/object:Gem::Requirement
+  requirement: &2156290520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2166725080
+  version_requirements: *2156290520
 - !ruby/object:Gem::Dependency
   name: ripple
-  requirement: &2166724480 !ruby/object:Gem::Requirement
+  requirement: &2156288920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2166724480
+  version_requirements: *2156288920
 - !ruby/object:Gem::Dependency
   name: toystore
-  requirement: &2166723920 !ruby/object:Gem::Requirement
+  requirement: &2156286980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *2166723920
+  version_requirements: *2156286980
 - !ruby/object:Gem::Dependency
   name: adapter-mongo
-  requirement: &2166721320 !ruby/object:Gem::Requirement
+  requirement: &2156284020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,7 +230,7 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *2166721320
+  version_requirements: *2156284020
 description: Tenacity provides a database client independent way of specifying simple
   relationships between models backed by different databases.
 email:
@@ -353,7 +353,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2735830648188006742
+      hash: 3771239550566841949
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: