godmin 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c9bc1e136e1f026504ed65cd0199c7bed3b2ec4
-  data.tar.gz: 36d462277c7c058a619c2fb29afd86f42de87574
+  metadata.gz: 3b2b9de0c881d61fc5e85818c2d335da6f291957
+  data.tar.gz: a6622de98d4b80f5713db91c2246a181034c8b91
 SHA512:
-  metadata.gz: e50bc8557f5bb7d677e75f6cc5e67f39221813f42d2e30539c8bc0d0bc874f6a52fe477fd3b4f9a84a34e911b7dab896c7a53d66f9d1fc4cf01c6d687ebaf042
-  data.tar.gz: 7185ab2665b695723c7422ee7007f6e11749ff9381ac5c51470342133dc220a2f482f29f3f7b885a2594964c12401db840481f3cac13359baf9aabcccd15671b
+  metadata.gz: 662aa94de5c99b574781a967cc6e8f4ef29223563028b26cb19c1b57c261a955e783b7c8a96e8115ac407bbc54e3b7d5be31eb31d494ddc4efc2a0641d6391f7
+  data.tar.gz: 26755fad1ee306f90dc5d3ca7be7f30b31757229a7efdda7018d97016c037dc762461f2218432486bbce6516f92bea5e529c1c3202829435ecaedf054bfd76b4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 0.9.7 - 2015-01-07
+Features
+- Support for Rails 4.2
+- New form system (https://github.com/varvet/godmin/pull/50)
+
 ### 0.9.6 - 2014-12-18
 Features
 - Bundled [datetimepicker](https://github.com/Eonasdan/bootstrap-datetimepicker/)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+Copyright 2013 Varvet
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -19,6 +19,7 @@ Godmin is an admin engine for Rails 4+.
 	- [Redirecting](#redirecting)
 	- [Pagination](#pagination)
 - [Views](#views)
+  - [Forms](#forms)
 - [Models](#models)
 - [Authentication](#authentication)
 	- [Simple authentication](#simple-authentication)
@@ -368,12 +369,24 @@ It is easy to override view templates and partials in Godmin, both globally and
 
 If you wish to customize the content of a table column, you can place a partial under `app/views/{resource}/columns/{column_name}.html.erb`, e.g. `app/views/articles/columns/_title.html.erb`. The resource is available to the partial through the `resource` variable.
 
-Oftentimes, the default form provided by Godmin doesn't cut it. The `godmin/resource/_form.html.erb` partial is therefore one of the most common to override per resource.
+Oftentimes, the default form provided by Godmin doesn't cut it. The `godmin/resource/_form.html.erb` partial is therefore one of the most common to override per resource. See below for more on form building.
 
 Likewise, the `godmin/shared/_navigation.html.erb` partial can be overridden to build a custom navigation bar.
 
 The full list of templates and partials that can be overridden [can be found here](https://github.com/varvet/godmin/tree/master/app/views/godmin)
 
+### Forms
+
+Godmin comes with its own FormBuilder that automatically generates bootstrapped markup. It is based on the [Rails Bootstrap Forms](https://github.com/bootstrap-ruby/rails-bootstrap-forms) FormBuilder, and all its methods are directly available. In addition it has a few convenience methods that can be leveraged.
+
+The `input` method will automatically detect the type of field from the database and generate an appropriate form field:
+
+```ruby
+form_for @resource do |f|
+  f.input :attribute
+end
+```
+
 ## Models
 
 ## Authentication

data/app/views/godmin/resource/_form.html.erb

@@ -1,12 +1,10 @@
-<%= simple_form_for @resource, html: { role: "form" } do |f| %>
-  <% attrs_for_form.each do |attr| %>
-    <div class="form-group">
-      <% if @resource_class.reflect_on_association(attr) %>
-        <%= f.association attr, error: false, input_html: { class: "form-control", data: { behavior: "select-box" } } %>
-      <% else %>
-        <%= f.input attr, error: false, input_html: { class: "form-control" } %>
-      <% end %>
-    </div>
+<%= form_for @resource do |f| %>
+  <% attrs_for_form.each do |attribute| %>
+    <% if f.object.class.reflect_on_association(attribute) %>
+      <%= f.association attribute %>
+    <% else %>
+      <%= f.input attribute %>
+    <% end %>
   <% end %>
-  <%= f.button :submit, class: "btn btn-default" %>
+  <%= f.submit %>
 <% end %>

data/config/locales/en.yml

@@ -33,3 +33,6 @@ en:
       entries:
         zero: "No %{resource} found"
         other: "Showing %{count} out of %{total} %{resource}"
+    datetimepickers:
+      datepicker: ! "%m/%d/%Y"
+      datetimepicker: ! "%m/%d/%Y%l:%M %p"

data/config/locales/sv.yml

@@ -33,3 +33,6 @@ sv:
       entries:
         zero: "Inga %{resource} funna"
         other: "Visar %{count} av %{total} %{resource}"
+    datetimepickers:
+      datepicker: ! "%Y-%m-%d"
+      datetimepicker: ! "%Y-%m-%d %H:%M"

data/godmin.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "bcrypt", "~> 3.1.7"
   gem.add_dependency "bootstrap-sass", "~> 3.3.1.0"
+  gem.add_dependency "bootstrap_form", "~> 2.2.0"
   gem.add_dependency "coffee-rails", [">= 4.0", "< 4.2"]
   gem.add_dependency "momentjs-rails", ">= 2.8.1"
-  gem.add_dependency "rails", [">= 4.0", "< 4.2"]
-  gem.add_dependency "sass-rails", [">= 4.0", "< 4.2"]
+  gem.add_dependency "rails", "~> 4.0"
+  gem.add_dependency "sass-rails", ">= 4.0"
   gem.add_dependency "selectize-rails", "~> 0.11.2"
-  gem.add_dependency "simple_form", "~> 3.0.0"
 
   gem.add_development_dependency "sqlite3"
 end

data/lib/godmin.rb

@@ -1,7 +1,7 @@
 require "bootstrap-sass"
+require "bootstrap_form"
 require "momentjs-rails"
 require "selectize-rails"
-require "simple_form"
 require "godmin/application"
 require "godmin/authentication"
 require "godmin/authorization"

data/lib/godmin/helpers/forms.rb

@@ -2,17 +2,66 @@ module Godmin
   module Helpers
     module Forms
       def form_for(record, options = {}, &block)
-        super(record, { builder: FormBuilders::FormBuilder }.merge(options), &block)
-      end
-
-      def simple_form_for(record, options = {}, &block)
-        super(record, { builder: FormBuilders::SimpleFormBuilder }.merge(options), &block)
+        super(record, { builder: FormBuilders::FormBuilder, inline_errors: false }.merge(options), &block)
       end
     end
   end
 
   module FormBuilders
-    class FormBuilder < ActionView::Helpers::FormBuilder; end
-    class SimpleFormBuilder < SimpleForm::FormBuilder; end
+    class FormBuilder < BootstrapForm::FormBuilder
+      def input(attribute, options = {})
+        case attribute_type(attribute)
+        when :text
+          text_area(attribute, options)
+        when :boolean
+          check_box(attribute, options)
+        when :date
+          date_field(attribute, options)
+        when :datetime
+          datetime_field(attribute, options)
+        else
+          text_field(attribute, options)
+        end
+      end
+
+      def association(attribute, options = {})
+        case association_type(attribute)
+        when :belongs_to
+          select attribute, association_collection(attribute), {}, data: { behavior: "select-box" }
+        else
+          input(attribute, options)
+        end
+      end
+
+      def date_field(attribute, options = {})
+        text_field(attribute, value: datetime_value(attribute, :datepicker), data: { behavior: "datepicker" })
+      end
+
+      def datetime_field(attribute, options = {})
+        text_field(attribute, value: datetime_value(attribute, :datetimepicker), data: { behavior: "datetimepicker" })
+      end
+
+      private
+
+      def attribute_type(attribute)
+        @object.column_for_attribute(attribute).try(:type)
+      end
+
+      def association_type(attribute)
+        association_reflection(attribute).try(:macro)
+      end
+
+      def association_collection(attribute)
+        association_reflection(attribute).try(:klass).try(:all)
+      end
+
+      def association_reflection(attribute)
+        @object.class.reflect_on_association(attribute)
+      end
+
+      def datetime_value(attribute, format)
+        @object.send(attribute).try(:strftime, @template.translate_scoped("datetimepickers.#{format}"))
+      end
+    end
   end
 end

data/lib/godmin/version.rb

@@ -1,3 +1,3 @@
 module Godmin
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/test/dummy/config/environments/test.rb

@@ -31,6 +31,9 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Jens Ljungblad
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -40,6 +40,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.1.0
+- !ruby/object:Gem::Dependency
+  name: bootstrap_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -78,22 +92,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +109,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,9 +116,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: selectize-rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +130,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.2
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement