formula 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f871d7c6e0aa16ab4fbc5daba851f21e7fd6c711
-  data.tar.gz: 4a8400b70f74cbe0b83d4c841534cf88ccd4f9d9
+  metadata.gz: 71265ae04390fb7f692448563df850e9be7a9e8d
+  data.tar.gz: ffeceabdcdfb3dc7580c2601b11e88359af766ac
 SHA512:
-  metadata.gz: 1e37642d22dd5415c2205128510faa56b6fcbc2c4107b5d2ed2d3d8dec6b1c3d8989d5f1f917b7eb81a9287195046c888fdad69b38ec65f0017f969d1e6b0bdb
-  data.tar.gz: 1e5e15bd7a483d0c3762d7126fbbac3ab22662506539175c9abf9a922bdea95a0fa1a4a81e8359d2f764ba2d70d92081cbcae83f01f85a6c7341a37fe9e4940f
+  metadata.gz: cc31a4d35f5aee33aaac50a725ec4ff49089741dea7323c094f35537605ec19097d23456c282bbab66bf435f4cb12a6493f5e7f47a2a67ee7672023bea99312b
+  data.tar.gz: 063b37f477229a164628cfb6b8ad9be57283d8c985d85fd2ee6e232f5bc5da65f9121c0b2a0e44c367d9d448313cbe4df0da0c32536a09cb15a875d2efd0277e

data/README.rdoc

@@ -6,15 +6,12 @@ Formula is a Rails form helper that generates awesome markup. The project lets u
 
 The gem is tested with:
 
-* Ruby on Rails 3.1.11
-* Ruby on Rails 3.2.13
-* Ruby (MRI) 2.0.0
-* Ruby (MRI) 1.9.3
-* Ruby (MRI) 1.9.2
-* Ruby (MRI) 1.8.7
-* Ruby (REE) 1.8.7
-* JRuby 1.7.2
-* Rubinius 1.2.4
+* Ruby on Rails 4.1.1
+* Ruby on Rails 4.0.5
+* Ruby 2.1.2
+* Ruby 2.0.0
+* Ruby 1.9.3
+* JRuby
 
 == Installation
 
@@ -25,7 +22,7 @@ The gem is tested with:
   <% formula_form_for @user do |f| %>
     <%= f.input :email %>
     <%= f.input :password %>
-    <%= f.button 'Save' } %>
+    <%= f.button 'Save' %>
   <% end %>
 
   <% formula_form_for @user do |f| %>
@@ -35,9 +32,9 @@ The gem is tested with:
   <% end %>
 
   <% formula_form_for @company do |f|
-    <%= f.input :url,   container: { class: 'grid-04' }, input: { class: 'fill' } %>
-    <%= f.input :phone, container: { class: 'grid-04' }, input: { class: 'fill' } %>
-    <%= f.input :email, container: { class: 'grid-04' }, input: { class: 'fill' } %>
+    <%= f.input :url,   container: { class: 'third' }, input: { class: 'fill' } %>
+    <%= f.input :phone, container: { class: 'third' }, input: { class: 'fill' } %>
+    <%= f.input :email, container: { class: 'third' }, input: { class: 'fill' } %>
     <%= f.button 'Save', button: { class: 'fancy' } %>
   <% end %>
 
@@ -67,9 +64,10 @@ The gem is tested with:
 
 == Status
 
-{<img src="https://travis-ci.org/ksylvest/formula.png" />}[https://travis-ci.org/ksylvest/formula]
-{<img src="https://codeclimate.com/github/ksylvest/formula.png" />}[https://codeclimate.com/github/ksylvest/formula]
+{<img src="http://img.shields.io/gemnasium/ksylvest/formula.svg" />}[https://gemnasium.com/ksylvest/formula]
+{<img src="http://img.shields.io/travis/ksylvest/formula.svg" />}[https://travis-ci.org/ksylvest/formula]
+{<img src="http://img.shields.io/codeclimate/github/ksylvest/formula.svg" />}[https://codeclimate.com/github/ksylvest/formula]
 
 == Copyright
 
-Copyright (c) 2010 - 2012 Kevin Sylvestre. See LICENSE for details.
+Copyright (c) 2010 - 2014 Kevin Sylvestre. See LICENSE for details.

data/Rakefile

@@ -1,13 +1,26 @@
-#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Formula'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
 
-require 'appraisal'
 
-require 'bundler'
 
-require 'rake/testtask'
 
 Bundler::GemHelper.install_tasks
 
+require 'rake/testtask'
+
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
@@ -15,4 +28,5 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-task :default => :test
+
+task default: :test

data/lib/formula.rb

@@ -3,6 +3,16 @@ module Formula
 
   require 'formula/railtie' if defined?(Rails)
 
+  mattr_accessor :box_options
+  mattr_accessor :area_options
+  mattr_accessor :file_options
+  mattr_accessor :field_options
+  mattr_accessor :select_options
+  @@box_options = {}
+  @@area_options = {}
+  @@file_options = {}
+  @@field_options = {}
+  @@select_options = {}
 
   # Default class assigned to block (<div class="block">...</div>).
   mattr_accessor :block_class
@@ -203,20 +213,20 @@ module Formula
       self.block(method, options) do
         @template.content_tag(::Formula.input_tag, :class => klass) do
           case options[:as]
-          when :text     then text_area       method, options[:input]
-          when :file     then file_field      method, options[:input]
-          when :string   then text_field      method, options[:input]
-          when :password then password_field  method, options[:input]
-          when :boolean  then check_box       method, options[:input]
-          when :url      then url_field       method, options[:input]
-          when :email    then email_field     method, options[:input]
-          when :phone    then phone_field     method, options[:input]
-          when :number   then number_field    method, options[:input]
-          when :country  then country_select  method, options[:input]
-          when :date     then date_select     method, options[:input], options[:input].delete(:html) || {}
-          when :time     then time_select     method, options[:input], options[:input].delete(:html) || {}
-          when :datetime then datetime_select method, options[:input], options[:input].delete(:html) || {}
-          when :select   then select          method, options[:choices], options[:input], options[:input].delete(:html) || {}
+          when :text     then text_area       method, ::Formula.area_options.merge(options[:input] || {})
+          when :file     then file_field      method, ::Formula.file_options.merge(options[:input] || {})
+          when :string   then text_field      method, ::Formula.field_options.merge(options[:input] || {})
+          when :password then password_field  method, ::Formula.field_options.merge(options[:input] || {})
+          when :url      then url_field       method, ::Formula.field_options.merge(options[:input] || {})
+          when :email    then email_field     method, ::Formula.field_options.merge(options[:input] || {})
+          when :phone    then phone_field     method, ::Formula.field_options.merge(options[:input] || {})
+          when :number   then number_field    method, ::Formula.field_options.merge(options[:input] || {})
+          when :boolean  then check_box       method, ::Formula.box_options.merge(options[:input] || {})
+          when :country  then country_select  method, ::Formula.select_options.merge(options[:input] || {})
+          when :date     then date_select     method, ::Formula.select_options.merge(options[:input] || {}), options[:input].delete(:html) || {}
+          when :time     then time_select     method, ::Formula.select_options.merge(options[:input] || {}), options[:input].delete(:html) || {}
+          when :datetime then datetime_select method, ::Formula.select_options.merge(options[:input] || {}), options[:input].delete(:html) || {}
+          when :select   then select          method, options[:choices], ::Formula.select_options.merge(options[:input] || {}), options[:input].delete(:html) || {}
           end
         end
       end

data/lib/formula/version.rb

@@ -1,3 +1,3 @@
 module Formula
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

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

@@ -2,5 +2,5 @@
   <%- attributes.each do |attribute -%>
   = form.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>
   <%- end -%>
-  
+
   = form.button :submit

data/test/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/test/dummy/Rakefile

@@ -1,7 +1,6 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
 
-Dummy::Application.load_tasks
+Rails.application.load_tasks

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

@@ -0,0 +1,5 @@
+#= require jquery
+#= require jquery_ujs
+#= require bootstrap
+#= require_self
+#= require_tree .

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

@@ -0,0 +1,4 @@
+@import bootstrap
+
+//= require_self
+//= require_tree .

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

@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
 
-  protect_from_forgery
+  protect_from_forgery with: :exception
 
   helper_method :user
   helper_method :authenticated?

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

@@ -22,14 +22,14 @@ class ContactsController < ApplicationController
 
   # POST /contacts
   def create
-    @contact = Contact.create(params[:contact])
+    @contact = Contact.create(attributes)
     respond_with(@contact, :location => contacts_path)
   end
 
   # PUT /contacts
   def update
     @contact = Contact.find(params[:id])
-    @contact.attributes = params[:contact]
+    @contact.attributes = attributes
     @contact.save
     respond_with(@contact, :location => contacts_path)
   end
@@ -41,4 +41,10 @@ class ContactsController < ApplicationController
     respond_with(@contact, :location => contacts_path)
   end
 
+private
+
+  def attributes
+    params.require(:contact).permit(:name, :details, :email, :phone, :url, :avatar, :secret, :group_id)
+  end
+
 end

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

@@ -14,7 +14,7 @@ class SessionsController < ApplicationController
 
   # POST /session
   def create
-    @session = Session.new(params[:session])
+    @session = Session.new(attributes)
 
     flash[:notice] = 'Session create successful.' if @session.valid?
     flash[:error] = 'Session create failed.' if @session.invalid?
@@ -34,4 +34,10 @@ class SessionsController < ApplicationController
     end
   end
 
+private
+
+  def attributes
+    params.require(:session).permit(:email, :password)
+  end
+
 end

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

@@ -21,7 +21,7 @@ class UsersController < ApplicationController
 
   # POST /user
   def create
-    @user = User.create(params[:user])
+    @user = User.create(attributes)
 
     flash[:notice] = 'User create successful.' if @user.valid?
     flash[:error] = 'User create failed.' if @user.invalid?
@@ -34,7 +34,7 @@ class UsersController < ApplicationController
   def update
     @user = user
 
-    @user.attributes = params[:user]
+    @user.attributes = attributes
     @user.save
 
     flash[:notice] = 'User update successful.' if @user.valid?
@@ -43,4 +43,10 @@ class UsersController < ApplicationController
     respond_with(@user, :location => restore(:default => root_path))
   end
 
+private
+
+  def attributes
+    params.require(:user).permit(:name, :email, :password)
+  end
+
 end

data/test/dummy/app/views/contacts/_form.html.haml

@@ -1,4 +1,4 @@
-= formula_form_for contact, :html => { :class => 'well form-horizontal' } do |form|
+= formula_form_for contact, :html => { :role => 'form' } do |form|
   = form.input :name, :hint => "first and last name"
   = form.input :details, :hint => "a detailed description", :input => { :size => "30x3" }
   = form.input :email, :hint => "sample@example.com"

data/test/dummy/app/views/layouts/application.html.haml

@@ -6,18 +6,16 @@
     = javascript_include_tag "application"
     = csrf_meta_tags
   %body
-    .navbar.navbar-fixed-top
-      .navbar-inner
-        .container
-          = link_to 'Formula', root_path, :class => 'brand'
-          %ul.nav
-            %li= link_to 'Contacts', contacts_path
-          %ul.nav.pull-right
-            - if authenticated?
-              %li= link_to 'Account', edit_user_path, :remote => true
-              %li= link_to 'Logout', session_path, :method => :delete
-            - else
-              %li= link_to 'Register', new_user_path, :remote => true
-              %li= link_to 'Login', new_session_path, :remote => true
+    .navbar.navbar-default{ :role => 'navigation' }
+      .container
+        = link_to 'Formula', root_path, :class => 'navbar-brand'
+        %ul.nav.navbar-nav
+          %li= link_to 'Contacts', contacts_path
+          - if authenticated?
+            %li= link_to 'Account', edit_user_path, :remote => true
+            %li= link_to 'Logout', session_path, :method => :delete
+          - else
+            %li= link_to 'Register', new_user_path, :remote => true
+            %li= link_to 'Login', new_session_path, :remote => true
     .container
-      = yield
+      = yield

data/test/dummy/app/views/main/index.html.haml

@@ -1,7 +1,7 @@
-.hero-unit
+.jumbotron
   %h1
     Formula
     %small a Ruby on Rails form generator library
   %p Formula is a Rails form helper that generates awesome markup. The project lets users create semantically beautiful forms without introducing too much syntax.
   %p
-    = link_to 'Contacts', contacts_path, :class => 'btn btn-primary btn-large'
+    = link_to 'Contacts', contacts_path, :class => 'btn btn-primary btn-lg'

data/test/dummy/app/views/sessions/_form.html.haml

@@ -1,4 +1,4 @@
-= formula_form_for @session, url: session_path, :html => { :class => 'well form-horizontal' } do |form|
+= formula_form_for @session, url: session_path, :html => { :role => 'form' } do |form|
   = render 'fields', :form => form
   .form-actions
     = form.submit 'Submit', :class => 'btn btn-primary'

data/test/dummy/app/views/sessions/_modal.html.haml

@@ -1,12 +1,14 @@
-.modal.fade
-  = formula_form_for @session, url: session_path, :html => { :class => 'form-horizontal' } do |form|
-    .modal-header
-      %a{ :class => 'close', :data => { :dismiss => 'modal' } } ×
-      %h2
-        Session
-        %small= title if title
-    .modal-body
-      = render 'fields', :form => form
-    .modal-footer
-      = form.submit "Submit", :class => 'btn btn-primary'
-      %a{ :class => 'btn', :data => { :dismiss => 'modal' } } Close
+.modal.fade{ :role => 'dialog' }
+  .modal-dialog
+    .modal-content
+      = formula_form_for @session, url: session_path, :html => { :role => 'form' } do |form|
+        .modal-header
+          %a{ :class => 'close', :data => { :dismiss => 'modal' } } ×
+          %h2
+            Session
+            %small= title if title
+        .modal-body
+          = render 'fields', :form => form
+        .modal-footer
+          = form.submit "Submit", :class => 'btn btn-primary'
+          %a{ :class => 'btn', :data => { :dismiss => 'modal' } } Close

data/test/dummy/app/views/users/_form.html.haml

@@ -1,4 +1,4 @@
-= formula_form_for @user, url: user_path, :html => { :class => 'well form-horizontal' } do |form|
+= formula_form_for @user, url: user_path, :html => { :role => 'form' } do |form|
   = render 'fields', :form => form
   .form-actions
     = form.submit 'Submit', :class => 'btn btn-primary'

data/test/dummy/app/views/users/_modal.html.haml

@@ -1,12 +1,14 @@
-.modal.fade
-  = formula_form_for @user, url: user_path, :html => { :class => 'form-horizontal' } do |form|
-    .modal-header
-      %a{ :class => 'close', :data => { :dismiss => 'modal' } } ×
-      %h2
-        User
-        %small= title if title
-    .modal-body
-      = render 'fields', :form => form
-    .modal-footer
-      = form.submit "Submit", :class => 'btn btn-primary'
-      %a{ :class => 'btn', :data => { :dismiss => 'modal' } } Close
+.modal.fade{ :role => 'dialog' }
+  .modal-dialog
+    .modal-content
+      = formula_form_for @user, url: user_path, :html => { :role => 'form' } do |form|
+        .modal-header
+          %a{ :class => 'close', :data => { :dismiss => 'modal' } } ×
+          %h2
+            User
+            %small= title if title
+        .modal-body
+          = render 'fields', :form => form
+        .modal-footer
+          = form.submit "Submit", :class => 'btn btn-primary'
+          %a{ :class => 'btn', :data => { :dismiss => 'modal' } } Close

data/test/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/test/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run