inline_forms 3.2.11 → 5.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTMzMDk1ZGM4Njk1YTFmMDQ3MGQ2MDU4MWQzN2UyMDVhYTJhNDhlZg==
+    NzViMjhjYTViNzM4ZjA5MjkyZWY4OGFiMzE2Y2Y2NzQ4MDhmZjA0MA==
   data.tar.gz: !binary |-
-    OWU0NjdhNzViYjhmZGQ1MGUwMzIwZjM4OTc4MjNjODRhNTQwZmQ4OQ==
+    NjFhMmUwNzI1YTI3NGNmOTkyNjg3ZmQ4YWFiOGMwZDg0ZDY0YjFhNg==
 SHA512:
   metadata.gz: !binary |-
-    YWJjODU1MTM2NGUwOWZkNDY1NmM5MWRhMDkwYzAxMWM1ZWMxNTQ2Yzg2YWUx
-    ZDA0ZGVkODBlYTI2Nzc1YzUxODM1ZmIxYWU2YmY3MTY1ZWRkMTE4ODA4Yjgy
-    MDJjZWFkNzc5ZDNkN2U4Zjc1OWZkNzAwYmI4MjA4MTFmYmVkZjk=
+    ZDliMTA0MDkzZWM3MDhiYWU1YTIwNzZlZDczNTNiM2NiYzVhYjY3MzhkZWFi
+    MmUxMWFiMGIwMTJmNjY0Njk3NzVkMmM2ZjhmNjQzMDI4YTkxOTFiOGI3NWFm
+    MWJjMTUxYmJjNmEzZmZjODc5NzkzMWZkNjM2ZTE4OWM2MmYwNjk=
   data.tar.gz: !binary |-
-    OTMxMTM2ZTM1M2VmZjg1ZDNiMTgwMzkwZjk2OGU3ZDU2N2ViZTU4Y2IwOTMw
-    NDU3NzJhZWExZGZiNTVlYTgwYWExMjUwYjdjNzM4MDViZmJjMWViNDY2MTU3
-    MjczZWE3ODRhYjZkMGQyYmY4NmYyNzZjOGFkNWUyMDRjNzg5Njg=
+    NTNjMzhiYmJhODFhNjhhNjk5ODM4M2Y0MTJhOGU2ODRmMzc0OGU5MmJhNDFj
+    ZWVkMTQxNWFkNjk3YjA3OTIwZmNmMzM1ZjIwM2VjYzU1ZTc5MjUwMTUxZTQ0
+    Y2JkM2M1NWVjNTc0ZjMzOTkzMzdhMmM1ZjhjNWU3NjZjZWI0MTE=

data/.gitignore

@@ -45,5 +45,6 @@ pkg
 .ruby-gemset
 .idea
 bin/LETOVER
+.vscode
 
 Gemfile.lock

data/bin/inline_forms_installer_core.rb

@@ -4,7 +4,7 @@ create_file 'Gemfile', "# created by inline_forms #{ENV['inline_forms_version']}
 
 add_source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.22.5'
+gem 'rails', '~> 5.0.2'
 gem 'rake'
 gem 'jquery-rails'
 gem 'jquery-ui-sass-rails'
@@ -372,7 +372,7 @@ create_file "app/controllers/application_controller.rb", <<-END_APPCONTROLLER.st
     protect_from_forgery
 
     # Comment next line if you don't want Devise authentication
-    before_filter :authenticate_user!
+    before_action :authenticate_user!
 
     # Comment next 6 lines if you do not want CanCan authorization
     enable_authorization :unless => :devise_controller?
@@ -385,7 +385,7 @@ create_file "app/controllers/application_controller.rb", <<-END_APPCONTROLLER.st
     ActionView::CompiledTemplates::MODEL_TABS = %w()
 
     # Uncomment next line if you want I18n (based on subdomain)
-    # before_filter :set_locale
+    # before_action :set_locale
 
     # Uncomment next line and specify default locale
     # I18n.default_locale = :en

data/inline_forms.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rvm')
   s.add_dependency('thor')
   s.add_dependency('validation_hints')
-  s.add_dependency('rails', '3.2.22.5')
+  s.add_dependency('rails', '5.0.2')
   s.add_dependency('rails-i18n')
 
   s.add_development_dependency(%q<rspec-rails>)

data/lib/app/controllers/inline_forms_controller.rb

@@ -17,16 +17,16 @@
 # and @Klass will be set to Example by the getKlass before filter.
 #
 # === How it works
-# The getKlass before_filter extracts the class and puts it in @Klass
+# The getKlass before_action extracts the class and puts it in @Klass
 #
 # @Klass is used in the InlineFormsHelper
 #
 class InlineFormsController < ApplicationController
-  before_filter :getKlass
+  before_action :getKlass
 
   def self.cancan_enabled?
     begin
-      ::Ability && true
+      CanCan::Ability && true
     rescue NameError
       false
     end
@@ -63,9 +63,7 @@ class InlineFormsController < ApplicationController
     @objects ||= @Klass.accessible_by(current_ability) if cancan_enabled?
     @objects ||= @Klass
     @objects = @objects.order(@Klass.table_name + "." + @Klass.order_by_clause) if @Klass.respond_to?(:order_by_clause) && ! @Klass.order_by_clause.nil?
-    @objects = @objects.paginate(
-        :page => params[:page],
-        :conditions => conditions )
+    @objects = @objects.where(conditions).paginate(:page => params[:page])
     respond_to do |format|
       format.html { render 'inline_forms/_list', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
       format.js { render :list }
@@ -87,19 +85,20 @@ class InlineFormsController < ApplicationController
 
     @object.inline_forms_attribute_list = @inline_forms_attribute_list if @inline_forms_attribute_list
     respond_to do |format|
+      format.html { render 'inline_forms/_new', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
       format.js { }
     end
   end
 
   # :edit presents a form to edit one specific attribute from an object
   def edit
-    @object = @Klass.find(params[:id])
+    @object = referenced_object
     @attribute = params[:attribute]
     @form_element = params[:form_element]
     @sub_id = params[:sub_id]
     @update_span = params[:update]
     respond_to do |format|
-      #format.html { } unless @Klass.not_accessible_through_html?
+      format.html { } unless @Klass.not_accessible_through_html?
       format.js { }
     end
   end
@@ -124,11 +123,13 @@ class InlineFormsController < ApplicationController
       conditions =  [ "#{foreign_key} = ?", @parent_id ]
       @object[foreign_key] = @parent_id
     end
+
     if @object.save
       flash.now[:success] = t('success', :message => @object.class.model_name.human)
-      @objects = @Klass.where(id: @object.id)
-      @objects = @objects.accessible_by(current_ability) if cancan_enabled?
-      @objects = @objects.paginate :page => params[:page], :conditions => conditions
+      @objects = @Klass
+      @objects = @Klass.accessible_by(current_ability) if cancan_enabled?
+      @objects = @objects.order(@Klass.table_name + "." + @Klass.order_by_clause) if @Klass.respond_to?(:order_by_clause) && ! @Klass.order_by_clause.nil?
+      @objects = @objects.where(conditions).paginate(:page => params[:page])
       @object = nil
       respond_to do |format|
         format.js { render :list}
@@ -145,7 +146,7 @@ class InlineFormsController < ApplicationController
 
   # :update updates a specific attribute from an object.
   def update
-    @object = @Klass.find(params[:id])
+    @object = referenced_object
     @attribute = params[:attribute]
     @form_element = params[:form_element]
     @sub_id = params[:sub_id]
@@ -153,6 +154,7 @@ class InlineFormsController < ApplicationController
     send("#{@form_element.to_s}_update", @object, @attribute)
     @object.save
     respond_to do |format|
+      format.html { } unless @Klass.not_accessible_through_html?
       format.js { }
     end
   end
@@ -160,7 +162,7 @@ class InlineFormsController < ApplicationController
   # :show shows one attribute (attribute) from a record (object).
   # It includes the link to 'edit'
   def show
-    @object = @Klass.find(params[:id])
+    @object = referenced_object
     @attribute = params[:attribute]
     @form_element = params[:form_element]
     close = params[:close] || false
@@ -187,6 +189,7 @@ class InlineFormsController < ApplicationController
       end
     else
       respond_to do |format|
+        format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :show_element }
       end
     end
@@ -195,15 +198,17 @@ class InlineFormsController < ApplicationController
   # :destroy destroys the record, but also shows an undo link (with paper_trail)
   def destroy
     @update_span = params[:update]
-    @object = @Klass.find(params[:id])
+    @object = referenced_object
     if current_user.role? :superadmin
       @object.destroy
       respond_to do |format|
+        format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :show_undo }
       end
     elsif (@Klass.safe_deletable? rescue false)
       @object.safe_delete(current_user)
       respond_to do |format|
+        format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :close }
       end
     end
@@ -219,12 +224,14 @@ class InlineFormsController < ApplicationController
       @object = @Klass.find(@version.item_id)
       authorize!(:revert, @object) if cancan_enabled?
       respond_to do |format|
+        format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :close }
       end
     elsif (@Klass.safe_deletable? rescue false)
-      @object = @Klass.find(params[:id])
+      @object = referenced_object
       @object.safe_restore
       respond_to do |format|
+        format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :close }
       end
     end
@@ -248,6 +255,15 @@ class InlineFormsController < ApplicationController
   # TODO think about this a bit more.
   def getKlass #:doc:
     @Klass = self.controller_name.classify.constantize
+    @Klass
+  end
+
+  def referenced_object
+    @Klass.find(object_id_params)
+  end
+
+  def object_id_params
+    params.require(:id)
   end
 
   def deep_hashify(ary)
@@ -270,4 +286,8 @@ class InlineFormsController < ApplicationController
     a
   end
 
+  def revert_params
+    params.require(:id).permit(:update)
+  end
+
 end

data/lib/app/helpers/form_elements/chicas_dropdown_with_family_members.rb

@@ -10,7 +10,7 @@ end
 def chicas_dropdown_with_family_members_edit(object, attribute)
   o = object.send(attribute) # the client
   values = o.family.clients
-  values.sort_by! &:_dropdown_presentation
+  values.sort_by(&:_dropdown_presentation)
   # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
   collection_select( ('_' + object.class.to_s.underscore).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', '_dropdown_presentation', :selected => object.send(attribute).id)
 end

data/lib/app/helpers/form_elements/dropdown.rb

@@ -25,7 +25,7 @@ def dropdown_edit(object, attribute)
   if klass.method_defined? :disabled_for_dropdown?
     options_disabled = values.map{|v| v.id if v.disabled_for_dropdown?}.compact
   end
-  values.sort_by! {|v|v.send presentation}
+  values.sort_by {|v|v.send presentation}
   # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
   collection_select( ('_' + object.class.to_s.underscore).to_sym,
                       attribute.to_s.foreign_key.to_sym,

data/lib/app/helpers/form_elements/dropdown_with_other.rb

@@ -24,7 +24,7 @@ def dropdown_with_other_edit(object, attribute)
   values.each do |v|
     v.name = v._presentation
   end
-  # values.sort_by! &:name
+  # values.sort_by(&:name)
 
   collection = values.map {|v|[v.name, v.id]}
   collection << [object[attribute + '_other'], 0] unless object[attribute + '_other'].nil? || object[attribute + '_other'].empty?

data/lib/app/helpers/form_elements/pdf_link.rb

@@ -17,17 +17,17 @@ def pdf_link_update(object, attribute)
   # do absolutely nothing
 end
 
-module ActionView::Helpers::DateHelper
-
-  def distance_of_time_in_words_to_now_with_future(from_time, include_seconds = false)
-    if from_time > Time.now()
-      'in ' + distance_of_time_in_words_to_now_without_future(from_time, include_seconds)
-    else
-      distance_of_time_in_words_to_now_without_future(from_time, include_seconds) + ' ago'
-    end
-  end
-
-  alias_method_chain :distance_of_time_in_words_to_now, :future
-
-end
-
+#module ActionView::Helpers::DateHelper
+#
+#  def distance_of_time_in_words_to_now_with_future(from_time, include_seconds = false)
+#    if from_time > Time.now()
+#      'in ' + distance_of_time_in_words_to_now_without_future(from_time, include_seconds)
+#    else
+#      distance_of_time_in_words_to_now_without_future(from_time, include_seconds) + ' ago'
+#    end
+#  end
+#
+#  alias_method_chain :distance_of_time_in_words_to_now, :future
+#
+#end
+#

data/lib/app/models/geo_code_curacao.rb

@@ -3,17 +3,17 @@ class GeoCodeCuracao
   attr_accessor :street, :neighbourhood, :zone
   
   class Zone < ActiveRecord::Base
-    set_table_name "Zones"
+    self.table_name =  "Zones"
     alias_attribute :name, :NAME
   end
 
   class Neighbourhood < ActiveRecord::Base
-    set_table_name "Buurten"
+    self.table_name =  "Buurten"
     alias_attribute :name, :NAME
   end
 
   class Street < ActiveRecord::Base
-    set_table_name "Straatcode"
+    self.table_name =  "Straatcode"
     alias_attribute :name, :NAME
   end
 

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

@@ -2,7 +2,7 @@
   <nav id='inline_forms_application_top_bar' class="top-bar" data-topbar>
     <ul class="title-area">
       <li class="name">
-        <h1><a href="/"><%= application_name %> v<%= inline_forms_version %></a></h1>
+        <h1><a href="/"><%= application_name %> v<%= inline_forms_version %> <%= current_user.name %></a></h1>
       </li>
       <li class="toggle-topbar menu-icon">
         <a href="#"><span></span></a>

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

@@ -37,7 +37,7 @@
     <% objects = parent_class.find(parent_id).send(attribute) %>
     <% objects = parent_class.find(parent_id).send(attribute).accessible_by(current_ability) if cancan_enabled? %>
     <% objects = objects.order(attribute.to_s.singularize.camelcase.constantize.order_by_clause) if attribute.to_s.singularize.camelcase.constantize.respond_to?(:order_by_clause) && ! attribute.to_s.singularize.camelcase.constantize.order_by_clause.nil? %>
-    <% objects = objects.paginate  :page => params[:page], :conditions => conditions %>
+    <% objects = objects.where(conditions).paginate(:page => params[:page]) %>
   <% end %>
 <% end %>
 

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

@@ -3,11 +3,9 @@
     <% flash.each do |key, value| %>
       <div class="flash <%= key %>">
         <ul>
-          <% value.each do |m| %>
             <li>
-              <%= m %>
+              <%= value %>
             </li>
-          <% end %>
         </ul>
       </div>
     <% end %>
@@ -27,16 +25,16 @@
     <% attributes.each do | attribute, name, form_element | -%>
       <% unless form_element.to_sym == :associated || form_element.to_sym == :tree || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute)) -%>
         <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
-        <% if form_element == :header %>
+        <% if form_element && form_element.to_sym == :header %>
           <div class="row form_element_header" >
             <div class='large-12 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-              <%= @object.class.human_attribute_name(attribute) -%>
+              <%= @object.human_attribute_name(attribute) -%>
             </div>
           </div>
         <% else %>
           <div class="row <%= cycle('odd', 'even') %>">
             <div class='medium-5 large-5 column' >
-              <%= @object.class.human_attribute_name(attribute) -%>
+              <%= @object.human_attribute_name(attribute) -%>
             </div>
             <div class='medium-7 large-7 column' >
               <span id="<%= css_class_id -%>" > <%= send("#{form_element}_edit", @object, attribute) -%> </span>

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

@@ -19,7 +19,6 @@
     <% end %>
     <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
     <% attributes.each do | attribute, name, form_element | -%>
-    <% puts "LOG: #{attribute}, #{form_element}" if Rails.env.development? %>
       <% if cancan_disabled? || can?(:read, @object, attribute) %>
         <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_#{attribute}" -%>
         <% if form_element == :header %>

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

@@ -1 +1 @@
-$('#<%= @update_span %>').html('<%= escape_javascript(link_to t('inline_forms.view.undo'), send('revert_' + @object.class.to_s.underscore + "_path", @object.versions.scoped.last, :update => @update_span), :remote => true, :method => :post)%>')
+$('#<%= @update_span %>').html('<%= escape_javascript(link_to t('inline_forms.view.undo'), send('revert_' + @object.class.to_s.underscore + "_path", @object.versions.scope.last, :update => @update_span), :remote => true, :method => :post)%>')

data/lib/generators/human_attribute_name_generator.rb

@@ -0,0 +1,7 @@
+class HumanAttributeNameGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path("../templates", __FILE__)
+ 
+  def copy_initializer_file
+      copy_file "model_instance_human_attribute_name.rb", "config/initializers/human_attribute_name.rb"
+  end
+end

data/lib/generators/templates/model_instance_human_attribute_name.rb

@@ -0,0 +1,7 @@
+# Wrapper for @model.human_attribute_name -> Model.human_attribute_name
+#
+class ActiveRecord::Base
+  def human_attribute_name(*args)
+    self.class.human_attribute_name(*args)
+  end
+end

data/lib/inline_forms/version.rb

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

data/lib/locales/inline_forms.en.yml

@@ -35,4 +35,4 @@ en:
     attributes:
       client:
         first_name: first name
-        last_name: last name
+        last_name: last name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 3.2.11
+  version: 5.0.0
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.5
+        version: 5.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.5
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,7 @@ extra_rdoc_files: []
 files:
 - .document
 - .gitignore
+- .vscode/settings.json
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -248,6 +249,7 @@ files:
 - lib/generators/assets/stylesheets/devise.scss
 - lib/generators/assets/stylesheets/foundation_and_overrides.scss
 - lib/generators/assets/stylesheets/inline_forms.scss
+- lib/generators/human_attribute_name_generator.rb
 - lib/generators/inline_forms_generator.rb
 - lib/generators/templates/_inline_forms_tabs.html.erb
 - lib/generators/templates/abstract_mysql2_adapter.rb
@@ -255,6 +257,7 @@ files:
 - lib/generators/templates/deploy.rb
 - lib/generators/templates/migration.erb
 - lib/generators/templates/model.erb
+- lib/generators/templates/model_instance_human_attribute_name.rb
 - lib/generators/templates/test.erb
 - lib/generators/templates/unicorn.rb
 - lib/inline_forms.rb