hobo 1.3.0.pre22 → 1.3.0.pre23

data/VERSION

@@ -1 +1 @@
-1.3.0.pre22
+1.3.0.pre23

data/doctests/hobo/scopes.rdoctest

@@ -285,18 +285,14 @@ Gives the N most recent items:
 
 ## include
 
-DEPRECATED: Automatic scope :include has been deprecated: use :including instead.
+DEPRECATED: Automatic scope :include has been deprecated: use :includes instead.
 
-## including
+## includes
 
-Adding the including function to your query chain has the same effect as
-the `:include` option to the `find` method.
-
-    >> Person.search("B", :name).including(:friends).*.name  # test LH#839
+    >> Person.search("B", :name).includes(:friends).*.name  # test LH#839
     => ["Bryan", "Bethany"]
-.hidden
 
-    >> Person.including(:friends).*.name
+    >> Person.includes(:friends).*.name
     => ["Bryan", "Bethany"]
 
 ## search

data/lib/hobo/controller.rb

@@ -58,10 +58,9 @@ module Hobo
 
     def hobo_ajax_response(*args)
       results = args.extract_options!
-      page_path = params[:page_path]
       r = params[:render]
       if r
-        ajax_update_response(page_path, r.values, results)
+        ajax_update_response(r.values, results)
         true
       else
         false
@@ -69,15 +68,13 @@ module Hobo
     end
 
 
-    def ajax_update_response(page_path, render_specs, results={})
-      if page_path
-        controller, action = controller_action_from_page_path(page_path)
-        identifier = view_context.view_paths.find( action,
-                                                   controller,
-                                                   false,
-                                                   view_context.lookup_context.instance_variable_get('@details')).identifier
-        renderer = Dryml.page_renderer(view_context, identifier, [], controller)
-      end
+    def ajax_update_response(render_specs, results={})
+      controller, action = controller_action_from_page_path
+      identifier = view_context.view_paths.find( action,
+                                                 controller,
+                                                 false,
+                                                 view_context.lookup_context.instance_variable_get('@details')).identifier
+      renderer = Dryml.page_renderer(view_context, identifier, [], controller)
 
       render :update do |page|
         page << "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;"

data/lib/hobo/engine.rb

@@ -23,12 +23,12 @@ module Hobo
     end
 
     ActiveSupport.on_load(:active_record) do
-      require 'hobo/extensions/active_record/association_collection'
-      require 'hobo/extensions/active_record/association_proxy'
-      require 'hobo/extensions/active_record/association_reflection'
+      require 'hobo/extensions/active_record/associations/collection'
+      require 'hobo/extensions/active_record/associations/proxy'
+      require 'hobo/extensions/active_record/associations/reflection'
       require 'hobo/extensions/active_record/hobo_methods'
       require 'hobo/extensions/active_record/permissions'
-      require 'hobo/extensions/active_record/scopes'
+      require 'hobo/extensions/active_record/associations/scope'
       require 'hobo/extensions/active_record/relation_with_origin'
       require 'hobo/extensions/active_model/name'
       require 'hobo/extensions/active_model/translation'

data/lib/hobo/extensions/active_record/{association_proxy.rb → associations/proxy.rb}

@@ -2,17 +2,16 @@ module ActiveRecord
   module Associations
     class AssociationProxy #:nodoc:
 
-    def origin
-      proxy_owner
-    end
+      def origin
+        proxy_owner
+      end
 
-    def origin_attribute
-      proxy_reflection.name
-    end
+      def origin_attribute
+        proxy_reflection.name
+      end
 
       private
 
-
       def raise_on_type_mismatch(record)
         # Don't complain if the interface type of a polymorphic association doesn't exist
         klass = @reflection.klass rescue nil

data/lib/hobo/extensions/active_record/associations/reflection.rb

@@ -0,0 +1,23 @@
+module ActiveRecord
+  module Reflection
+    class AssociationReflection
+
+      alias_method :association_name, :name
+
+      def klass_with_create_polymorphic_class
+        if options[:polymorphic]
+          begin
+            klass_without_create_polymorphic_class
+          rescue NameError => e
+            Object.class_eval "class #{e.missing_name} < ActiveRecord::Base; set_table_name '#{active_record.name.tableize}'; end"
+            e.missing_name.constantize
+          end
+        else
+          klass_without_create_polymorphic_class
+        end
+      end
+      alias_method_chain :klass, :create_polymorphic_class
+
+    end
+  end
+end

data/lib/hobo/extensions/active_record/associations/scope.rb

@@ -0,0 +1,35 @@
+# Add support for :scope => :my_scope to associations
+
+module ActiveRecord
+  module Associations
+    module ThroughAssociationScope
+
+      def construct_scope_with_scope
+        s = construct_scope_without_scope
+        s[:find][:scope] = @reflection.options[:scope]
+        s
+      end
+      alias_method_chain :construct_scope, :scope
+
+      end
+    end
+
+  module SpawnMethods
+
+    def apply_finder_options_with_scope(options)
+      scopes = []
+      Array.wrap(options.delete(:scope)).each do |s|
+        if s.is_a?(Hash)
+          s.each_pair{|k,v| scopes << [k,v] }
+        else
+          scopes << [s]
+        end
+      end
+      relation = apply_finder_options_without_scope(options)
+      return relation if scopes.empty?
+      scopes.inject(relation) {|r, s| r.send *s }
+    end
+    alias_method_chain :apply_finder_options, :scope
+
+  end
+end

data/lib/hobo/extensions/array.rb

@@ -1,4 +1,7 @@
 # Add support for type metadata to arrays
+
+require 'will_paginate/array'
+
 class Array
 
   attr_accessor :member_class, :origin, :origin_attribute
@@ -12,4 +15,13 @@ class Array
     origin and origin_id = origin.try.typed_id and "#{origin_id}:#{origin_attribute}"
   end
 
+  def paginate_with_hobo_metadata(*args, &block)
+    collection = paginate_without_hobo_metadata(*args, &block)
+    collection.member_class     = member_class
+    collection.origin           = try.proxy_owner
+    collection.origin_attribute = try.proxy_reflection._?.name
+    collection
+  end
+  alias_method_chain :paginate, :hobo_metadata
+
 end

data/lib/hobo/model.rb

@@ -61,7 +61,7 @@ module Hobo
         WillPaginate::Finders::Base.class_eval do
           def paginate_with_hobo_metadata(*args, &block)
             collection = paginate_without_hobo_metadata(*args, &block)
-            collection.member_class     = self
+            collection.member_class     = self.is_a?(ActiveRecord::Relation) ? member_class : self
             collection.origin           = try.proxy_owner
             collection.origin_attribute = try.proxy_reflection._?.name
             collection

data/lib/hobo/model/lifecycles/lifecycle.rb

@@ -212,7 +212,7 @@ module Hobo
         end
 
         def clear_key
-          record.write_attribute key_timestamp_field, nil
+          record.send :write_attribute, key_timestamp_field, nil
         end
 
         def invariants_satisfied?

data/lib/hobo/model/scopes/automatic_scopes.rb

@@ -31,11 +31,11 @@ module Hobo
         def create_scope(check_only=false)
           matched_scope = true
 
-
+          case
           # --- Association Queries --- #
 
           # with_players(player1, player2)
-          if name =~ /^with_(.*)/ && (refl = reflection($1))
+          when name =~ /^with_(.*)/ && (refl = reflection($1))
             return true if check_only
 
             def_scope do |*records|
@@ -49,7 +49,7 @@ module Hobo
             end
 
           # with_player(a_player)
-          elsif name =~ /^with_(.*)/ && (refl = reflection($1.pluralize))
+          when name =~ /^with_(.*)/ && (refl = reflection($1.pluralize))
             return true if check_only
 
             exists_sql = exists_sql_condition(refl)
@@ -59,7 +59,7 @@ module Hobo
             end
 
           # any_of_players(player1, player2)
-          elsif name =~ /^any_of_(.*)/ && (refl = reflection($1))
+          when name =~ /^any_of_(.*)/ && (refl = reflection($1))
             return true if check_only
 
             def_scope do |*records|
@@ -73,7 +73,7 @@ module Hobo
             end
 
           # without_players(player1, player2)
-          elsif name =~ /^without_(.*)/ && (refl = reflection($1))
+          when name =~ /^without_(.*)/ && (refl = reflection($1))
             return true if check_only
 
             def_scope do |*records|
@@ -87,7 +87,7 @@ module Hobo
             end
 
           # without_player(a_player)
-          elsif name =~ /^without_(.*)/ && (refl = reflection($1.pluralize))
+          when name =~ /^without_(.*)/ && (refl = reflection($1.pluralize))
             return true if check_only
 
             exists_sql = exists_sql_condition(refl)
@@ -97,7 +97,7 @@ module Hobo
             end
 
           # team_is(a_team)
-          elsif name =~ /^(.*)_is$/ && (refl = reflection($1)) && refl.macro.in?([:has_one, :belongs_to])
+          when name =~ /^(.*)_is$/ && (refl = reflection($1)) && refl.macro.in?([:has_one, :belongs_to])
             return true if check_only
 
             if refl.options[:polymorphic]
@@ -113,7 +113,7 @@ module Hobo
             end
 
           # team_is_not(a_team)
-          elsif name =~ /^(.*)_is_not$/ && (refl = reflection($1)) && refl.macro.in?([:has_one, :belongs_to])
+          when name =~ /^(.*)_is_not$/ && (refl = reflection($1)) && refl.macro.in?([:has_one, :belongs_to])
             return true if check_only
 
             if refl.options[:polymorphic]
@@ -132,7 +132,7 @@ module Hobo
           # --- Column Queries --- #
 
           # name_is(str)
-          elsif name =~ /^(.*)_is$/ && (col = column($1))
+          when name =~ /^(.*)_is$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -140,7 +140,7 @@ module Hobo
             end
 
           # name_is_not(str)
-          elsif name =~ /^(.*)_is_not$/ && (col = column($1))
+          when name =~ /^(.*)_is_not$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -148,7 +148,7 @@ module Hobo
             end
 
           # name_contains(str)
-          elsif name =~ /^(.*)_contains$/ && (col = column($1))
+          when name =~ /^(.*)_contains$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -156,7 +156,7 @@ module Hobo
             end
 
           # name_does_not_contain
-          elsif name =~ /^(.*)_does_not_contain$/ && (col = column($1))
+          when name =~ /^(.*)_does_not_contain$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -164,7 +164,7 @@ module Hobo
             end
 
           # name_starts(str)
-          elsif name =~ /^(.*)_starts$/ && (col = column($1))
+          when name =~ /^(.*)_starts$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -172,7 +172,7 @@ module Hobo
             end
 
           # name_does_not_start
-          elsif name =~ /^(.*)_does_not_start$/ && (col = column($1))
+          when name =~ /^(.*)_does_not_start$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -180,7 +180,7 @@ module Hobo
             end
 
           # name_ends(str)
-          elsif name =~ /^(.*)_ends$/ && (col = column($1))
+          when name =~ /^(.*)_ends$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -188,7 +188,7 @@ module Hobo
             end
 
           # name_does_not_end(str)
-          elsif name =~ /^(.*)_does_not_end$/ && (col = column($1))
+          when name =~ /^(.*)_does_not_end$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -196,7 +196,7 @@ module Hobo
             end
 
           # published (a boolean column)
-          elsif (col = column(name)) && (col.type == :boolean)
+          when (col = column(name)) && (col.type == :boolean)
             return true if check_only
 
             def_scope do
@@ -204,7 +204,7 @@ module Hobo
             end
 
           # not_published
-          elsif name =~ /^not_(.*)$/ && (col = column($1)) && (col.type == :boolean)
+          when name =~ /^not_(.*)$/ && (col = column($1)) && (col.type == :boolean)
             return true if check_only
 
             def_scope do
@@ -212,7 +212,7 @@ module Hobo
             end
 
           # published_before(time)
-          elsif name =~ /^(.*)_before$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
+          when name =~ /^(.*)_before$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
             return true if check_only
 
             def_scope do |time|
@@ -220,7 +220,7 @@ module Hobo
             end
 
           # published_after(time)
-          elsif name =~ /^(.*)_after$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
+          when name =~ /^(.*)_after$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
             return true if check_only
 
             def_scope do |time|
@@ -228,7 +228,7 @@ module Hobo
             end
 
           # published_between(time1, time2)
-          elsif name =~ /^(.*)_between$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
+          when name =~ /^(.*)_between$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
             return true if check_only
 
             def_scope do |time1, time2|
@@ -236,12 +236,12 @@ module Hobo
             end
 
            # active (a lifecycle state)
-          elsif @klass.has_lifecycle? && name.to_sym.in?(@klass::Lifecycle.state_names)
+          when @klass.has_lifecycle? && name.to_sym.in?(@klass::Lifecycle.state_names)
             return true if check_only
 
             if @klass::Lifecycle.state_names.length == 1
               # nothing to check for - create a dummy scope
-              def_scope { @klass.where '' }
+              def_scope { @klass.scoped }
               true
             else
               def_scope do
@@ -250,104 +250,94 @@ module Hobo
             end
 
           # self is / is not
-          elsif name == "is"
+          when name == "is"
             return true if check_only
 
             def_scope do |record|
               @klass.where "#{@klass.table_name}.#{@klass.primary_key} = ?", record
             end
 
-          elsif name == "is_not"
+          when name == "is_not"
             return true if check_only
 
             def_scope do |record|
               @klass.where "#{@klass.table_name}.#{@klass.primary_key} <> ?", record
             end
 
-          else
-
-            case name
 
-            when "by_most_recent"
-              return true if check_only
+          when name == "by_most_recent"
+            return true if check_only
 
-              def_scope do
-                @klass.order "#{@klass.table_name}.created_at DESC"
-              end
+            def_scope do
+              @klass.order "#{@klass.table_name}.created_at DESC"
+            end
 
-            when "recent"
-              return true if check_only
+          when name == "recent"
+            return true if check_only
 
-              if "created_at".in?(@klass.columns.*.name)
-                def_scope do |*args|
-                  count = args.first || 6
-                  @klass.order("#{@klass.table_name}.created_at DESC").limit(count)
-                end
-              else
-                def_scope do |*args|
-                  count = args.first || 6
-                  limit(count)
-                end
+            if "created_at".in?(@klass.columns.*.name)
+              def_scope do |*args|
+                count = args.first || 6
+                @klass.order("#{@klass.table_name}.created_at DESC").limit(count)
               end
-
-            when "order_by"
-              return true if check_only
-
-              klass = @klass
+            else
               def_scope do |*args|
-                field, asc = args
-                type = klass.attr_type(field)
-                if type.nil? #a virtual attribute from an SQL alias, e.g., 'total' from 'COUNT(*) AS total'
-                  colspec = "#{field}" # don't prepend the table name
-                elsif type.respond_to?(:name_attribute) && (name = type.name_attribute)
-                  include = field
-                  colspec = "#{type.table_name}.#{name}"
-                else
-                  colspec = "#{klass.table_name}.#{field}"
-                end
-                @klass.includes(include).order("#{colspec} #{asc._?.upcase}")
+                count = args.first || 6
+                limit(count)
               end
+            end
 
+          when name == "order_by"
+            # DEPRECATED: use :order instead.
+            Rails.logger.warn "Automatic scope :order_by has been deprecated: use :order instead."
+            return true if check_only
 
-            when "include"
-              # DEPRECATED: it clashes with Module.include when called on an ActiveRecord::Relation
-              # after a scope chain, if you didn't call it on the class itself first
-              Rails.logger.warn "Automatic scope :include has been deprecated: use :including instead."
-              return true if check_only
-
-              def_scope do |inclusions|
-                @klass.includes(inclusions)
+            klass = @klass
+            def_scope do |*args|
+              field, asc = args
+              type = klass.attr_type(field)
+              if type.nil? #a virtual attribute from an SQL alias, e.g., 'total' from 'COUNT(*) AS total'
+                colspec = "#{field}" # don't prepend the table name
+              elsif type.respond_to?(:name_attribute) && (name = type.name_attribute)
+                include = field
+                colspec = "#{type.table_name}.#{name}"
+              else
+                colspec = "#{klass.table_name}.#{field}"
               end
+              @klass.includes(include).order("#{colspec} #{asc._?.upcase}")
+            end
 
-            when "including"
-              return true if check_only
-
-              def_scope do |inclusions|
-                @klass.includes(inclusions)
-              end
+          when name == "include"
+            # DEPRECATED: it clashes with Module.include when called on an ActiveRecord::Relation
+            # after a scope chain, if you didn't call it on the class itself first
+            Rails.logger.warn "Automatic scope :include has been deprecated: use :includes instead."
+            return true if check_only
 
-            when "search"
-              return true if check_only
+            def_scope do |inclusions|
+              @klass.includes(inclusions)
+            end
 
-              def_scope do |query, *fields|
-                match_keyword = ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
+          when name == "search"
+            return true if check_only
 
-                words = query.split
-                args = []
-                word_queries = words.map do |word|
-                  field_query = '(' + fields.map { |field| "(#{@klass.table_name}.#{field} #{match_keyword} ?)" }.join(" OR ") + ')'
-                  args += ["%#{word}%"] * fields.length
-                  field_query
-                end
+            def_scope do |query, *fields|
+              match_keyword = ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
 
-                @klass.where *([word_queries.join(" AND ")] + args)
+              words = query.split
+              args = []
+              word_queries = words.map do |word|
+                field_query = '(' + fields.map { |field| "(#{@klass.table_name}.#{field} #{match_keyword} ?)" }.join(" OR ") + ')'
+                args += ["%#{word}%"] * fields.length
+                field_query
               end
 
-            else
-              matched_scope = false
+              @klass.where *([word_queries.join(" AND ")] + args)
             end
 
+          else
+            matched_scope = false
           end
+
           matched_scope
         end
 

data/lib/hobo/rapid/generators/rapid/cards.dryml.erb

@@ -53,7 +53,7 @@ model_key = model.to_s.underscore
       <view:<%= creator_attribute %> param="creator"/>
 <% end -%>
 <% if primary_collection -%>
-      <ht key="<%= primary_collection.to_s.underscore %>.collection.count" count="&this.<%= primary_collection %>.size">
+      <ht key="<%= model.reflect_on_association(primary_collection).klass.to_s.underscore %>.collection.count" count="&this.<%= primary_collection %>.size">
          <count:<%= primary_collection%> param/>
       </ht>
 <% end -%>

data/lib/hobo/rapid/generators/rapid/pages.dryml.erb

@@ -177,7 +177,7 @@ end
 <% if collection -%>
             <section param="collection-section">
               <h3 param="collection-heading">
-                <ht key="<%= collection.to_s.underscore %>.collection.heading" count="&this.<%= collection.to_s %>.count" >
+                <ht key="<%= collection_class.to_s.underscore %>.collection.heading" count="&this.<%= collection.to_s %>.count" >
                   <human-collection-name collection="<%= collection %>" your/>
                 </ht>
               </h3>
@@ -190,21 +190,21 @@ end
 <%   if add_link -%>
 
               <a:<%= collection %> action="new" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)" param="new-link">
-                <ht key="<%= collection.to_s.underscore %>.actions.new" count="1">
-                  New <%= collection.to_s.singularize.titleize %>
+                <ht key="<%= collection_class.to_s.underscore %>.actions.new" count="1">
+                  New <%= collection_class.to_s.titleize %>
                 </ht>
               </a:<%= collection %>>
 <%   elsif add_form -%>
 
               <section param="add-to-collection" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)">
                 <h3 param="add-form-heading">
-                  <ht key="<%= collection.to_s.underscore %>.collection.add_form_heading" count="1">
-                    Add <%= a_or_an collection.to_s.singularize.titleize %>
+                  <ht key="<%= collection_class.to_s.underscore %>.collection.add_form_heading" count="1">
+                    Add <%= a_or_an collection_class.to_s.titleize %>
                   </ht>
                 </h3>
                 <form with="&@<%= collection_class.name.underscore %> || new_for_current_user(@<%= model.name.underscore %>.<%= collection %>)" owner="<%= owner %>" without-cancel param>
                   <field-list: skip="<%= owner %>"/>
-                  <submit: label="#{ht '<%= sq_escape collection.to_s.underscore %>.actions.add', :default=>['Add'] }"/>
+                  <submit: label="#{ht '<%= sq_escape collection_class.to_s.underscore %>.actions.add', :default=>['Add'] }"/>
                 </form>
               </section>
 <%   end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637108444
+  hash: -1637108443
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre22
-  version: 1.3.0.pre22
+  - pre23
+  version: 1.3.0.pre23
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 -04:00
+date: 2010-11-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108444
+        hash: -1637108443
         segments: 
         - 1
         - 3
         - 0
-        - pre22
-        version: 1.3.0.pre22
+        - pre23
+        version: 1.3.0.pre23
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108444
+        hash: -1637108443
         segments: 
         - 1
         - 3
         - 0
-        - pre22
-        version: 1.3.0.pre22
+        - pre23
+        version: 1.3.0.pre23
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108444
+        hash: -1637108443
         segments: 
         - 1
         - 3
         - 0
-        - pre22
-        version: 1.3.0.pre22
+        - pre23
+        version: 1.3.0.pre23
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -266,13 +266,13 @@ files:
 - lib/hobo/extensions/action_view/translation_helper.rb
 - lib/hobo/extensions/active_model/name.rb
 - lib/hobo/extensions/active_model/translation.rb
-- lib/hobo/extensions/active_record/association_collection.rb
-- lib/hobo/extensions/active_record/association_proxy.rb
-- lib/hobo/extensions/active_record/association_reflection.rb
+- lib/hobo/extensions/active_record/associations/collection.rb
+- lib/hobo/extensions/active_record/associations/proxy.rb
+- lib/hobo/extensions/active_record/associations/reflection.rb
+- lib/hobo/extensions/active_record/associations/scope.rb
 - lib/hobo/extensions/active_record/hobo_methods.rb
 - lib/hobo/extensions/active_record/permissions.rb
 - lib/hobo/extensions/active_record/relation_with_origin.rb
-- lib/hobo/extensions/active_record/scopes.rb
 - lib/hobo/extensions/array.rb
 - lib/hobo/extensions/enumerable.rb
 - lib/hobo/extensions/i18n.rb

data/lib/hobo/extensions/active_record/association_reflection.rb

@@ -1,19 +0,0 @@
-class ActiveRecord::Reflection::AssociationReflection
-
-  alias_method :association_name, :name
-
-  def klass_with_create_polymorphic_class
-    if options[:polymorphic]
-      begin
-        klass_without_create_polymorphic_class
-      rescue NameError => e
-        Object.class_eval "class #{e.missing_name} < ActiveRecord::Base; set_table_name '#{active_record.name.tableize}'; end"
-        e.missing_name.constantize
-      end
-    else
-      klass_without_create_polymorphic_class
-    end
-  end
-  alias_method_chain :klass, :create_polymorphic_class
-
-end

data/lib/hobo/extensions/active_record/scopes.rb

@@ -1,31 +0,0 @@
-# Add support for :scope => :my_scope to associations
-
-ActiveRecord::Associations::ThroughAssociationScope.class_eval do
-
-  def construct_scope_with_scope
-    s = construct_scope_without_scope
-    s[:find][:scope] = @reflection.options[:scope]
-    s
-  end
-  alias_method_chain :construct_scope, :scope
-
-end
-
-ActiveRecord::SpawnMethods.class_eval do
-
-  def apply_finder_options_with_scope(options)
-    scopes = []
-    Array.wrap(options.delete(:scope)).each do |s|
-      if s.is_a?(Hash)
-        s.each_pair{|k,v| scopes << [k,v] }
-      else
-        scopes << [s]
-      end
-    end
-    relation = apply_finder_options_without_scope(options)
-    return relation if scopes.empty?
-    scopes.inject(relation) {|r, s| r.send *s }
-  end
-  alias_method_chain :apply_finder_options, :scope
-
-end