hobo 1.3.0.RC4 → 1.3.0.pre10

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

@@ -5,6 +5,11 @@
   <%= Rails.version -%>
 </def>
 
+<!-- returns "vendor" or "gem" -->
+<def tag="rails-location">
+  <%= Rails.vendor_rails? ? "vendor" : "gem" -%>
+</def>
+
 <!-- `Rails.root` -->
 <def tag="rails-root">
   <%= Rails.root -%>
@@ -34,18 +39,18 @@
 <!-- the git version currently in use -->
 <def tag="git-version" attrs="dir">
   <% dir=Rails.root if dir.blank? -%>
-  <%= Dir.chdir(dir) {`git rev-parse --verify HEAD --short=7`} -%>
+  <%= Dir.chdir(dir) {`git rev-list "HEAD^..HEAD" --abbrev-commit --abbrev=7`} -%>
 </def>
 
-<!-- returns 'clean' if there are no modified or added files, 'dirty' otherwise. -->
+<!-- returns 'clean' if there are no modified files, 'modified' otherwise. -->
 <def tag="git-clean" attrs="dir">
   <% dir=Rails.root if dir.blank? -%>
-  <%= Dir.chdir(dir) {`git status -s`}.blank? ? "clean" : "dirty"  -%>
+  <%= Dir.chdir(dir) {`git ls-files -m`}.blank? ? "clean" : "modified"  -%>
 </def>
 
 <!-- the time & date of the last commit -->
 <def tag="git-last-commit-time">
-  <%= `git log -1 --format=%cD` -%>
+  <%= `git log "HEAD^..HEAD" --pretty=format:%cD` -%>
 </def>
 
 <!-- calls `git-clean` or `svn-clean` as appropriate.  `svn-clean` not yet written. -->
@@ -79,7 +84,13 @@
 
 <!-- repeats on Rails.configuration.gems, including dependent gems -->
 <def tag="with-gems">
-  <% gems = Bundler::LockfileParser.new(File.read('Gemfile.lock')).specs -%>
+  <% gems = ActiveSupport::OrderedHash.new -%>
+  <% Rails.configuration.gems.each do |gem|
+       gems[name] ||= gem
+       gem.dependencies.each do |dep|
+         gems[dep] ||= dep
+       end
+     end -%>
   <repeat with="&gems">
     <do param="default"/>
   </repeat>
@@ -90,19 +101,37 @@
   <%= this.name -%>
 </def>
 
+<def tag="gem-version-requirement">
+  <unless test="this.nil?"><%=
+    this.requirements.map{|l| l.first+l.second.to_s}.join(",")
+-%></unless>
+</def>
+
+<!-- inside `<with-gems>`, returns the version required -->
+<def tag="gem-version-required">
+  <gem-version-requirement:version-requirements />
+</def>
+
 <!-- inside `<with-gems>`, returns the version -->
 <def tag="gem-version">
-  <%= this.version.to_s -%>
+  <%= this.specification.version.to_s -%>
+</def>
+
+<!-- inside `<with-gems>`, returns 'frozen', 'installed' or 'missing' -->
+<def tag="gem-frozen">
+  <%= this.frozen? ? "frozen" : (this.installed? ? "installed" : "missing") -%>
 </def>
 
 <!-- inside `<with-gems>`, returns the gem dependencies -->
 <def tag="gem-dependencies">
-    <%= this.dependencies(&it.to_s).safe_join('<br>'.html_safe) -%>
+  <repeat with="&this.dependencies">
+    <%= this.name -%><gem-version-requirement with="&this.requirement || this.version_requirements" />
+  </repeat>
 </def>
 
 <!-- repeats on the plugins used by the application -->
 <def tag="with-plugins">
-  <% plugins = Rails.application.railties.plugins %>
+  <% plugins = Rails.configuration.plugin_loader.new(Hobo.rails_initializer).plugins %>
   <repeat with="&plugins">
     <do param="default" />
   </repeat>
@@ -110,31 +139,31 @@
 
 <!-- within `<with-plugins>`, returns the plugin name -->
 <def tag="plugin-name">
-  <%= this.name.to_s -%>
+  <%= this.name -%>
 </def>
 
 <!-- within `<with-plugins>`, returns the plugin location (directory) -->
 <def tag="plugin-location">
-  <%= this.root.to_s -%>
+  <%= this.directory -%>
 </def>
 
 <def tag="plugin-git-clean">
-  <git-clean dir="&this.root.to_s"/>
+  <git-clean dir="&this.directory"/>
 </def>
 
 <def tag="plugin-git-version">
-  <git-version dir="&this.root.to_s"/>
+  <git-version dir="&this.directory"/>
 </def>
 
 <!-- within `<with-plugins>`, try and determine the method that was used to install the plugin.   Returns "braid", "symlink", "git-submodule" or "other" -->
 <def tag="plugin-method">
   <%=
       braids = File.open("#{Rails.root}/.braids") {|f| YAML::load(f) } rescue {}
-      if !braids[this.root.to_s.gsub(Rails.root.to_s+"/", "")].nil?
+      if !braids[this.directory.gsub(Rails.root+"/", "")].nil?
         "braid"
-      elsif File.lstat(this.root.to_s).symlink?
+      elsif File.lstat(this.directory).symlink?
         "symlink"
-      elsif File.exist?(this.root.to_s+"/.git")
+      elsif File.exist?(this.directory+"/.git")
         "git-submodule"
       else
         "other"
@@ -252,7 +281,7 @@
 <!-- given a column in the context and the model as an attribute, returns the comment for the column.  It returns the SQL comment if that is available (using the activerecord-comments plugin).  If that is not available, it returns the HoboFields comment.  -->
 
 <def tag="model-column-comment" attrs="model">
-  <%= this.try.comment || model.try.field_specs.try.get(this.name).try.first.try.comment -%>
+  <%= this.try.comment || model.try.field_specs.try.get(this.name).try.comment -%>
 </def>
 
 <!-- given a model, repeats on the associations -->

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

@@ -0,0 +1,36 @@
+<!-- Rapid Translations contains the tags that assist with internationalization. -->
+
+<!-- 
+
+Uses RoR native I18n.translate.
+    
+Adds some conventions for easier hobo translation. 
+
+1. Assumes the first part of the key to be a model name (e.g.: users.index.title -> user)
+2. Tries to translate the model by lookup for: (e.g.: user-> activerecord.models.user)
+3. Adds a default fallback to the beginning of the fallback chain by replacing the first part of the key with "hobo" and using the translated model name as additional attribute. This allows us to have default translations (e.g.: hobo.index.title: "{{model}} Index")
+   
+Is also used as a tag in the dryml-view files. The syntax is:
+
+      <ht key="my.app">My Application</ht>
+
+Will lookup the "my.app"-key for your locale and replaces the "My Application" content if found.
+    
+      <ht key="my" app="Program">My Application</ht>
+
+Will look up both the "my"- and "app"-key for your locale, and replaces the "My Application" with the "my"-key contents (interpolated using the "app"-key.
+
+sample.no.yml-file:
+
+      "no":
+        my: "Mitt {{app}}"
+
+The output should be: Mitt Program
+    
+Otherwise with features as the ht method, step 1, 2 and 3 above. 
+
+For more information, see the [manual](/manual/i18n)
+-->
+<def tag="ht">
+  <% # this tag is actually implemented in translations.rb.   This file is for documentation only! -%>
+</def>

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

@@ -39,7 +39,7 @@
       </labelled-item>
     </labelled-item-list>
     <div param="actions">
-      <submit label="#{t 'hobo.actions.login', :default=>['Log in'] }" param/><if test="&signup_url" class='nav-item'>
+      <submit label="#{I18n.t 'hobo.actions.login', :default=>['Log in'] }" param/><if test="&signup_url" class='nav-item'>
       <t key="hobo.support.or">or</t> <a param="signup" href="&signup_url"><t key="hobo.login.signup">Sign up</t></a></if>
     </div>
   </form>
@@ -48,7 +48,7 @@
 <!-- Simple log-in page  -->
 <def tag="login-page">
   <% remember_me = true if remember_me.nil? %>
-  <simple-page title="#{t 'hobo.login.title', :default=>['Log in'] }" merge>
+  <simple-page title="#{I18n.t 'hobo.login.title', :default=>['Log in'] }" merge>
 
     <body: class="login-page" param/>
 
@@ -69,7 +69,7 @@
 <!-- The page that initiates the forgotten password process. Contains a single text-input where the user can provide
  their email address -->
 <def tag="forgot-password-page">
-  <simple-page title="#{t 'hobo.forgot_password.title', :default=>['Forgotten Password'] }" merge>
+  <simple-page title="#{I18n.t 'hobo.forgot_password.title', :default=>['Forgotten Password'] }" merge>
 
     <body: class="forgot-password-page" param/>
 
@@ -92,7 +92,7 @@
             </labelled-item>
           </labelled-item-list>
           <div param="actions">
-            <submit label="#{t 'hobo.actions.send', :default=>['Send'] }" param/>
+            <submit label="#{I18n.t 'hobo.actions.send', :default=>['Send'] }" param/>
           </div>
         </form>
       </section>
@@ -105,7 +105,7 @@
 entered is in our records". This is to avoid a privacy concern that the forgotten-password mechanism can be otherwise used to tell
 if a given email is associated with an account or not. -->
 <def tag="forgot-password-email-sent-page">
-  <simple-page title="#{t 'hobo.forgot_password_sent.title', :default=>['Forgotten Password - Sent'] }" merge>
+  <simple-page title="#{I18n.t 'hobo.forgot_password_sent.title', :default=>['Forgotten Password - Sent'] }" merge>
     <body: class="forgot-password-page" param/>
 
     <content: param>
@@ -132,7 +132,7 @@ if a given email is associated with an account or not. -->
 <!-- The page that is displayed on attempting to log in to an account that has been disabled. -->
 <def tag="account-disabled-page">
 
-  <simple-page title="#{t 'hobo.account_disabled_page.title', :default=>['Account Disabled'] }" merge>
+  <simple-page title="#{I18n.t 'hobo.account_disabled_page.title', :default=>['Account Disabled'] }" merge>
 
     <body: class="account-disabled-page" param/>
 
@@ -153,7 +153,7 @@ if a given email is associated with an account or not. -->
 <!-- Basic account page that provides the ability for the user to change their email address and password. -->
 <def tag="account-page">
 
-  <page title="#{t 'hobo.account_page.title', :default=>['Your Account'] }" merge>
+  <page title="#{I18n.t 'hobo.account_page.title', :default=>['Your Account'] }" merge>
 
     <body: class="user-account-page #{type_name}" param/>
 
@@ -171,7 +171,7 @@ if a given email is associated with an account or not. -->
           </field-list>
 
           <div class="actions" param="actions">
-            <submit label="#{t 'hobo.actions.save_account', :default=>'Save'}" param/>
+            <submit label="#{I18n.t 'hobo.actions.save_account', :default=>'Save'}" param/>
           </div>
         </form>
       </section>

data/lib/hobo/routes.rb

@@ -1,31 +1,32 @@
 module Hobo
-  module Routes
-    extend self
+  class Routes
+    class << self
 
-    def reset_linkables
-      @linkable_keys = Set.new
-    end
+      def reset_linkables
+        @linkable_keys = Set.new
+      end
 
-    def linkable_key(klass, action, options)
-      subsite = options[:subsite] || options['subsite']
-      method  = options[:method]  || options['method'] || :get
-      [ subsite, klass.name, action, method ].join('/')
-    end
+      def linkable_key(klass, action, options)
+        subsite = options[:subsite] || options['subsite']
+        method  = options[:method]  || options['method'] || :get
+        [ subsite, klass.name, action, method ].join('/')
+      end
 
-    def linkable!(klass, action, options={})
-      @linkable_keys << linkable_key(klass, action, options)
-    end
+      def linkable!(klass, action, options={})
+        @linkable_keys << linkable_key(klass, action, options)
+      end
 
-    def linkable?(klass, action, options={})
-      @linkable_keys.member? linkable_key(klass, action, options)
-    end
+      def linkable?(klass, action, options={})
+        @linkable_keys.member? linkable_key(klass, action, options)
+      end
 
-    def models_with(wanted_action)
-      @linkable_keys.map do |k|
-        subsite, class_name, action, method = k.split('/')
-        (action == wanted_action.to_s) ? class_name.constantize : nil
-      end.compact
-    end
+      def models_with(wanted_action)
+        @linkable_keys.map do |k|
+          subsite, class_name, action, method = k.split('/')
+          (action == wanted_action) ? class_name.constantize : nil
+        end.compact
+      end
 
+    end
   end
 end

data/lib/hobo/view_hints.rb

@@ -0,0 +1,101 @@
+module Hobo
+
+  class ViewHints
+
+    def self.setter(name, default=nil, &block)
+      ivname = name.to_s.remove(/\?$/)
+      metaclass.send :define_method, name do |*args|
+        if args.empty?
+          val = instance_variable_get("@#{ivname}")
+          if val.nil?
+            val = default.is_a?(Proc) ? instance_eval(&default) : default
+            instance_variable_set("@#{ivname}", val)
+          end
+          val
+        else
+          arg = if block
+                  instance_exec(*args, &block)
+                else
+                  args.first
+                end
+          instance_variable_set("@#{ivname}", arg)
+        end
+      end
+    end
+
+    setter :children,    [] do |*args|
+      # Setting children also gives a default parent using the reverse association
+      child_model = model.reflections[args.first].klass
+      if child_model.view_hints.parent.nil? and !child_model.view_hints.parent_defined
+        parent = model.reverse_reflection(args.first)
+        child_model.view_hints.parent(parent.name, :undefined => true) if parent
+      end
+      args
+    end
+
+    setter :parent,         nil do |*args|
+      options = args.extract_options!
+      parent_defined(true) unless options[:undefined]
+      args.first
+    end
+
+    setter :parent_defined, nil
+
+    setter :paginate?,    proc { !sortable? }
+
+    setter :sortable?,    proc { defined?(ActiveRecord::Acts::List::InstanceMethods) &&
+                                 model < ActiveRecord::Acts::List::InstanceMethods &&
+                                 model.new.try.scope_condition == "1 = 1" }
+
+    setter :inline_booleans, [] do |*args|
+     if args[0] == true
+       model.columns.select { |c| c.type == :boolean }.*.name
+     else
+       args.*.to_s
+     end
+    end
+
+    # Accessors
+
+    class << self
+
+      def _name
+        @_name ||= name.sub(/Hints$/, '')
+      end
+
+      def model
+        @model ||= _name.constantize
+      end
+
+      def primary_children
+        children.first
+      end
+
+      def secondary_children
+        children.rest
+      end
+
+
+##### LEGACY METHODS TO REMOVE #####
+
+      def model_name(*)
+        raise NotImplementedError, "ViewHints.model_name is no longer supported, please use model.model_name.human and set a the activerecord.models.<model_name> key in a locale file"
+      end
+
+      def model_name_plural(*)
+        raise NotImplementedError, "ViewHints.model_name_plural is no longer supported, please use model.model_name.human(:count => n) and set a the activerecord.models.<model_name> key in a locale file"
+      end
+
+      def field_name(*)
+        raise NotImplementedError, "ViewHints.field_name is no longer supported, please use model..human_attribute_name and set a the activerecord.attributes.<model_name>.<field_name> key in a locale file"
+      end
+
+      def field_names(*)
+        raise NotImplementedError, "ViewHints.field_names is no longer supported, please set the activerecord.attributes.<model_name>.<field_name> keys in a locale file"
+      end
+
+    end
+
+  end
+
+end

data/test/irt/generators/admin_subsite.irt

@@ -1,7 +1,7 @@
 require File.expand_path('../helper.rb', __FILE__)
 
 
-invoke 'hobo:assets', %w[ -q ]
+invoke 'hobo:basic', %w[ -q ]
 invoke 'hobo:admin_subsite', %w[ -q ]
 desc "Admin Subsite files exist"
 files_exist? %w[ app/controllers/admin/admin_site_controller.rb

data/test/irt/generators/{assets.irt → basic.irt}

@@ -1,8 +1,8 @@
 require File.expand_path('../helper.rb', __FILE__)
 
 
-desc "hobo:assets invoke"
-invoke 'hobo:assets', %w(-q)
+desc "hobo:basic invoke"
+invoke 'hobo:basic', %w(-q)
 
 files_exist? %w[ app/views/taglibs/application.dryml
                  public/stylesheets/application.css

data/test/irt/generators/front_controller.irt

@@ -7,7 +7,8 @@ files_exist? %w[ app/controllers/front_controller.rb
                  app/helpers/front_helper.rb
                  test/unit/helpers/front_helper_test.rb
                  test/functional/front_controller_test.rb
-                 app/views/front/index.dryml ]
+                 app/views/front/index.dryml
+                 app/views/front/summary.dryml ]
 test_value_eql? true
 
 desc "public/index.html removed"
@@ -19,12 +20,13 @@ desc "front_controller.rb content matches"
 file_include? 'app/controllers/front_controller.rb',
               'hobo_controller',
               'def index',
+              'def summary',
               'def search'
 test_value_eql? true
 
 
 desc "Routes added"
 file_include? 'config/routes.rb',
-              %(match 'search' => 'front#search', :as => 'site_search'),
+              %(match 'search' => 'front#search', :as => 'search'),
               %(root :to => 'front#index')
 test_value_eql? true

data/test/irt/generators/partials/_subsite_taglib_variables.rb

@@ -1,6 +1,6 @@
 tags = %(<!-- Tag definitions for the subs subsite -->
 
-<include src="rapid" gem="hobo"/>
+<include src="rapid" plugin="hobo"/>
 
 <include src="taglibs/auto/subs/rapid/cards"/>
 <include src="taglibs/auto/subs/rapid/pages"/>