dry_crud 5.0.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd475eb483f54acdff9dff23ae75d80715edfcdb
-  data.tar.gz: 7ba54fb2d5a22f562627fd0641f23e2a32a975ee
+SHA256:
+  metadata.gz: 3fa4767cf781b94a5ed47a5833f76a96494c450967e9f3599806226aafcf4a74
+  data.tar.gz: bd4c40f8493eef40c6618ead701877f8ec8d39b552db5787ae184273be0fc8d3
 SHA512:
-  metadata.gz: 38e784965cdb8dc622b659437fa6cb2e4be27eb3eb17b3c1686a5ec6cdfded184fb08fb10a533ff6d7f9e14331045b111aadbde8a371d6c59272462c589839e6
-  data.tar.gz: e0b78f3534243dd715cb53c6ddbfc547f236e90e84ee6a7439e392a4d0b837f17fd2a7e9e5a24fb1b885611aaf44f7c2dca47ac388256279559cd5b212e24699
+  metadata.gz: 8fef4d2ed06521eafd92c4fa87a36d07fdeee79a1a0f0d3a0e6098e2ac98b6c92d7c5cd2e87046b4cf37a3fa2e90f2d1cda382d645e828b3aeba2b5cd26e0903
+  data.tar.gz: 41b31166a4f5c82374587e49fe76580d32487ccff0fa52b6f0e72f131b2eb9a7d296d6ff53d8cc3de470fe1671dbdfb2749a4bdba685ce2bf110ea163abea225

data/README.rdoc

@@ -70,7 +70,7 @@ Say you want to manage a +Person+ model. Overwrite the +to_s+ method of your mod
     end
   end
 
-Then create the following controller. The +permitted_attrs+ define the attribute parameters allowed when creating or updating a model entry (see {Strong Paramters}[http://api.rubyonrails.org/classes/ActionController/StrongParameters.html]).
+Then create the following controller. The +permitted_attrs+ define the attribute parameters allowed when creating or updating a model entry (see {Strong Parameters}[http://api.rubyonrails.org/classes/ActionController/StrongParameters.html]).
 
 <tt>app/controllers/people_controller.rb</tt>:
   class PeopleController < CrudController
@@ -86,7 +86,7 @@ Well, maybe there are certain attributes you do not want to display in the peopl
 
   <%= crud_table :lastname, :firstname, :city, :sex %>
 
-This only displays these three attributes in the table. All other templates, as well as the main index view, fallback to the ones in <tt>app/views/crud</tt>.
+This only displays these four attributes in the table. All other templates, as well as the main index view, fallback to the ones in <tt>app/views/crud</tt>.
 
 
 ==== Adapt general behavior

data/VERSION

@@ -1 +1 @@
-5.0.0
+5.2.0

data/app/assets/stylesheets/sample.scss

@@ -51,20 +51,20 @@ a.navbar-brand:hover {
   color: #ddd;
 }
 
-.nav {
+.navbar-nav {
   list-style: none;
   margin: 0;
   float: left;
 }
 
-.nav li {
+.navbar-nav li.nav-item {
   float: left;
   font-size: 110%;
   margin: 0;
   padding: 0;
 }
 
-.nav a {
+.navbar-nav a.nav-link {
   color: #ddd !important;
   display: block;
   float: left;
@@ -74,7 +74,7 @@ a.navbar-brand:hover {
   height: 19px;
 }
 
-.nav a:hover {
+.navbar-nav a.nav-link:hover {
   background: $theme_color bottom center no-repeat;
   color: #fff !important;
   text-decoration: none;
@@ -261,10 +261,11 @@ textarea, select[multiple] {
   border-color: #D88;
 }
 
-.input-group-addon {
+.input-group-append {
   font-size: 80%;
   vertical-align: top;
   margin-left: 4px;
+  display: inline-block;
 }
 
 .help-block {
@@ -291,11 +292,11 @@ textarea, select[multiple] {
   float: right;
 }
 
-.pull-right {
+.float-right {
   float: right;
 }
 
-.pull-left {
+.float-left {
   float: left;
 }
 
@@ -306,10 +307,6 @@ footer {
   min-width: $container_width - 200px;
 }
 
-footer * {
-  font-size: 80%;
-}
-
 .col-md-offset-2 {
   margin-left: 130px;
 }

data/app/controllers/crud_controller.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 # Abstract controller providing basic CRUD actions.
 #
 # Some enhancements were made to ease extensibility.
@@ -22,7 +20,7 @@ class CrudController < ListController
   # further down.
   define_render_callbacks :show, :new, :edit
 
-  before_action :entry, only: [:show, :new, :edit, :update, :destroy]
+  before_action :entry, only: %i[show new edit update destroy]
 
   helper_method :entry, :full_entry_label
 
@@ -32,8 +30,7 @@ class CrudController < ListController
   #   GET /entries/1.json
   #
   # Show one entry of this model.
-  def show
-  end
+  def show; end
 
   #   GET /entries/new
   #   GET /entries/new.json
@@ -55,27 +52,21 @@ class CrudController < ListController
   # in the given block will take precedence over the one defined here.
   #
   # Specify a :location option if you wish to do a custom redirect.
-  def create(options = {}, &_block)
-    assign_attributes
-    created = with_callbacks(:create, :save) { entry.save }
-
-    respond_to do |format|
-      yield(format, created) if block_given?
-      if created
-        format.html { redirect_on_success(options) }
-        format.json { render :show, status: :created, location: show_path }
-      else
-        format.html { render :new }
-        format.json { render json: entry.errors, status: :unprocessable_entity }
-      end
+  def create(options = {}, &block)
+    model_class.transaction do
+      assign_attributes
+      created = with_callbacks(:create, :save) { entry.save }
+      respond(created,
+              options.merge(status: :created, render_on_failure: :new),
+              &block)
+      raise ActiveRecord::Rollback unless created
     end
   end
 
   #   GET /entries/1/edit
   #
   # Display a form to edit an exisiting entry of this model.
-  def edit
-  end
+  def edit; end
 
   #   PUT /entries/1
   #   PUT /entries/1.json
@@ -89,19 +80,14 @@ class CrudController < ListController
   # in the given block will take precedence over the one defined here.
   #
   # Specify a :location option if you wish to do a custom redirect.
-  def update(options = {}, &_block)
-    assign_attributes
-    updated = with_callbacks(:update, :save) { entry.save }
-
-    respond_to do |format|
-      yield(format, updated) if block_given?
-      if updated
-        format.html { redirect_on_success(options) }
-        format.json { render :show, status: :ok, location: show_path }
-      else
-        format.html { render :edit }
-        format.json { render json: entry.errors, status: :unprocessable_entity }
-      end
+  def update(options = {}, &block)
+    model_class.transaction do
+      assign_attributes
+      updated = with_callbacks(:update, :save) { entry.save }
+      respond(updated,
+              options.merge(status: :ok, render_on_failure: :edit),
+              &block)
+      raise ActiveRecord::Rollback unless updated
     end
   end
 
@@ -117,18 +103,13 @@ class CrudController < ListController
   # in the given block will take precedence over the one defined here.
   #
   # Specify a :location option if you wish to do a custom redirect.
-  def destroy(options = {}, &_block)
-    destroyed = run_callbacks(:destroy) { entry.destroy }
-
-    respond_to do |format|
-      yield(format, destroyed) if block_given?
-      if destroyed
-        format.html { redirect_on_success(options) }
-        format.json { head :no_content }
-      else
-        format.html { redirect_on_failure(options) }
-        format.json { render json: entry.errors, status: :unprocessable_entity }
-      end
+  def destroy(options = {}, &block)
+    model_class.transaction do
+      destroyed = run_callbacks(:destroy) { entry.destroy }
+      respond(destroyed,
+              options.merge(status: :no_content),
+              &block)
+      raise ActiveRecord::Rollback unless destroyed
     end
   end
 
@@ -171,6 +152,29 @@ class CrudController < ListController
     path_args(entry)
   end
 
+  def respond(success, options)
+    respond_to do |format|
+      yield(format, success) if block_given?
+      if success
+        format.html { redirect_on_success(options) }
+        format.json { render_success_json(options[:status]) }
+      else
+        format.html { render_or_redirect_on_failure(options) }
+        format.json { render_failure_json }
+      end
+    end
+  end
+
+  # If the option :render_on_failure is given, render the corresponding
+  # template, otherwise redirect.
+  def render_or_redirect_on_failure(options)
+    if options[:render_on_failure]
+      render options[:render_on_failure]
+    else
+      redirect_on_failure(options)
+    end
+  end
+
   # Perform a redirect after a successfull operation and set a flash notice.
   def redirect_on_success(options = {})
     location = options[:location] ||
@@ -188,6 +192,20 @@ class CrudController < ListController
     redirect_to location
   end
 
+  # Render the show json with the given status or :no_content
+  def render_success_json(status)
+    if status == :no_content
+      head :no_content
+    else
+      render :show, status: status, location: show_path
+    end
+  end
+
+  # Render a json with the errors.
+  def render_failure_json
+    render json: entry.errors, status: :unprocessable_entity
+  end
+
   # Get an I18n flash message.
   # Uses the key {controller_name}.{action_name}.flash.{state}
   # or crud.{action_name}.flash.{state} as fallback.

data/app/controllers/dry_crud/generic_model.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module DryCrud
 
   # Connects the including controller to the model whose name corrsponds to

data/app/controllers/dry_crud/nestable.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module DryCrud
 
   # Provides functionality to nest controllers/resources.

data/app/controllers/dry_crud/rememberable.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module DryCrud
 
   # Remembers certain params of the index action in order to return
@@ -18,7 +16,7 @@ module DryCrud
 
     included do
       class_attribute :remember_params
-      self.remember_params = %w(q sort sort_dir page)
+      self.remember_params = %w[q sort sort_dir page]
 
       before_action :handle_remember_params, only: [:index]
     end

data/app/controllers/dry_crud/render_callbacks.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module DryCrud
 
   # Provide +before_render+ callbacks.

data/app/controllers/dry_crud/searchable.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module DryCrud
 
   # The search functionality for the index table.

data/app/controllers/dry_crud/sortable.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module DryCrud
 
   # Sort functionality for the index table.
@@ -44,7 +42,7 @@ module DryCrud
         sortable = sortable?(params[:sort])
         if sortable || default_sort
           clause = [sortable ? sort_expression : nil, default_sort]
-          super.reorder(clause.compact.join(', '))
+          super.reorder(Arel.sql(clause.compact.join(', ')))
         else
           super
         end

data/app/controllers/list_controller.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 # Abstract controller providing a basic list action.
 # The loaded model entries are available in the view as an instance variable
 # named after the +model_class+ or by the helper method +entries+.

data/app/helpers/actions_helper.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 # Helpers to create action links. This default implementation supports
 # regular links with an icon and a label. To change the general style
 # of action links, change the method #action_link, e.g. to generate a button.
@@ -9,7 +7,7 @@ module ActionsHelper
   # A generic helper method to create action links.
   # These link could be styled to look like buttons, for example.
   def action_link(label, icon = nil, url = {}, html_options = {})
-    add_css_class html_options, 'action btn btn-default'
+    add_css_class html_options, 'action btn btn-light'
     link_to(icon ? action_icon(icon, label) : label,
             url, html_options)
   end

data/app/helpers/dry_crud/form/builder.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module DryCrud
   module Form
 
@@ -84,8 +82,8 @@ module DryCrud
       end
 
       # Add form-control class to all input fields.
-      %w(text_field password_field email_field text_area
-         number_field date_field time_field datetime_field).each do |method|
+      %w[text_field password_field email_field
+         number_field date_field time_field datetime_field].each do |method|
         define_method(method) do |attr, html_options = {}|
           add_css_class(html_options, 'form-control')
           super(attr, html_options)
@@ -150,7 +148,8 @@ module DryCrud
       # Renders the given content with an addon.
       def with_addon(content, addon)
         content_tag(:div, class: 'input-group') do
-          content + content_tag(:span, addon, class: 'input-group-addon')
+          html = content_tag(:span, addon, class: 'input-group-text')
+          content + content_tag(:div, html, class: 'input-group-append')
         end
       end
 
@@ -244,13 +243,13 @@ module DryCrud
         if field_method
           build_labeled_field(field_method, *args)
         else
-          super(name, *args)
+          super
         end
       end
 
       # Overriden to fullfill contract with method_missing 'labeled_' methods.
-      def respond_to?(name, include_private = false)
-        labeled_field_method?(name).present? || super(name, include_private)
+      def respond_to_missing?(name, include_private = false)
+        labeled_field_method?(name).present? || super
       end
 
       private

data/app/helpers/dry_crud/form/control.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module DryCrud
   module Form
 
@@ -8,7 +6,7 @@ module DryCrud
     # required mark.
     class Control
 
-      attr_reader :builder, :attr, :args, :options, :span, :addon, :help
+      attr_reader :builder, :attr, :args, :options, :addon, :help
 
       delegate :content_tag, :object,
                to: :builder
@@ -32,8 +30,8 @@ module DryCrud
       # This includes an options hash as the last argument, that
       # may contain the following special options:
       #
-      # * <tt>:addon</tt> - Addon content displayd just after the input field.
-      # * <tt>:help</tt> - A help text displayd below the input field.
+      # * <tt>:addon</tt> - Addon content displayed just after the input field.
+      # * <tt>:help</tt> - A help text displayed below the input field.
       # * <tt>:span</tt> - Number of columns the input field should span.
       # * <tt>:caption</tt> - Different caption for the label.
       # * <tt>:field_method</tt> - Different method to create the input field.

data/app/helpers/dry_crud/table/actions.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module DryCrud
   module Table
 
@@ -20,8 +18,8 @@ module DryCrud
       # the current entry.
       # A block may be given to define the link path for the row entry.
       def attr_with_show_link(attr, &block)
-        sortable_attr(attr) do |e|
-          link_to(format_attr(e, attr), action_path(e, &block))
+        sortable_attr(attr) do |entry|
+          link_to(format_attr(entry, attr), action_path(entry, &block))
         end
       end
 
@@ -29,8 +27,8 @@ module DryCrud
       # A block may be given to define the link path for the row entry.
       # If the block returns nil, no link is rendered.
       def show_action_col(html_options = {}, &block)
-        action_col do |e|
-          path = action_path(e, &block)
+        action_col do |entry|
+          path = action_path(entry, &block)
           if path
             table_action_link('zoom-in',
                               path,
@@ -43,8 +41,8 @@ module DryCrud
       # A block may be given to define the link path for the row entry.
       # If the block returns nil, no link is rendered.
       def edit_action_col(html_options = {}, &block)
-        action_col do |e|
-          path = action_path(e, &block)
+        action_col do |entry|
+          path = action_path(entry, &block)
           if path
             path = path.is_a?(String) ? path : edit_polymorphic_path(path)
             table_action_link('pencil', path, html_options.clone)
@@ -56,8 +54,8 @@ module DryCrud
       # A block may be given to define the link path for the row entry.
       # If the block returns nil, no link is rendered.
       def destroy_action_col(html_options = {}, &block)
-        action_col do |e|
-          path = action_path(e, &block)
+        action_col do |entry|
+          path = action_path(entry, &block)
           if path
             table_action_link('remove',
                               path,
@@ -85,8 +83,8 @@ module DryCrud
 
       # If a block is given, call it to get the path for the current row entry.
       # Otherwise, return the standard path args.
-      def action_path(e)
-        block_given? ? yield(e) : path_args(e)
+      def action_path(entry)
+        block_given? ? yield(entry) : path_args(entry)
       end
 
     end