hobo 2.0.1 → 2.1.0.pre1

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

@@ -24,7 +24,7 @@ module ActiveRecord
 
       private
 
-      def raise_on_type_mismatch(record)
+      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
         unless klass.nil? || record.is_a?(klass)

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

@@ -14,9 +14,10 @@ module ActiveRecord
       end
     end if false # DISABLED Getting Rails 3.1 working
 
-  module SpawnMethods
+ class Relation
+  module DeprecatedMethods
 
-    def apply_finder_options_with_scope(options)
+    def apply_finder_options_with_scope(options, silence_deprecation = false)
       scopes = []
       Array.wrap(options.delete(:scope)).each do |s|
         if s.is_a?(Hash)
@@ -25,11 +26,11 @@ module ActiveRecord
           scopes << [s]
         end
       end
-      relation = apply_finder_options_without_scope(options)
+      relation = apply_finder_options_without_scope(options, silence_deprecation)
       return relation if scopes.empty?
       scopes.inject(relation) {|r, s| r.send *s }
     end
     alias_method_chain :apply_finder_options, :scope
-
-  end
+  end if false # DISABLED Getting Rails 4.0 working
+ end
 end

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

@@ -24,13 +24,15 @@ module ActiveRecord
   module Associations
     class CollectionProxy
 
-      def scoped_with_origin
-        relation = scoped_without_origin.clone
-        relation.origin = proxy_association.owner
-        relation.origin_attribute = proxy_association.reflection.name
-        relation
-      end
-      alias_method_chain :scoped, :origin
+      # FIXME Ralis4:  really hoping that we can replace this with
+      # something based on https://github.com/rails/rails/issues/5717
+      # def scoped_with_origin
+      #   relation = scoped_without_origin.clone
+      #   relation.origin = proxy_association.owner
+      #   relation.origin_attribute = proxy_association.reflection.name
+      #   relation
+      # end
+      # alias_method_chain :scoped, :origin
 
       def method_missing_with_origin(method, *args, &block)
         res = method_missing_without_origin(method, *args, &block)

data/lib/hobo/model.rb

@@ -227,7 +227,6 @@ module Hobo
 
       def find_by_sql(*args)
         result = super
-        result.member_class = self # find_by_sql always returns array
         result
       end
 
@@ -278,7 +277,7 @@ module Hobo
               r.klass >= self &&
               !r.options[:conditions] &&
               !r.options[:scope] &&
-              r.foreign_key == refl.foreign_key
+              r.foreign_key.to_s == refl.foreign_key.to_s
           end
         end
       end

data/lib/hobo/model/accessible_associations.rb

@@ -11,7 +11,7 @@ module Hobo
         array.map! do |record_hash_or_string|
           finder = association.member_class
           conditions = association.proxy_association.reflection.options[:conditions]
-          finder = finder.scoped :conditions => conditions unless conditions == [[]] || conditions == [[],[]]
+          finder = finder.where(conditions) unless conditions == [[]] || conditions == [[],[]]
           find_or_create_and_update(owner, association_name, finder, record_hash_or_string) do |id|
             # The block is required to either locate find an existing record in the collection, or build a new one
             if id
@@ -91,7 +91,8 @@ module Hobo
 
       def finder_for_belongs_to(record, name)
         refl = record.class.reflections[name]
-        conditions = ActiveRecord::Associations::BelongsToAssociation.new(record, refl).reflection.send(:conditions)
+        #conditions = ActiveRecord::Associations::BelongsToAssociation.new(record, refl).reflection.send(:conditions)
+        conditions = [[]]
         conditions == [[]] || conditions == [[],[]] ? refl.klass : refl.klass.scoped(:conditions => conditions)
       end
 
@@ -104,7 +105,6 @@ module Hobo
 
       def self.has_many_with_accessible(name, options={}, &block)
         has_many_without_accessible(name, options, &block)
-
         if options[:accessible]
           class_eval %{
             def #{name}_with_accessible=(array_or_hash)
@@ -163,8 +163,7 @@ module Hobo
 
 
       # Add :accessible to the valid options so AR doesn't complain
-      ::ActiveRecord::Associations::Builder::BelongsTo.valid_options << :accessible
-      ::ActiveRecord::Associations::Builder::HasMany.valid_options << :accessible
+      ::ActiveRecord::Associations::Builder::Association.valid_options << :accessible
 
     end
   end

data/lib/hobo/model/permissions.rb

@@ -7,8 +7,8 @@ module Hobo
         klass.class_eval do
           extend ClassMethods
 
-          alias_method_chain :create, :hobo_permission_check
-          alias_method_chain :update, :hobo_permission_check
+          alias_method_chain :create_record, :hobo_permission_check
+          alias_method_chain :update_record, :hobo_permission_check
           alias_method_chain :destroy, :hobo_permission_check
           class << self
             alias_method_chain :has_many, :hobo_permission_check
@@ -132,18 +132,18 @@ module Hobo
         acting_user && !(self.class.has_lifecycle? && lifecycle.active_step)
       end
 
-      def create_with_hobo_permission_check(*args, &b)
+      def create_record_with_hobo_permission_check(*args, &b)
         if permission_check_required?
           create_permitted? or raise PermissionDeniedError, "#{self.class.name}#create"
         end
-        create_without_hobo_permission_check(*args, &b)
+        create_record_without_hobo_permission_check(*args, &b)
       end
 
-      def update_with_hobo_permission_check(*args)
+      def update_record_with_hobo_permission_check(*args)
         if permission_check_required?
           update_permitted? or raise PermissionDeniedError, "#{self.class.name}#update"
         end
-        update_without_hobo_permission_check(*args)
+        update_record_without_hobo_permission_check(*args)
       end
 
       def destroy_with_hobo_permission_check
@@ -255,6 +255,7 @@ module Hobo
 
 
       def attribute_protected?(attribute)
+        return false if attribute.nil?
         attribute = attribute.to_s
 
         return true if self.class.send(:attributes_protected_by_default).include? attribute

data/lib/hobo/model/scopes.rb

@@ -2,9 +2,7 @@ module Hobo
   module Model
     module Scopes
 
-      ::ActiveRecord::Associations::Builder::BelongsTo.valid_options << :scope
-      ::ActiveRecord::Associations::Builder::HasMany.valid_options << :scope
-      ::ActiveRecord::Associations::Builder::HasOne.valid_options << :scope
+      ::ActiveRecord::Associations::Builder::Association.valid_options << :scope
 
       def self.included_in_class(klass)
         klass.class_eval do

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

@@ -4,12 +4,12 @@ module Hobo
       module ApplyScopes
 
         def apply_scopes(scopes)
-          result = scoped
+          result = self
           scopes.each_pair do |scope, arg|
             if arg.is_a?(Array)
-              result = result.send(scope, *arg) unless arg.first.blank?
+              result = self.send(scope, *arg) unless arg.first.blank?
             else
-              result = result.send(scope, arg) unless arg.blank?
+              result = self.send(scope, arg) unless arg.blank?
             end
           end
           result

data/test/irt/generators/admin_subsite.irt

@@ -3,3 +3,9 @@ invoke 'hobo:admin_subsite', %w[ -q ]
 desc "Admin Subsite files exist"
 files_exist? %w( app/controllers/admin/admin_site_controller.rb app/controllers/admin/users_controller.rb app/helpers/admin/users_helper.rb app/views/taglibs/admin_site.dryml )
 test_value_eql? true
+
+desc "Admin::UsersController matches"
+file_include? "app/controllers/admin/users_controller.rb",
+             'class Admin::UsersController < Admin::AdminSiteController',
+             'hobo_model_controller'
+test_value_eql? true

metadata

@@ -1,84 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: hobo
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.1.0.pre1
 platform: ruby
 authors:
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo_support
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
 - !ruby/object:Gem::Dependency
   name: hobo_fields
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
 - !ruby/object:Gem::Dependency
   name: dryml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: hobo_will_paginate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubydoctest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: irt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -166,6 +147,7 @@ files:
 - CHANGES-1.3.txt
 - CHANGES-1.4.txt
 - CHANGES-2.0.markdown
+- CHANGES-2.1.markdown
 - Gemfile
 - LICENSE.txt
 - README
@@ -333,8 +315,6 @@ files:
 - test/doctest/hobo/hobo_helper.rdoctest
 - test/doctest/hobo/lifecycles.rdoctest
 - test/doctest/hobo/model.rdoctest
-- test/doctest/hobo/multi_model_forms.rdoctest
-- test/doctest/hobo/scopes.rdoctest
 - test/doctest/prepare_testapp.rb
 - test/irt/generators/admin_subsite.irt
 - test/irt/generators/assets.irt
@@ -367,28 +347,26 @@ files:
 - test/permissions/test_permissions.rb
 homepage: http://hobocentral.net
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: hobo
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The web app builder for Rails
 test_files: []
-has_rdoc: 

data/test/doctest/hobo/multi_model_forms.rdoctest

@@ -1,260 +0,0 @@
-Accessible Associations
-{.document-title}
-
-This chapter describes Hobo's support for nested models in forms.
-This is mostly technical background -- beginners should not have to
-read more than the introduction.
-
-Contents
-{.contents-heading}
-
-- contents
-{:toc}
-
-    doctest: prepare testapp environment
-    doctest_require: '../prepare_testapp'
-
-    >> ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(StringIO.new(''))
-    >>
-     def migrate(renames={})
-       up, down = Generators::Hobo::Migration::Migrator.run(renames)
-       ActiveRecord::Migration.class_eval(up)
-       ActiveRecord::Base.send(:descendants).each { |model| model.reset_column_information }
-       [up, down]
-     end
-{.hidden}
-
-# Introduction
-
-Using multi-model forms in Hobo is very straightforward:
-
-    class Blog < ActiveRecord::Base
-      hobo_model
-      has_many :posts, :accessible => true, :inverse_of => :blog
-
-    class Post < ActiveRecord::Base
-      hobo_model
-      belongs_to :blog, :inverse_of => :posts
-
-The `:accessible` flag is a Hobo addition, the `:inverse_of` flag is
-standard Rails.  `:inverse_of` is optional but highly recommended in
-Rails; Hobo requires it.
-
-Once you've done that, the default forms that Hobo builds will use the
-[input-many](/api_tag_defs/input-many) tag.
-
-`:accessible => true` works for `has_many`, `has_many :through` and
-`belongs_to`, but does not work for `has_one` or
-`has_and_belongs_to_many`.
-
-It's quite common to also add the `:dependent => :destroy` flag to
-accessible associations.  This also used to trigger magic in Hobo, but
-this additional magic has been removed and replaced with [View
-Hints](/manual/viewhints).  See the [Rails
-rdoc](http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html)
-for more information on `:dependent => :destroy`.
-
-# Model Support
-
-We'll use rubydoctest to provide our examples for this section.  Here
-are the models:
-
-    >>
-     class Foo < ActiveRecord::Base
-       hobo_model
-       fields { name :string }
-       has_many :bars, :accessible => true
-       attr_accessible :name, :bars
-     end
-    >>
-     class Bar < ActiveRecord::Base
-       hobo_model
-       fields { name :string }
-       belongs_to :foo
-       attr_accessible :name, :foo, :foo_id
-     end
-    >> migrate
-
-The `:accessible => true` option patches in
-`Hobo::Model::AccessibleAssociations` to your ActiveRecord model.  It
-modifies the `bars=` writer function to support assigning an array of
-records, an array of hashes, an array of ids, or an empty string.
-
-## Assigning an array of records
-
-The whole array must be assigned -- any records that are not assigned
-are deleted from your association.
-
-    >> bar1 = Bar.new(:name => "bar1")
-    >> bar2 = Bar.new(:name => "bar2")
-    >> foo = Foo.new(:name => "foo1")
-    >> foo.bars = [bar1, bar2]
-    >> foo.bars.*.name
-    => ["bar1", "bar2"]
-    >> foo.save!
-
-    >> foo.bars = [bar2]
-    >> foo.bars.*.name
-    => ["bar2"]
-    >> foo.save!
-
-    >> bar2.foo.name
-    => "foo1"
-    >> bar1.reload
-    >> bar1.foo
-    => nil
-
-If `:dependent => :destroy` had been set on `has_many :bars`, bar1
-would now be deleted from the database.   Since it hasn't, it still
-exists in the database but has become orphaned.
-
-## Assigning an array of hashes
-
-Assigning an array of hashes maps nicely with how Rails deconstructs
-your URI encoded query string.  For example, your form can return
-
-    foo[bars][0][name]=bar1&foo[bars][0][name]=bar2
-
-which Rails will decode into your params hash as
-
-    >> params = {"foo" => {"bars" => [ {"name" => "bar3"}, {"name" => "bar4"}]}}
-
-With Hobo's accessible associations, the params hash may be directly
-assigned.
-
-    >> foo.attributes = params["foo"]
-    >> foo.bars.*.name
-    => ["bar3", "bar4"]
-    >> foo.save!
-
-Because these parameters did not include an ID, Hobo created new bar
-models.   If you include an ID, Hobo looks up the existing record in
-the database and modifies it with the parameters assigned.
-
-    >> params = {"foo" => {"bars" => [ {:name => "bar3_mod", :id => "#{foo.bars[0].id}"}]}}
-
-    >> old_bar3_id = foo.bars[0].id
-    >> foo.attributes = params["foo"]
-    >> foo.save!
-    >> foo.bars.*.name
-    => ["bar3_mod"]
-    >> foo.bars[0].id == old_bar3_id
-    => true
-
-## Assigning an array of IDs
-
-While [input-many](/api_tag_defs/input-many) returns an array of
-hashes, [select-many](/api_tag_defs/select-many) returns an array of
-ids.  These ids must have an "@" prepended.
-
-    >> params = {"foo" => {"bars" => ["@#{bar1.id}", "@#{bar2.id}"]}}
-    >> foo.attributes = params["foo"]
-    >> foo.save!
-    >> foo.bars.*.name
-    => ["bar1", "bar2"]
-
-## Assigning an empty string
-
-You can remove all elements from the association by assigning an empty
-array:
-
-    >> foo.bars = []
-    >> foo.bars
-    => []
-
-However, there is no way to format a URI query string to make Rails
-construct an empty array in its params hash, so Hobo adds a useful
-shortcut to it's accessible associations:
-
-    >> foo.bars = ""
-    >> foo.bars
-    => []
-
-# View Support
-
-The Rapid tags [input-many](/api_tag_defs/input-many),
-[input-all](/api_tag_defs/input-all),
-[select-many](/api_tag_defs/select-many) and
-[check-many](/api_tag_defs/check-many) all require accessible
-associations.
-
-`input-many` may even be used in a nested fashion:
-
-    <form>
-      <field-list:>
-        <foos-view:>
-          <input-many>
-            <field-list:>
-              <bars-view:>
-                <input-many>
-                </input-many>
-              </bars-view:>
-            </field-list:>
-          </input-many>
-        </foos-view:>
-      </field-list:>
-    </form>
-
-You do not need to use the accessible association tags -- standard
-inputs acquire the correct `name` for use with accessible associations
-when called from the appropriate context.  Here's an example form that
-will work with the example given above in *Model Support*
-
-    <form>
-      <field-list:>
-        <bars-view:>
-          <repeat>
-            <input:name/>
-          </repeat>
-        </bars-view:>
-      <field-list:>
-    </form>
-
-# Controller Support
-
-No special code is required in your controllers to support accessible
-associations, even if you aren't using a Hobo controller.
-
-# Validations
-
-Validations simply work as you'd expect.  The only thing to note is
-that validation errors in a child object will cause the parent
-object to receive an error message of "..." on the association.
-
-# Transactions
-
-Hobo's accessible associations do not do any explicit saves so any new
-child objects are not saved until the parent object is saved.   Rails
-wraps this save in a transaction, so any save is an all or nothing
-deal even though parents and children are saved via different SQL
-statements.
-
-# Rails 2.3 nested models
-
-Rails 2.3 includes a functionality similar to Hobo's accessible
-associations.  The Hobo version is based on an early version of the
-Rails functionality, but unfortunately the Rails version changed
-significantly between the time that the Hobo version was released and
-when Rails 2.3 was released.
-
-For more information on Rails 2.3's `accept_nested_attributes_for`,
-see [the Ruby on Rails
-blog](http://weblog.rubyonrails.org/2009/1/26/nested-model-forms) or
-[Ryan Daigle's blog](http://ryandaigle.com/articles/2009/2/1/what-s-new-in-edge-rails-nested-attributes).
-
-The two versions use a different model:  in Hobo the whole array is
-assigned, allowing add, delete or update via a single mechanism.   In
-rails, there's a different mechanism for adding or deleting objects
-from the association, and there's no method for update.
-
-Each version have their pluses and minuses.  The Hobo version is
-conceptually simpler, but it starts to get unwieldy if there are a
-large number of elements in the association.
-
-Both mechanisms are compatible and may be enabled simultaneously.
-
-It's certainly possible that later versions of Rapid will acquire tags
-that will require `accept_nested_attributes_for`.  However, it's
-unlikely that Hobo will drop support for accessible associations
-unless ActiveRecord itself changes significantly.
-