hobo 1.4.0.pre8 → 2.0.0.pre1

data/lib/hobo/engine.rb

@@ -86,5 +86,17 @@ module Hobo
       end
     end
 
+    # hobo_field's rich types let you refer to rich type with symbols:
+    #     fields do; shout :loud; end.
+    # The problem comes if you never use LoudText in your code, rails
+    # autoloader will never kick in and autoload
+    # app/rich_types/loud_text.rb, so let's preemptively require
+    # everything in that directory.
+    initializer 'hobo.rich_types' do |app|
+      Dir["#{Rails.root}/app/rich_types/*"].each do |file|
+        require_dependency file
+      end
+    end
+
   end
 end

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

@@ -68,34 +68,25 @@ ActiveRecord::Associations::HasManyThroughAssociation.class_eval do
   end
 
 
-  def create!(attrs = nil)
+  def create_record_with_user_create(attrs, options, raise = false, &block)
     klass = @reflection.klass
     user = acting_user if klass < Hobo::Model
-    klass.transaction do
-      object = if attrs
-                 klass.send(:with_scope, :create => attrs) { user ? klass.user_create!(user) : klass.create! }
-               else
-                 user ? klass.user_create!(user) : klass.create!
-               end
-      self << object
-      object
-    end
-  end
-
-
-  def create(attrs = nil)
-    klass = @reflection.klass
-    user = acting_user if klass < Hobo::Model
-    klass.transaction do
-      object = if attrs
-                 klass.send(:with_scope, :create => attrs) { user ? klass.user_create(user) : klass.create }
-               else
-                 user ? klass.user_create(user) : klass.create
-               end
-      self << object
-      object
+    if user
+      if attributes.is_a?(Array)
+        attributes.collect { |attr| create_record(attr, options, raise, &block) }
+      else
+        transaction do
+          add_to_target(klass.user_create(attributes)) do |record|
+            yield(record) if block_given?
+            insert_record(record, true, raise)
+          end
+        end
+      end
+    else
+      create_record_without_user_create(attrs, options, raise, &block)
     end
   end
+  alias_method_chain :create_record, :user_create
 
 
   def insert_record_with_owner_attributes(record, force = true, raise = false)

data/lib/hobo/model.rb

@@ -20,6 +20,9 @@ module Hobo
         inheriting_cattr_reader :default_order
         alias_method_chain :attributes=, :hobo_type_conversion
 
+        cattr_accessor :hobo_controller
+        self.hobo_controller = {}
+
         include Permissions
         include Lifecycles::ModelExtensions
         include FindFor

data/lib/hobo/model/permissions.rb

@@ -257,7 +257,7 @@ module Hobo
       def attribute_protected?(attribute)
         attribute = attribute.to_s
 
-        return true if self.class.attributes_protected_by_default.include? attribute
+        return true if self.class.send(:attributes_protected_by_default).include? attribute
 
         if !self.class.accessible_attributes.empty?
           return true if !self.class.accessible_attributes.include?(attribute)

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

@@ -1,3 +1,10 @@
+<% # routing's not available yet, so we just guess based on presence
+# of methods
+def linkable?(model, action)
+  model.hobo_controller[subsite] && model.hobo_controller[subsite].public_instance_methods.include?(action)
+end
+
+%>
 <% each_model do -%>
 <%
 name_attribute        = model.name_attribute
@@ -10,9 +17,9 @@ if creator_attribute
   creator_link = creator_refl && linkable?(creator_refl.klass, :show)
 end
 
-show_link     = linkable?(:show)
-edit_link     = !show_link && linkable?(:edit)
-delete_button = !show_link && !edit_link && linkable?(:destroy, :method => :delete)
+show_link     = linkable?(model, :show)
+edit_link     = !show_link && linkable?(model, :edit)
+delete_button = !show_link && !edit_link && linkable?(model, :destroy)
 
 has_actions = edit_link || delete_button
 has_body    = (!show_link && description_attribute) || creator_link || creator_attribute || primary_collection

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

@@ -1,10 +1,17 @@
+<% # routing's not available yet, so we just guess based on presence
+# of methods
+def linkable?(model, action)
+  model.hobo_controller[subsite] && model.hobo_controller[subsite].public_instance_methods.include?(action)
+end
+
+%>
 <% each_controller do -%>
 <%
 next unless @controller < Hobo::Controller::Model
 form_fields = standard_fields :belongs_to, :has_many
 
-cancel_to_show_page  = linkable?(:show)
-cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
+cancel_to_show_page  = linkable?(model, :show)
+cancel_to_index_page = !cancel_to_index_page && linkable?(model, :index)
 model_key = model.to_s.underscore
 -%>
 <def tag="form" for="<%= model.name %>">

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

@@ -1,3 +1,10 @@
+<% # routing's not available yet, so we just guess based on presence
+# of methods
+def linkable?(model, action)
+  model.hobo_controller[subsite] && model.hobo_controller[subsite].public_instance_methods.include?(action)
+end
+
+%>
 <!-- ====== Main Navigation ====== -->
 
 <def tag="main-nav">
@@ -15,8 +22,8 @@
 <% next unless @controller < Hobo::Controller::Model %>
 <!-- ====== <%= model.name %> Pages ====== -->
 <%
-new_link = linkable?(:new)
-new_form = !new_link && linkable?(model, :create, :method => :post)
+new_link = linkable?(model, :new)
+new_form = !new_link && linkable?(model, :create)
 model_key = model.to_s.underscore
 -%>
 
@@ -106,7 +113,7 @@ back_link_human_name = back_link_human_name && back_link_human_name.model_name.h
 boolean_fields = model.table_exists? ? (model.columns.select { |c| c.type == :boolean }.*.name - model.view_hints.inline_booleans) : []
 creator        = model.creator_attribute
 creator_link   = creator && model.reflections[creator] && linkable?(model.reflections[creator].klass, :show)
-edit_link      = linkable?(:edit)
+edit_link      = linkable?(model, :edit)
 main_content   = model.primary_content_attribute
 show_fields    = standard_fields(:belongs_to).*.to_s - [model.name_attribute, main_content, creator, back_link, *boolean_fields].*.to_s
 
@@ -118,7 +125,7 @@ if collection
   owner            = model.reverse_reflection(collection)._?.name
   if owner
     add_link = collection && linkable?(collection_class, :"new_for_#{owner}")
-    add_form = !add_link && linkable?(collection_class, :"create_for_#{owner}", :method => :post)
+    add_form = !add_link && linkable?(collection_class, :"create_for_#{owner}")
   end
 end
 

data/lib/hobo/routes.rb

@@ -17,10 +17,12 @@ module Hobo
     end
 
     def linkable?(klass, action, options={})
+      #raise Hobo::Error, "deprecated"
       @linkable_keys.member? linkable_key(klass, action, options)
     end
 
     def models_with(wanted_action)
+      raise Hobo::Error, "deprecated"
       @linkable_keys.map do |k|
         subsite, class_name, action, method = k.split('/')
         (action == wanted_action.to_s) ? class_name.constantize : nil

data/test/doctest/hobo/hobo_helper.rdoctest

@@ -1,5 +1,6 @@
     doctest: prepare testapp environment
     doctest_require: '../prepare_testapp'
+    doctest_require: 'mocha'
 
 # Hobo::Helper
 
@@ -22,35 +23,37 @@ Useful stuff
         >> def init_mocha; $stubba = Mocha::Central.new; end
         >> def mock; Mocha::Mockery.instance.named_mock 'mock'; end
 
-## `object_url`
+# object_url now uses polymorphic_url, so this is completely out of date.  FIXME
 
-Returns a canonical restful URL for a given object. THe Hobo routing is checked and URLs are only returned for routes that exist.
+# ## `object_url`
 
-Note that `object_url` doesn't perform "reverse routing". It knows nothing about attractive URLs you may have declared in your routes file.
+# Returns a canonical restful URL for a given object. THe Hobo routing is checked and URLs are only returned for routes that exist.
 
-Something to link to:
+# Note that `object_url` doesn't perform "reverse routing". It knows nothing about attractive URLs you may have declared in your routes file.
 
-        >> init_mocha
-        >> class Thing; end
-        >> thing = Thing.new
-        >> thing.expects(:to_url_path).at_least_once.returns("things/1")
+# Something to link to:
 
-### Simple 'show' URLs
+#         >> init_mocha
+#         >> class Thing; end
+#         >> thing = Thing.new
+#         >> thing.expects(:to_url_path).at_least_once.returns("things/1")
 
-        >> Hobo::Routes.expects(:linkable?).with(Thing, :show, {:subsite => ''}).returns(true)
-        >> View.object_url(thing)
-        => "/things/1"
+# ### Simple 'show' URLs
 
-Returns nil if Routes says it's not linkable
+#         >> Hobo::Routes.expects(:linkable?).with(Thing, :show, {:subsite => ''}).returns(true)
+#         >> View.object_url(thing)
+#         => "/things/1"
 
-        >> Hobo::Routes.expects(:linkable?).with(Thing, :show, {:subsite => ''}).returns(false)
-        >> View.object_url(thing)
-        => nil
+# Returns nil if Routes says it's not linkable
 
-A URL to the 'edit' page:
+#         >> Hobo::Routes.expects(:linkable?).with(Thing, :show, {:subsite => ''}).returns(false)
+#         >> View.object_url(thing)
+#         => nil
 
-        >> Hobo::Routes.expects(:linkable?).with(Thing, :edit, {:subsite => ''}).returns(true)
-        >> View.object_url(thing, :edit)
-        => "/things/1/edit"
+# A URL to the 'edit' page:
+
+#         >> Hobo::Routes.expects(:linkable?).with(Thing, :edit, {:subsite => ''}).returns(true)
+#         >> View.object_url(thing, :edit)
+#         => "/things/1/edit"
 
 

data/test/doctest/hobo/lifecycles.rdoctest

@@ -26,6 +26,7 @@ A user model for our example:
           fields do
             name :string
           end
+          attr_accessible :name
         end
 
 Now the friendship. For now we'll just declare the *invite* part of the lifecycle. We first declare the *states* -- there's only one for now. We then declare the *invite* action. This is the action that first creates the friendship, so we declare it with `create`:

data/test/doctest/hobo/model.rdoctest

@@ -44,6 +44,7 @@ declaration:
          title :string, :name => true, :index => true
          content :text, :primary_content => true
        end
+       attr_accessible :title, :content, :poster, :poster_id
 
        belongs_to :poster, :class_name => "User", :creator => true
 
@@ -122,6 +123,7 @@ object.  In this case, you can provide your own name method instead:
          first_name :string
          last_name :string
        end
+       attr_accessible :first_name, :last_name
 
        def name
          first_name + ' ' + last_name
@@ -185,6 +187,7 @@ used elsewhere.
        fields do
          email_address :string, :login => true, :unique => true
        end
+       attr_accessible :email_address
      end
 
     >> User.login_attribute
@@ -214,6 +217,7 @@ case the `login_attribute` is saved to the field:
         fields do
           creator_login :string, :creator => true
         end
+        attr_accessible :creator_login
      end
 
     >> Foo2.creator_attribute

data/test/doctest/hobo/multi_model_forms.rdoctest

@@ -54,12 +54,14 @@ are the models:
        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
 

data/test/doctest/hobo/scopes.rdoctest

@@ -36,7 +36,8 @@ Nobody but the computer needs to read the rest of this section.
 
 Let's set up a few models for our testing:
 
-    >>
+    >> File.open("#{Rails.root}/app/models/person.rb", "w") do |f|
+     f.write("""
      class Person < ActiveRecord::Base
        hobo_model
 
@@ -47,6 +48,7 @@ Let's set up a few models for our testing:
          male :boolean
          timestamps
        end
+       attr_accessible :name, :born_at, :code, :male
 
        lifecycle(:key_timestamp_field => false) do
          state :inactive, :active
@@ -55,19 +57,30 @@ Let's set up a few models for our testing:
        has_many :friendships
        has_many :friends, :through => :friendships
      end
-
-    >>
+     """)
+     end
+    >> File.open("#{Rails.root}/app/models/friendship.rb", "w") do |f|
+     f.write("""
      class Friendship < ActiveRecord::Base
        hobo_model
        fields
+       attr_accessible :person, :friend
        belongs_to :person
-       belongs_to :friend, :class_name => "Person"
+       belongs_to :friend, :class_name => 'Person'
+     end
+     """)
      end
 
 Generate a migration and run it:
 {.hidden}
 
-    >> ActiveRecord::Migration.class_eval(Generators::Hobo::Migration::Migrator.run[0])
+    >> File.open("m.txt", "w") {|f| f.write("m\n\n")}
+    >> system("rails g hobo:migration < m.txt")
+    >> ActionDispatch::Reloader.cleanup!
+    >> ActionDispatch::Reloader.prepare!
+    >> Person.connection.clear_cache!
+    >> Person.connection.schema_cache.clear!
+    >> Person.reset_column_information
     >> Person.columns.*.name
     => ["id", "name", "born_at", "code", "male", "created_at", "updated_at", "state"]
 {.hidden}

data/test/doctest/prepare_testapp.rb

@@ -3,9 +3,11 @@ require 'tmpdir'
 
 TESTAPP_PATH = ENV['TESTAPP_PATH'] || File.join(Dir.tmpdir, 'hobo_testapp')
 system %(rake test:prepare_testapp TESTAPP_PATH=#{TESTAPP_PATH})
-system %(echo "gem 'mocha'" >> #{TESTAPP_PATH}/Gemfile)
+system %(echo "gem 'mocha', :require => false" >> #{TESTAPP_PATH}/Gemfile)
+system %(echo "gem 'test-unit'" >> #{TESTAPP_PATH}/Gemfile)
 FileUtils.chdir TESTAPP_PATH
 require "#{TESTAPP_PATH}/config/environment"
 require 'rails/generators'
-Rails::Generators.configure!
+Rails::Generators.configure!(Rails.application.config.generators)
+
 

data/test/irt/generators/admin_subsite.irt

@@ -1,9 +1,5 @@
 invoke 'hobo:assets', %w[ -q ]
-invoke 'hobo:admin_subsite', %w[ -q --make-front-site=false ]
+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
-]
+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

data/test/irt/generators/assets.irt

@@ -1,11 +1,5 @@
 desc "hobo:assets invoke"
 invoke 'hobo:assets', %w(-q)
 
-files_exist? %w[ app/views/taglibs/application.dryml
-                 app/assets/stylesheets/application.css
-                 app/assets/stylesheets/front.css
-                 app/assets/javascripts/application.js
-                 app/assets/javascripts/front.js
-                 app/models/guest.rb
-]
+files_exist? %w( app/views/taglibs/application.dryml app/assets/stylesheets/application.scss app/assets/stylesheets/front.scss app/assets/javascripts/application.js app/assets/javascripts/front.js app/models/guest.rb )
 test_value_eql? true

data/test/irt/generators/front_controller.irt

@@ -1,8 +1,6 @@
 invoke 'hobo:front_controller', %w[ -q ]
 desc "All files exist"
-files_exist? %w[ app/controllers/front_controller.rb
-                 app/helpers/front_helper.rb
-                 app/views/front/index.dryml ]
+files_exist? %w( app/controllers/front_controller.rb app/helpers/front_helper.rb app/views/front/index.dryml )
 test_value_eql? true
 
 desc "public/index.html removed"

data/test/irt/generators/model.irt

@@ -5,8 +5,7 @@ eval_file '../partials/_house_model_tests.rb'
 invoke 'hobo:model', %w(nest/ed alpha:string -q)
 
 desc "Nested files exist"
-files_exist? %w[ app/models/nest/ed.rb
-        app/models/nest.rb ]
+files_exist? %w( app/models/nest/ed.rb app/models/nest.rb )
 test_value_eql? true
 
 desc "Nested injection matches"

data/test/irt/generators/partials/_account_user_model_tests.rb

@@ -1,7 +1,5 @@
 desc "Account Model files exist"
-files_exist? %w[ app/models/account.rb
-                 app/models/account.rb
-]
+files_exist? %w(app/models/account.rb)
 test_value_eql? true
 
 desc "Account Model injection matches"

data/test/irt/generators/partials/_accounts_users_controller_tests.rb

@@ -1,7 +1,5 @@
 desc "All controller files exists"
-files_exist? %w[ app/controllers/accounts_controller.rb
-                 app/helpers/accounts_helper.rb
-]
+files_exist? %w( app/controllers/accounts_controller.rb app/helpers/accounts_helper.rb )
 test_value_eql? true
 
 

data/test/irt/generators/partials/_default_user_model_tests.rb

@@ -1,7 +1,5 @@
 desc "All files exists"
-files_exist? %w[ app/models/user.rb
-                 app/models/user.rb
-]
+files_exist? %w( app/models/user.rb )
 test_value_eql? true
 
 desc "User Model injection matches"