hobo 1.3.0.RC1 → 1.3.0.RC2

data/VERSION

@@ -1 +1 @@
-1.3.0.RC1
+1.3.0.RC2

data/hobo.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
   s.add_runtime_dependency('hobo_fields', ["= #{version}"])
   s.add_runtime_dependency('dryml', ["= #{version}"])
-  s.add_runtime_dependency('will_paginate', [">= 3.0.pre"])
+  s.add_runtime_dependency('will_paginate', [">= 3.0.0"])
 
   s.add_development_dependency('rubydoctest', [">= 0"])
   s.add_development_dependency('shoulda', [">= 0"])

data/lib/generators/hobo/i18n/templates/app.nb.yml

@@ -0,0 +1,25 @@
+# Even if you only support one language, you can use this file to customise the names that appear in the UI
+# e.g.
+
+nb:
+  hello: "Hei verden"
+
+#  attributes:
+#    created_at: Opprettet
+#    updated_at: Endret
+#
+#  activerecord:
+#    models:
+#      user:
+#        one: Bruker
+#        other: Brukere
+#    attributes:
+#      user:
+#        name: Navn
+#        password: Passord
+#        current_password: Gjeldende Password
+#        password_confirmation: Bekreft Passord
+#        email_address: E-post
+#    attribute_help:
+#      user:
+#        email_address: Vi kommer aldri til � dele mailadressen din med tredjepart

data/lib/generators/hobo/i18n/templates/hobo.nb.yml

@@ -0,0 +1,198 @@
+# Hobo internals translation file for Norwegian
+# Translated by Ronny Hanssen (super.ronny@gmail.com)
+# If you find an error or if you have suggestions on improvements, please post it to http://hobousers.googlegroups.com.
+
+nb:
+  hobo:
+    # default hobo pages translations
+    index:
+      # if you uncomment the following you will loose the automatic selection of dynamically pluralized nav-tabs
+      # if you need a different title you should implement a different way to select the tab on your own
+      #title: "%{model} Index"
+      heading: "%{model}liste"
+
+    new:
+      title: "Ny %{model}"
+      heading: "Ny %{model}"
+
+    show:
+      title: "%{model}"
+      heading: "%{model} %{name}"
+      back_link: "Tilbake"
+      edit_link: "Endre %{model}"
+      new_link: "Ny %{model}"
+      add_form_heading: "Legg til %{model}"
+
+    edit:
+      title: "Endre %{model}"
+      heading: "Endre %{model}"
+
+    index_for_owner:
+      title: "%{model} for"
+      # be aware that you will loose the automatic Your <collection> / Jom's <collection>
+      # default output for User models
+      # you better define the heading.* in the specific collection namespace
+      #heading:
+      subheading: "For:"
+
+    new_for_owner:
+      title: "Ny %{model} for"
+      heading: "Ny %{model}"
+      subheading: "For:"
+
+    login:
+      title: "Logg på"
+      heading: "Logg på"
+      email_address: &email_address "E-post adresse"
+      name: "Navn"
+      password: "Passord"
+      remember_me: "Husk meg"
+      login: "Logg på"
+      signup: "Opprett konto"
+      forgot_password: &forgot_password "Glemt passordet?"
+
+    signup:
+      title: "Opprett Konto"
+      heading: "Opprett Konto"
+
+    forgot_password:
+      title: *forgot_password
+      heading: *forgot_password
+      text: "Skriv inn epost-adressen du brukte når du registrerte deg.
+             Vi sender deg en epost som du kan bruke for å generere et nytt passord."
+      email_address: *email_address
+      send: "Send"
+
+    forgot_password_sent:
+      title: "Gjenopprettelse av passord - Epost sendt."
+      heading: "Gjenopprettelse av passord - Epost sendt."
+      text: "En epost med instruksjoner om hvordan du kan opprette nytt passsord har blitt sendt til %{email_address}. Hvis du ikke mottar denne mailen så vennligst sjekk søppelpostfilter o.l."
+
+    account_disabled_page:
+      title: "Konto inaktiv"
+      heading: "Konto inaktiv"
+      text: "Kontoen din er inaktiv for øyeblikket."
+
+    account_page:
+      title: "Din Konto"
+      heading: "Din Konto"
+      new_password: "Nytt passord"
+      confirm_new_password: "Bekreft nytt passord"
+
+    # default hobo action translation
+    # The action with added model variable are new, create, delete, save,
+    # edit and back_to_parent
+    actions:
+      new: "Ny %{model}"
+      create: "Opprett %{model}"
+      previous: "Forrige"
+      next: "Neste"
+      add: "Legg til"
+      show_all: "Vis alle %{model}..."
+      delete: "Slett %{model}"
+      save: "Lagre %{model}"
+      cancel: "Avbryt"
+      edit: "Endre %{model}"
+      edit_control: "Endre"
+      back: "Tilbake til"
+      back_to_parent: "Tilbake til %{parent} %{name}"
+      send: "Send"
+      remove: "Fjern"
+      signup: "Opprett konto"
+      login: "Logg på"
+      logout: "Logg av"
+      logged_in_as: "Logget på som %{name}"
+      account: "Konto"
+      save_account: "Lagre Dine Innstillinger"
+
+    # default hobo message translation
+    messages:
+      create:
+        success: "%{model} ble opprettet"
+        error: "Klarte ikke å opprette %{model}.\n%{errors}"
+      creator:
+        error: "Kunne ikke utføre oppretteren; %{name}.\n%{errors}"
+      transition:
+        error: "Kunne ikke utføre transisjonen; %{name}.\n%{errors}"
+      update:
+        no_attribute_error: "Ingen oppdatering spesifisert i 'params'"
+        success: "Endringene for %{model} ble lagret"
+        error: "Det oppsto et problem med å gjennomføre denne endringen.\n%{errors}"
+      destroy:
+        success: "%{model} ble slettet"
+      signup:
+        success: "Takk for at du opprettet en konto!"
+        must_activate: "Du må aktivere kontoen din før du kan logge på. Vennligst sjekk eposten din."
+      login:
+        success: "Du er nå logget på."
+        error: "Du oppga ikke et gyldig %{login} og passord!"
+      logout: "Du er nå logget av."
+      reset_password: "Passordet ditt har blitt tilbakestilt."
+      permission_denied: "Ingen Tilgang"
+      not_found: "Finner ikke siden du ba om."
+      unauthenticated: "Kunne ikke autentisere deg"
+      validate_password: "må være minst 6 tegn langt og kan ikke være bare små bokstaver"
+      current_password_is_not_correct: "er ikke riktig"
+      you_are_site_admin: "Du har nå admininstrator-rettigheter for dette webstedet"
+      you_signed_up: "Du har opprettet konto"
+      none: "Ingen %{model} tilgjengelig."
+      confirm: "Er du sikker?"
+
+    # default hobo collection translation
+    collection:
+      count: &collection_count
+        zero: "Ingen %{model}"
+        one: "Viser %{count} %{model}"
+        other: "Viser %{count} %{model}"
+      # you can use the following to completely override the collection heading
+      # be aware that you will loose the automatic Your <collection> / Jom's <collection>
+      # default output for User models
+      # you better define the heading.* in the specific collection namespace
+      #heading:
+      add_form_heading: "Legg til %{model}"
+      empty_message: "Ingen poster å vise"
+
+    # default hobo form translation
+    form:
+      new:
+        heading: "Ny %{model}"
+      error:
+        heading: "Følgende feil oppstod:"
+      select_many:
+            prompt: "Legg til %{model}"
+
+    # hobo support
+    support:
+      or: "eller"
+      a: "en"
+      an: "en"
+
+    table_plus:
+      search: "Søk"
+      submit_label: "Søk"
+
+    live_search:
+      label: "Søk"
+      results_label: "Søkeresultater"
+      close_button: "lukk"
+      no_results: "Ingen resultater for søket ditt."
+
+    dev_user_changer:
+      guest: "Gjest"
+
+    admin:
+      subsite_name: "Admin"
+      invite_new_user: "Invitér en ny bruker"
+
+    subsite:
+      back_link: "Tlbake til nettstedet"
+
+    boolean_yes: "Ja"
+    boolean_no: "Nei"
+    password_hidden: "[passordet er skjult]"
+
+    in_place_editor:
+      click_to_edit: "(klikk her for å endre)"
+
+    select_one_editor:
+      blank_message: *no_model

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

@@ -444,23 +444,6 @@ var Hobo = {
     },
 
 
-    fixSectionGroup: function(e) {
-	    rows = e.childElements().map(function(e, i) {
-    	    cells = e.childElements().map(function(e, i) {
-        	    return e.outerHTML.sub("<DIV", "<td  valign='top'").sub(/<\/DIV>$/i, "</td>")
-            }).join('')
-
-            var attrs = e.outerHTML.match(/<DIV([^>]+)/)[1]
-            return "<tr" + attrs + ">" + cells + "</tr>"
-	    }).join("\n")
-
-        var attrs = e.outerHTML.match(/<DIV([^>]+)/)[1]
-
-	    var table= "<table cellpadding='0' cellspacing='0' border='0' style='border-collapse: collapse; border-spacing: 0'" + attrs + ">" +
-	               rows + "</table>"
-	    e.outerHTML = table
-    },
-
     makeHtmlEditor: function(textarea) {
         // do nothing - plugins can overwrite this method
     }
@@ -913,10 +896,6 @@ AutocompleteBehavior = Behavior.create({
 Event.addBehavior.reassignAfterAjax = true;
 Event.addBehavior({
 
-    'div.section-group' : function() {
-        if (Prototype.Browser.IE) Hobo.fixSectionGroup(this);
-    },
-
     'div.select-many.input' : SelectManyInput(),
 
     'textarea.html' : function() {

data/lib/generators/hobo/routes/router.rb

@@ -34,7 +34,7 @@ module Generators
             routes << link("put '#{records}/:id/#{transition}(.:format)' => '#{records}#do_#{transition}', :as => 'do_#{record}_#{transition}'", transition, :put)
             routes << link("get '#{records}/:id/#{transition}(.:format)' => '#{records}##{transition}', :as => '#{record}_#{transition}'", transition)
           end
-          routes.compact
+          routes.compact.uniq
         end
 
         def resource_routes

data/lib/hobo/controller/model.rb

@@ -785,16 +785,16 @@ module Hobo
 
 
     def this
-      @this ||= (instance_variable_get("@#{model.name.underscore}") ||
-                 instance_variable_get("@#{model.name.underscore.pluralize}"))
+      @this ||= (instance_variable_get("@#{model.name.demodulize.underscore}") ||
+                 instance_variable_get("@#{model.name.demodulize.underscore.pluralize}"))
     end
 
 
     def this=(object)
-      ivar = if object.is_a?(Array)
-               (object.try.member_class || model).name.underscore.pluralize
+      ivar = if object.is_a?(Array) || object.respond_to?(:member_class)
+               (object.try.member_class || model).name.demodulize.underscore.pluralize
              else
-               object.class.name.underscore
+               object.class.name.demodulize.underscore
              end
       @this = instance_variable_set("@#{ivar}", object)
     end

data/lib/hobo/model.rb

@@ -56,21 +56,45 @@ module Hobo
 
         WillPaginate::Collection.class_eval do
           attr_accessor :member_class, :origin, :origin_attribute
+
+          # make paginate_by_sql, etc. carry metadata
+          def replace_with_hobo_metadata(array)
+            result = replace_without_hobo_metadata(array)
+            self.member_class = array.try.member_class
+            self.origin = array.try.origin
+            self.origin_attribute = array.try.origin_attribute
+            result
+          end
+          alias_method_chain :replace, :hobo_metadata
         end
 
-        WillPaginate::Finders::Base.class_eval do
-          def paginate_with_hobo_metadata(*args, &block)
+        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 = paginate_without_hobo_metadata(*args, &block)
             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
@@ -119,7 +143,6 @@ module Hobo
       end
     end
 
-
     module ClassMethods
 
       # TODO: should this be an inheriting_cattr_accessor as well? Probably.

data/lib/hobo/model/lifecycles.rb

@@ -103,9 +103,9 @@ module Hobo
         end
 
         def transition(name, change, options={}, &block)
-          @lifecycle.def_transition(name,
-                                    Array(change.keys.first), change.values.first,
-                                    block, options)
+          change.each do |k,v|
+		    @lifecycle.def_transition(name, Array(k), v, block, options)
+          end
         end
 
         def invariant(&block)

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

@@ -41,7 +41,7 @@ module Hobo
           Creator.new(self, name.to_s, on_create, options)
         end
 
-        def self.def_transition(name, start_state, end_states, on_transition, options)
+        def self.def_transition(name, start_states, end_state, on_transition, options)
           class_eval %{
                        def #{name}!(user, attributes=nil)
                          transition(:#{name}, user, attributes)
@@ -50,7 +50,7 @@ module Hobo
                          can_transition?(:#{name}, user)
                        end
                       }
-          Transition.new(self, name.to_s, start_state, end_states, on_transition, options)
+          Transition.new(self, name.to_s, start_states, end_state, on_transition, options)
         end
 
         def self.state_names

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

@@ -29,7 +29,7 @@ model_key = model.to_s.underscore
 </def>
 <% end -%>
 
-<% transitions.each do |transition| -%>
+<% transitions.uniq{|s| s.name}.each do |transition| -%>
 <def tag="<%= transition.name.to_s.dasherize %>-form" polymorphic/>
 <def tag="<%= transition.name.to_s.dasherize %>-form" for="<%= model.name %>">
   <form lifecycle="<%= transition.name %>" merge param="default">

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

@@ -314,7 +314,7 @@ new_link = :new.in?(actions)
 
       <section param="content-body">
 <% if new_link -%>
-        <a action="new" to="&model" param="new-link">
+        <a action="new" to="&@<%= owner %>.<%= collection_name %>" param="new-link">
           <ht key="<%= model_key %>.actions.new" >New <%=model_name %></ht>
         </a>
 

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

@@ -496,12 +496,14 @@ Assuming the context is a blog post...
 <!-- Renders localized `number_with_delimiter this`, or `format % this` if the `format` attribute is given -->
 <def tag="view" for="Numeric" attrs="format"><%= format ? format % this : number_with_delimiter(this) %></def>
 
-<!-- Renders `this` with HTML escaping and newlines replaced with `<br>` tags -->
+<!-- If `this.html_safe?`, returns this unchanged.  Otherwise renders `this` with HTML escaping and newlines replaced with `<br>` tags -->
 <def tag="view" for="string"><%=
-  if !(this.class == String) && this.respond_to?(:to_html) # workaround for Maruku which adds String#to_html : (
+  if this.html_safe?
+    this
+  elsif !(this.class == String) && this.respond_to?(:to_html) # workaround for Maruku which adds String#to_html : (
     this.to_html(scope.xmldoctype)
   else
-    h(this).gsub("\n", "<br#{scope.xmldoctype ? ' /' : ''}>")
+    h(this).gsub("\n", "<br#{scope.xmldoctype ? ' /' : ''}>").html_safe
   end
 %></def>
 

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

@@ -25,7 +25,9 @@ Transitions with parameters are implemented using a form.  HTML does not allow f
 
     html_attributes[:method] ||= has_params ? :get : :put
     add_classes!(html_attributes, "transition-button #{transition_name}-button")
-    label = ht("#{this.class.to_s.underscore}.actions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
+    label = t("activerecord.attributes.#{this.class.to_s.underscore}.lifecycle.transitions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
+    title = t("activerecord.attribute_help.#{this.class.to_s.underscore}.lifecycle.transitions.#{transition_name}")
+    html_attributes.update(:title => title) unless title.empty? 
     url = object_url(this, transition_name, :method => html_attributes[:method])
 
     if (update || !ajax_attributes.empty?) && !has_params

metadata

@@ -2,7 +2,7 @@
 name: hobo
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.3.0.RC1
+  version: 1.3.0.RC2
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 -04:00
+date: 2011-08-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.RC1
+        version: 1.3.0.RC2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.RC1
+        version: 1.3.0.RC2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.RC1
+        version: 1.3.0.RC2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.pre
+        version: 3.0.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -147,6 +147,7 @@ files:
 - lib/generators/hobo/i18n/templates/app.es.yml
 - lib/generators/hobo/i18n/templates/app.fr.yml
 - lib/generators/hobo/i18n/templates/app.it.yml
+- lib/generators/hobo/i18n/templates/app.nb.yml
 - lib/generators/hobo/i18n/templates/app.pt-PT.yml
 - lib/generators/hobo/i18n/templates/app.ru.yml
 - lib/generators/hobo/i18n/templates/hobo.de.yml
@@ -154,6 +155,7 @@ files:
 - lib/generators/hobo/i18n/templates/hobo.es.yml
 - lib/generators/hobo/i18n/templates/hobo.fr.yml
 - lib/generators/hobo/i18n/templates/hobo.it.yml
+- lib/generators/hobo/i18n/templates/hobo.nb.yml
 - lib/generators/hobo/i18n/templates/hobo.pt-PT.yml
 - lib/generators/hobo/i18n/templates/hobo.ru.yml
 - lib/generators/hobo/invite_only.rb