hobo 1.3.0.pre21 → 1.3.0.pre22

data/VERSION

@@ -1 +1 @@
-1.3.0.pre21
+1.3.0.pre22

data/doctests/hobo/scopes.rdoctest

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

data/lib/generators/hobo/rapid/templates/hobo-rapid.js

@@ -691,7 +691,7 @@ HoboInputMany = {
       Event.stop(ev);
       var ul = el.up('ul.input-many'), li = el.up('li.input-many-li');
 
-      if(li.id.search(/_-1$/ && ul.immediateDescendants().length>2)>=0) {
+      if(li.id.search(/_-1$/)>=0 && ul.immediateDescendants().length>2) {
           /* if(console) console.log("IE7 messed up again (bug 605)"); */
           return;
       }

data/lib/generators/hobo/test_framework/test_framework_generator.rb

@@ -61,10 +61,10 @@ private
     def add_generators_block
       n = name == 'rspec_with_shoulda' ? 'rspec' : name
       block = "  config.generators do |g|"
-      block << "\n    g.test_framework :#{n}, :fixtures => #{options[:fixtures].inspect}" if !options[:fixtures] || name != 'test_unit'
-      block << "\n    g.fallbacks[:#{n}] = :test_unit" unless name == 'test_unit'
-      block << "\n    g.fixture_replacement => :#{options[:fixture_replacement]}" unless options[:fixture_replacement].blank?
-      block << "\n  end"
+      block << "\n      g.test_framework :#{n}, :fixtures => #{options[:fixtures].inspect}" if !options[:fixtures] || name != 'test_unit'
+      block << "\n      g.fallbacks[:#{n}] = :test_unit" unless name == 'test_unit'
+      block << "\n      g.fixture_replacement => :#{options[:fixture_replacement]}" unless options[:fixture_replacement].blank?
+      block << "\n    end"
       environment block
     end
 

data/lib/hobo/controller/model.rb

@@ -578,10 +578,11 @@ module Hobo
 
       self.this ||= args.first || find_instance
       changes = options[:attributes] || attribute_parameters or raise RuntimeError, t("hobo.messages.update.no_attribute_error", :default=>["No update specified in params"])
-      this.user_update_attributes(current_user, changes)
 
-      # Ensure current_user isn't out of date
-      @current_user = @this if @this == current_user
+      if this.user_update_attributes(current_user, changes)
+        # Ensure current_user isn't out of date
+        @current_user = @this if @this == current_user
+      end
 
       in_place_edit_field = changes.keys.first if changes.size == 1 && params[:render]
       update_response(in_place_edit_field, options, &b)

data/lib/hobo/model.rb

@@ -34,6 +34,8 @@ module Hobo
 
         alias_method_chain :has_one, :new_method
 
+        # eval avoids the ruby 1.9.2 "super from singleton method ..." error
+        eval %(
         def inherited(klass)
           super
           fields(false) do
@@ -41,6 +43,7 @@ module Hobo
             field(klass.inheritance_column, :string)
           end
         end
+        )
       end
 
       base.fields(false) # force hobo_fields to load

data/lib/hobo/model/lifecycles.rb

@@ -56,14 +56,15 @@ module Hobo
 
         end
 
-
-        def valid?(context=nil)
-          if context.nil? && self.class.has_lifecycle? && (step = lifecycle.active_step)
-            context = step.name
+        # eval avoids the ruby 1.9.2 "super from singleton method ..." error
+        eval %(
+          def valid?(context=nil)
+            if context.nil? && self.class.has_lifecycle? && (step = lifecycle.active_step)
+              context = step.name
+            end
+            super(context)
           end
-          super(context)
-        end
-
+        )
 
         def lifecycle
           @lifecycle ||=  if self.class.const_defined?(:Lifecycle)

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

@@ -310,6 +310,16 @@ module Hobo
 
 
             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)
+              end
+
+            when "including"
               return true if check_only
 
               def_scope do |inclusions|

data/lib/hobo/model/view_hints.rb

@@ -25,7 +25,7 @@ module Hobo
 
       setter :children,    [] do |*args|
         # Setting children also gives a default parent using the reverse association
-        child_model = model.reflections[args.first].klass
+        child_model = model.reflect_on_association(args.first).klass
         if child_model.view_hints.parent.nil? and !child_model.view_hints.parent_defined
           parent = model.reverse_reflection(args.first)
           child_model.view_hints.parent(parent.name, :undefined => true) if parent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637108441
+  hash: -1637108444
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre21
-  version: 1.3.0.pre21
+  - pre22
+  version: 1.3.0.pre22
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 -04:00
+date: 2010-11-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108441
+        hash: -1637108444
         segments: 
         - 1
         - 3
         - 0
-        - pre21
-        version: 1.3.0.pre21
+        - pre22
+        version: 1.3.0.pre22
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108441
+        hash: -1637108444
         segments: 
         - 1
         - 3
         - 0
-        - pre21
-        version: 1.3.0.pre21
+        - pre22
+        version: 1.3.0.pre22
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108441
+        hash: -1637108444
         segments: 
         - 1
         - 3
         - 0
-        - pre21
-        version: 1.3.0.pre21
+        - pre22
+        version: 1.3.0.pre22
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency