app/views/authors/new.html.haml app/views/sessions/new.html.haml public/stylesheets/sass/modules/_all.sass public/stylesheets/sass/modules/_clearfix.sass public/stylesheets/sass/modules/_float.sass public/stylesheets/sass/modules/_forms.sass public/stylesheets/sass/modules/_hacks.sass public/stylesheets/sass/modules/_links.sass public/stylesheets/sass/modules/_messages.sass public/stylesheets/sass/modules/_opacity.sass public/stylesheets/sass/modules/_reset.sass public/stylesheets/sass/modules/_rounded.sass public/stylesheets/sass/modules/_shadow.sass public/stylesheets/sass/modules/_typography.sass public/stylesheets/sass/partials/_base.sass public/stylesheets/sass/partials/_footer.sass public/stylesheets/sass/partials/_header.sass public/stylesheets/sass/partials/_layout.sass public/stylesheets/sass/partials/_main.sass public/stylesheets/sass/screen.sass public/stylesheets/screen.css vendor/plugins/haml-2.2.9/.yardopts vendor/plugins/haml-2.2.9/CONTRIBUTING vendor/plugins/haml-2.2.9/MIT-LICENSE vendor/plugins/haml-2.2.9/README.md vendor/plugins/haml-2.2.9/REVISION vendor/plugins/haml-2.2.9/Rakefile vendor/plugins/haml-2.2.9/VERSION vendor/plugins/haml-2.2.9/VERSION_NAME vendor/plugins/haml-2.2.9/bin/css2sass vendor/plugins/haml-2.2.9/bin/haml vendor/plugins/haml-2.2.9/bin/html2haml vendor/plugins/haml-2.2.9/bin/sass vendor/plugins/haml-2.2.9/extra/haml-mode.el vendor/plugins/haml-2.2.9/extra/sass-mode.el vendor/plugins/haml-2.2.9/extra/update_watch.rb vendor/plugins/haml-2.2.9/init.rb vendor/plugins/haml-2.2.9/lib/haml.rb vendor/plugins/haml-2.2.9/lib/haml/buffer.rb vendor/plugins/haml-2.2.9/lib/haml/engine.rb vendor/plugins/haml-2.2.9/lib/haml/error.rb vendor/plugins/haml-2.2.9/lib/haml/exec.rb vendor/plugins/haml-2.2.9/lib/haml/filters.rb vendor/plugins/haml-2.2.9/lib/haml/helpers.rb vendor/plugins/haml-2.2.9/lib/haml/helpers/action_view_extensions.rb vendor/plugins/haml-2.2.9/lib/haml/helpers/action_view_mods.rb vendor/plugins/haml-2.2.9/lib/haml/helpers/xss_mods.rb vendor/plugins/haml-2.2.9/lib/haml/html.rb vendor/plugins/haml-2.2.9/lib/haml/precompiler.rb vendor/plugins/haml-2.2.9/lib/haml/shared.rb vendor/plugins/haml-2.2.9/lib/haml/template.rb vendor/plugins/haml-2.2.9/lib/haml/template/patch.rb vendor/plugins/haml-2.2.9/lib/haml/template/plugin.rb vendor/plugins/haml-2.2.9/lib/haml/util.rb vendor/plugins/haml-2.2.9/lib/haml/version.rb vendor/plugins/haml-2.2.9/lib/sass.rb vendor/plugins/haml-2.2.9/lib/sass/css.rb vendor/plugins/haml-2.2.9/lib/sass/engine.rb vendor/plugins/haml-2.2.9/lib/sass/environment.rb vendor/plugins/haml-2.2.9/lib/sass/error.rb vendor/plugins/haml-2.2.9/lib/sass/files.rb vendor/plugins/haml-2.2.9/lib/sass/plugin.rb vendor/plugins/haml-2.2.9/lib/sass/plugin/merb.rb vendor/plugins/haml-2.2.9/lib/sass/plugin/rails.rb vendor/plugins/haml-2.2.9/lib/sass/repl.rb vendor/plugins/haml-2.2.9/lib/sass/script.rb vendor/plugins/haml-2.2.9/lib/sass/script/bool.rb vendor/plugins/haml-2.2.9/lib/sass/script/color.rb vendor/plugins/haml-2.2.9/lib/sass/script/funcall.rb vendor/plugins/haml-2.2.9/lib/sass/script/functions.rb vendor/plugins/haml-2.2.9/lib/sass/script/lexer.rb vendor/plugins/haml-2.2.9/lib/sass/script/literal.rb vendor/plugins/haml-2.2.9/lib/sass/script/node.rb vendor/plugins/haml-2.2.9/lib/sass/script/number.rb vendor/plugins/haml-2.2.9/lib/sass/script/operation.rb vendor/plugins/haml-2.2.9/lib/sass/script/parser.rb vendor/plugins/haml-2.2.9/lib/sass/script/string.rb vendor/plugins/haml-2.2.9/lib/sass/script/unary_operation.rb vendor/plugins/haml-2.2.9/lib/sass/script/variable.rb vendor/plugins/haml-2.2.9/lib/sass/tree/comment_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/debug_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/directive_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/for_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/if_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/import_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/mixin_def_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/mixin_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/prop_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/rule_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/variable_node.rb vendor/plugins/haml-2.2.9/lib/sass/tree/while_node.rb vendor/plugins/haml-2.2.9/rails/init.rb vendor/plugins/haml-2.2.9/test/benchmark.rb vendor/plugins/haml-2.2.9/test/haml/engine_test.rb vendor/plugins/haml-2.2.9/test/haml/helper_test.rb vendor/plugins/haml-2.2.9/test/haml/html2haml_test.rb vendor/plugins/haml-2.2.9/test/haml/markaby/standard.mab vendor/plugins/haml-2.2.9/test/haml/mocks/article.rb vendor/plugins/haml-2.2.9/test/haml/results/content_for_layout.xhtml vendor/plugins/haml-2.2.9/test/haml/results/eval_suppressed.xhtml vendor/plugins/haml-2.2.9/test/haml/results/filters.xhtml vendor/plugins/haml-2.2.9/test/haml/results/helpers.xhtml vendor/plugins/haml-2.2.9/test/haml/results/helpful.xhtml vendor/plugins/haml-2.2.9/test/haml/results/just_stuff.xhtml vendor/plugins/haml-2.2.9/test/haml/results/list.xhtml vendor/plugins/haml-2.2.9/test/haml/results/nuke_inner_whitespace.xhtml vendor/plugins/haml-2.2.9/test/haml/results/nuke_outer_whitespace.xhtml vendor/plugins/haml-2.2.9/test/haml/results/original_engine.xhtml vendor/plugins/haml-2.2.9/test/haml/results/partial_layout.xhtml vendor/plugins/haml-2.2.9/test/haml/results/partials.xhtml vendor/plugins/haml-2.2.9/test/haml/results/render_layout.xhtml vendor/plugins/haml-2.2.9/test/haml/results/silent_script.xhtml vendor/plugins/haml-2.2.9/test/haml/results/standard.xhtml vendor/plugins/haml-2.2.9/test/haml/results/tag_parsing.xhtml vendor/plugins/haml-2.2.9/test/haml/results/very_basic.xhtml vendor/plugins/haml-2.2.9/test/haml/results/whitespace_handling.xhtml vendor/plugins/haml-2.2.9/test/haml/rhtml/_av_partial_1.rhtml vendor/plugins/haml-2.2.9/test/haml/rhtml/_av_partial_2.rhtml vendor/plugins/haml-2.2.9/test/haml/rhtml/action_view.rhtml vendor/plugins/haml-2.2.9/test/haml/rhtml/standard.rhtml vendor/plugins/haml-2.2.9/test/haml/spec/README.md vendor/plugins/haml-2.2.9/test/haml/spec/lua_haml_spec.lua vendor/plugins/haml-2.2.9/test/haml/spec/ruby_haml_test.rb vendor/plugins/haml-2.2.9/test/haml/spec/tests.json vendor/plugins/haml-2.2.9/test/haml/template_test.rb vendor/plugins/haml-2.2.9/test/haml/templates/_av_partial_1.haml vendor/plugins/haml-2.2.9/test/haml/templates/_av_partial_1_ugly.haml vendor/plugins/haml-2.2.9/test/haml/templates/_av_partial_2.haml vendor/plugins/haml-2.2.9/test/haml/templates/_av_partial_2_ugly.haml vendor/plugins/haml-2.2.9/test/haml/templates/_layout.erb vendor/plugins/haml-2.2.9/test/haml/templates/_layout_for_partial.haml vendor/plugins/haml-2.2.9/test/haml/templates/_partial.haml vendor/plugins/haml-2.2.9/test/haml/templates/_text_area.haml vendor/plugins/haml-2.2.9/test/haml/templates/action_view.haml vendor/plugins/haml-2.2.9/test/haml/templates/action_view_ugly.haml vendor/plugins/haml-2.2.9/test/haml/templates/breakage.haml vendor/plugins/haml-2.2.9/test/haml/templates/content_for_layout.haml vendor/plugins/haml-2.2.9/test/haml/templates/eval_suppressed.haml vendor/plugins/haml-2.2.9/test/haml/templates/filters.haml vendor/plugins/haml-2.2.9/test/haml/templates/helpers.haml vendor/plugins/haml-2.2.9/test/haml/templates/helpful.haml vendor/plugins/haml-2.2.9/test/haml/templates/just_stuff.haml vendor/plugins/haml-2.2.9/test/haml/templates/list.haml vendor/plugins/haml-2.2.9/test/haml/templates/nuke_inner_whitespace.haml vendor/plugins/haml-2.2.9/test/haml/templates/nuke_outer_whitespace.haml vendor/plugins/haml-2.2.9/test/haml/templates/original_engine.haml vendor/plugins/haml-2.2.9/test/haml/templates/partial_layout.haml vendor/plugins/haml-2.2.9/test/haml/templates/partialize.haml vendor/plugins/haml-2.2.9/test/haml/templates/partials.haml vendor/plugins/haml-2.2.9/test/haml/templates/render_layout.haml vendor/plugins/haml-2.2.9/test/haml/templates/silent_script.haml vendor/plugins/haml-2.2.9/test/haml/templates/standard.haml vendor/plugins/haml-2.2.9/test/haml/templates/standard_ugly.haml vendor/plugins/haml-2.2.9/test/haml/templates/tag_parsing.haml vendor/plugins/haml-2.2.9/test/haml/templates/very_basic.haml vendor/plugins/haml-2.2.9/test/haml/templates/whitespace_handling.haml vendor/plugins/haml-2.2.9/test/haml/util_test.rb vendor/plugins/haml-2.2.9/test/linked_rails.rb vendor/plugins/haml-2.2.9/test/sass/css2sass_test.rb vendor/plugins/haml-2.2.9/test/sass/engine_test.rb vendor/plugins/haml-2.2.9/test/sass/functions_test.rb vendor/plugins/haml-2.2.9/test/sass/more_results/more1.css vendor/plugins/haml-2.2.9/test/sass/more_results/more1_with_line_comments.css vendor/plugins/haml-2.2.9/test/sass/more_results/more_import.css vendor/plugins/haml-2.2.9/test/sass/more_templates/_more_partial.sass vendor/plugins/haml-2.2.9/test/sass/more_templates/more1.sass vendor/plugins/haml-2.2.9/test/sass/more_templates/more_import.sass vendor/plugins/haml-2.2.9/test/sass/plugin_test.rb vendor/plugins/haml-2.2.9/test/sass/results/alt.css vendor/plugins/haml-2.2.9/test/sass/results/basic.css vendor/plugins/haml-2.2.9/test/sass/results/compact.css vendor/plugins/haml-2.2.9/test/sass/results/complex.css vendor/plugins/haml-2.2.9/test/sass/results/compressed.css vendor/plugins/haml-2.2.9/test/sass/results/expanded.css vendor/plugins/haml-2.2.9/test/sass/results/import.css vendor/plugins/haml-2.2.9/test/sass/results/line_numbers.css vendor/plugins/haml-2.2.9/test/sass/results/mixins.css vendor/plugins/haml-2.2.9/test/sass/results/multiline.css vendor/plugins/haml-2.2.9/test/sass/results/nested.css vendor/plugins/haml-2.2.9/test/sass/results/parent_ref.css vendor/plugins/haml-2.2.9/test/sass/results/script.css vendor/plugins/haml-2.2.9/test/sass/results/subdir/nested_subdir/nested_subdir.css vendor/plugins/haml-2.2.9/test/sass/results/subdir/subdir.css vendor/plugins/haml-2.2.9/test/sass/results/units.css vendor/plugins/haml-2.2.9/test/sass/script_test.rb vendor/plugins/haml-2.2.9/test/sass/templates/_partial.sass vendor/plugins/haml-2.2.9/test/sass/templates/alt.sass vendor/plugins/haml-2.2.9/test/sass/templates/basic.sass vendor/plugins/haml-2.2.9/test/sass/templates/bork.sass vendor/plugins/haml-2.2.9/test/sass/templates/bork2.sass vendor/plugins/haml-2.2.9/test/sass/templates/compact.sass vendor/plugins/haml-2.2.9/test/sass/templates/complex.sass vendor/plugins/haml-2.2.9/test/sass/templates/compressed.sass vendor/plugins/haml-2.2.9/test/sass/templates/expanded.sass vendor/plugins/haml-2.2.9/test/sass/templates/import.sass vendor/plugins/haml-2.2.9/test/sass/templates/importee.sass vendor/plugins/haml-2.2.9/test/sass/templates/line_numbers.sass vendor/plugins/haml-2.2.9/test/sass/templates/mixins.sass vendor/plugins/haml-2.2.9/test/sass/templates/multiline.sass vendor/plugins/haml-2.2.9/test/sass/templates/nested.sass vendor/plugins/haml-2.2.9/test/sass/templates/parent_ref.sass vendor/plugins/haml-2.2.9/test/sass/templates/script.sass vendor/plugins/haml-2.2.9/test/sass/templates/subdir/nested_subdir/_nested_partial.sass vendor/plugins/haml-2.2.9/test/sass/templates/subdir/nested_subdir/nested_subdir.sass vendor/plugins/haml-2.2.9/test/sass/templates/subdir/subdir.sass vendor/plugins/haml-2.2.9/test/sass/templates/units.sass vendor/plugins/haml-2.2.9/test/test_helper.rb @@ -1,7 +1,17 @@ # Methods added to this helper will be available to all templates in the application. require 'digest/md5' module ApplicationHelper + def gravatar_url(email, size=80) "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email)}?s=#{size}&d=wavatar" end -end + + def content_for?(symbol) + !(get_content_for(symbol)).nil? + end + + def get_content_for(symbol) + instance_variable_get("@content_for_#{symbol}") + end + +end \ No newline at end of file app/helpers/application_helper.rb @@ -75,7 +75,8 @@ class Author < ActiveRecord::Base end def full_name - [first_name, last_name].compact.join ' ' + fn = [first_name, last_name].compact.join ' ' + fn.empty? ? login : fn end alias :name :full_name app/models/author.rb @@ -1,5 +1,5 @@ -%h2 Edit your profile -= error_messages_for :author +- @title = "Edit Your Profile" + - form_for @author, :html => {:method => :put} do |f| %fieldset.half %legend @@ -7,19 +7,19 @@ %p %label{"for"=>"author_first_name"} First name - = f.text_field :first_name + = f.text_field :first_name, :class => "textbox" %p %label{"for"=>"author_last_name"} Last name - = f.text_field :last_name + = f.text_field :last_name, :class => "textbox" %p %label{"for"=>"author_website"} Website URL - = f.text_field :website + = f.text_field :website, :class => "textbox" %p %label{"for"=>"author_email"} Email - = f.text_field :email + = f.text_field :email, :class => "textbox" %p %label{"for"=>"author_notes"} Personal notes @@ -32,15 +32,14 @@ %p %label{"for"=>"author_login"} Login - = f.text_field :login + = f.text_field :login, :class => "textbox" %p %label{"for"=>"author_password"} Password - = f.password_field :password + = f.password_field :password, :class => "textbox" %p %label{"for"=>"author_password_confirmation"} Confirm Password - = f.password_field :password_confirmation - %p#buttons - %button{:type => "submit"} - Save profile \ No newline at end of file + = f.password_field :password_confirmation, :class => "textbox" + .buttons + = submit_tag "Save Profile", :class => "button" \ No newline at end of file app/views/authors/edit.html.haml @@ -1,4 +1,5 @@ -%h2 Extension Authors +- @title = "All Extension Authors" + #authors -unless @authors.blank? - @authors.each do |author| @@ -11,5 +12,4 @@ - unless author.website.blank? .website Website: - = link_to author.website.gsub(/<\/?[^>]*>/, ""), author.website -.clearfix \ No newline at end of file + = link_to author.website.gsub(/<\/?[^>]*>/, ""), author.website \ No newline at end of file app/views/authors/index.html.haml @@ -1,20 +1,18 @@ -%h2 - Author: - = h(@author.full_name.gsub(/<\/?[^>]*>/, "")) - +-@title = "Author: #{h(@author.full_name.gsub(/<\/?[^>]*>/, ""))}" + %table.attributes %tr %th.label Email - %td.value=mail_to(@author.email.gsub(/<\/?[^>]*>/, ""), nil, :encode => :javascript) + %td.value= mail_to(@author.email.gsub(/<\/?[^>]*>/, ""), nil, :encode => :javascript) %tr %th.label Website %td.value= link_to(@author.website.gsub(/<\/?[^>]*>/, ""), @author.website) if @author.website %tr %th.label Notes - %td.value= textilize(@author.notes.gsub(/<\/?[^>]*>/, "")) + %td.value= textilize(@author.notes.to_s.gsub(/<\/?[^>]*>/, "")) %tr %th.label Extensions %td.value %ul - - @author.extensions.each do |ext| - %li[ext]= link_to ext.name.gsub(/<\/?[^>]*>/, ""), ext \ No newline at end of file + - for extension in @author.extensions + %li[extension]= link_to extension.name.to_s.gsub(/<\/?[^>]*>/, ""), extension \ No newline at end of file app/views/authors/show.html.haml @@ -1,28 +1,27 @@ -= error_messages_for :extension %p %label Name %span.hint the directory name - = f.text_field :name + = f.text_field :name, :class => "textbox" %p %label Current Version %span.hint the most recent version number of the extension - = f.text_field :current_version + = f.text_field :current_version, :class => "textbox" %p %label Homepage %span.hint where to find out more information, readme (http, (github)) - = f.text_field :homepage + = f.text_field :homepage, :class => "textbox" %p %label Repository URL %span.hint where to download the latest code (svn, git) - = f.text_field :repository_url, :size => "50" + = f.text_field :repository_url, :size => "50", :class => "textbox" %p %label Repository type @@ -32,7 +31,7 @@ Download URL %span.hint where to download a bundled package (tgz, gem) - = f.text_field :download_url, :size => "50" + = f.text_field :download_url, :size => "50", :class => "textbox" %p %label Download type @@ -42,7 +41,7 @@ Supports Radiant Version %span.hint the highest version of radiant with full support - = f.text_field :supports_radiant_version + = f.text_field :supports_radiant_version, :class => "textbox" %p %label Description app/views/extensions/_form.html.haml @@ -1,6 +1,6 @@ -%h2 Edit extension +- @title = "Edit Extension" + - form_for @extension do |f| = render :partial => "form", :locals => {:f => f} - %p - %button{:type => "submit"} - Update \ No newline at end of file + .buttons + = submit_tag "Update Extension", :class => "button" \ No newline at end of file app/views/extensions/edit.html.haml @@ -1,7 +1,9 @@ +- @title = "All Extensions" + +- content_for :actions do + = link_to "Add Extension", new_extension_path, :class => "add_link" + #extensions - - if logged_in? - %p{:style => "float:right;"}= link_to "Add", new_extension_path, :class => "add-link" - %h2{:style => "margin-bottom:21px"} Available Extensions - @extensions.each do |extension| %div[extension] %h3.name= link_to extension.name.gsub(/<\/?[^>]*>/, ""), extension app/views/extensions/index.html.haml @@ -1,6 +1,6 @@ -%h2 Create extension +- @title = "Add Extension" + - form_for @extension do |f| = render :partial => "form", :locals => {:f => f} - %p - %button{:type => "submit"} - Create \ No newline at end of file + .buttons + = submit_tag "Add Extension", :class => "button" \ No newline at end of file app/views/extensions/new.html.haml @@ -1,7 +1,6 @@ +- @title = "Extension: #{h(@extension.name.gsub(/<\/?[^>]*>/, ""))}" + %div[@extension] - %h2 - Extension: - = @extension.name.gsub(/<\/?[^>]*>/, "") %table.attributes %tr %th.label#author app/views/extensions/show.html.haml @@ -4,27 +4,39 @@ %title Radiant CMS - Extension Registry = !@extension.blank? && !@extension.new_record? ? "— #{h(@extension.name)}" : "" - = stylesheet_link_tag "main" + = stylesheet_link_tag "screen" = javascript_include_tag :defaults %link{ :href => "/extensions.atom", :rel => "alternate", :type => "application/atom+xml", :title => "Radiant Extension Registry" } %body{:id => "#{@controller.controller_name}_#{@controller.action_name}"} - #header - %h1#logo Radiant CMS Extension Registry - %ul#account{:class => logged_in? ? "in" : "out"} - - if logged_in? - %li#account_link= link_to "My Profile", edit_author_url(current_author) - %li#logout_link.last= link_to "Logout", logout_url - - else - %li#signup_link= link_to "Signup", signup_url - %li#login_link.last= link_to "Login", login_url - %ul#navigation - %li#index_link= link_to "Extensions", extensions_path - %li#authors_link= link_to "Authors", authors_path - #content - - flash.keys.each do |key| - %p{:id => key}= flash[key] - = yield + #page + #header + #logo Radiant CMS Extension Registry + %ul#account{:class => logged_in? ? "in" : "out"} + - if logged_in? + %li#account_link= link_to "My Profile", edit_author_url(current_author) + %li#logout_link.last= link_to "Logout", logout_url + - else + %li#signup_link= link_to "Signup", signup_url + %li#login_link.last= link_to "Login", login_url + %ul#navigation + %li#index_link= link_to "Extensions", extensions_path + %li#authors_link= link_to "Authors", authors_path + #main + #content + - if content_for? :actions + #actions + = yield :actions + - if @title + %h1= @title + - flash.keys.each do |key| + %p{:id=>key}= flash[key] + = yield #footer - © 2008 Radiant CMS Dev Team. Radiant CMS is © 2006-2008 John W. Long and Sean Cribbs. - %br/ - Extensions only work in Radiant CMS 0.6.x and above. + %p + Copyright © + = "2008–#{Date.today.year}" + the Radiant CMS development team. + = link_to "Radiant CMS", "http://radiantcms.org" + is copyright © + = "2006–#{Date.today.year}" + John W. Long and Sean Cribbs. app/views/layouts/application.html.haml @@ -56,4 +56,13 @@ Rails::Initializer.run do |config| # Make Active Record use UTC-base instead of local time config.active_record.default_timezone = :utc + + # Set the default field error proc + config.action_view.field_error_proc = Proc.new do |html, instance| + if html !~ /label/ + %{#{html} • #{[instance.error_message].flatten.first}} + else + html + end + end end \ No newline at end of file config/environment.rb @@ -9,14 +9,14 @@ describe AuthorsController do it 'allows signup' do lambda do - create_author + create_author_via_post response.should be_redirect end.should change(Author, :count).by(1) end it 'requires login on signup' do lambda do - create_author(:login => nil) + create_author_via_post(:login => nil) assigns[:author].errors.on(:login).should_not be_nil response.should be_success end.should_not change(Author, :count) @@ -24,7 +24,7 @@ describe AuthorsController do it 'requires password on signup' do lambda do - create_author(:password => nil) + create_author_via_post(:password => nil) assigns[:author].errors.on(:password).should_not be_nil response.should be_success end.should_not change(Author, :count) @@ -32,7 +32,7 @@ describe AuthorsController do it 'requires password confirmation on signup' do lambda do - create_author(:password_confirmation => nil) + create_author_via_post(:password_confirmation => nil) assigns[:author].errors.on(:password_confirmation).should_not be_nil response.should be_success end.should_not change(Author, :count) @@ -40,7 +40,7 @@ describe AuthorsController do it 'requires email on signup' do lambda do - create_author(:email => nil) + create_author_via_post(:email => nil) assigns[:author].errors.on(:email).should_not be_nil response.should be_success end.should_not change(Author, :count) @@ -96,7 +96,7 @@ describe AuthorsController do end end - def create_author(options = {}) + def create_author_via_post(options = {}) post :create, :author => { :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options) end spec/controllers/authors_controller_spec.rb @@ -1,20 +1,24 @@ class AuthorsDataset < Dataset::Base def load - create_model Author, :quentin, - :login => "quentin", - :email => "quentin@example.com", - :password => "test", - :password_confirmation => "test" - - create_model Author, :aaron, - :login => "aaron", - :email => "aaron@example.com", - :password => "test", - :password_confirmation => "test" + create_author "Quentin" + create_author "Aaron" end helpers do + def create_author(first_name, attributes = {}) + symbol = first_name.downcase.intern + create_model(Author, symbol, + { + :first_name => first_name, + :login => symbol.to_s, + :email => "#{symbol.to_s}@example.com", + :password => "test", + :password_confirmation => "test" + }.merge(attributes) + ) + end + def login_as(author = nil) session[:author_id] = case author when Symbol spec/datasets/authors_dataset.rb @@ -2,32 +2,38 @@ class ExtensionsDataset < Dataset::Base uses :authors def load - create_model Extension, :page_attachments, - extension_params(:name => "page_attachments", - :repository_url => "git://github.com/seancribbs/radiant-page-attachments.git", - :download_url => "http://seancribbs.com/download/page_attachments.tar.gz", - :download_type => "Tarball") - create_model Extension, :reorder, - extension_params(:name => "reorder", - :repository_url => "git://github.com/seancribbs/radiant-reorder.git", - :download_url => "http://seancribbs.com/download/reorder.tar.gz", - :download_type => "Tarball") - create_model Extension, :gitonly, - extension_params(:name => "gitonly", - :repository_url => "git://github.com/seancribbs/radiant-gitonly.git") - create_model Extension, :taronly, - extension_params(:name => "taronly", - :repository_url => nil, - :download_url => "http://seancribbs.com/download/taronly.tar.gz", - :repository_type => nil, - :download_type => "Tarball") + create_extension("page_attachments", + :repository_url => "git://github.com/seancribbs/radiant-page-attachments.git", + :download_url => "http://seancribbs.com/download/page_attachments.tar.gz", + :download_type => "Tarball" + ) + create_extension("reorder", + :repository_url => "git://github.com/seancribbs/radiant-reorder.git", + :download_url => "http://seancribbs.com/download/reorder.tar.gz", + :download_type => "Tarball" + ) + create_extension("gitonly", + :repository_url => "git://github.com/seancribbs/radiant-gitonly.git" + ) + create_extension("taronly", + :repository_url => "", + :download_url => "http://seancribbs.com/download/taronly.tar.gz", + :repository_type => nil, + :download_type => "Tarball", + :author_id => author_id(:aaron) + ) end helpers do + def create_extension(name, attributes = {}) + create_model Extension, name.intern, extension_params(attributes.symbolize_keys.merge({:name => name})) + end + def extension_params(attributes = {}) { :name => "test_extension", :repository_url => "git://github.com/seancribbs/radiant-test-extension.git", + :description => "(none)", :download_url => nil, :author_id => author_id(:quentin), :repository_type => "Git", spec/datasets/extensions_dataset.rb @@ -11,7 +11,7 @@ describe Author do before do @author = nil @creating_author = lambda do - @author = create_author + @author = create_author_via_model violated "#{@author.errors.full_messages.to_sentence}" if @author.new_record? end end @@ -23,28 +23,28 @@ describe Author do it 'requires login' do lambda do - u = create_author(:login => nil) + u = create_author_via_model(:login => nil) u.errors.on(:login).should_not be_nil end.should_not change(Author, :count) end it 'requires password' do lambda do - u = create_author(:password => nil) + u = create_author_via_model(:password => nil) u.errors.on(:password).should_not be_nil end.should_not change(Author, :count) end it 'requires password confirmation' do lambda do - u = create_author(:password_confirmation => nil) + u = create_author_via_model(:password_confirmation => nil) u.errors.on(:password_confirmation).should_not be_nil end.should_not change(Author, :count) end it 'requires email' do lambda do - u = create_author(:email => nil) + u = create_author_via_model(:email => nil) u.errors.on(:email).should_not be_nil end.should_not change(Author, :count) end @@ -108,7 +108,7 @@ describe Author do end protected - def create_author(options = {}) + def create_author_via_model(options = {}) record = Author.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options)) record.save record spec/models/author_spec.rb app/views/authors/new.html.erb app/views/sessions/new.html.erb public/stylesheets/main.css public/stylesheets/sass/main.sass vendor/plugins/haml-1.8.2/MIT-LICENSE vendor/plugins/haml-1.8.2/README vendor/plugins/haml-1.8.2/Rakefile vendor/plugins/haml-1.8.2/VERSION vendor/plugins/haml-1.8.2/bin/css2sass vendor/plugins/haml-1.8.2/bin/haml vendor/plugins/haml-1.8.2/bin/html2haml vendor/plugins/haml-1.8.2/bin/sass vendor/plugins/haml-1.8.2/init.rb vendor/plugins/haml-1.8.2/lib/haml.rb vendor/plugins/haml-1.8.2/lib/haml/buffer.rb vendor/plugins/haml-1.8.2/lib/haml/engine.rb vendor/plugins/haml-1.8.2/lib/haml/error.rb vendor/plugins/haml-1.8.2/lib/haml/exec.rb vendor/plugins/haml-1.8.2/lib/haml/filters.rb vendor/plugins/haml-1.8.2/lib/haml/helpers.rb vendor/plugins/haml-1.8.2/lib/haml/helpers/action_view_extensions.rb vendor/plugins/haml-1.8.2/lib/haml/helpers/action_view_mods.rb vendor/plugins/haml-1.8.2/lib/haml/html.rb vendor/plugins/haml-1.8.2/lib/haml/precompiler.rb vendor/plugins/haml-1.8.2/lib/haml/template.rb vendor/plugins/haml-1.8.2/lib/haml/template/patch.rb vendor/plugins/haml-1.8.2/lib/haml/template/plugin.rb vendor/plugins/haml-1.8.2/lib/haml/util.rb vendor/plugins/haml-1.8.2/lib/sass.rb vendor/plugins/haml-1.8.2/lib/sass/constant.rb vendor/plugins/haml-1.8.2/lib/sass/constant/color.rb vendor/plugins/haml-1.8.2/lib/sass/constant/literal.rb vendor/plugins/haml-1.8.2/lib/sass/constant/number.rb vendor/plugins/haml-1.8.2/lib/sass/constant/operation.rb vendor/plugins/haml-1.8.2/lib/sass/constant/string.rb vendor/plugins/haml-1.8.2/lib/sass/css.rb vendor/plugins/haml-1.8.2/lib/sass/engine.rb vendor/plugins/haml-1.8.2/lib/sass/error.rb vendor/plugins/haml-1.8.2/lib/sass/plugin.rb vendor/plugins/haml-1.8.2/lib/sass/plugin/merb.rb vendor/plugins/haml-1.8.2/lib/sass/plugin/rails.rb vendor/plugins/haml-1.8.2/lib/sass/tree/attr_node.rb vendor/plugins/haml-1.8.2/lib/sass/tree/comment_node.rb vendor/plugins/haml-1.8.2/lib/sass/tree/directive_node.rb vendor/plugins/haml-1.8.2/lib/sass/tree/node.rb vendor/plugins/haml-1.8.2/lib/sass/tree/rule_node.rb vendor/plugins/haml-1.8.2/lib/sass/tree/value_node.rb vendor/plugins/haml-1.8.2/test/benchmark.rb vendor/plugins/haml-1.8.2/test/haml/engine_test.rb vendor/plugins/haml-1.8.2/test/haml/helper_test.rb vendor/plugins/haml-1.8.2/test/haml/html2haml_test.rb vendor/plugins/haml-1.8.2/test/haml/markaby/standard.mab vendor/plugins/haml-1.8.2/test/haml/mocks/article.rb vendor/plugins/haml-1.8.2/test/haml/results/content_for_layout.xhtml vendor/plugins/haml-1.8.2/test/haml/results/eval_suppressed.xhtml vendor/plugins/haml-1.8.2/test/haml/results/filters.xhtml vendor/plugins/haml-1.8.2/test/haml/results/helpers.xhtml vendor/plugins/haml-1.8.2/test/haml/results/helpful.xhtml vendor/plugins/haml-1.8.2/test/haml/results/just_stuff.xhtml vendor/plugins/haml-1.8.2/test/haml/results/list.xhtml vendor/plugins/haml-1.8.2/test/haml/results/original_engine.xhtml vendor/plugins/haml-1.8.2/test/haml/results/partials.xhtml vendor/plugins/haml-1.8.2/test/haml/results/silent_script.xhtml vendor/plugins/haml-1.8.2/test/haml/results/standard.xhtml vendor/plugins/haml-1.8.2/test/haml/results/tag_parsing.xhtml vendor/plugins/haml-1.8.2/test/haml/results/very_basic.xhtml vendor/plugins/haml-1.8.2/test/haml/results/whitespace_handling.xhtml vendor/plugins/haml-1.8.2/test/haml/rhtml/_av_partial_1.rhtml vendor/plugins/haml-1.8.2/test/haml/rhtml/_av_partial_2.rhtml vendor/plugins/haml-1.8.2/test/haml/rhtml/action_view.rhtml vendor/plugins/haml-1.8.2/test/haml/rhtml/standard.rhtml vendor/plugins/haml-1.8.2/test/haml/runner.rb vendor/plugins/haml-1.8.2/test/haml/template_test.rb vendor/plugins/haml-1.8.2/test/haml/templates/_av_partial_1.haml vendor/plugins/haml-1.8.2/test/haml/templates/_av_partial_2.haml vendor/plugins/haml-1.8.2/test/haml/templates/_partial.haml vendor/plugins/haml-1.8.2/test/haml/templates/_text_area.haml vendor/plugins/haml-1.8.2/test/haml/templates/action_view.haml vendor/plugins/haml-1.8.2/test/haml/templates/breakage.haml vendor/plugins/haml-1.8.2/test/haml/templates/content_for_layout.haml vendor/plugins/haml-1.8.2/test/haml/templates/eval_suppressed.haml vendor/plugins/haml-1.8.2/test/haml/templates/filters.haml vendor/plugins/haml-1.8.2/test/haml/templates/helpers.haml vendor/plugins/haml-1.8.2/test/haml/templates/helpful.haml vendor/plugins/haml-1.8.2/test/haml/templates/just_stuff.haml vendor/plugins/haml-1.8.2/test/haml/templates/list.haml vendor/plugins/haml-1.8.2/test/haml/templates/original_engine.haml vendor/plugins/haml-1.8.2/test/haml/templates/partialize.haml vendor/plugins/haml-1.8.2/test/haml/templates/partials.haml vendor/plugins/haml-1.8.2/test/haml/templates/silent_script.haml vendor/plugins/haml-1.8.2/test/haml/templates/standard.haml vendor/plugins/haml-1.8.2/test/haml/templates/tag_parsing.haml vendor/plugins/haml-1.8.2/test/haml/templates/very_basic.haml vendor/plugins/haml-1.8.2/test/haml/templates/whitespace_handling.haml vendor/plugins/haml-1.8.2/test/profile.rb vendor/plugins/haml-1.8.2/test/sass/engine_test.rb vendor/plugins/haml-1.8.2/test/sass/plugin_test.rb vendor/plugins/haml-1.8.2/test/sass/results/alt.css vendor/plugins/haml-1.8.2/test/sass/results/basic.css vendor/plugins/haml-1.8.2/test/sass/results/compact.css vendor/plugins/haml-1.8.2/test/sass/results/complex.css vendor/plugins/haml-1.8.2/test/sass/results/compressed.css vendor/plugins/haml-1.8.2/test/sass/results/constants.css vendor/plugins/haml-1.8.2/test/sass/results/expanded.css vendor/plugins/haml-1.8.2/test/sass/results/import.css vendor/plugins/haml-1.8.2/test/sass/results/nested.css vendor/plugins/haml-1.8.2/test/sass/results/parent_ref.css vendor/plugins/haml-1.8.2/test/sass/results/subdir/nested_subdir/nested_subdir.css vendor/plugins/haml-1.8.2/test/sass/results/subdir/subdir.css vendor/plugins/haml-1.8.2/test/sass/templates/_partial.sass vendor/plugins/haml-1.8.2/test/sass/templates/alt.sass vendor/plugins/haml-1.8.2/test/sass/templates/basic.sass vendor/plugins/haml-1.8.2/test/sass/templates/bork.sass vendor/plugins/haml-1.8.2/test/sass/templates/bork2.sass vendor/plugins/haml-1.8.2/test/sass/templates/compact.sass vendor/plugins/haml-1.8.2/test/sass/templates/complex.sass vendor/plugins/haml-1.8.2/test/sass/templates/compressed.sass vendor/plugins/haml-1.8.2/test/sass/templates/constants.sass vendor/plugins/haml-1.8.2/test/sass/templates/expanded.sass vendor/plugins/haml-1.8.2/test/sass/templates/import.sass vendor/plugins/haml-1.8.2/test/sass/templates/importee.sass vendor/plugins/haml-1.8.2/test/sass/templates/nested.sass vendor/plugins/haml-1.8.2/test/sass/templates/parent_ref.sass vendor/plugins/haml-1.8.2/test/sass/templates/subdir/nested_subdir/nested_subdir.sass vendor/plugins/haml-1.8.2/test/sass/templates/subdir/subdir.sass 54afbf6b68d661377af9e99a2d188e5212eef149 John W. Long me@johnwlong.com http://github.com/radiant/radiant-extension-registry/commit/b0d7a73328650d80ab91ed1437cb18a7926580df b0d7a73328650d80ab91ed1437cb18a7926580df

2009-10-23T20:19:10-07:00

2009-10-23T20:10:51-07:00

updated styles 2be4d09832ebed15386a9d6a812567882b51e78d John W. Long me@johnwlong.com