hobo 1.3.0 → 1.3.1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/hobo/controller/model.rb

@@ -495,6 +495,9 @@ module Hobo
       response_block(&b)
     end
 
+    def hobo_edit(*args, &b)
+      hobo_show(*args, &b)
+    end
 
     def hobo_new(record=nil, &b)
       self.this = record || model.user_new(current_user)

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

@@ -8,6 +8,17 @@ module ActiveRecord
     end
   end
 
+  module SpawnMethods
+    def merge_with_origin(r)
+      merged = merge_without_origin(r)
+      merged.origin ||= r.respond_to?(:origin) && r.origin
+      merged.origin_attribute ||= r.respond_to?(:origin_attribute) && r.origin_attribute
+      merged
+    end
+
+    alias_method_chain :merge, :origin
+  end
+
   module Associations
     class AssociationCollection
 

data/lib/hobo/helper.rb

@@ -127,7 +127,11 @@ module Hobo
 
 
     def recognize_page_path
-      Rails.application.routes.recognize_path(params[:page_path]||request.fullpath)
+      if params[:page_path]
+        Rails.application.routes.recognize_path(params[:page_path].gsub(/^#{Rails.configuration.action_controller.relative_url_root}/,''))
+      else
+        params
+      end
     end
 
     def url_for_page_path(options={})
@@ -436,13 +440,6 @@ module Hobo
       this_parent.class.try.attribute_help(this_field.to_sym) || ""
     end
 
-
-    # --- default Helpers --- #
-
-    def your_default
-      this == current_user ? "Your" : (this.name.ends_with?('s') ? "#{this.name}'" : "#{this.name}'s")
-    end
-
     # --- Debugging Helpers ---- #
 
     def abort_with(*args)

data/lib/hobo/model.rb

@@ -57,35 +57,6 @@ module Hobo
           alias_method_chain :replace, :hobo_metadata
         end
 
-        WillPaginate::ActiveRecord::Pagination.class_eval do
-
-          def apply_hobo_metadata(collection)
-            klass = Object.instance_method(:class).bind(self).call
-            is_relation = klass <= ActiveRecord::Relation
-            is_association_proxy = klass <= ActiveRecord::Associations::AssociationProxy
-            collection.member_class     = (is_relation || is_association_proxy) ? member_class : self
-            collection.origin           = try.proxy_owner
-            collection.origin_attribute = try.proxy_reflection._?.name
-            collection
-          end
-
-          # NOTE: as of will_paginate 3.0.0, the standard paginate method calls the page method.
-          # However, it converts an association proxy into a relation first (via adding a limit clause),
-          # which causes the proxy_owner and proxy_reflection methods to disappear.
-          def paginate_with_hobo_metadata(*args, &block)
-            collection = paginate_without_hobo_metadata(*args, &block)
-            apply_hobo_metadata(collection)
-          end
-          alias_method_chain :paginate, :hobo_metadata
-
-          def page_with_hobo_metadata(*args, &block)
-            collection = page_without_hobo_metadata(*args, &block)
-            apply_hobo_metadata(collection)
-          end
-          alias_method_chain :page, :hobo_metadata
-
-        end
-
       end
     end
 

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

@@ -324,7 +324,10 @@ module Hobo
               words = query.split
               args = []
               word_queries = words.map do |word|
-                field_query = '(' + fields.map { |field| "(#{@klass.table_name}.#{field} #{match_keyword} ?)" }.join(" OR ") + ')'
+                field_query = '(' + fields.map { |field|
+                  field = "#{@klass.table_name}.#{field}" unless field =~ /\./
+                  "(#{field} #{match_keyword} ?)"
+                }.join(" OR ") + ')'
                 args += ["%#{word}%"] * fields.length
                 field_query
               end

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

@@ -120,7 +120,7 @@ This will use `<input/>` as the tag in each table cell instead of `<view/>`
           <with-field-names merge-attrs="&all_attributes & attrs_for(:with_fields)">
             <th param="#{scope.field_name}-heading"><%= this.member_class.human_attribute_name(scope.field_name) if scope %></th>
           </with-field-names>
-          <th if="&all_parameters[:controls]" class="controls"/>
+          <th if="&all_parameters[:controls]" class="controls" param="controls-heading"/>
         </tr>
       </thead>
       <tbody param>
@@ -180,11 +180,11 @@ Provides a short hand way of displaying images in public/images
        res << "var pluralisations = {#{names * ', '}}; "
      end
      base = [base_url, subsite].compact.join("/")
-     res << "urlBase = '#{base}'; hoboPagePath = '#{request.fullpath}'"
+     res << "urlBase = '#{base}'; hoboPagePath = '#{CGI.escape(request.fullpath)}'"
      if protect_against_forgery?
        res << "; formAuthToken = { name: '#{request_forgery_protection_token}', value: '#{form_authenticity_token}' }"
      end
-     res
+     res.html_safe
   %></script>
 </def>
 
@@ -597,7 +597,7 @@ with :it locale and summary="choice" (key "tags.count.choice")
             when this.is_a?(Class)
               this.model_name.human(:count=>c)
             when (attr = this.try.origin_attribute)
-              this_parent.class.human_attribute_name(attr, :count=>c)
+              (this_parent || this.origin).class.human_attribute_name(attr, :count=>c)
             else
               this.member_class.model_name.human(:count=>c)
             end
@@ -758,13 +758,14 @@ Notes
 
 - `<your>Posts</your>`: "your Posts" or "Jim's Posts"
  -->
-<def tag="your" attrs="key, capitalize"><%=
+<def tag="your" attrs="key, capitalize, name"><%=
    key ||= 'default'
+   name ||= name(:no_wrapper => true)
    # prepare symbolized attributes for merging
    attrs = {}
    attributes.each_pair{|k,v| attrs[k.to_sym] = v}
-   d = "#{your_default} #{all_parameters.default}"
-   options = {:default=>[d], :count=>(attrs[:count]||1), :name=>name(:no_wrapper => true)}
+   d = "#{h name}'#{'s' unless name.ends_with?('s')} #{all_parameters.default}"
+   options = {:default=>[d], :count=>(attrs[:count]||1), :name=>name}
    your_key = key.split('.').last
    unless key.eql?(your_key) || attrs.has_key?(your_key.to_sym)
      options[your_key.to_sym] = t(key, :count=>options[:count], :default=>your_key.titleize)
@@ -776,7 +777,7 @@ Notes
          options[:default].unshift :"tags.your.default.other_user"
          t("tags.your.#{your_key}.other_user", options.merge(attrs))
        end
-   capitalize ? s.sub(/^./){|c| c.upcase} : s
+   (capitalize ? s.sub(/^./){|c| c.upcase} : s).html_safe
 %></def>
 
 <!-- Capitalised version of `<a-or-an>` -->

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

@@ -773,7 +773,7 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
   min_chars ||= 1
   value = name(:no_wrapper => true, :if_present => true)
   -%>
-  <wrap tag="span" class="field-with-errors" when="&!this_parent.errors[this_field].empty?">
+  <wrap tag="span" class="field-with-errors" when="&!this_parent.nil? && !this_parent.errors[this_field].empty?">
     <input type="text" name="#{param_name_for_this}"
            class="autocompleter #{type_and_field._?.dasherize} #{css_data :complete_on, typed_id(complete_target), completer} #{css_data :min_chars, min_chars} #{'nil-value' if value==''}"
            value="#{value=='' ? nil_value : value}"

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

@@ -14,11 +14,21 @@ All of the [standard ajax attributes](/api_taglibs/rapid_forms) are also support
 
 Transitions with parameters are implemented using a form.  HTML does not allow forms to be nested, so a transitions with parameters should not be placed inside of a form.
 
+### Invalid transitions
+
+If the transition could not be found, the user does not have permissions for the transition or the object is not in the correct state for the transition, the transition-button displays nothing.  You can use an `<else>` to display an appropriate message.
+
+     <transition-button transition="mogrify"/><else>Cannot mogrify</else>
+
   -->
 <def tag="transition-button" attrs="transition, update, label"><%=
     if transition.is_a?(String)
       transition = this.lifecycle.find_transition(transition, current_user)
     end
+    if transition.nil?
+      Dryml.last_if = false
+      return ""
+    end
     transition_name = transition.name
     has_params = !transition.options[:params].blank?
     ajax_attributes, html_attributes = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS)
@@ -43,6 +53,28 @@ Transitions with parameters are implemented using a form.  HTML does not allow f
 </def>
 
 
+<!-- Displays a link to a lifecycle transition page if the transition is valid.  If the transition is valid, this is equivalent to:
+
+    <a action="&transition" ...
+
+If the transition is invalid, you may use the `<else>` tag to display an appropriate message:
+
+    <transition-link transition="mogrify">Mogrify</transition-link>
+    <else>Cannot mogrify</else>
+
+### Attributes
+
+All attributes and parameters for the `<a>` tag are also valid.
+
+ - `transition` - the name of the transition to invoke. Required
+  -->
+<def tag="transition-link" attrs="transition"><%
+    trans = this.lifecycle.find_transition(transition, current_user) %>
+    <if test="&trans">
+      <a action="&transition" merge/>
+    </if>
+</def>
+
 <!-- Renders a div containing transition buttons for every transition available to the current user.
 
 For example, you could use this on a `Friendship` card: the person invited to have friendship would automatically see 'Accept' and 'Decline' buttons, while the person initiating the invite would see 'Retract'.

metadata

@@ -1,104 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hobo
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.3.1
   prerelease: 
-  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-14 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hobo_support
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hobo_fields
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: hobo_fields
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dryml
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: dryml
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: will_paginate
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rubydoctest
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rubydoctest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: irt
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: irt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.5
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
 description: The web app builder for Rails
 email: tom@tomlocke.com
-executables: 
+executables:
 - hobo
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGES-1.1.txt
 - CHANGES.txt
 - LICENSE.txt
@@ -318,33 +349,30 @@ files:
 - test/permissions/models/models.rb
 - test/permissions/models/schema.rb
 - test/permissions/test_permissions.rb
-has_rdoc: true
 homepage: http://hobocentral.net
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: hobo
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The web app builder for Rails
 test_files: []
-
+has_rdoc: