Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: RMS-TEAM/rmsWebPage
base: ab926866d2
...
head fork: RMS-TEAM/rmsWebPage
compare: f414b9b054
  • 7 commits
  • 12 files changed
  • 0 commit comments
  • 1 contributor
View
2  .gitignore
@@ -14,4 +14,4 @@
/log/*.log
/tmp
-/.idea
+
View
25 .idea/rmsWebPage.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="RailsFacetType" name="Ruby on Rails">
+ <configuration>
+ <RAILS_FACET_CONFIG_ID NAME="RAILS_FACET_SUPPORT_REMOVED" VALUE="false" />
+ <RAILS_FACET_CONFIG_ID NAME="RAILS_TESTS_SOURCES_PATCHED" VALUE="true" />
+ <RAILS_FACET_CONFIG_ID NAME="RAILS_FACET_APPLICATION_ROOT" VALUE="$MODULE_DIR$" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager">
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/tmp" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+ <component name="RModuleSettingsStorage">
+ <LOAD_PATH number="0" />
+ <I18N_FOLDERS number="1" string0="$MODULE_DIR$/config/locales" />
+ </component>
+</module>
+
View
125 .idea/workspace.xml 100755 → 100644
@@ -22,10 +22,28 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="index.html.erb" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/views/users/index.html.erb">
+ <file leaf-file-name="users_controller.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/controllers/users_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="41" selection-start="521" selection-end="521" vertical-scroll-proportion="0.42857143">
+ <state line="46" column="62" selection-start="964" selection-end="964" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Gemfile" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Gemfile">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="38" column="43" selection-start="733" selection-end="733" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="user.rb" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/models/user.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="5" column="69" selection-start="196" selection-end="196" vertical-scroll-proportion="0.1146789">
<folding />
</state>
</provider>
@@ -41,22 +59,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/Gemfile" />
- <option value="$PROJECT_DIR$/config/environments/production.rb" />
- <option value="$PROJECT_DIR$/app/controllers/user_controller.rb" />
- <option value="$PROJECT_DIR$/app/views/user/index.html.erb" />
<option value="$PROJECT_DIR$/app/views/layouts/application.html.erb" />
<option value="$PROJECT_DIR$/app/assets/stylesheets/comentarios.css.scss" />
<option value="$PROJECT_DIR$/app/views/layouts/_footer.html.erb" />
<option value="$PROJECT_DIR$/README.markdown" />
- <option value="$PROJECT_DIR$/app/controllers/users_controller.rb" />
<option value="$PROJECT_DIR$/app/views/users/jvelezpo.html.erb" />
<option value="$PROJECT_DIR$/app/assets/stylesheets/application.css" />
<option value="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
- <option value="$PROJECT_DIR$/app/views/users/_user-info.html.erb" />
<option value="$PROJECT_DIR$/app/assets/stylesheets/user.css.scss" />
<option value="$PROJECT_DIR$/app/views/comentarios/index.html.erb" />
<option value="$PROJECT_DIR$/app/views/users/index.html.erb" />
+ <option value="$PROJECT_DIR$/app/controllers/users_controller.rb" />
+ <option value="$PROJECT_DIR$/app/views/users/_user-info.html.erb" />
+ <option value="$PROJECT_DIR$/.gitignore" />
+ <option value="$PROJECT_DIR$/Gemfile" />
+ <option value="$PROJECT_DIR$/app/models/contactanos.rb" />
+ <option value="$PROJECT_DIR$/app/models/user.rb" />
</list>
</option>
</component>
@@ -158,24 +176,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="config" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="environments" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="rms" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="rmsWebPage" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -686,79 +686,110 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/controllers/users_controller.rb">
+ <entry file="file://$PROJECT_DIR$/app/views/comentarios/show.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="19" selection-start="622" selection-end="622" vertical-scroll-proportion="0.5963303">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/layouts/_header.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/views/comentarios/delete.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="42" selection-start="187" selection-end="187" vertical-scroll-proportion="0.11904762">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/application.css">
+ <entry file="file://$PROJECT_DIR$/app/views/comentarios/index.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="15" selection-start="1845" selection-end="1845" vertical-scroll-proportion="-1.821101">
+ <state line="4" column="28" selection-start="177" selection-end="177" vertical-scroll-proportion="0.0952381">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/user.css.scss">
+ <entry file="file://$PROJECT_DIR$/README.markdown">
+ <provider editor-type-id="MarkdownPreviewEditor">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="130" column="16" selection-start="2354" selection-end="2354" vertical-scroll-proportion="0.26605505">
+ <state line="11" column="56" selection-start="240" selection-end="240" vertical-scroll-proportion="0.2606635">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/users/_user-info.html.erb">
+ <entry file="file://$PROJECT_DIR$/config/environments/production.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="23" selection-start="1388" selection-end="1388" vertical-scroll-proportion="0.5105348">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/users/jvelezpo.html.erb">
+ <entry file="file://$PROJECT_DIR$/config/routes.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="20" selection-start="20" selection-end="20" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/comentarios/new.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/views/layouts/_header.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="5" column="42" selection-start="187" selection-end="187" vertical-scroll-proportion="0.11904762">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/comentarios/show.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/views/users/_user-info.html.erb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="30" column="11" selection-start="798" selection-end="798" vertical-scroll-proportion="0.23987034">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/views/layouts/_footer.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/comentarios/delete.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/views/users/index.html.erb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="18" column="41" selection-start="521" selection-end="521" vertical-scroll-proportion="0.42857143">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/views/layouts/application.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/comentarios/index.html.erb">
+ <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="28" selection-start="177" selection-end="177" vertical-scroll-proportion="0.0952381">
+ <state line="16" column="0" selection-start="431" selection-end="431" vertical-scroll-proportion="0.36697248">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/users/index.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/controllers/users_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="41" selection-start="521" selection-end="521" vertical-scroll-proportion="0.42857143">
+ <state line="46" column="62" selection-start="964" selection-end="964" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Gemfile">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="38" column="43" selection-start="733" selection-end="733" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/models/user.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="5" column="69" selection-start="196" selection-end="196" vertical-scroll-proportion="0.1146789">
<folding />
</state>
</provider>
View
1  Gemfile
@@ -7,6 +7,7 @@ gem 'rails', '3.2.1'
gem 'sqlite3'
gem 'httparty'
+gem 'pg'
# Gems used only for assets and not required
View
2  Gemfile.lock
@@ -57,6 +57,7 @@ GEM
mime-types (1.18)
multi_json (1.3.2)
multi_xml (0.4.1)
+ pg (0.13.2)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -110,6 +111,7 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
httparty
jquery-rails
+ pg
rails (= 3.2.1)
sass-rails (~> 3.2.3)
sqlite3
View
4 app/controllers/users_controller.rb
@@ -1,9 +1,10 @@
class UsersController < ApplicationController
+
def index
@title = "RMS-Solutions"
@user = User.new
-
end
+
def create
@monda = User.new(params[:user])
if @monda.save
@@ -44,7 +45,6 @@ def user_info(user)
def user_repos(user)
HTTParty.get("https://api.github.com/users/#{user}/repos")
-
end
View
3  app/models/contactanos.rb
@@ -1,3 +0,0 @@
-class Contactanos < ActiveRecord::Base
- attr_accessible :nombre, :email, :content
-end
View
8 app/models/user.rb
@@ -1,8 +1,12 @@
class User < ActiveRecord::Base
attr_accessible :nombre, :email, :content
- validates :nombre, :presence => true
- validates :email, :presence => true
+ email_regex = /[\w+\-.]+@[a-z\d\-.]+\.[a-z]+/i
+
+ validates :nombre, :presence => true, :length => {:maximum => 50}
+ validates :email, :presence => true,
+ :format => {:with => email_regex},
+ :uniqueness => {:case_sensitive => false}
validates :content, :presence => true, :length => {:within => 10..180}
end
View
BIN  public/assets/application-809744515e816ecf3d960b6ef869559c.css.gz
Binary file not shown
View
BIN  public/assets/application-bc826404a0926a0aff3a05308639bb73.js.gz
Binary file not shown
View
BIN  public/assets/application.css.gz
Binary file not shown
View
BIN  public/assets/application.js.gz
Binary file not shown

No commit comments for this range

Something went wrong with that request. Please try again.