diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index cd2641e..aa54e10 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -4,7 +4,7 @@ def index end def show - @user = User.find params[:id] + @user = User.find(params[:id], :include=>:projects) end end diff --git a/app/helpers/meetings_helper.rb b/app/helpers/meetings_helper.rb index e814169..f8b0a25 100644 --- a/app/helpers/meetings_helper.rb +++ b/app/helpers/meetings_helper.rb @@ -4,5 +4,4 @@ def content_links meeting link_to h(content), content.url, :popup => true end.to_sentence end -end - +end \ No newline at end of file diff --git a/app/models/project.rb b/app/models/project.rb index 3152c4f..c9bf073 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -6,7 +6,7 @@ class Project < ActiveRecord::Base default_scope :order => 'projects.name' # Validations - validates_presence_of :user, :name, :description + validates_presence_of :user, :name with_options :allow_blank => true do |u| u.validates_length_of :name, :description, :in => 1..255 diff --git a/app/models/user.rb b/app/models/user.rb index 86e95d4..82976a1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -23,7 +23,7 @@ class User < ActiveRecord::Base with_options :allow_blank => true do |u| u.validates_length_of :name, :city, :github, :in => 1..255 - # FIXME: u.validates_as_email :email + u.validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i u.validates_format_of :github, :with => /^[a-z_]+$/ u.validates_uniqueness_of :email, :github, :case_sensitive => false end @@ -47,7 +47,7 @@ def fetch_projects! def to_s name end - + def github_url "http://github.com/#{github}" end diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml index e5bb83e..306bf34 100644 --- a/app/views/members/show.html.haml +++ b/app/views/members/show.html.haml @@ -14,7 +14,7 @@ usando Ruby desde #{@user.using_ruby_since} .about - != simple_format h(@user.about) + != simple_format auto_link(h(@user.about), :link => :urls, :target => "_blank") %ul.links - if @user.site? @@ -41,4 +41,4 @@ = link_to h(project), project.github_url %p - = project.description + = project.description \ No newline at end of file diff --git a/config/environments/test.rb b/config/environments/test.rb index c3ffced..4ea73aa 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -29,5 +29,4 @@ config.gem 'rspec', :lib => false, :version => '1.2.9' config.gem 'rspec-rails', :lib => false, :version => '1.2.9' config.gem 'remarkable_rails', :lib => false, :version => '3.1.11' -config.gem 'machinist', :lib => false, :version => '1.0.6' - +config.gem 'machinist', :lib => false, :version => '1.0.6' \ No newline at end of file diff --git a/script/about b/script/about old mode 100644 new mode 100755 diff --git a/script/autospec b/script/autospec old mode 100644 new mode 100755 diff --git a/script/console b/script/console old mode 100644 new mode 100755 diff --git a/script/dbconsole b/script/dbconsole old mode 100644 new mode 100755 diff --git a/script/destroy b/script/destroy old mode 100644 new mode 100755 diff --git a/script/generate b/script/generate old mode 100644 new mode 100755 diff --git a/script/performance/benchmarker b/script/performance/benchmarker old mode 100644 new mode 100755 diff --git a/script/performance/profiler b/script/performance/profiler old mode 100644 new mode 100755 diff --git a/script/plugin b/script/plugin old mode 100644 new mode 100755 diff --git a/script/runner b/script/runner old mode 100644 new mode 100755 diff --git a/script/server b/script/server old mode 100644 new mode 100755 diff --git a/script/spec b/script/spec old mode 100644 new mode 100755 diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 89444bc..3067045 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -17,7 +17,7 @@ should_belong_to :user, :counter_cache => true # Validations - should_validate_presence_of :user, :name, :description + should_validate_presence_of :user, :name with_options :allow_blank => true do |p| p.should_validate_length_of :name, :description, :in => 1..255