formula 0.3.5 → 0.3.6

data/lib/formula/railtie.rb

@@ -7,4 +7,4 @@ module Formula
       ActionView::Base.send :include, Formula::FormulaFormHelper
     end
   end
-end
+end

data/lib/formula/version.rb

@@ -1,3 +1,3 @@
 module Formula
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/lib/generators/attached/templates/_form.html.haml

@@ -0,0 +1,6 @@
+= formula_form_for(@<%= singular_table_name %>) do |form|
+  <%- attributes.each do |attribute -%>
+  = form.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>
+  <%- end -%>
+  
+  = form.button :submit

data/test/dummy/app/assets/javascripts/application.js

@@ -1,3 +1,4 @@
 //= require jquery
 //= require jquery_ujs
-//= require_tree .
+//= require bootstrap
+//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -1,173 +1,9 @@
 /*
  *= require_self
- *= require_tree . 
+ *= require_tree .
 */
 
-/* global */
-
-html, body
-{
-  font-family: Helvetica, Verdana, Arial, sans-serif;
-  font-style: normal;
-  font-weight: normal;
-}
-
-/* grid */
-
-.container
-{
-  width: 960px;
-  margin-left:  auto;
-  margin-right: auto;
-}
-
-.grid-01, .grid-02, .grid-03, .grid-04, .grid-05, .grid-06, .grid-07, .grid-08, .grid-09, .grid-10, .grid-11, .grid-12 
-{
-  float: left;
-  display: inline;
-  position: relative;
-  margin-left:  10px;
-  margin-right: 10px;
-}
-
-.alpha { margin-left:  0px; }
-.omega { margin-right: 0px; }
-
-.grid-01 { width:  60px; }
-.grid-02 { width: 140px; }
-.grid-03 { width: 220px; }
-.grid-04 { width: 300px; }
-.grid-05 { width: 380px; }
-.grid-06 { width: 460px; }
-.grid-07 { width: 540px; }
-.grid-08 { width: 620px; }
-.grid-09 { width: 700px; }
-.grid-10 { width: 780px; }
-.grid-11 { width: 860px; }
-.grid-12 { width: 940px; }
-
-.prefix-01 { padding-left:   80px; }
-.suffix-01 { padding-right:  80px; }
-.prefix-02 { padding-left:  160px; }
-.suffix-02 { padding-right: 160px; }
-.prefix-03 { padding-left:  240px; }
-.suffix-03 { padding-right: 240px; }
-.prefix-04 { padding-left:  320px; }
-.suffix-04 { padding-right: 320px; }
-.prefix-05 { padding-left:  400px; }
-.suffix-05 { padding-right: 400px; }
-.prefix-06 { padding-left:  480px; }
-.suffix-06 { padding-right: 480px; }
-.prefix-07 { padding-left:  560px; }
-.suffix-07 { padding-right: 560px; }
-.prefix-08 { padding-left:  640px; }
-.suffix-08 { padding-right: 640px; }
-.prefix-09 { padding-left:  720px; }
-.suffix-09 { padding-right: 720px; }
-.prefix-10 { padding-left:  800px; }
-.suffix-10 { padding-right: 800px; }
-.prefix-11 { padding-left:  880px; }
-.suffix-11 { padding-right: 880px; }
-
-.left  { float: left;  }
-.right { float: right; }
-
-.center  { text-align: center;  }
-.justify { text-align: justify; }
-
-.clear
-{
-  clear: both;
-	overflow: hidden;
-	visibility: hidden;
-  height: 0px; 
-  width: 0px;
-}
-
-/* form */
-
-.field_with_errors 
-{ 
-  display: inline;
-}
-
-.input
-{
-  padding: 0px;
-}
-
-.input.url, .input.text, .input.email, .input.string, .input.phone, .input.password
-{
-  padding: 0px 20px 0px 0px;
-}
-
-.block
-{
-  padding: 4px 0px;
-}
-
-.hint
-{
-  display: block;
-  color: #888;
-  margin: 2px 0px;
-  padding: 0px;
-  font-size: 12px;
-  font-weight: normal;
-}
-
-.error
-{
-  display: block;
-  color: #C22;
-  margin: 2px 0px;
-  padding: 0px;
-  font-size: 12px;
-  font-weight: bolder;
-}
-
-.errors label
-{
-	color: #A00;
-}
-
-.errors .hint
-{
-	color: #A00;
-}
-
-.errors .error
-{
-	color: #A00;
-}
-
-label
-{
-  display: inline;
-  color: #444;
-  margin: 2px 0px;
-  padding: 0px;
-  font-size: 14px;
-  font-weight: normal;
-}
-
-input[type="url"], 
-input[type="tel"], 
-input[type="text"], 
-input[type="email"], 
-input[type="password"], 
-textarea
-{
-  width: 100%;
-  padding: 8px;
-  font-size: 16px;
-  font-weight: normal;
-}
-
-textarea
+body
 {
-  width: 100%;
-  padding: 8px;
-  font-size: 16px;
-  font-weight: normal;d
-}
+  padding: 80px 0px;
+}

data/test/dummy/app/assets/stylesheets/main.css.scss

@@ -0,0 +1,6 @@
+@import "bootstrap";
+
+.modal form
+{
+  margin: auto;
+}

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,59 @@
 class ApplicationController < ActionController::Base
+
   protect_from_forgery
+
+  helper_method :user
+  helper_method :authenticated?
+
+private
+
+  def user
+    cookie = cookies.signed[:user]
+    @_user ||= User.find(cookie) rescue deauthenticate if cookie
+  end
+
+  def authenticate(user)
+    cookies.permanent.signed[:user] = user.id
+  end
+
+  def deauthenticate
+    cookies.delete :user
+  end
+
+  def authenticated?
+    user.present?
+  end
+
+  def authenticate!
+    unless authenticated?
+      store
+      flash[:warning] = 'You must be logged in.'
+      respond_to do |format|
+        format.html { redirect_to new_user_path }
+      end
+      return false
+    end
+  end
+
+  def deauthenticate!
+    if authenticated?
+      store
+      flash[:warning] = 'You must be logged out.'
+      respond_to do |format|
+        format.html { redirect_to edit_user_path }
+      end
+      return false
+    end
+  end
+
+  def store
+    session[:location] = request.fullpath
+  end
+
+  def restore(options)
+    location = session[:location] || options[:default]
+    session[:location] = nil
+    return location
+  end
+
 end

data/test/dummy/app/controllers/contacts_controller.rb

@@ -1,37 +1,44 @@
 class ContactsController < ApplicationController
-  
+
   respond_to :html
-  
+
   # GET /contacts
   def index
     @contacts = Contact.all
     respond_with(@contacts)
   end
-  
+
   # GET /contacts/new
   def new
     @contact = Contact.new
     respond_with(@contact)
   end
-  
+
   # GET /contacts/:id/edit
   def edit
     @contact = Contact.find(params[:id])
     respond_with(@contact)
   end
-  
+
   # POST /contacts
   def create
     @contact = Contact.create(params[:contact])
     respond_with(@contact, :location => contacts_path)
   end
-  
-  # put /contacts
+
+  # PUT /contacts
   def update
     @contact = Contact.find(params[:id])
     @contact.attributes = params[:contact]
     @contact.save
     respond_with(@contact, :location => contacts_path)
   end
-  
+
+  # DELETE /contacts/:id
+  def destroy
+    @contact = Contact.find(params[:id])
+    @contact.delete
+    respond_with(@contact, :location => contacts_path)
+  end
+
 end

data/test/dummy/app/controllers/main_controller.rb

@@ -1,10 +1,10 @@
 class MainController < ApplicationController
-  
+
   # GET /
   def index
     respond_to do |format|
       format.html
     end
   end
-  
+
 end

data/test/dummy/app/controllers/sessions_controller.rb

@@ -0,0 +1,37 @@
+class SessionsController < ApplicationController
+
+  respond_to :html, :js
+
+  before_filter :authenticate!, :only => [:destroy]
+  before_filter :deauthenticate!, :only => [:new, :create]
+
+  # GET /session/new
+  def new
+    @session = Session.new
+
+    respond_with(@session)
+  end
+
+  # POST /session
+  def create
+    @session = Session.new(params[:session])
+
+    flash[:notice] = 'Session create successful.' if @session.valid?
+    flash[:error] = 'Session create failed.' if @session.invalid?
+
+    authenticate(@session.user) if @session.valid?
+    respond_with(@session, :location => restore(:default => root_path))
+  end
+
+  # DELETE /session
+  def destroy
+    flash[:notice] = 'Session destroyed.'
+
+    deauthenticate()
+
+    respond_to do |format|
+      format.html { redirect_to(restore(:default => root_path)) }
+    end
+  end
+
+end

data/test/dummy/app/controllers/users_controller.rb

@@ -0,0 +1,46 @@
+class UsersController < ApplicationController
+
+  respond_to :html, :js
+
+  before_filter :authenticate!, :only => [:edit, :update]
+  before_filter :deauthenticate!, :only => [:new, :create]
+
+  # GET /user/new
+  def new
+    @user = User.new
+
+    respond_with(@user)
+  end
+
+  # GET /user/edit
+  def edit
+    @user = user
+
+    respond_with(@user)
+  end
+
+  # POST /user
+  def create
+    @user = User.create(params[:user])
+
+    flash[:notice] = 'User create successful.' if @user.valid?
+    flash[:error] = 'User create failed.' if @user.invalid?
+
+    authenticate(@user) if @user.valid?
+    respond_with(@user, :location => restore(:default => root_path))
+  end
+
+  # PUT /user
+  def update
+    @user = user
+
+    @user.attributes = params[:user]
+    @user.save
+
+    flash[:notice] = 'User update successful.' if @user.valid?
+    flash[:error] = 'User update failed.' if @user.invalid?
+
+    respond_with(@user, :location => restore(:default => root_path))
+  end
+
+end

data/test/dummy/app/helpers/sessions_helper.rb

@@ -0,0 +1,2 @@
+module SessionsHelper
+end

data/test/dummy/app/helpers/users_helper.rb

@@ -0,0 +1,2 @@
+module UsersHelper
+end

data/test/dummy/app/models/contact.rb

@@ -1,19 +1,19 @@
 class Contact < ActiveRecord::Base
-  
+
   attr_accessor :secret
-  
+
   belongs_to :group
-  
+
   validates_presence_of :name
   validates_presence_of :details
   validates_presence_of :email
   validates_presence_of :phone
   validates_presence_of :url
   validates_presence_of :group
-  
+
   validates_format_of :email, :with => /\A([^\s]+)@([^\s]+)\Z/i, :message => "is not valid"
   validates_format_of :phone, :with => /\A[0-9\s\(\)\+\-]+\Z/i, :message => "is not valid"
-  
+
   has_attached :avatar
-  
+
 end