RubyGems - hobo - Versions diffs - 0.8.3 → 0.8.4 - Mend

hobo 0.8.3 → 0.8.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (80) hide show

data/CHANGES.txt +330 -0
data/Manifest +12 -4
data/Rakefile +4 -6
data/dryml_generators/rapid/cards.dryml.erb +5 -1
data/dryml_generators/rapid/forms.dryml.erb +8 -10
data/dryml_generators/rapid/pages.dryml.erb +65 -36
data/hobo.gemspec +28 -15
data/lib/active_record/association_collection.rb +3 -22
data/lib/hobo.rb +25 -258
data/lib/hobo/accessible_associations.rb +131 -0
data/lib/hobo/authentication_support.rb +15 -9
data/lib/hobo/composite_model.rb +1 -1
data/lib/hobo/controller.rb +7 -8
data/lib/hobo/dryml.rb +9 -10
data/lib/hobo/dryml/dryml_builder.rb +7 -1
data/lib/hobo/dryml/dryml_doc.rb +161 -0
data/lib/hobo/dryml/dryml_generator.rb +18 -9
data/lib/hobo/dryml/part_context.rb +76 -42
data/lib/hobo/dryml/tag_parameters.rb +1 -0
data/lib/hobo/dryml/taglib.rb +2 -1
data/lib/hobo/dryml/template.rb +39 -29
data/lib/hobo/dryml/template_environment.rb +79 -37
data/lib/hobo/dryml/template_handler.rb +66 -21
data/lib/hobo/guest.rb +2 -10
data/lib/hobo/hobo_helper.rb +125 -53
data/lib/hobo/include_in_save.rb +0 -1
data/lib/hobo/lifecycles.rb +54 -24
data/lib/hobo/lifecycles/actions.rb +95 -31
data/lib/hobo/lifecycles/creator.rb +18 -23
data/lib/hobo/lifecycles/lifecycle.rb +86 -62
data/lib/hobo/lifecycles/state.rb +1 -2
data/lib/hobo/lifecycles/transition.rb +22 -28
data/lib/hobo/model.rb +64 -176
data/lib/hobo/model_controller.rb +67 -54
data/lib/hobo/model_router.rb +5 -2
data/lib/hobo/permissions.rb +397 -0
data/lib/hobo/permissions/associations.rb +167 -0
data/lib/hobo/scopes.rb +15 -38
data/lib/hobo/scopes/association_proxy_extensions.rb +15 -5
data/lib/hobo/scopes/automatic_scopes.rb +43 -18
data/lib/hobo/scopes/named_scope_extensions.rb +2 -2
data/lib/hobo/user.rb +10 -4
data/lib/hobo/user_controller.rb +6 -5
data/lib/hobo/view_hints.rb +58 -0
data/rails_generators/hobo/hobo_generator.rb +7 -3
data/rails_generators/hobo/templates/guest.rb +1 -13
data/rails_generators/hobo_front_controller/hobo_front_controller_generator.rb +1 -1
data/rails_generators/hobo_model/hobo_model_generator.rb +4 -2
data/rails_generators/hobo_model/templates/hints.rb +4 -0
data/rails_generators/hobo_model/templates/model.rb +8 -8
data/rails_generators/hobo_model_controller/hobo_model_controller_generator.rb +10 -0
data/rails_generators/hobo_model_controller/templates/controller.rb +1 -1
data/rails_generators/hobo_rapid/templates/hobo-rapid.js +91 -56
data/rails_generators/hobo_rapid/templates/lowpro.js +15 -15
data/rails_generators/hobo_rapid/templates/reset.css +36 -3
data/rails_generators/hobo_rapid/templates/themes/clean/public/stylesheets/clean.css +13 -17
data/rails_generators/hobo_user_controller/templates/controller.rb +1 -1
data/rails_generators/hobo_user_model/templates/model.rb +18 -16
data/taglibs/core.dryml +60 -18
data/taglibs/rapid.dryml +8 -401
data/taglibs/rapid_core.dryml +586 -0
data/taglibs/rapid_document_tags.dryml +28 -10
data/taglibs/rapid_editing.dryml +92 -55
data/taglibs/rapid_forms.dryml +406 -87
data/taglibs/rapid_generics.dryml +1 -1
data/taglibs/rapid_navigation.dryml +2 -1
data/taglibs/rapid_pages.dryml +7 -16
data/taglibs/rapid_plus.dryml +39 -14
data/taglibs/rapid_support.dryml +1 -1
data/taglibs/rapid_user_pages.dryml +14 -4
data/tasks/{generate_tag_reference.rb → generate_tag_reference.rake} +49 -18
data/tasks/hobo_tasks.rake +16 -0
data/test/permissions/models/models.rb +134 -0
data/test/permissions/models/schema.rb +55 -0
data/test/permissions/models/test.sqlite3 +0 -0
data/test/permissions/test_permissions.rb +436 -0
metadata +27 -14
data/lib/hobo/mass_assignment.rb +0 -64
data/rails_generators/hobo/templates/patch_routing.rb +0 -30
data/uninstall.rb +0 -1

data/taglibs/rapid_generics.dryml CHANGED

@@ -1,6 +1,6 @@
 <def tag="card" polymorphic>
   <div class="card" param="default" merge-attrs>
-    <header param if-content/>
+    <header param/>
     <div param="body" if="&all_parameters[:body]"/>
   </div>
 </def>

data/taglibs/rapid_navigation.dryml CHANGED

@@ -14,7 +14,8 @@
 </def>
 <def tag="nav-item">
-  <set body="&parameters.default"/>
+  <% body = parameters.default
+     body = h(this.to_s) if body.blank? -%>
   <li class="#{'current' if (c = scope.current_navigation) && c.downcase == body.downcase.gsub(/<.*?>/, '').strip}"
       merge-attrs="&attributes - attrs_for(:a)">
     <a merge-attrs="&attributes & attrs_for(:a)"><%= body %></a>

data/taglibs/rapid_pages.dryml CHANGED

@@ -4,15 +4,16 @@
     <head param>
       <title param><%= strip_tags full_title %></title>
       <do param="stylesheets">
-        <stylesheet name="reset"/>
-        <stylesheet name="hobo-rapid"/>
+        <stylesheet name="reset, hobo-rapid"/>
         <theme-stylesheet/>
-        <stylesheet name="application"/>
+        <stylesheet name="application" param="app-stylesheet"/>
       </do>
       <do param="scripts">
-        <javascript param name="prototype, effects, dragdrop, controls, lowpro, hobo-rapid, application"/>
+        <javascript param name="prototype, effects, dragdrop, controls, lowpro, hobo-rapid"/>
         <if-ie version="lt IE 7" param="fix-ie6"><javascript name="IE7"/></if-ie>
+        <do param="custom-scripts"/>
+        <javascript param="application-javascript" name="application"/>
       </do>
     </head>
@@ -23,7 +24,7 @@
           <h1 param="app-name"><a href="#{base_url}/"><app-name/></a></h1>
           <live-search param if="&defined_route? :site_search"/>
           <account-nav if="&login_url(Hobo::User.default_user_model)" param/>
-          <main-nav param/>
+          <main-nav current="&title" param/>
         </header>
         <section with-flash-messages param="content"/>
         <footer class="page-footer" param/>
@@ -122,9 +123,7 @@
 </def>
 <def tag="stylesheet" attrs="name">
-  <repeat with="&comma_split(name)">
-    <%= stylesheet_link_tag name, attributes %>
-  </repeat>
+  <%= stylesheet_link_tag *(comma_split(name) + [attributes]) %>
 </def>
@@ -173,11 +172,3 @@
     %><do field="&name" param="default"/><%
   end
 %></def>
-<def tag="or-cancel">
-  <if test="&linkable?">or <a>Cancel</a></if>
-  <else>
-    <if test="&linkable?(this.class)">or <a to="&this.class">Cancel</a></if>
-  </else>
-</def>

data/taglibs/rapid_plus.dryml CHANGED

@@ -41,20 +41,6 @@
 </def>
-<def tag="change-password-form">
-  <form class="change-password" param>
-    <field-list fields="current_password, password, password_confirmation" param>
-      <password-label:>New Password</password-label:>
-      <password-confirmation-label:>Confirm New Password</password-confirmation-label:>
-    </field-list>
-    <div class="actions" param="actions">
-      <submit label="Change Password" param/>
-    </div>
-  </form>
-</def>
 <def tag="sortable-collection" attrs="sortable-options"><%
   singular_name = this.member_class.name.underscore
   attributes[:id] ||= "#{singular_name}_ordering"
@@ -79,3 +65,42 @@
       end # FIXME: Make unobstrusive
    %>
 </def>
+<def tag="preview-with-more" attrs="name">
+  <% name ||= collection_name.pluralize -%>
+  <section class="#{name.gsub(' ', '-').dasherize} preview-with-more" param="default">
+    <h3 param="heading"><%= name.titleize %></h3>
+    <a param="more">More <type-name plural lowercase/>...</a>
+    <collection param/>
+  </section>
+</def>
+<def tag="gravatar" attrs="size, rating">
+  <% size ||= 80; rating ||= 'g'; digest = Digest::MD5.hexdigest(this.email_address) -%>
+  <a class="gravatar"><img class="gravatar" src="http://www.gravatar.com/avatar/#{digest}?s=#{size}&r=#{rating}" merge-attrs/></a>
+</def>
+<def tag="live-search">
+  <div class="search">
+    <label for="search-field">Search</label><input type="search" class="live-search"/>
+    <spinner id="search-spinner"/>
+  </div>
+  <section class="hidden" id="search-results-panel">
+    <h2>Search Results</h2><div param="close-button">close</div>
+    <section id="search-results">&nbsp;</section>
+  </section>
+</def>
+<def tag="filter-menu" attrs="param-name, options, no-filter">
+  <% no_filter ||= "All" %>
+  <form action="&request.request_uri" method="get" class="filter-menu">
+    <div>
+      <select-menu name="&param_name" options="&options" selected="&params[param_name.gsub('-', '_')]"
+                   first-option="&no_filter" merge-params/>
+    </div>
+  </form>
+</def>

data/taglibs/rapid_support.dryml CHANGED

@@ -18,7 +18,7 @@
                     columns + assocs
                   end
                 else
-                  comma_split(fields)
+                  comma_split(fields.gsub('-', '_'))
                 end
   field_names -= comma_split(skip) if skip
   field_names = field_names.select {|f| can_view?(this, f)} unless force_all

data/taglibs/rapid_user_pages.dryml CHANGED

@@ -1,5 +1,7 @@
 <def tag="simple-page">
-  <page without-live-search without-account-nav without-main-nav merge/>
+  <page without-live-search without-main-nav merge>
+    <account-nav: replace><dev-user-changer/></account-nav:>
+  </page>
 </def>
@@ -131,13 +133,21 @@
     <content: param>
       <header param="content-header">
-        <h2><name/></h2>
+        <h2 param="heading"><name/></h2>
       </header>
       <section param="content-body">
         <error-messages param/>
-        <h2>Change Password</h2>
-        <change-password-form/>
+        <form class="change-password" param>
+          <field-list fields="email_address, current_password, password, password_confirmation" param>
+            <password-label:>New Password</password-label:>
+            <password-confirmation-label:>Confirm New Password</password-confirmation-label:>
+          </field-list>
+          <div class="actions" param="actions">
+            <submit label="Save" param/>
+          </div>
+        </form>
       </section>
     </content:>

data/tasks/{generate_tag_reference.rb → generate_tag_reference.rake} RENAMED

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'hobosupport'
 ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__) + "/../lib"
 require 'rexml/xpath'
@@ -115,47 +115,78 @@ end
 def contents(root)
-  tags = XPath.match(root, '/*/def')
+  tags = XPath.match(root, '/*/*[@tag]')
   tags.map { |tag| " * #{link_to_tag tag}\n" }.join
 end
 def doc_for_taglib(title, root)
-  tags = XPath.match(root, '/*/def').map { |e| doc_for_tag(e) }.join("\n\n")
+  tags = XPath.match(root, '/*/*[@tag]').map { |e| doc_for_tag(e) }.join("\n\n")
   "# #{title}\n\n" + contents(root) + "\n\n" + tags
 end
-namespace :hobo do
+def index_page(output_files, output_dir)
+  markdown = "# Tag Documentation\n\n" + output_files.map do |f|
+    link = f.gsub(output_dir+'/', '')
+    link_text = link.gsub('_', '\_').gsub(/\.html$/, '')
+    "* [#{link_text}](#{link})"
+  end.join("\n")
-  desc "Generate markdown formatted reference docs automatically from DRYML taglibs"
-  task :generate_tag_reference do
-    gem 'maruku'
-    require 'maruku'
+  html = Maruku.new(markdown).to_html
+  File.open("#{output_dir}/index.html", 'w') { |f| f.write(html) }
+end
-    src = ENV['src']
+def process_directory(src, output_dir, output_format)
+  raise RuntimeError, "#{output_dir} is not a directory" if File.exists?(output_dir) && !File.directory?(output_dir)
-    output_dir = ENV['output'] || "taglib-docs"
-    raise RuntimeError, "#{output_dir} is not a directory" if File.exists?(output_dir) && !File.directory?(output_dir)
+  FileUtils.mkdir output_dir unless File.exists? output_dir
-    FileUtils.mkdir output_dir unless File.exists? output_dir
+  dryml_files = File.directory?(src) ? Dir["#{src}/*"] : [src]
-    dryml_files = File.directory?(src) ? Dir["#{src}/*"] : [src]
+  output_files = []
-    dryml_files.each do |f|
+  dryml_files.each do |f|
+    if File.directory?(f)
+      output_files += process_directory(f, "#{output_dir}/#{File.basename(f)}", output_format)
+    elsif f =~ /\.dryml$/
       basename = File.basename(f).sub(/\.dryml$/, '')
       title = basename.titleize
       doc = Hobo::Dryml::Parser::Document.new(File.read(f), f)
-      markdown = doc_for_taglib(title, doc)
-      #html = Maruku.new(markdown).to_html
+      output = doc.restore_erb_scriptlets(doc_for_taglib(title, doc))
+      output = Maruku.new(output).to_html.gsub('&amp;', '&') if output_format == 'html'
-      output_file = "#{output_dir}/#{basename}.markdown"
+      output_file = "#{output_dir}/#{basename}.#{output_format}"
       puts output_file
-      File.open(output_file, 'w') { |f| f.write(markdown) }
+      File.open(output_file, 'w') { |f| f.write(output) }
+      output_files << output_file
     end
   end
+  output_files
+end
+namespace :hobo do
+  desc "Generate markdown formatted reference docs automatically from DRYML taglibs"
+  task :generate_tag_reference => :environment do
+    gem 'maruku'
+    require 'maruku'
+    src = ENV['src']
+    output_dir = ENV['output'] || "taglib-docs"
+    output_format = ENV['format'] || "markdown"
+    output_files = process_directory(src, output_dir, output_format)
+    index_page(output_files, output_dir)
+  end
 end

data/tasks/hobo_tasks.rake CHANGED

@@ -27,6 +27,22 @@ namespace :hobo do
     end
   end
+  desc "Run the DRYML generators to generate taglibs in app/views/taglibs/auto"
+  task :generate_taglibs => :environment do
+    Hobo::Dryml::DrymlGenerator.run
+  end
+  desc "Run the standard generators that the hobo command runs."
+  task :run_standard_generators do
+    exec <<-END
+      ruby script/generate hobo --add-routes && \
+      ruby script/generate hobo_rapid --import-tags && \
+      ruby script/generate hobo_user_model user && \
+      ruby script/generate hobo_user_controller user && \
+      ruby script/generate hobo_front_controller front --delete-index --add-routes
+    END
+  end
 end

data/test/permissions/models/models.rb ADDED

@@ -0,0 +1,134 @@
+HOBO_HOME = "#{File.dirname(__FILE__)}/../../../.."
+$:.unshift "#{HOBO_HOME}/hobosupport/lib"
+$:.unshift "#{HOBO_HOME}/hobofields/lib"
+$:.unshift "#{HOBO_HOME}/hobo/lib"
+require 'rubygems'
+require 'sqlite3'
+require 'activerecord'
+require 'hobosupport'
+require 'hobofields'
+require 'hobo'
+Hobo::Model.enable
+module Models
+  extend self
+  HOME = File.dirname(__FILE__)
+  def model(name, &b)
+    klass = Object.const_set(name, Class.new(ActiveRecord::Base))
+    klass.hobo_model
+    klass.class_eval(&b)
+    klass.delete_all rescue nil
+  end
+  def user_model(name, &b)
+    klass = Object.const_set(name, Class.new(ActiveRecord::Base))
+    klass.hobo_user_model
+    klass.class_eval(&b)
+    klass.delete_all rescue nil
+  end
+  def create_database_sqlite3
+    ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",
+                                            :database => "#{HOME}/test.sqlite3",
+                                            :timeout  => 5000)
+  end
+  def init
+    create_database_sqlite3
+    make_models
+    up, down = HoboFields::MigrationGenerator.run
+    ActiveRecord::Migration.class_eval(up)
+  end
+  def make_models
+    model :Response do
+      fields do
+        body :string
+      end
+      belongs_to :user
+      belongs_to :recipe
+      belongs_to :request
+    end
+    model :Comment do
+      fields do
+        body :string
+      end
+      belongs_to :user
+      belongs_to :recipe
+    end
+    model :Request do
+      fields do
+        body :string
+      end
+      belongs_to :user
+      has_many   :responses
+    end
+    model :Recipe do
+      fields do
+        name :string
+        body :string
+      end
+      belongs_to :user,         :creator => true
+      has_many   :responses,    :dependent => :destroy
+      has_many   :comments,     :dependent => :destroy
+      has_many   :images,       :dependent => :destroy, :accessible => true
+      belongs_to :code_example, :dependent => :destroy, :accessible => true
+      has_many   :collaboratorships
+      has_many   :collaborators, :through => :collaboratorships, :source => :user, :accessible => true
+      def create_permitted?;  acting_user == user end
+      def update_permitted?;  acting_user == user end
+      def destroy_permitted?; acting_user == user end
+    end
+    model :Collaboratorship do
+      belongs_to :user
+      belongs_to :recipe
+      def create_permitted?;  recipe.user == acting_user end
+      def destroy_permitted?; recipe.user == acting_user end
+    end
+    model :Image do
+      fields do
+        name :string
+      end
+      belongs_to :recipe
+      delegate :user, :to => :recipe
+      def create_permitted?;  user._?.paid_up? && user == acting_user end
+      def update_permitted?;  user == acting_user end
+      def destroy_permitted?; user == acting_user end
+    end
+    model :CodeExample do
+      fields do
+        filename :string
+      end
+    end
+    user_model :User do
+      fields do
+        name    :string
+        paid_up :boolean
+      end
+      has_many :recipes
+      has_many :comments
+      has_many :responses
+      has_many :requests
+      lifecycle do
+        state :active, :default => true
+      end
+    end
+  end
+end

data/test/permissions/models/schema.rb ADDED

@@ -0,0 +1,55 @@
+# ActiveRecord Schema for testing the Hobo permission system
+ActiveRecord::Schema.define do
+  create_table "responses", :force => true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "user_id"
+    t.integer  "recipe_id"
+    t.integer  "request_id"
+    t.text     "body"
+    t.boolean  "markdown"
+  end
+  create_table "comments", :force => true do |t|
+    t.text     "body"
+    t.boolean  "markdown"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "user_id"
+    t.integer  "recipe_id"
+  end
+  create_table "requests", :force => true do |t|
+    t.text     "description"
+    t.boolean  "markdown"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "user_id"
+    t.string   "subject"
+  end
+  create_table "recipes", :force => true do |t|
+    t.string   "name"
+    t.text     "body"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "user_id"
+  end
+  create_table "users", :force => true do |t|
+    t.string   "crypted_password",          :limit => 40
+    t.string   "salt",                      :limit => 40
+    t.string   "remember_token"
+    t.datetime "remember_token_expires_at"
+    t.string   "username"
+    t.string   "email_address"
+    t.boolean  "administrator",                           :default => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "state",                                   :default => "active"
+    t.datetime "key_timestamp"
+  end
+end