hobo 1.3.0.pre15 → 1.3.0.pre16

data/VERSION

@@ -1 +1 @@
-1.3.0.pre15
+1.3.0.pre16

data/lib/generators/hobo/admin_subsite/admin_subsite_generator.rb

@@ -7,6 +7,7 @@ module Hobo
 
     include Generators::Hobo::Subsite
     include Generators::Hobo::InviteOnly
+    include Generators::HoboSupport::EvalTemplate
 
     def self.banner
       "rails generate hobo:admin_subsite [NAME=admin] [options]"
@@ -29,14 +30,9 @@ module Hobo
     end
 
     def append_admin_tag_into_application_taglib
-      source  = File.expand_path(find_in_source_paths('admin_tag_injection.erb'))
       destination = File.join(Rails.root, "app/views/taglibs/application.dryml")
-      context = instance_eval('binding')
-      append_file destination do
-        ERB.new(::File.binread(source), nil, '-').result(context)
-      end
+      append_file(destination) { eval_template('admin_tag_injection.erb') }
     end
 
-
   end
 end

data/lib/generators/hobo/admin_subsite/templates/admin_tag_injection.erb

@@ -2,7 +2,9 @@
 <extend tag="page">
   <old-page merge>
     <footer:>
-      <a href="&<%= file_name %>_<%= options[:user_resource_name].underscore.pluralize %>_url" if="&current_user.administrator?">Admin</a>
+      <a href="&<%= file_name %>_<%= options[:user_resource_name].underscore.pluralize %>_url" if="&current_user.administrator?">
+        <t key="hobo.admin.subsite_name"><%= name.titleize %></t>
+      </a>
     </footer:>
   </old-page>
 </extend>

data/lib/generators/hobo/admin_subsite/templates/users_index.dryml

@@ -1,5 +1,7 @@
 <index-page without-new-form>
   <after-count:>
-    <a with="&<%= options[:user_resource_name].camelize %>" action="invite">Invite a new user</a>
+    <a with="&<%= options[:user_resource_name].camelize %>" action="invite">
+      <t key="hobo.admin.invite_new_user">Invite a new user</t>
+    </a>
   </after-count:>
 </index-page>

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

@@ -15,7 +15,6 @@ en:
 #        other: Users
 #    attributes:
 #      user:
-#        created_at: Created at
 #        name: Name
 #        password: Password
 #        password_confirmation: Password Confirmation

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

@@ -85,7 +85,7 @@ en:
       previous: "Previous"
       next: "Next"
       add: "Add"
-      show_all: "show all..."
+      show_all: "Show all %{model}..."
       delete: "Delete %{model}"
       save: "Save %{model}"
       cancel: "Cancel"
@@ -175,6 +175,13 @@ en:
     dev_user_changer:
       guest: "Guest"
 
+    admin:
+      subsite_name: "Admin"
+      invite_new_user: "Invite a new user"
+
+    subsite:
+      back_link: "View Site"
+
     boolean_yes: "Yes"
     boolean_no: "No"
     password_hidden: "[password hidden]"

data/lib/generators/hobo/i18n/templates/hobo.es-DO.yml

@@ -91,7 +91,7 @@
       previous: "Precedente"
       next: "Proxima"
       add: "Añadir"
-      show_all: "todos..."
+      show_all: "Muestra todos %{model}..."
       delete: "Borrar %{model}"
       save: "Guardar %{model}"
       cancel: "Cancelar"
@@ -181,6 +181,13 @@
     dev_user_changer:
       guest: "Invitado"
 
+    admin:
+      subsite_name: "Administración"
+      invite_new_user: "Invitar Nuevo Usuario"
+
+    subsite:
+      back_link: "Sitio Principal"
+
     boolean_yes: "Si"
     boolean_no: "No"
     password_hidden: "[contraseña]"

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

@@ -91,7 +91,7 @@ it:
       previous: "Precedente"
       next: "Prossimo"
       add: "Aggiungere"
-      show_all: "vedi tutti..."
+      show_all: "Mostra tutti..."
       delete: "Elimina %{model}"
       save: "Registra %{model}"
       cancel: "Annulla"
@@ -182,6 +182,13 @@ it:
     dev_user_changer:
       guest: "Invitato"
 
+    admin:
+      subsite_name: "Amministrazione"
+      invite_new_user: "Invita Nuovo Utente"
+
+    subsite:
+      back_link: "Sito Principale"
+
     boolean_yes: "Si"
     boolean_no: "No"
     password_hidden: "[parola chiave]"

data/lib/generators/hobo/i18n/templates/hobo.pt-PT.yml

@@ -86,7 +86,7 @@
       previous: "Anterior"
       next: "Seguinte"
       add: "Adicionar"
-      show_all: "mostrar tudo..."
+      show_all: "Mostrar tudo %{model}..."
       delete: "Apagar %{model}"
       save: "Gravar %{model}"
       cancel: "Cancelar"
@@ -176,6 +176,13 @@
     dev_user_changer:
       guest: "Visitante"
 
+    admin:
+      subsite_name: "Administração"
+      invite_new_user: "Invitar Novo Utilizador"
+
+    subsite:
+      back_link: "Sítio Principal"
+
     boolean_yes: "Sim"
     boolean_no: "Não"
     password_hidden: "[palavra-chave]"

data/lib/generators/hobo/subsite_taglib/templates/taglib.dryml.erb

@@ -16,7 +16,7 @@
       <stylesheet name="<%= file_name %>"/>
     </append-stylesheets:>
     <footer:>
-      <a href="#{base_url}/">View Site</a> |
+      <a href="#{base_url}/"><t key="hobo.subsite.back_link">View Site</t></a>
     </footer:>
   </old-page>
 </extend>

data/lib/hobo/extensions/array.rb

@@ -4,7 +4,7 @@ class Array
   attr_accessor :member_class, :origin, :origin_attribute
 
   def to_url_path
-    base_path = origin_object.try.to_url_path
+    base_path = origin.try.to_url_path
     "#{base_path}/#{origin_attribute}" unless base_path.blank?
   end
 

data/lib/hobo/helper.rb

@@ -58,7 +58,7 @@ module Hobo
       options[:subsite] ||= self.subsite
       subsite, method = options.get :subsite, :method
 
-      if obj.respond_to?(:member_class) && obj.respond_to?(:origin)
+      if obj.respond_to?(:member_class) && obj.respond_to?(:origin) && obj.origin
         # Asking for URL of a collection, e.g. category/1/adverts or category/1/adverts/new
 
         refl = obj.origin.class.reverse_reflection(obj.origin_attribute)
@@ -112,7 +112,10 @@ module Hobo
 
     def app_name(add_subsite=true)
       an = Rails.application.config.hobo.app_name
-      an = an + " - #{subsite.titleize}" if add_subsite && subsite
+      if add_subsite && subsite
+        subsite_name = I18n.t 'hobo.admin.subsite_name', :default => subsite.titleize
+        an = an + " - #{subsite_name}"
+      end
       an
     end
 

data/lib/hobo/helper/translations.rb

@@ -74,7 +74,7 @@ module Hobo
           # the singularize method is used because Hobo does not keep the ActiveRecord convention in its tags
           # no default needed because human_name defaults to the model name
           # try because Hobo class is not an ActiveRecord::Base subclass
-          translated_pluralized_model = klass.try.model_name.try.human(:count=>options[:count])
+          translated_pluralized_model = klass.try.model_name.try.human(:count=>options[:count]||1)
           options[:model] = translated_pluralized_model
         end
 

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

@@ -113,8 +113,8 @@ This tag assumes the controller has a `reorder` action and the model has a `posi
       <ht key="#{model_class.to_s.tableize}.actions.new">New <%= model_class.model_name.human %></ht>
     </a>
     <collection param/>
-    <unless test="&this.empty?">
-      <a param="show-all"><ht key="#{model_class.to_s.tableize}.actions.show_all">Show all <%= name.pluralize.titleize %>...</ht></a>
+    <unless test="&this.empty? || this.size <= model_class.count">
+      <a param="show-all"><ht key="#{model_class.to_s.tableize}.actions.show_all" count="100">Show all <%= name.pluralize.titleize %>...</ht></a>
     </unless>
   </section>
 </def>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637175966
+  hash: -1637175965
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre15
-  version: 1.3.0.pre15
+  - pre16
+  version: 1.3.0.pre16
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -04:00
+date: 2010-11-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175966
+        hash: -1637175965
         segments: 
         - 1
         - 3
         - 0
-        - pre15
-        version: 1.3.0.pre15
+        - pre16
+        version: 1.3.0.pre16
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175966
+        hash: -1637175965
         segments: 
         - 1
         - 3
         - 0
-        - pre15
-        version: 1.3.0.pre15
+        - pre16
+        version: 1.3.0.pre16
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175966
+        hash: -1637175965
         segments: 
         - 1
         - 3
         - 0
-        - pre15
-        version: 1.3.0.pre15
+        - pre16
+        version: 1.3.0.pre16
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency