scoped_associations 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87cba658ebd3925c7a4c54f86a83835dc02765dc
-  data.tar.gz: 635d06993d642244a3e5ee70bfe8b3056cd5b17a
+  metadata.gz: e04ccbeb140afbf311d49706224e27f270945e24
+  data.tar.gz: 357ec935059c9e0657f1eba5b22e35ddce8b31cf
 SHA512:
-  metadata.gz: 6da6be8c4bd63955d1e2fd163b8300dc1f8de18c1cc2802195587a68d340dd3e997d5b41c3ef127b2944a55282805861a432731472e839387de28c9d8f9a3cd3
-  data.tar.gz: aef9d9d81706944fd4477ab55a388784e350bd5c978371945bb39848898569d1bff0684980f143e473bc7ce66bd326792a3b826abe72cc4bcd8e8b9c1e51a655
+  metadata.gz: 665ce8e29af580228fa003f7f9348a14ffedab668cef5ebff06b6eaabb41ea54b7b799060cd4948f9eded1afef0aa3ecaeda612516333b2e21f060aa9512d027
+  data.tar.gz: bcb5ac38011ce283316dec718b0a1711cf88748413b9b93b41fc353a34eb2d70c98a8ac59cfd43260410e7991270e5aeb1e45ce7c88ae3e6aca560bfb638e8e2

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -6,15 +6,8 @@ rvm:
   - "2.2.2"
 
 gemfile:
-  - "gemfiles/activerecord30.gemfile"
   - "gemfiles/activerecord40.gemfile"
   - "gemfiles/activerecord41.gemfile"
   - "gemfiles/activerecord42.gemfile"
 
-matrix:
- exclude:
-    - rvm: "2.2.2"
-      gemfile: "gemfiles/activerecord30.gemfile"
-
 script: "bundle exec rake spec"
-

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "activerecord30" do
-  gem "activerecord", "3.2.21"
-end
-
 appraise "activerecord40" do
   gem "activerecord", "4.0.13"
 end
@@ -13,4 +9,3 @@ end
 appraise "activerecord42" do
   gem "activerecord", "4.2.1"
 end
-

data/Gemfile

@@ -4,4 +4,3 @@ source 'https://rubygems.org'
 gemspec
 
 gem "appraisal"
-

data/README.md

@@ -7,10 +7,15 @@ ScopedAssociations is able to create multiple `has_to` and `has_many`
 associations between two ActiveRecord models.
 
 ## Installation
+Scoped Association works on Rails4+
 
 Add this line to your application's Gemfile:
 
     gem 'scoped_associations'
+    
+If you need it on a Rails3.2 project (without .joins support), add this one:
+
+	gem 'scoped_association', '0.0.5'
 
 And then execute:
 
@@ -36,6 +41,7 @@ class Post < ActiveRecord::Base
     class_name: "Tag",
     scoped: true
 end
+```
 
 ## Running tests
 

data/lib/scoped_associations/activerecord4/has_many.rb

@@ -12,6 +12,29 @@ module ScopedAssociations
         reflection
       end
 
+      def initialize(model, name, scope, options)
+        super
+        if scoped?
+          search_scope = foreign_scope(model)
+          proc_scope = proc { where(search_scope => name) }
+          if @scope.nil?
+            @scope = proc { instance_eval(&proc_scope) }
+          else
+            old_scope = @scope
+            @scope = proc { instance_eval(&proc_scope)
+                              .instance_eval(&old_scope) }
+          end
+        end
+      end
+
+      def foreign_scope(model)
+        if options[:as]
+          "#{options[:as]}_scope"
+        else
+          model.name.underscore.demodulize + "_scope"
+        end
+      end
+
       private
 
       def extend_reflection(reflection)
@@ -45,18 +68,9 @@ module ScopedAssociations
           attributes[reflection.foreign_scope] = reflection.name.to_s
           attributes
         end
-
-        def association_scope
-          super.where(reflection.foreign_scope => reflection.name.to_s)
-        end
-
-        def target_scope
-          super.where(reflection.foreign_scope => reflection.name.to_s)
-        end
       end
     end
   end
 end
 
 ActiveRecord::Associations::Builder::HasMany.send :include, ScopedAssociations::ActiveRecord4::HasMany
-

data/lib/scoped_associations/activerecord4/has_one.rb

@@ -12,6 +12,29 @@ module ScopedAssociations
         reflection
       end
 
+      def initialize(model, name, scope, options)
+        super
+        if scoped?
+          search_scope = foreign_scope(model)
+          proc_scope = proc { where(search_scope => name) }
+          if @scope.nil?
+            @scope = proc { instance_eval(&proc_scope) }
+            else
+              old_scope = @scope
+              @scope = proc { instance_eval(&proc_scope)
+                               .instance_eval(&old_scope) }
+          end
+        end
+      end
+
+      def foreign_scope(model)
+        if options[:as]
+          "#{options[:as]}_scope"
+        else
+          model.name.underscore.demodulize + "_scope"
+        end
+      end
+
       private
 
       def extend_reflection(reflection)
@@ -45,18 +68,9 @@ module ScopedAssociations
           attributes[reflection.foreign_scope] = reflection.name.to_s
           attributes
         end
-
-        def association_scope
-          super.where(reflection.foreign_scope => reflection.name.to_s)
-        end
-
-        def target_scope
-          super.where(reflection.foreign_scope => reflection.name.to_s)
-        end
       end
     end
   end
 end
 
 ActiveRecord::Associations::Builder::HasOne.send :include, ScopedAssociations::ActiveRecord4::HasOne
-

data/lib/scoped_associations/version.rb

@@ -1,4 +1,3 @@
 module ScopedAssociations
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end
-

data/scoped_associations.gemspec

@@ -6,8 +6,8 @@ require 'scoped_associations/version'
 Gem::Specification.new do |spec|
   spec.name          = 'scoped_associations'
   spec.version       = ScopedAssociations::VERSION
-  spec.authors       = ['Stefano Verna']
-  spec.email         = ['stefano.verna@gmail.com']
+  spec.authors       = ['Stefano Verna', 'David Librera']
+  spec.email         = ['stefano.verna@gmail.com', "davidlibrera@gmail.com"]
   spec.description   = %q{ScopedAssociations lets you create multiple `has_to` and `has_many` associations between two ActiveRecord models.}
   spec.summary       = %q{Create multiple `has_to` and `has_many` associations between two ActiveRecord models}
   spec.homepage      = 'https://github.com/stefanoverna/scoped_associations'
@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'database_cleaner'
 
   spec.required_ruby_version = ">= 1.9.3"
 
-  spec.add_dependency 'activerecord', ['>= 3.2', '< 4.3']
+  spec.add_dependency 'activerecord', ['>= 4.0', '< 4.3']
   spec.add_dependency 'activesupport'
 end
-

data/spec/has_many_polymorphic_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe 'ScopedAssociations' do
+  let(:post) { Post.new(title: "A title") }
+
+  describe "polymorphic has_many" do
+    it "works with direct assignment" do
+      post.secondary_tags = [ Tag.new(name: "foo") ]
+      post.save!
+
+      post.reload
+      expect(post.secondary_tags).to be_present
+      expect(post.primary_tags).to be_blank
+    end
+
+    it "works with nested attributes" do
+      post = Post.new(primary_tags_attributes: [ { name: "foo" } ])
+      post.save!
+      post.reload
+
+      expect(post.primary_tags).to be_present
+      expect(post.secondary_tags).to be_blank
+    end
+
+    it "works with .build" do
+      post.secondary_tags.build(name: "foo")
+      post.save!
+      post.reload
+
+      expect(post.secondary_tags).to be_present
+      expect(post.primary_tags).to be_blank
+    end
+
+    it "works with .create" do
+      post.save!
+      post.secondary_tags.create(name: "foo")
+
+      post.reload
+      expect(post.secondary_tags).to be_present
+      expect(post.primary_tags).to be_blank
+    end
+
+    it "works with .joins" do
+      post.save!
+      post.primary_tags.create(name: "foo")
+      post.reload
+
+      expect(Post.joins(:primary_tags)).to be_present
+      expect(Post.joins(:secondary_tags)).to be_blank
+    end
+
+    it "works with <<" do
+      post.save
+      post.secondary_tags << Tag.new(name: "foo")
+
+      post.reload
+      expect(post.secondary_tags).to be_present
+      expect(post.primary_tags).to be_blank
+    end
+
+    it "works with additional scope" do
+      post.save!
+
+      post.active_tags.create(name: "foo")
+      post.primary_tags.create(name: "bar", active: false)
+      post.secondary_tags.create(name: "baz", active: true)
+
+      post.active_tags.update_all(active: false)
+      post.reload
+
+      expect(post.active_tags).to be_blank
+    end
+  end
+end

data/spec/has_many_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe 'ScopedAssociations' do
+  let(:post) { Post.new(title: "A title") }
+
+  describe "not polymorphic has_many" do
+    it "works with direct assignment" do
+      post.secondary_comments = [ Comment.new(comment: "foo") ]
+      post.save!
+
+      post.reload
+      expect(post.secondary_comments).to be_present
+      expect(post.primary_comments).to be_blank
+    end
+
+    it "works with nested attributes" do
+      post = Post.new(primary_comments_attributes: [ { comment: "foo" } ])
+      post.save!
+      post.reload
+
+      expect(post.primary_comments).to be_present
+      expect(post.secondary_comments).to be_blank
+    end
+
+    it "works with .build" do
+      post.secondary_comments.build(comment: "foo")
+      post.save
+
+      post.reload
+      expect(post.secondary_comments).to be_present
+      expect(post.primary_comments).to be_blank
+    end
+
+    it "works with .create" do
+      post.save!
+      post.primary_comments.create(comment: "foo")
+      post.reload
+
+      expect(post.primary_comments).to be_present
+      expect(post.secondary_comments).to be_blank
+    end
+
+    it "works with .joins" do
+      post.save!
+      post.primary_comments.create(comment: "foo")
+      post.reload
+
+      expect(Post.joins(:primary_comments)).to be_present
+      expect(Post.joins(:secondary_comments)).to be_blank
+    end
+
+    it "works with <<" do
+      post.save
+      post.secondary_comments << Comment.new(comment: "foo")
+
+      post.reload
+      expect(post.secondary_comments).to be_present
+      expect(post.primary_comments).to be_blank
+    end
+
+    it "works with additional scope" do
+      post.save!
+
+      post.active_comments.create(comment: "foo")
+      post.primary_comments.create(comment: "bar", active: false)
+      post.secondary_comments.create(comment: "baz", active: true)
+
+      post.active_comments.update_all(active: false)
+      post.reload
+
+      expect(post.active_comments).to be_blank
+    end
+  end
+end

data/spec/has_one_polymorphic_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe 'ScopedAssociations' do
+  let(:post) { Post.new(title: "A title") }
+
+  context "polymorphic has_one" do
+
+    it "works with direct assignment" do
+      post.secondary_tag = Tag.new(name: "foo")
+      post.save!
+      post.reload
+
+      expect(post.secondary_tag).to be_present
+      expect(post.primary_tag).to be_nil
+    end
+
+    it "works with nested attributes" do
+      post = Post.new(primary_tag_attributes: { name: "foo" })
+      post.save!
+      post.reload
+
+      expect(post.primary_tag).to be_present
+      expect(post.secondary_tag).to be_nil
+    end
+
+    it "works with .build" do
+      post.build_secondary_tag(name: "foo")
+      post.save!
+      post.reload
+
+      expect(post.secondary_tag).to be_present
+      expect(post.primary_tag).to be_nil
+    end
+
+    it "works with .create" do
+      post.save!
+      post.create_secondary_tag(name: "foo")
+      post.reload
+
+      expect(post.secondary_tag).to be_present
+      expect(post.primary_tag).to be_nil
+    end
+
+    it "works with .joins" do
+      post.save!
+      post.create_secondary_tag(name: "foo")
+
+      expect(Post.joins(:primary_tag)).to be_blank
+      expect(Post.joins(:secondary_tag)).to be_present
+    end
+
+    it "works with additional scope" do
+      post.active_tag = Tag.new(name: "foo", active: false)
+      post.primary_tag = Tag.new(name: "bar", active: false)
+      post.secondary_tag = Tag.new(name: "baz", active: true)
+
+      post.save!
+      post.reload
+
+      expect(post.active_tag).to be_nil
+    end
+  end
+end

data/spec/has_one_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe 'ScopedAssociations' do
+  let(:post) { Post.new(title: "A title") }
+
+  context "non polymorphic has_one" do
+    it "works with direct assignment" do
+      post.secondary_comment = Comment.new(comment: "foo")
+      post.save!
+      post.reload
+
+      expect(post.secondary_comment).to be_present
+      expect(post.primary_comment).to be_nil
+    end
+
+    it "works with nested attributes" do
+      post = Post.new(primary_comment_attributes: { comment: "foo" })
+      post.save!
+      post.reload
+
+      expect(post.primary_comment).to be_present
+      expect(post.secondary_comment).to be_nil
+    end
+
+    it "works with .build" do
+      post.build_secondary_comment(comment: "foo")
+      post.save!
+      post.reload
+
+      expect(post.secondary_comment).to be_present
+      expect(post.primary_comment).to be_nil
+    end
+
+    it "works with .create" do
+      post.save!
+      post.create_primary_comment(comment: "foo")
+      post.reload
+
+      expect(post.primary_comment).to be_present
+      expect(post.secondary_comment).to be_nil
+    end
+
+    it "works with .joins" do
+      post.save!
+      post.create_secondary_comment(comment: "foo")
+
+      expect(Post.joins(:primary_comment)).to be_blank
+      expect(Post.joins(:secondary_comment)).to be_present
+    end
+
+    it "works with additional scope" do
+      post.active_comment = Comment.new(comment: "foo", active: false)
+      post.primary_comment = Comment.new(comment: "bar", active: false)
+      post.secondary_comment = Comment.new(comment: "baz", active: true)
+      post.save!
+      post.reload
+
+      expect(post.active_comment).to be_nil
+    end
+  end
+end

data/spec/integration_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe 'ScopedAssociations' do
   let(:post) { Post.new }
 
-
   context "non polymorphic" do
 
     describe "has_one" do

data/spec/spec_helper.rb

@@ -3,12 +3,27 @@ require 'bundler'
 require 'active_record'
 require 'logger'
 require 'coveralls'
+require 'database_cleaner'
+
 Coveralls.wear!
 
 ROOT = File.expand_path('../', __FILE__)
 
 require 'scoped_associations'
 
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
+end
+
 ActiveRecord::Base.establish_connection(
   adapter: "sqlite3",
   database: ":memory:"
@@ -22,6 +37,7 @@ ActiveRecord::Schema.define do
     t.string   :owner_type,  null: false
     t.string   :owner_scope, null: false
     t.string   :name,        null: false
+    t.boolean  :active,      null: false, default: false
   end
 
   create_table :posts do |t|
@@ -32,11 +48,10 @@ ActiveRecord::Schema.define do
     t.integer  :post_id,    null: false
     t.string   :post_scope, null: false
     t.string   :comment,    null: false
+    t.boolean  :active,     null: false, default: false
   end
 end
 
-# ActiveRecord::Base.logger = Logger.new(STDOUT)
-
 class Comment < ActiveRecord::Base
   belongs_to :post
 end
@@ -47,40 +62,70 @@ end
 
 class Post < ActiveRecord::Base
   has_one :primary_tag, as: :owner,
-                        class_name: "Tag",
-                        scoped: true
+          class_name: "Tag",
+          scoped: true
 
   accepts_nested_attributes_for :primary_tag
 
+  has_one :active_tag,
+          -> { where(active: true) },
+          as: :owner,
+          class_name: "Tag",
+          scoped: true
+
+
+
   has_one :secondary_tag, as: :owner,
-                          class_name: "Tag",
-                          scoped: true
+          class_name: "Tag",
+          scoped: true
 
   has_many :primary_tags, as: :owner,
-                          class_name: "Tag",
-                          scoped: true
+           class_name: "Tag",
+           scoped: true
 
   accepts_nested_attributes_for :primary_tags
 
-  has_many :secondary_tags, as: :owner,
-                            class_name: "Tag",
-                            scoped: true
+  has_many :active_tags,
+           -> { where(active: true) },
+           as: :owner,
+           class_name: "Tag",
+           scoped: true
+
+
+  has_many :secondary_tags,
+           as: :owner,
+           class_name: "Tag",
+           scoped: true
 
+  has_many :comments
 
-  has_one :primary_comment, class_name: "Comment",
-                            scoped: true
+  has_one :primary_comment,
+          class_name: "Comment",
+          scoped: true
+
+  has_one :active_comment,
+          -> { where(active: true) },
+          class_name: "Comment",
+          scoped: true
 
   accepts_nested_attributes_for :primary_comment
 
-  has_one :secondary_comment, class_name: "Comment",
-                              scoped: true
+  has_one :secondary_comment,
+          class_name: "Comment",
+          scoped: true
+
+  has_many :primary_comments,
+           class_name: "Comment",
+           scoped: true
 
-  has_many :primary_comments, class_name: "Comment",
-                              scoped: true
+  has_many :active_comments,
+           -> { where(active: true) },
+           class_name: "Comment",
+           scoped: true
 
   accepts_nested_attributes_for :primary_comments
 
-  has_many :secondary_comments, class_name: "Comment",
-                              scoped: true
+  has_many :secondary_comments,
+           class_name: "Comment",
+           scoped: true
 end
-

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: scoped_associations
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Stefano Verna
+- David Librera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,13 +81,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  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: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.3'
@@ -96,7 +111,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.3'
@@ -118,28 +133,31 @@ description: ScopedAssociations lets you create multiple `has_to` and `has_many`
   between two ActiveRecord models.
 email:
 - stefano.verna@gmail.com
+- davidlibrera@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/activerecord30.gemfile
 - gemfiles/activerecord40.gemfile
 - gemfiles/activerecord41.gemfile
 - gemfiles/activerecord42.gemfile
 - lib/scoped_associations.rb
-- lib/scoped_associations/activerecord3/has_many.rb
-- lib/scoped_associations/activerecord3/has_one.rb
 - lib/scoped_associations/activerecord4/has_many.rb
 - lib/scoped_associations/activerecord4/has_one.rb
 - lib/scoped_associations/version.rb
 - scoped_associations.gemspec
+- spec/has_many_polymorphic_spec.rb
+- spec/has_many_spec.rb
+- spec/has_one_polymorphic_spec.rb
+- spec/has_one_spec.rb
 - spec/integration_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/stefanoverna/scoped_associations
@@ -168,5 +186,9 @@ specification_version: 4
 summary: Create multiple `has_to` and `has_many` associations between two ActiveRecord
   models
 test_files:
+- spec/has_many_polymorphic_spec.rb
+- spec/has_many_spec.rb
+- spec/has_one_polymorphic_spec.rb
+- spec/has_one_spec.rb
 - spec/integration_spec.rb
 - spec/spec_helper.rb

data/gemfiles/activerecord30.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "activerecord", "3.2.21"
-
-gemspec :path => "../"

data/lib/scoped_associations/activerecord3/has_many.rb

@@ -1,63 +0,0 @@
-require 'active_support/concern'
-
-module ScopedAssociations
-  module ActiveRecord3
-    module HasMany
-      extend ActiveSupport::Concern
-
-      included do |klass|
-        klass.valid_options += [:scoped]
-      end
-
-      def build
-        reflection = super
-        extend_reflection(reflection)
-        reflection
-      end
-
-      private
-
-      def extend_reflection(reflection)
-        if scoped?
-          reflection.extend ReflectionExtension
-        end
-      end
-
-      def scoped?
-        options[:scoped]
-      end
-
-      module ReflectionExtension
-        def foreign_scope
-          if options[:as]
-            "#{options[:as]}_scope"
-          else
-            name = active_record.name
-            name.underscore.demodulize + "_scope"
-          end
-        end
-
-        def association_class
-          ScopedHasManyAssociation
-        end
-      end
-
-      class ScopedHasManyAssociation < ActiveRecord::Associations::HasManyAssociation
-        def creation_attributes
-          attributes = super
-          attributes[reflection.foreign_scope] = reflection.name.to_s
-          attributes
-        end
-
-        def association_scope
-          super.where(reflection.foreign_scope => reflection.name.to_s)
-        end
-      end
-
-    end
-  end
-end
-
-ActiveRecord::Associations::Builder::HasMany.send :include, ScopedAssociations::ActiveRecord3::HasMany
-
-

data/lib/scoped_associations/activerecord3/has_one.rb

@@ -1,64 +0,0 @@
-require 'active_support/concern'
-
-module ScopedAssociations
-  module ActiveRecord3
-    module HasOne
-      extend ActiveSupport::Concern
-
-      included do |klass|
-        klass.valid_options += [:scoped]
-      end
-
-      def build
-        reflection = super
-        extend_reflection(reflection)
-        reflection
-      end
-
-      private
-
-      def extend_reflection(reflection)
-        if scoped?
-          reflection.extend ReflectionExtension
-        end
-      end
-
-      def scoped?
-        options[:scoped]
-      end
-
-      module ReflectionExtension
-        def foreign_scope
-          if options[:as]
-            "#{options[:as]}_scope"
-          else
-            name = active_record.name
-            name.underscore.demodulize + "_scope"
-          end
-        end
-
-        def association_class
-          ScopedHasOneAssociation
-        end
-      end
-
-      class ScopedHasOneAssociation < ActiveRecord::Associations::HasOneAssociation
-        def creation_attributes
-          attributes = super
-          attributes[reflection.foreign_scope] = reflection.name.to_s
-          attributes
-        end
-
-        def association_scope
-          super.where(reflection.foreign_scope => reflection.name.to_s)
-        end
-      end
-
-    end
-  end
-end
-
-ActiveRecord::Associations::Builder::HasOne.send :include, ScopedAssociations::ActiveRecord3::HasOne
-
-
-