my-feedback-form 0.0.2 → 0.0.3

data/README.md

@@ -1,4 +1,4 @@
-# MyFeedbackForm v 0.0.2
+# MyFeedbackForm v 0.0.3
 
 The gem does not have a server side interface, it has only the client side, unfortunatly you need to implement a way to see the feedbacks you received
 
@@ -63,6 +63,6 @@ rails g my_feedback_form:views
 If you are using Devise to authenticate users, it will be saved automatically, otherwise you must extend feedbacks controller.
 
 #Next Steps
-The next steps for this gem will be add validations to the feedback modell and create a task to easier install.
+The next steps for this gem will be create a task to easier install.
 
 

data/app/assets/javascripts/my_feedback_form/feedbacks.js

@@ -1,14 +1,19 @@
 $('document').ready(function() {
+	$('#my-feedback-form-modal').on('hidden', function () {
+  	$('#new_feedback').remove();
+	});
+
 	$("#feedback-button").live('click', function (e){
 		e.preventDefault
 		form = $('#new_feedback');
 		$.get('/my_feedback_form/feedbacks/new', function(s) {
 			m = $("#my-feedback-form-modal .modal-body");
 			m.html(s);
-	        $('#send-feedback').live('click', function (e) {
-	        	$('#new_feedback').submit()
-	    });
 		});
 	});
+
+	$('#send-feedback').live('click', function (e) {
+  	$('#new_feedback').submit();
+  });
 });
 

data/app/controllers/my_feedback_form/feedbacks_controller.rb

@@ -18,11 +18,13 @@ module MyFeedbackForm
   
       respond_to do |format|
         if @feedback.save
-          format.html { redirect_to '/', notice: 'Feedback was successfully sent.' }
+          format.html { redirect_to(@feedback) }
           format.json { render json: @feedback, status: :created, location: @feedback }
+          format.js
         else
-          format.html { render action: "new" }
+          format.html { render :action => "new" }
           format.json { render json: @feedback.errors, status: :unprocessable_entity }
+          format.js
         end
       end
     end

data/app/models/my_feedback_form/feedback.rb

@@ -1,5 +1,7 @@
 module MyFeedbackForm
   class Feedback < ActiveRecord::Base
     attr_accessible :message, :title, :type, :user_id
+
+    validates_presence_of :message, :title, :type, :on => :create
   end
 end

data/app/views/my_feedback_form/feedbacks/_form.html.erb

@@ -0,0 +1,31 @@
+<%= form_for(@feedback, :remote => true, :html => {:class => 'form-horizontal'}) do |f| %>
+  <div class="control-group <%= @feedback.errors[:type].empty? ? '' : 'error' %>">
+    <%= f.label :type, :class => 'control-label' %>
+    <div class="controls">
+      <%= f.collection_select :type, MyFeedbackForm::FeedbackType.all, :id, :description, {:prompt => 'Type'} %>
+      <% @feedback.errors[:type].each do |msg| %>
+        <p class="help-inline"><%= msg %></p>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="control-group <%= @feedback.errors[:title].empty? ? '' : 'error' %>">
+    <%= f.label :title, :class => 'control-label' %>
+    <div class="controls">
+      <%= f.text_field :title %>
+      <% @feedback.errors[:title].each do |msg| %>
+        <p class="help-inline"><%= msg %></p>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="control-group <%= @feedback.errors[:message].empty? ? '' : 'error' %>">
+    <%= f.label :message, :class => 'control-label' %>
+    <div class="controls">
+      <%= f.text_area :message, :size => "10x5" %>
+      <% @feedback.errors[:message].each do |msg| %>
+        <p class="help-inline"><%= msg %></p>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/my_feedback_form/feedbacks/_modal.html.erb

@@ -1,12 +1,12 @@
 <div id="my-feedback-form-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="feedback-form" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="feedback-form">New feedback</h3>
+    <h3 id="feedback-form">New Feedback</h3>
   </div>
   <div class="modal-body">
   </div>
   <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">Back</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">Voltar</button>
     <button class="btn btn-primary" name="commit" type="submit" value="Submit" id="send-feedback">Submit</button>
   </div>
 </div>

data/app/views/my_feedback_form/feedbacks/create.js.erb

@@ -0,0 +1,6 @@
+$('#new_feedback').remove();
+<%- if @feedback.errors.any? %>
+	$('#my-feedback-form-modal .modal-body').html('<%= escape_javascript(render('form')) %>');
+<%- else %>
+  $('#my-feedback-form-modal').modal('hide');
+<%- end %>

data/app/views/my_feedback_form/feedbacks/new.html.erb

@@ -1,25 +1 @@
-<%= form_for(@feedback, :html => {:class => 'form-horizontal'}) do |f| %>
-  <div class="control-group">
-    <%= f.label :type, :class => 'control-label' %>
-    <div class="controls">
-      <%= f.collection_select :type, MyFeedbackForm::FeedbackType.all, :id, :description, {:prompt => 'Type'} %>
-    </div>
-  </div>
-
-  <div class="control-group">
-    <%= f.label :title, :class => 'control-label' %>
-    <div class="controls">
-      <%= f.text_field :title %>
-    </div>
-  </div>
-
-  <div class="control-group">
-    <%= f.label :message, :class => 'control-label' %>
-    <div class="controls">
-      <%= f.text_area :message, :size => "10x5" %>
-    </div>
-  </div>
-<% end %>    
-
- 
-
+<%= render 'form' %>

data/lib/my-feedback-form/version.rb

@@ -1,3 +1,3 @@
 module MyFeedbackForm
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my-feedback-form
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -93,7 +93,9 @@ files:
 - app/helpers/my_feedback_form/feedbacks_helper.rb
 - app/models/my_feedback_form/feedback.rb
 - app/models/my_feedback_form/feedback_type.rb
+- app/views/my_feedback_form/feedbacks/_form.html.erb
 - app/views/my_feedback_form/feedbacks/_modal.html.erb
+- app/views/my_feedback_form/feedbacks/create.js.erb
 - app/views/my_feedback_form/feedbacks/new.html.erb
 - config/routes.rb
 - db/migrate/20130227125242_create_my_feedback_form_feedbacks.rb