hobo 1.3.3 → 1.4.0.pre2

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

@@ -32,7 +32,7 @@ module Hobo
           allowed = params.dup
           params.each do |p|
             if (refl = model.reflections[p]) && refl.macro == :belongs_to
-              allowed << refl.primary_key_name.to_s
+              allowed << refl.foreign_key.to_s
               allowed << refl.options[:foreign_type] if refl.options[:polymorphic]
             end
           end

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

@@ -25,7 +25,7 @@ module Hobo
           allowed = params.dup
           params.each do |p|
             if (refl = model.reflections[p]) && refl.macro == :belongs_to
-              allowed << refl.primary_key_name.to_s
+              allowed << refl.foreign_key.to_s
               allowed << refl.options[:foreign_type] if refl.options[:polymorphic]
             end
           end

data/lib/hobo/model/permissions.rb

@@ -339,9 +339,9 @@ module Hobo
       def with_attribute_or_belongs_to_keys(attribute)
         if (refl = self.class.reflections[attribute.to_sym]) && refl.macro == :belongs_to
           if refl.options[:polymorphic]
-            yield refl.primary_key_name, refl.options[:foreign_type]
+            yield refl.foreign_key, refl.options[:foreign_type]
           else
-            yield refl.primary_key_name, nil
+            yield refl.foreign_key, nil
           end
         else
           yield attribute.to_s, nil
@@ -387,7 +387,7 @@ module Hobo
 
         if (refl = self.class.reflections[attr.to_sym]) && refl.macro == :belongs_to
           # A belongs_to -- also unknownify the underlying fields
-          unknownify_attribute refl.primary_key_name
+          unknownify_attribute refl.foreign_key
           unknownify_attribute refl.options[:foreign_type] if refl.options[:polymorphic]
         else
           # A regular field -- hack the dirty tracking methods
@@ -430,7 +430,7 @@ module Hobo
 
         if (refl = self.class.reflections[attr]) && refl.macro == :belongs_to
           # A belongs_to -- restore the underlying fields
-          deunknownify_attribute refl.primary_key_name
+          deunknownify_attribute refl.foreign_key
           deunknownify_attribute(refl.options[:foreign_type], false) if refl.options[:polymorphic]
         else
           # A regular field -- restore the dirty tracking methods

data/lib/hobo/model/scopes.rb

@@ -2,12 +2,13 @@ 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
+
       def self.included_in_class(klass)
         klass.class_eval do
           extend ClassMethods
-          metaclass.alias_method_chain :valid_keys_for_has_many_association,   :scopes
-          metaclass.alias_method_chain :valid_keys_for_has_one_association,    :scopes
-          metaclass.alias_method_chain :valid_keys_for_belongs_to_association, :scopes
         end
       end
 
@@ -17,20 +18,6 @@ module Hobo
 
         include ApplyScopes
 
-        # --- monkey-patches to allow :scope key on has_many, has_one and belongs_to ---
-
-        def valid_keys_for_has_many_association_with_scopes
-          valid_keys_for_has_many_association_without_scopes + [:scope]
-        end
-
-        def valid_keys_for_has_one_association_with_scopes
-          valid_keys_for_has_one_association_without_scopes + [:scope]
-        end
-
-        def valid_keys_for_belongs_to_association_with_scopes
-          valid_keys_for_belongs_to_association_without_scopes + [:scope]
-        end
-
       end
 
     end

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

@@ -354,18 +354,18 @@ module Hobo
 
           if reflection.options[:through]
             join_table   = reflection.through_reflection.klass.table_name
-            owner_fkey   = reflection.through_reflection.primary_key_name
+            owner_fkey   = reflection.through_reflection.foreign_key
             conditions   = reflection.options[:conditions].blank? ? '' : " AND #{reflection.through_reflection.klass.send(:sanitize_sql_for_conditions, reflection.options[:conditions])}"
 
             if any
               "EXISTS (SELECT * FROM #{join_table} WHERE #{join_table}.#{owner_fkey} = #{owner_primary_key}#{conditions})"
             else
-              source_fkey  = reflection.source_reflection.primary_key_name
+              source_fkey  = reflection.source_reflection.foreign_key
               "EXISTS (SELECT * FROM #{join_table} " +
                 "WHERE #{join_table}.#{source_fkey} = ? AND #{join_table}.#{owner_fkey} = #{owner_primary_key}#{conditions})"
             end
           else
-            foreign_key = reflection.primary_key_name
+            foreign_key = reflection.foreign_key
             related     = reflection.klass
             conditions = reflection.options[:conditions].blank? ? '' : " AND #{reflection.klass.send(:sanitize_sql_for_conditions, reflection.options[:conditions])}"
 
@@ -401,15 +401,7 @@ module Hobo
 
 
         def def_scope(&block)
-          _name = name.to_sym
-          @klass.scope _name, (lambda &block)
-          # this is tricky; ordinarily, we'd worry about subclasses that haven't yet been loaded.
-          # HOWEVER, they will pick up the scope setting via read_inheritable_attribute when they do
-          # load, so only the currently existing subclasses need to be fixed up.
-          _scope = @klass.scopes[_name]
-          @klass.send(:descendants).each do |k|
-            k.scopes[_name] = _scope
-          end
+          @klass.scope name.to_sym, (lambda &block)
         end
 
 
@@ -419,7 +411,7 @@ module Hobo
 
 
         def foreign_key_column(refl)
-          "#{@klass.table_name}.#{refl.primary_key_name}"
+          "#{@klass.table_name}.#{refl.foreign_key}"
         end
 
       end

data/lib/hobo/rapid/helper.rb

@@ -1,167 +1,7 @@
 module Hobo
   module Rapid
     module Helper
-
-      def comma_split(x)
-        case x
-        when nil
-          []
-        when String
-          x.strip.split(/\s*,\s*/)
-        else
-          x.compact.map{|e| comma_split(e)}.flatten
-        end
-      end
-
-      def rapid_build_callbacks(options)
-        callbacks = {}
-        options.each do |callback, code|
-          if AJAX_CALLBACKS.include?(callback.to_sym)
-            name = 'on' + callback.to_s.capitalize
-            callbacks[name] = "function(request){#{code}}"
-          end
-        end
-        callbacks
-      end
-
-
-      def options_for_hobo_ajax(options)
-        js_options = rapid_build_callbacks(options)
-
-        js_options['asynchronous']  = false if options[:type] == :synchronous
-        js_options['method']        = method_option_to_s(options[:method]) if options[:method]
-        js_options['evalScripts']   = false if options[:script] == false
-        js_options['form']          = options[:form] if options[:form]
-        js_options['params']        = make_params_js(options[:params]) if options[:params]
-        js_options['resultUpdate']  = js_result_updates(options[:result_update]) if options[:result_update]
-        js_options['resetForm']     = options[:reset_form] if options.has_key?(:reset_form)
-        js_options['refocusForm']   = options[:refocus_form] if options.has_key?(:refocus_form)
-        js_options['spinnerNextTo'] = js_str(options[:spinner_next_to]) if options.has_key?(:spinner_next_to)
-        js_options['message']       = js_str(options[:message]) if options[:message]
-
-        js_options.empty? ? nil : options_for_javascript(js_options)
-      end
-
-
-      def js_updates(updates)
-        return '[]' unless updates
-        updates = [updates] unless updates.is_a? Array
-        updates = comma_split(updates).map do |u|
-          if u.to_s == "self"
-            "Hobo.partFor(this)"
-          else
-            js_str(u)
-          end
-        end
-        "[#{updates * ', '}]"
-      end
-
-
-      def js_result_updates(updates)
-        return '[]' unless updates
-        updates = [updates] unless updates.is_a? Array
-        pairs = comma_split(updates).map &it.split(/\s*=\s*/)
-        '[' + pairs.map{|p| "{id: #{js_str(p[0])}, result: #{js_str(p[1])}}"}.join(", ") + ']'
-      end
-
-
-      def ajax_updater(url_or_form, update, options={})
-        options ||= {}
-        options = options.symbolize_keys
-
-        target = if url_or_form == :post_form
-                   target = "this"
-                 else
-                   js_str(url_or_form)
-                 end
-        js_options = options_for_hobo_ajax(options)
-        args = [target, js_updates(update), js_options].compact
-
-        confirm = options.delete(:confirm)
-
-        func = "Hobo.ajaxRequest(#{args * ', '})"
-        if confirm
-          "if (confirm(#{js_str(confirm)})) { #{func} }"
-        else
-          func
-        end
-      end
-
-
-      def a_or_an(word)
-        if word =~ /^[aeiouh]/
-          "an #{word}"
-        else
-          "a #{word}"
-        end
-      end
-
-
-      def no_break(s)
-        s = new_context { yield } if block_given?
-        s.gsub(' ', ' ')
-      end
-
-      # returns the number of items in the collection.  See LH #889
-      def collection_count
-        this.try.to_int || this.try.total_entries || (this.try.loaded? && this.try.length) || this.try.count || this.try.length
-      end
-
-
-      def in_place_editor(attributes, this=nil)
-        blank_message = attributes.delete(:blank_message) ||
-                        t('hobo.in_place_editor.click_to_edit', :default => '(click to edit)')
-
-        attributes = add_classes(attributes, "in-place-edit", model_id_class(this_parent, this_field))
-        attributes.update(:hobo_blank_message => blank_message,
-                          :if_blank => blank_message,
-                          :no_wrapper => false)
-
-        edit_text = this._?.to_s
-        attributes.update(:hobo_edit_text => edit_text) unless edit_text.nil?
-
-        if update = attributes.delete(:update)
-          attributes = add_classes(attributes, update_elements_class(update))
-        end
-
-        view(attributes)
-      end
-
-
-
-      AJAX_CALLBACKS = [ :success, :failure, :complete ]
-
-      AJAX_ATTRS = AJAX_CALLBACKS + [ :update, :type, :method,
-                                      :script, :form, :params, :confirm, :message,
-                                      :reset_form, :refocus_form, :result_update, :spinner_next_to ]
-
-
-      def through_collection_names(object=this)
-        object.class.reflections.values.select do |refl|
-          refl.macro == :has_many && refl.options[:through]
-        end.map {|x| x.options[:through]}
-      end
-
-
-      def non_through_collections(object=this)
-        names = object.class.reflections.values.select do |refl|
-          refl.macro == :has_many
-        end.*.name
-
-        names - through_collection_names
-      end
-
-      def standard_fields(model, include_timestamps=false)
-        fields = model.attr_order.*.to_s & model.content_columns.*.name
-        fields -= %w{created_at updated_at created_on updated_on deleted_at} unless include_timestamps
-        fields.reject! { |f| model.never_show? f }
-        fields
-      end
-
-      def current_time
-        Time.zone ? Time.zone.now : Time.now
-      end
-
+      # functions have moved to HoboRapidHelper
     end
   end
 end

data/lib/hobo/rapid/taglibs/rapid.dryml

@@ -1,25 +1,11 @@
 <!--
 
+Hobo rapid has moved into its own gem.
+
 The Rapid tag library makes web development go fast. The Rapid tag library is your friend.
 
 (This taglib defines no tags - it just includes all the other taglibs. Move along. Nothing to see here.)
 
 -->
 
-<include module="Hobo::Helper"/>
-<include module="Hobo::Rapid::Helper"/>
-<include module="Hobo::Helper::Translations"/>
-
-<include src="rapid_core"/>
-<include src="rapid_support"/>
-<include src="rapid_document_tags"/>
-<include src="rapid_pages"/>
-<include src="rapid_editing"/>
-<include src="rapid_forms"/>
-<include src="rapid_navigation"/>
-<include src="rapid_plus"/>
-<include src="rapid_generics"/>
-<include src="rapid_lifecycles"/>
-<include src="rapid_summary"/>
-<include src="rapid_user_pages"/>
-<include src="rapid_i18n"/>
+<% Rails.logger.warn '<include src="rapid" plugin="hobo"/> should be replaced with <include gem="hobo_rapid"/>' %>

data/test/doctest/hobo/hobo_helper.rdoctest

@@ -1,19 +1,13 @@
-# Hobo::Helper
-
-Various view helpers
+    doctest: prepare testapp environment
+    doctest_require: '../prepare_testapp'
 
-        doctest_require: 'rubygems'
-        doctest_require: 'active_support'
-        doctest_require: 'mocha'
-        doctest_require: '../../../hobo_support/lib/hobo_support'
-        doctest_require: '../../../hobo_fields/lib/hobo_fields'
-        doctest_require: '../../lib/hobo'
+# Hobo::Helper
 
 Create a mock view layer:
 
         >>
          class View
-           extend Hobo::Helper
+           extend HoboRouteHelper
            class << self
              protected_instance_methods.each {|m| public m }
 
@@ -22,19 +16,11 @@ Create a mock view layer:
              def base_url; "" ;end
            end
          end
-        >> Rails.root = "test-app"
 
 Useful stuff
 
         >> def init_mocha; $stubba = Mocha::Central.new; end
-        >>
-         class Thing
-           class Mocks; extend Mocha::AutoVerify; end
-             def self.mock(hash)
-             Mocks.mock(hash.update(:class => self))
-           end
-         end
-
+        >> def mock; Mocha::Mockery.instance.named_mock 'mock'; end
 
 ## `object_url`
 
@@ -45,7 +31,9 @@ Note that `object_url` doesn't perform "reverse routing". It knows nothing about
 Something to link to:
 
         >> init_mocha
-        >> thing = Thing.mock(:to_url_path => "things/1")
+        >> class Thing; end
+        >> thing = Thing.new
+        >> thing.expects(:to_url_path).at_least_once.returns("things/1")
 
 ### Simple 'show' URLs
 
@@ -66,27 +54,3 @@ A URL to the 'edit' page:
         => "/things/1/edit"
 
 
-### POST URLs for creating new items in collections:
-
-        >> collection = mock(:origin => thing, :origin_attribute => "parts")
-        >> Hobo::Routes.expects(:linkable?).with(Thing, :create_part, {:subsite => '', :method => :post}).returns(true)
-        >> View.object_url(collection, :method => :post)
-        => "/things/1/parts"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/{doctests → test/doctest}/hobo/model.rdoctest

@@ -52,10 +52,8 @@ declaration:
 
      end
 
-    $ rails generate hobo:migration -n -m
-
     >> Rails::Generators.invoke 'hobo:migration', %w(-n -m)
-    >> Post.all
+    >> Post.connection.execute 'select * from posts'  # Post.all was breaking : /
     => []
 {.hidden}
 
@@ -133,7 +131,7 @@ object.  In this case, you can provide your own name method instead:
     $ rails generate hobo:migration -n -m
 
     >> Rails::Generators.invoke 'hobo:migration', %w(-n -m)
-    >> Person.all
+    >> Person.connection.execute 'select * from people'
     => []
 {.hidden}
 

data/{doctests → test/doctest}/hobo/multi_model_forms.rdoctest

@@ -11,30 +11,9 @@ Contents
 - contents
 {:toc}
 
-    >> require 'rubygems'
-    >> require 'active_support'
-    >> require 'active_record'
-    >> require 'action_pack'
-    >> require 'action_view'
-    >> require 'action_controller'
-    >> mysql_adapter = defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'
-    >> mysql_user = 'root'; mysql_password = ''
-    >> mysql_login = "-u #{mysql_user} --password='#{mysql_password}'"
-    >> mysql_database = "hobo_fields_doctest"
-    >> system "mysqladmin #{mysql_login} --force drop #{mysql_database} 2> /dev/null"
-    >> system("mysqladmin #{mysql_login} create #{mysql_database}") or raise "could not create database"
-    >> ActiveRecord::Base.establish_connection(:adapter => mysql_adapter,
-                                               :database => mysql_database,
-                                               :host => "localhost",
-                                               :username => mysql_user,
-                                               :password => mysql_password)
-    >> $:.unshift File.expand_path('../../../../hobo_support/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../hobo_fields/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../dryml/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../lib', __FILE__)
-    >> gem 'will_paginate', ">= 3.0.pre"
-    >> require 'will_paginate'
-    >> require 'hobo'
+    doctest: prepare testapp environment
+    doctest_require: '../prepare_testapp'
+
     >> ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(StringIO.new(''))
     >>
      def migrate(renames={})