inline_forms 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52f4a06037437f39577e650e97424ad15c3eeda2
-  data.tar.gz: 14c177bf9e3c0049e357aa71bac9118c3bffd308
+  metadata.gz: 508d19cb75c838a6c031cda1af55fd3d5c4dc164
+  data.tar.gz: 7f0b89f9d09ab310576781a3c76fed0849092508
 SHA512:
-  metadata.gz: 3abe277abf781d80902b92eaa0a3a88457de1f6605b15c6f9c4abc0856b50986ad6b0f207896c0188fd26f05b1d1c6427156005e4f181080f03e9f3d714993df
-  data.tar.gz: 915e21c01f8916b26270c89556dbed943838be92c476a26c9a97e785f264dda037289adc0243fb4d34a1f1a6237ad6d09c47583b9f3503189e056166ad4d3df2
+  metadata.gz: 9d84b37c2928f2a3a3aa7430adb571f9034020c5b63b7bcb010b60e705277aeb6989087aef7634a8e147e7fd0408814f62899eed190350aab6ad1593eda62e34
+  data.tar.gz: 9cdf6fd442d5994e0c6ff8c611fe62ac88751ad209f1ca9fd1fcaae8336a903c7cda6ee71b0a7587866d79ee95a48463809567a7f217a9d23dcfa1fc20eebc33

data/app/controllers/concerns/versions_concern.rb

@@ -8,18 +8,16 @@ module VersionsConcern
   def list_versions
     @update_span = params[:update]
     @object = referenced_object
-    respond_to do |format|
-      format.html { } unless @Klass.not_accessible_through_html?
-      format.js { render :versions_list }
-    end
-  end
-
-  def close_versions_list
-    @update_span = params[:update]
-    @object = referenced_object
-    respond_to do |format|
-      format.html { } unless @Klass.not_accessible_through_html?
-      format.js { render :versions }
+    close = params[:close] || false
+    if close
+      respond_to do |format|
+        format.js { render :versions }
+      end
+    else
+      respond_to do |format|
+        format.html { } unless @Klass.not_accessible_through_html?
+        format.js { render :versions_list }
+      end
     end
   end
 end

data/app/helpers/form_elements/audio_field.rb

@@ -0,0 +1,28 @@
+# -*- encoding : utf-8 -*-
+InlineForms::SPECIAL_COLUMN_TYPES[:audio_field]=:string
+
+def audio_field_show(object, attribute)
+  o = object.send(attribute)
+  msg = "<i class='fi-pencil' title='Edit #{attribute.to_s}'></i>".html_safe
+  if o.send(:present?)
+    if o.respond_to? :palm
+      audio_html = audio_tag(o.send(:palm).send(:url), autoplay: false, controls: true)
+    else
+      audio_html = audio_tag(o.send(:url), autoplay: false, controls: true)
+    end
+  end
+  link_to_edit = link_to_inline_edit object, attribute, msg
+  if cancan_disabled? || ( can? :update, object, attribute )
+    "#{audio_html} #{link_to_edit}".html_safe
+  else
+    audio_html.html_safe
+  end
+end
+
+def audio_field_edit(object, attribute)
+  file_field_tag attribute, class: 'input_text_field'
+end
+
+def audio_field_update(object, attribute)
+  object.send(attribute.to_s + '=', params[attribute.to_sym])
+end

data/app/helpers/inline_forms_helper.rb

@@ -99,7 +99,7 @@ module InlineFormsHelper
                    :class => html_class,
                    :title => t('inline_forms.view.list_versions')
           )
-    if current_user.role? :superadmin
+    if can? :list_versions, object.class.name.pluralize.underscore.to_sym
       raw out
     end
   end
@@ -107,9 +107,10 @@ module InlineFormsHelper
   # close versions list link
   def close_versions_list_link(object, update_span, html_class = 'button close_button' )
     link_to "<i class='fi-x'></i>".html_safe,
-      send('close_versions_list_' + @object.class.to_s.underscore + "_path",
+      send('list_versions_' + @object.class.to_s.underscore + "_path",
           object,
-          :update => update_span
+          :update => update_span,
+          :close => true
       ),
       :remote => true,
       :class => html_class,
@@ -206,6 +207,10 @@ module InlineFormsHelper
     values
   end
 
+  def version_modified_by id
+    user = User.find_by_id id
+    user.nil? ? 'Unknown' : user.name
+  end
 
 end
 

data/app/views/inline_forms/_show.html.erb

@@ -115,7 +115,7 @@
         <% end %>
       <% end %>
     <% end %>
-    <% if current_user.role? :superadmin %>
+    <% if can? :list_versions, @object.class.name.pluralize.underscore.to_sym  %>
       <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_versions" -%>
       <div id="<%= css_class_id -%>">
         <%= render 'versions' %>

data/app/views/inline_forms/_versions_list.html.erb

@@ -45,7 +45,7 @@
         <%= version.event -%>
       </div>
       <div  class="small-2 column">
-        <%= version.whodunnit.nil? ? 'nil' : version.author.name -%>
+        <%= version_modified_by version.whodunnit -%>
       </div>
       <div  class="small-8 column">
         <% if version.changeset.empty? %>

data/app/views/layouts/devise.html.erb

@@ -7,6 +7,7 @@
       <%= t('inline_forms.general.application_title') %> v<%= InlineForms::VERSION %>
     </title>
     <%= stylesheet_link_tag "inline_forms/devise" %>
+    <%= stylesheet_link_tag "inline_forms_devise" %>
     <%= csrf_meta_tags %>
   </head>
 

data/bin/inline_forms_installer_core.rb

@@ -6,7 +6,7 @@ add_source 'https://rubygems.org'
 
 gem 'cancancan', '~> 2.0'
 gem 'carrierwave'
-gem 'ckeditor'
+gem 'ckeditor', github: 'galetahub/ckeditor'
 gem 'coffee-rails'
 gem 'compass-rails'
 gem 'devise'
@@ -21,12 +21,12 @@ gem 'mini_magick'
 gem 'mysql2'
 gem 'paper_trail'
 gem 'rails-i18n'
-gem 'rails', '~> 5.0.6'
+gem 'rails', '~> 5.1.4'
 gem 'rake'
 gem 'remotipart', '~> 1.0'
 gem 'rvm'
 gem 'sass-rails'
-gem 'tabs_on_rails', git: 'https://github.com/acesuares/tabs_on_rails.git', :branch => 'update_remote'
+gem 'tabs_on_rails'
 gem 'therubyracer'
 gem 'uglifier'
 gem 'figaro'
@@ -95,7 +95,6 @@ devise_for :users, :path_prefix => 'auth'
   resources :users do
     post 'revert', :on => :member
     get 'list_versions', :on => :member
-    get 'close_versions_list', :on => :member
 end
 ROUTE
 
@@ -106,7 +105,7 @@ create_file "db/migrate/" +
   Time.now.utc.strftime("%Y%m%d%H%M%S") +
   "_" +
   "devise_create_users.rb", <<-DEVISE_MIGRATION.strip_heredoc
-class DeviseCreateUsers < ActiveRecord::Migration
+class DeviseCreateUsers < ActiveRecord::Migration[5.0]
 
   def change
     create_table(:users) do |t|
@@ -254,7 +253,7 @@ create_file "db/migrate/" +
   Time.now.utc.strftime("%Y%m%d%H%M%S") +
   "_" +
   "inline_forms_create_join_table_user_role.rb", <<-ROLES_MIGRATION.strip_heredoc
-  class InlineFormsCreateJoinTableUserRole < ActiveRecord::Migration
+  class InlineFormsCreateJoinTableUserRole < ActiveRecord::Migration[5.0]
     def self.up
       create_table  :roles_users, :id => false, :force => true do |t|
         t.integer   :role_id
@@ -274,17 +273,8 @@ append_to_file "db/seeds.rb", "Role.create({ id: 1, name: 'superadmin', descript
 say "- Installaing ZURB Foundation..."
 generate "foundation:install", "-f"
 
-say "- Copy images..."
-%w(glass_plate.gif).each do |image|
-  copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/images' , image), File.join('app/assets/images' , image)
-end
-
-say "- Copy javascripts..."
-remove_file 'app/assets/javascripts/application.js'
-%w(application.js inline_forms.js).each do |javascript|
-  copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts' , javascript), File.join('app/assets/javascripts' , javascript)
-end
-
+say "- Copy inline_forms_devise file for custom styles..."
+copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/stylesheets/inline_forms_devise.css'), 'app/assets/stylesheets/inline_forms_devise.css'
 
 say "- Add human_attribute_name in app/models/application_record.rb"
 remove_file 'app/models/application_record.rb' # the one that 'rails new' created
@@ -301,10 +291,7 @@ say "- Set languages for ckeditor to ['en', 'nl'] in config/initializers/ckedito
 insert_into_file "config/initializers/ckeditor.rb", "  config.assets_languages = ['en', 'nl']\n", :after => "config.assets_languages = ['en', 'uk']\n"
 
 say "- Paper_trail install..."
-generate "paper_trail:install" # TODO One day, we need some management tools so we can actually SEE the versions, restore them etc.
-
-say "- Import migrations from engines"
-run "bundle exec rails railties:install:migrations" # This is needed to add changeset field to the paper_trail versions table
+generate "paper_trail:install --with-changes"
 
 # Create Translations
 say "- Generate models and tables and views for translations..." # TODO Translations need to be done in inline_forms, and then generate a yml file, perhaps
@@ -317,7 +304,7 @@ create_file "db/migrate/" +
   Time.now.utc.strftime("%Y%m%d%H%M%S") +
   "_" +
   "inline_forms_create_view_for_translations.rb", <<-VIEW_MIGRATION.strip_heredoc
-  class InlineFormsCreateViewForTranslations < ActiveRecord::Migration
+  class InlineFormsCreateViewForTranslations < ActiveRecord::Migration[5.0]
     def self.up
       execute 'CREATE VIEW translations
                AS
@@ -496,7 +483,7 @@ remove_file 'spec/models/user_spec.rb'
 
 # precompile devise.css
 say "- Precompile devise.css in environments/production.rb... (Since Rails 5 in config/initializers/assets.rb !)"
-append_file "config/initializers/assets.rb", "  Rails.application.config.assets.precompile += %w( devise.css )\n"
+append_file "config/initializers/assets.rb", "  Rails.application.config.assets.precompile += %w( inline_forms_devise.css )\n"
 
 # devise mailer stuff
 say "- Injecting devise mailer stuff in environments/production.rb..."

data/lib/generators/assets/stylesheets/inline_forms_devise.css

@@ -0,0 +1 @@
+/* Put here your custom styles for inline_forms devise views */

data/lib/generators/inline_forms_generator.rb

@@ -111,7 +111,8 @@ module InlineForms
             ## :drop_down, :references and :belongs_to all end up with the column_type :belongs_to
             @belongs_to << '  belongs_to :'         + attribute.name + "\n"
           end
-          if attribute.type  == :image_field # upload images via carrierwave
+          # upload images or audio files via carrierwave
+          case attribute.type when :image_field, :audio_field then
             @carrierwave_mounters << '  mount_uploader :' + attribute.name + ', ' + "#{attribute.name}_uploader".camelcase + "\n"
           end
           if attribute.type         == :has_many ||
@@ -173,7 +174,6 @@ module InlineForms
           resources :#{resource_name} do
             post 'revert', :on => :member
             get 'list_versions', :on => :member
-            get 'close_versions_list', :on => :member
           end
         ROUTE
       end

data/lib/inline_forms.rb

@@ -138,14 +138,6 @@ module InlineForms
   # Declare as a Rails::Engine, see http://www.ruby-forum.com/topic/211017#927932
   class Engine < Rails::Engine
 
-    initializer :append_migrations do |app|
-      unless app.root.to_s.match(root.to_s)
-        config.paths["db/migrate"].expanded.each do |path|
-          app.config.paths["db/migrate"] << path
-        end
-      end
-    end
-
     initializer "inline_forms.assets.precompile" do |app|
       app.config.assets.precompile += %w( inline_forms/inline_forms.scss
         inline_forms/devise.css

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "5.1.0"
+  VERSION = "5.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Ace Suares
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -167,6 +167,7 @@ files:
 - app/controllers/geo_code_curacao_controller.rb
 - app/controllers/inline_forms_application_controller.rb
 - app/controllers/inline_forms_controller.rb
+- app/helpers/form_elements/audio_field.rb
 - app/helpers/form_elements/check_box.rb
 - app/helpers/form_elements/check_list.rb
 - app/helpers/form_elements/chicas_dropdown_with_family_members.rb
@@ -255,18 +256,10 @@ files:
 - bin/inline_forms
 - bin/inline_forms_app_template.rb
 - bin/inline_forms_installer_core.rb
-- config/initializers/paper_trail.rb
-- db/migrate/20180116154757_add_object_changes_to_versions.rb
 - inline_forms.gemspec
-- lib/app/controllers/concerns/versions_concern.rb
-- lib/app/views/devise/sessions/_flash.html.erb
-- lib/app/views/devise/sessions/_top-bar.html.erb
-- lib/app/views/inline_forms/_versions.html.erb
-- lib/app/views/inline_forms/_versions_list.html.erb
-- lib/app/views/inline_forms/versions.js.erb
-- lib/app/views/inline_forms/versions_list.js.erb
 - lib/generators/USAGE
 - lib/generators/assets/stylesheets/inline_forms.scss
+- lib/generators/assets/stylesheets/inline_forms_devise.css
 - lib/generators/inline_forms_generator.rb
 - lib/generators/templates/_inline_forms_tabs.html.erb
 - lib/generators/templates/abstract_mysql2_adapter.rb

data/config/initializers/paper_trail.rb

@@ -1,7 +0,0 @@
-PaperTrail.config.track_associations = false
-
-PaperTrail::Version.class_eval do
-  def author
-    User.find(whodunnit) if whodunnit
-  end
-end

data/db/migrate/20180116154757_add_object_changes_to_versions.rb

@@ -1,5 +0,0 @@
-class AddObjectChangesToVersions < ActiveRecord::Migration[5.0]
-  def change
-    add_column :versions, :object_changes, :text
-  end
-end

data/lib/app/controllers/concerns/versions_concern.rb

@@ -1,25 +0,0 @@
-module VersionsConcern
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :set_paper_trail_whodunnit
-  end
-
-  def list_versions
-    @update_span = params[:update]
-    @object = referenced_object
-    respond_to do |format|
-      format.html { } unless @Klass.not_accessible_through_html?
-      format.js { render :versions_list }
-    end
-  end
-
-  def close_versions_list
-    @update_span = params[:update]
-    @object = referenced_object
-    respond_to do |format|
-      format.html { } unless @Klass.not_accessible_through_html?
-      format.js { render :versions }
-    end
-  end
-end

data/lib/app/views/devise/sessions/_flash.html.erb

@@ -1,7 +0,0 @@
-<% if !flash.empty? %>
-  <div id='inline_forms_devise_flash_div' class='row'>
-    <% flash.each do |name, msg| %>
-      <%= content_tag :div, msg, :id => "flash_#{name}", :class => 'devise flash' %>
-    <% end %>
-  </div>
-<% end %>

data/lib/app/views/devise/sessions/_top-bar.html.erb

@@ -1,12 +0,0 @@
-<div class='contain-to-grid'>
-  <nav id='inline_forms_devise_top_nav_bar' class='top-bar' data-topbar>
-    <ul class='title-area'>
-      <li class='name'>
-        <h1><a href='/'><%= t('inline_forms.devise.title_for_devise') %> <%= InlineForms::VERSION %></a></h1>
-      </li>
-      <li class='toggle-topbar menu-icon'>
-        <a href='#'><span></span></a>
-      </li>
-    </ul>
-  </nav>
-</div>

data/lib/app/views/inline_forms/_versions.html.erb

@@ -1,14 +0,0 @@
-<% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_versions" -%>
-<div class="row form_element_header associated_auto_header callout">
-  <div class='medium-11 large-11 column' >
-    <%= "Versions (#{@object.versions.length})" %>
-  </div>
-  <div class='medium-1 large-1 column'>
-      <%= link_to_versions_list(
-            'list_versions_' + @object.class.to_s.underscore + "_path",
-            @object,
-            css_class_id
-          )
-        %>
-  </div>
-</div>

data/lib/app/views/inline_forms/_versions_list.html.erb

@@ -1,75 +0,0 @@
-<% path_to_object = @object.class.to_s.underscore + '_path' %>
-<% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_versions" -%>
-<div class="row form_element_header associated_auto_header callout">
-  <div class='medium-11 large-11 column' >
-    <%= "Versions (#{@object.versions.length})" %>
-  </div>
-  <div class='medium-1 large-1 column'>
-    <%= close_versions_list_link(
-          @object,
-          css_class_id
-        )
-      %>
-  </div>
-</div>
-<div class="row <%= cycle('odd', 'even') %>">
-  <div class='small-12 column'>
-      <div class="small-1 column">
-        &nbsp;
-      </div>
-      <div  class="small-1 column">
-        <strong>Event</strong>
-      </div>
-      <div  class="small-2 column">
-        <strong>Done by</strong>
-      </div>
-      <div  class="small-8 column">
-        <strong>Changeset</strong>
-      </div>
-  </div>
-</div>
-<div class="row <%= cycle('odd', 'even') %>">
-  <% @object.versions.reverse.each do | version | %>
-    <div class='small-12 column'>
-      <div class="small-1 column">
-        <%= link_to t('inline_forms.view.restore'),
-          send('revert_' + @object.class.to_s.underscore + "_path",
-            version,
-            :update => "#{@object.class.name.underscore}_#{@object.id}"
-          ),
-          :remote => true,
-          :method => :post
-        %>
-      </div>
-      <div class="small-1 column">
-        <%= version.event -%>
-      </div>
-      <div  class="small-2 column">
-        <%= version.whodunnit.nil? ? 'nil' : version.author.name -%>
-      </div>
-      <div  class="small-8 column">
-        <% if version.changeset.empty? %>
-          <em>empty</em>
-        <% else %>
-          <% version.changeset.each do |attribute, value| %>
-            <% next if attribute == 'updated_at' %>
-            <table>
-              <tr>
-                <th colspan="2" class="text-center"><%= attribute %></th>
-                <th></th>
-              </tr>
-              <tr>
-                <td>old value</td>
-                <td>new value</td>
-              </tr>
-              <tr>
-                <td><%= value[0] %></td>
-                <td><%= value[1] %></td>
-              </tr>
-            </table>
-          <% end %>
-        <% end %>
-      </div>
-    </div>
-  <% end %>
-</div>

data/lib/app/views/inline_forms/versions.js.erb

@@ -1,4 +0,0 @@
-$('#<%= @update_span %>').fadeOut("slow", function() {
-$(this).html('<%= escape_javascript(render(:partial => 'inline_forms/versions' ))%>');
-$(this).fadeIn("slow");
-});

data/lib/app/views/inline_forms/versions_list.js.erb

@@ -1 +0,0 @@
-$('#<%= @update_span %>').html('<%= escape_javascript(render(:partial => 'inline_forms/versions_list' ))%>')