hobo 1.3.0.pre10 → 1.3.0.pre11

data/VERSION

@@ -1 +1 @@
-1.3.0.pre10
+1.3.0.pre11

data/lib/generators/hobo/i18n/i18n_generator.rb

@@ -31,13 +31,5 @@ module Hobo
       remove_file 'config/locales/en.yml'
     end
 
-    def add_default_count_helper
-      return if File.read('app/helpers/application_helper.rb') =~ /def default_count\b/
-      inject_into_file 'app/helpers/application_helper.rb',
-        File.read( File.expand_path('../templates/default_count_injection.rb', __FILE__)),
-        :after => "module ApplicationHelper\n"
-    end
-
-
   end
 end

data/lib/hobo/helper/translations.rb

@@ -75,18 +75,13 @@ module Hobo
                   end
           # add :"hobo.#{key}" as the first fallback
           options[:default].unshift("hobo.#{subkey}".to_sym)
-          # set the count option in order to allow multiple pluralization
-          count = options.delete(:count)
-          count = default_count if count.blank?
-          c = count.try.to_i || count==:dynamic && klass.try.count
           # translate the model
           # 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=>c)
+          translated_pluralized_model = klass.try.model_name.try.human(:count=>options[:count])
           options[:model] = translated_pluralized_model
         end
-        options[:count] = c
 
         key_prefix = "<span class='translation-key'>#{key}</span>" if defined?(HOBO_SHOW_LOCALE_KEYS) && HOBO_SHOW_LOCALE_KEYS
 

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

@@ -4,7 +4,7 @@
   <navigation class="main-nav" merge-attrs param="default">
     <nav-item href="#{base_url}/">Home</nav-item>
 <% models.select { |m| linkable?(m, :index) }[0..4].each do |m| -%>
-    <nav-item with="&<%= m.name %>"><ht key="<%= m.name.tableize %>.nav_item"><model-name-human/></ht></nav-item>
+    <nav-item with="&<%= m.name %>"><ht key="<%= m.name.tableize %>.nav_item" count="100"><model-name-human count="100"/></ht></nav-item>
 <% end -%>
   </navigation>
 </def>
@@ -21,7 +21,7 @@ model_key = model.name.tableize
 -%>
 
 <def tag="index-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.index.title', :default=>[model.model_name.human(:count=>model.count)] }">
+  <page merge title="#{ht '<%= model_key %>.index.title', :default=>[model.model_name.human(:count=>100)] }">
     <body: class="index-page <%= model_class %>" param/>
 
     <content: param>
@@ -283,7 +283,7 @@ new_link = :new.in?(actions)
 -%>
 <def tag="index-for-<%= owner.dasherize %>-page" polymorphic/>
 <def tag="index-for-<%= owner.dasherize %>-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.index_for_owner.title', :default=>['<%= sq_escape(model_name(:plural)) %> for']} #{name :with => @<%= owner %>, :no_wrapper => true}">
+  <page merge title="#{ht '<%= model_key %>.index_for_owner.title', :count=>100, :default=>['<%= sq_escape(model_name(:plural)) %> for']} #{name :with => @<%= owner %>, :no_wrapper => true}">
     <body: class="index-for-owner-page <%= owner.dasherize %> <%= model_class %>" param/>
     <content: param>
       <header param="content-header">

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

@@ -12,7 +12,7 @@ There is a default :count => 1
 -->
 <def tag="t"><%=
   options = {}
-  attributes.each_pair{|k,v| options[k.to_sym] = h(v)}
+  all_attributes.each_pair{|k,v| options[k.to_sym] = h(v)}
   k = options.delete(:key)
   I18n.t(k, {:default=>all_parameters.default}.merge(options)).html_safe
 %></def>
@@ -23,21 +23,16 @@ It dynamically pluralizes the human name by using the implicit model.count.
 #### Attributes
 
  - model - (optional) should be a model class or a record object (default to this)
- - count - (optional) used to pick the inflected string for the model. It should be an integer
-   or the symbol :dynamic if you want to have the pluralization consistent with the model.count.
-   If you don't pass any count it uses the ApplicationHelper#default_count.
+ - count - (optional) used to pick the inflected string for the model. It should be an integer.
  -->
 
 <def tag="model-name-human" attrs="model, count"><%=
   model ||= this
   model = model.class unless model.kind_of? Class
-  # adapted from count tag
-  count = default_count if count.blank?
-  c = count.try.to_int || count==:dynamic && this.try.total_entries || (this.try.loaded? && this.try.length) || this.try.count || this.try.length
   # prepare symbolized attributes for merging
   attrs = {}
-  attributes.each_pair{|k,v| attrs[k.to_sym] = v}
-  model.model_name.human( {:count=>c}.merge(attrs) )
+  all_attributes.each_pair{|k,v| attrs[k.to_sym] = v}
+  model.model_name.human( attrs )
 %>
 </def>
 
@@ -57,21 +52,20 @@ It dynamically pluralizes the human name by using the implicit model.count.
   model = model.class unless model.kind_of? Class
   # prepare symbolized attributes for merging
   attrs = {}
-  attributes.each_pair{|k,v| attrs[k.to_sym] = v}
+  all_attributes.each_pair{|k,v| attrs[k.to_sym] = v}
   model.human_attribute_name( attribute.to_sym, attrs )
 %>
 </def>
 
 <!-- Used to localize and pluralize collection names.
-A collection name is a special case of an attribute name, (indeed you should store the collection names as attribute names in the locale files), so this tag internally uses human_attribute_name to return them. It does also the default pluralization by calling count on the collection attribute (that you can override passing an explicit `count` attribute).
+A collection name is a special case of an attribute name, (indeed you should store the collection names as attribute names in the locale files), so this tag internally uses human_attribute_name to return them.
 
 With the `your` attribute and in the special case the context is a Hobo::Model::User instance it automatically embeds the `your` tag funtionality. (note: :name is added by default as an interpolable variable)
 
 ### Attributes
 
  - collection - the attribute/collection key to lookup in the `activerecord.attributes` namespace. (e.g. 'roles')
- - count - It should be an integer or the symbol :dynamic if you want to have the pluralization
-   consistent with the collection.count. If you don't pass any count it uses the ApplicationHelper#default_count.
+ - count - used to pick the inflected string for the collection. It should be an integer.
  - your - wraps the collection name in a `Your` tag
 
 ### Example
@@ -99,17 +93,17 @@ With the `your` attribute and in the special case the context is a Hobo::Model::
             other: Ruoli di {{name}}"
 
   # context is a Post instance ('your' is ignored)
-  <human-collection-name collection="comments" your/>
+  <human-collection-name collection="comments" count="&user.comments.count" your/>
   I18n.locale = :en => "Comment" or "Comments"
   I18n.locale = :it => "Commento" or "Commenti"
 
   # context is an User instance
-  <human-collection-name collection="roles' your/>
+  <human-collection-name collection="roles' count="&user.roles.count" your/>
   I18n.locale = :en => "Your Role" or "Jim's Role" or "Your Roles" or "Jim's Roles"
   I18n.locale = :it => "Il tuo Ruolo" or "Il Ruolo di Jim" or "I tuoi Ruoli" or "I Ruoli di Jim"
   (output is the same as <Your key="roles" count=>"&user.roles.count"/> )
 
-  <human-collection-name collection="roles"/>
+  <human-collection-name collection="roles" count="&user.roles.count"/>
   I18n.locale = :en => "Role" or "Roles"
   I18n.locale = :it => "Ruolo" or "Ruoli"
 -->
@@ -117,17 +111,15 @@ With the `your` attribute and in the special case the context is a Hobo::Model::
   raise Hobo::Error, "The 'collection' attribute must be defined" if collection.blank?
   belong_class = this.kind_of?(Class) ? this : this.class
   raise Hobo::Error, "The context is not an ActiveRecord::Base instance or class. (this = #{this.typed_id rescue this.inspect})" unless belong_class < ActiveRecord::Base
-  count = default_count if count.blank?
-  c = count.try.to_int || count==:dynamic && this.kind_of?(ActiveRecord::Base) && this.send(collection.to_sym).count
   # prepare symbolized attributes for merging
   attrs = {}
-  attributes.each_pair{|k,v| attrs[k.to_sym] = v} -%>
+  all_attributes.each_pair{|k,v| attrs[k.to_sym] = v} -%>
 <% if your && belong_class < Hobo::Model::User && this.kind_of?(Hobo::Model::User) && I18n.locale == :en -%>
     <your key="&collection" merge-attrs="&{:count=>c, :name=>this.name}.merge(attrs)" capitalize>
-      <%= belong_class.human_attribute_name(collection.to_sym, {:count=>c}.merge(attrs)) %>
+      <%= belong_class.human_attribute_name(collection.to_sym, attrs) %>
     </your>
 <% else -%>
-    <%= belong_class.human_attribute_name( collection.to_sym, {:count=>c}.merge(attrs) ) %>
+    <%= belong_class.human_attribute_name( collection.to_sym, attrs ) %>
 <% end %>
 </def>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637175975
+  hash: -1637175962
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre10
-  version: 1.3.0.pre10
+  - pre11
+  version: 1.3.0.pre11
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -04:00
+date: 2010-10-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175975
+        hash: -1637175962
         segments: 
         - 1
         - 3
         - 0
-        - pre10
-        version: 1.3.0.pre10
+        - pre11
+        version: 1.3.0.pre11
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175975
+        hash: -1637175962
         segments: 
         - 1
         - 3
         - 0
-        - pre10
-        version: 1.3.0.pre10
+        - pre11
+        version: 1.3.0.pre11
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175975
+        hash: -1637175962
         segments: 
         - 1
         - 3
         - 0
-        - pre10
-        version: 1.3.0.pre10
+        - pre11
+        version: 1.3.0.pre11
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -199,7 +199,6 @@ files:
 - lib/generators/hobo/i18n/templates/app.es-DO.yml
 - lib/generators/hobo/i18n/templates/app.it.yml
 - lib/generators/hobo/i18n/templates/app.pt-PT.yml
-- lib/generators/hobo/i18n/templates/default_count_injection.rb
 - lib/generators/hobo/i18n/templates/hobo.en.yml
 - lib/generators/hobo/i18n/templates/hobo.es-DO.yml
 - lib/generators/hobo/i18n/templates/hobo.it.yml

data/lib/generators/hobo/i18n/templates/default_count_injection.rb

@@ -1,10 +0,0 @@
-
-  # the default_count is called from i18n tags in order to produce the right pluralization
-  # when no count is explicitly passed. It is normally used to generate a plural.
-  # You can return different integers according to the needs of different languages
-  # if you return the symbol :dynamic the count will be the model count
-  # so the tag output will be singular or plural depending on the record count
-  def default_count
-    100 # fixed plural by default
-  end
-