has-relationship 0.0.8 → 0.0.9

data/Rakefile

@@ -1,47 +1,3 @@
-begin
-  # Rspec 1.3.0
-  require 'spec/rake/spectask'
-
-  desc 'Default: run specs'
-  task :default => :spec
-  Spec::Rake::SpecTask.new do |t|
-    t.spec_files = FileList["spec/**/*_spec.rb"]
-  end
-
-  Spec::Rake::SpecTask.new('rcov') do |t|
-    t.spec_files = FileList["spec/**/*_spec.rb"]
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec']
-  end
-  
-rescue LoadError
-  # Rspec 2.0
-  require 'rspec/core/rake_task'
-
-  desc 'Default: run specs'
-  task :default => :spec  
-  Rspec::Core::RakeTask.new do |t|
-    t.pattern = "spec/**/*_spec.rb"
-  end
-  
-  Rspec::Core::RakeTask.new('rcov') do |t|
-    t.pattern = "spec/**/*_spec.rb"
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec']
-  end
-
-rescue LoadError
-  puts "Rspec not available. Install it with: gem install rspec"  
-end
-
-namespace 'rails2.3' do
-  task :spec do
-    gemfile = File.join(File.dirname(__FILE__), 'lib', 'has_relationship', 'compatibility', 'Gemfile')
-    ENV['BUNDLE_GEMFILE'] = gemfile
-    Rake::Task['spec'].invoke    
-  end
-end
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/has_relationship/has_relationship.rb

@@ -30,7 +30,7 @@ module HasRelationship
         
         relationships = relationship.kind_of?(Array) ? relationship : [relationship]
         
-        relationship_through = options[:singular] ? "relationship_through_#{relationships.join("_").to_s.tableize.singularize}".to_sym : "relationship_through_#{relationships.join("_").to_s.tableize}".to_sym
+        relationship_through = options[:singular] ? ("#{self.to_s}_#{resource_name}").to_s.tableize.singularize.to_sym : ("#{self.to_s}_#{resource_name}").to_s.tableize.to_sym
       
         class_eval do
           through_conditions = (relationship.kind_of?(Array) ? nil : {:relationship => relationship})
@@ -81,7 +81,7 @@ module HasRelationship
         
         relationships = relationship.kind_of?(Array) ? relationship : [relationship]
         
-        relationship_through = options[:singular] ? "inverse_relationship_through_#{relationships.join("_").to_s.tableize.singularize}".to_sym : "inverse_relationship_through_#{relationships.join("_").to_s.tableize}".to_sym
+        relationship_through = options[:singular] ? ("#{self.to_s}_#{resource_name}").to_s.tableize.singularize.to_sym : ("#{self.to_s}_#{resource_name}").to_s.tableize.to_sym
       
         class_eval do
           through_conditions = (relationship.kind_of?(Array) ? nil : {:relationship => relationship})

data/rails/init.rb

@@ -1 +1 @@
-require 'has-relationship'
+require 'has-relationship'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has-relationship
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-07-19 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: has_relationship is an easy way to instantly create an association between any two database tables