adminpanel 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dabdd27ecf752a66c20e0b2199b03137a16be78
-  data.tar.gz: f805cee1bda91e50223bf6ecf6901b04e1e5290e
+  metadata.gz: e5f00c2db221e6cb620e033aa8a68858d6b3981a
+  data.tar.gz: 5bd1f80432627e6a24dd8a133ea42eb652dde722
 SHA512:
-  metadata.gz: 9e161090ba658140efac3b49198595ed904b473deba28873d7e64cd72b88e77ce1ade33ad946560757c90479cb7ad6797cae1f2559077bde85221937f366cc77
-  data.tar.gz: 392c942c45621ebb2f557799a97ac1d430a0459613f3d79a35785141a70512672727dbc89a97ebc6cc3548e30b031edc70177f0d49ffa43eb6fc91e5dc3c6eb3
+  metadata.gz: 271dcd2b02ed4b3ef483d2ada2e043910a9894b7c4660fda66e066bac6e18aae5034d76d04825c48205a8094c5837d47c6a992a0f9b0245164f59499958b042f
+  data.tar.gz: f32a7d5d6d64d5af11b35fd42286a7b7c0dbc529c185ba0b5d011c22750eb1ab942bb71b222d82a43d2660a821cac84815b3ba5cddc656eee01b48dd9c6f5af2

data/adminpanel.gemspec

@@ -54,4 +54,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-capybara','0.7.1'
   spec.add_development_dependency 'poltergeist'
   spec.add_development_dependency 'sqlite3',          '~> 1.3',   '>= 1.3.10'
+  spec.add_development_dependency 'byebug'
 end

data/app/assets/javascripts/adminpanel/realm.js

@@ -1,15 +1,15 @@
 var ready = function(){
 
   // toggle arrow on menu items
-  $('.accordion-heading .accordion-toggle').click(function(){
-    $('.accordion-heading .accordion-toggle').not($(this)[0], '.accordion-heading .accordion-toggle.collapse').addClass('collapsed');
-  });
+  // $('.accordion-heading .accordion-toggle').click(function(){
+  //   $('.accordion-heading .accordion-toggle').not($(this)[0], '.accordion-heading .accordion-toggle.collapse').addClass('collapsed');
+  // });
 
   // show the overview boxes on the dashboard once they are loaded
-  $('.overview_boxes .box_row').css('display', 'inline-block');
+  // $('.overview_boxes .box_row').css('display', 'inline-block');
 
   // init tooltips on .tips class elements, text for the tooltip is in the data-title attribute on the element itself
-  // $('.tip').tooltip();
+  $('[data-toggle="tooltip"]').tooltip();
 
   // init popover on .pop class elements
   // $('.pop').popover({
@@ -25,22 +25,22 @@ var ready = function(){
 
 
   // funtion to slide menu out from the left
-  $('.slide_menu_left').click(function(e){
-
-    e.preventDefault();
-    if($(".nav-collapse.collapse").hasClass('open_left')){
-      sidemenu_close();
-    }else{
-      sidemenu_open();
-      $('.main_container').bind('click', function(){
-        sidemenu_close();
-      });
-    //   var handler = function() {
-      //  sidemenu_close();
-      // };
-     //  $(window).bind('resize', handler);
-    }
-  });
+  // $('.slide_menu_left').click(function(e){
+  //
+  //   e.preventDefault();
+  //   if($(".nav-collapse.collapse").hasClass('open_left')){
+  //     sidemenu_close();
+  //   }else{
+  //     sidemenu_open();
+  //     $('.main_container').bind('click', function(){
+  //       sidemenu_close();
+  //     });
+  //   //   var handler = function() {
+  //     //  sidemenu_close();
+  //     // };
+  //    //  $(window).bind('resize', handler);
+  //   }
+  // });
 
 
   // collapse function for the widget
@@ -65,25 +65,25 @@ $(document).on('page:load', ready);
 //-----  Side menu functions -----
 
   // slide menu out of view
-  function sidemenu_close(){
-    $(".main_container").stop().animate({
-        'left': '0'
-    }, 250, 'swing');
-    $(".nav-collapse.collapse").stop().animate({
-        'left': '-150px'
-    }, 250, 'swing').removeClass('open_left');
-    $('.main_container').unbind('click');
-    if(typeof handler != 'undefined'){
-      $(window).unbind('resize', handler);
-    }
-  }
-
-  // slide menu in
-  function sidemenu_open(){
-      $(".main_container").stop().animate({
-          'left': '150px'
-      }, 250, 'swing');
-      $(".nav-collapse.collapse").stop().animate({
-          'left': '0'
-      }, 250, 'swing').addClass('open_left');
-  }
+  // function sidemenu_close(){
+  //   $(".main_container").stop().animate({
+  //       'left': '0'
+  //   }, 250, 'swing');
+  //   $(".nav-collapse.collapse").stop().animate({
+  //       'left': '-150px'
+  //   }, 250, 'swing').removeClass('open_left');
+  //   $('.main_container').unbind('click');
+  //   if(typeof handler != 'undefined'){
+  //     $(window).unbind('resize', handler);
+  //   }
+  // }
+  //
+  // // slide menu in
+  // function sidemenu_open(){
+  //     $(".main_container").stop().animate({
+  //         'left': '150px'
+  //     }, 250, 'swing');
+  //     $(".nav-collapse.collapse").stop().animate({
+  //         'left': '0'
+  //     }, 250, 'swing').addClass('open_left');
+  // }

data/app/assets/javascripts/adminpanel/trix-upload.coffee

@@ -0,0 +1,45 @@
+document.addEventListener "trix-attachment-add", (event) ->
+  attachment = event.attachment
+  if attachment.file
+    return uploadAttachment(event)
+
+document.addEventListener "trix-attachment-remove", (event) ->
+  image_url = event.attachment.attachment.preloadedURL
+  $("input[data-url='#{image_url}']").remove()
+
+uploadAttachment = (e) ->
+  $element = $(e.srcElement)
+  $form = $('form:first')
+  host = $form.data('trix-url')
+  attachment = e.attachment
+  file = attachment.file
+  formData = new FormData
+  formData.append("parent_object_class", $form.data('parent-class'))
+  formData.append("model", $element.data('uploader-class'))
+  formData.append("file", file)
+
+  xhr = new XMLHttpRequest
+  xhr.open("POST", host, true)
+
+  xhr.upload.onprogress = (event) ->
+    progress = event.loaded / event.total * 100
+    return attachment.setUploadProgress(progress)
+
+  xhr.onload = ->
+    if (xhr.status is 204 || xhr.status is 200)
+      response = JSON.parse(xhr.responseText)
+
+      uploader = $element.data('uploader-name')
+      console.log $element
+      console.log uploader
+      $form.append("<input type=\"hidden\" name=\"#{$form.data('params-key')}[#{uploader.slice(0, -1)}_ids][]\" value=\"#{response.id}\" />")
+      return attachment.setAttributes({
+        url:  response.image_url,
+        href: response.image_url
+      })
+
+  xhr.setRequestHeader(
+    "X-CSRF-Token",
+    $('meta[name="csrf-token"]').attr('content')
+  )
+  return xhr.send(formData)

data/app/controllers/concerns/adminpanel/gallery_actions.rb

@@ -10,7 +10,8 @@ module Adminpanel
       if image.save
         response = {
           class: image_class.to_controller_name,
-          id: image.id
+          id: image.id,
+          image_url: image.file_url(:thumb)
         }
 
         respond_to do |f|

data/app/controllers/concerns/adminpanel/rest_actions.rb

@@ -31,7 +31,12 @@ module Adminpanel
     def new
       @resource_instance = @model.new
       respond_to do |format|
-        render_new(format)
+        format.html do
+          render 'adminpanel/templates/new'
+        end
+        format.js do
+          render 'adminpanel/templates/new'
+        end
       end
     end
 
@@ -52,7 +57,12 @@ module Adminpanel
             end
           end
         else
-          render_new(format)
+          format.html do
+            render 'adminpanel/templates/new'
+          end
+          format.js do
+            render 'adminpanel/templates/new'
+          end
         end
       end
     end
@@ -102,14 +112,5 @@ module Adminpanel
       resource = controller_name.singularize.to_sym
       "#{resource}_params"
     end
-
-    def render_new(format)
-      format.html do
-        render 'adminpanel/templates/new'
-      end
-      format.js do
-        render 'adminpanel/templates/new'
-      end
-    end
   end
 end

data/app/helpers/adminpanel/adminpanel_form_builder.rb

@@ -55,7 +55,14 @@ module Adminpanel
 
       options = args.extract_options!
 
-      hidden_field(method, id: "#{self.object.class.to_s.demodulize}-trix-#{method}") + base_layout(method, options, 'trix_field')
+      hidden_field(
+          method,
+          id: "#{self.object.class.to_s.demodulize}-trix-#{method}"
+        ) + base_layout(
+          method,
+          options,
+          'trix_field'
+      )
     end
 
     def text_area(method, *args)
@@ -204,10 +211,29 @@ module Adminpanel
         options = args.extract_options!
         options.reverse_merge! input: "#{self.object.class.to_s.demodulize}-trix-#{method}", id: "#{method}-trix-editor"
         options[:class] << ' trix-content'
+        options[:data] ||= {}
+        editor_images = []
+        if options['uploader'].present?
+          options[:data][:uploader_name] = options['uploader'].to_s
+          options[:data][:uploader_class] = "Adminpanel::#{options['uploader'].to_s.singularize.capitalize}"
+          relation_name = "#{options['uploader'].to_s.singularize}_ids"
+          editor_images = self.object.send(options['uploader'].to_s)
+          empty_uploader_field = @template.hidden_field_tag "#{self.object.class.name.demodulize.underscore}[#{relation_name}][]"
+        end
 
-        @template.content_tag 'trix-editor', options do
+        editor = @template.content_tag 'trix-editor', options do
           self.object.send(method)
         end
+        editor_images_fields = editor_images.map {|image|
+          @template.hidden_field_tag(
+            "#{self.object.class.name.demodulize.underscore}[#{relation_name}][]",
+            image.id,
+            data: {
+              url: image.file_url(:thumb)
+            }
+          )
+        }.join('').html_safe
+        editor + empty_uploader_field + editor_images_fields
       end
 
     private

data/app/helpers/adminpanel/application_helper.rb

@@ -4,19 +4,24 @@ module Adminpanel
     include BreadcrumbsHelper
     include SharedPagesHelper
 
-    def adminpanel_form_for(name, *args, &block)
+    def adminpanel_form_for(object, *args, &block)
       options = args.extract_options!
       options.reverse_merge! builder: Adminpanel::AdminpanelFormBuilder, html: { class: 'form-horizontal' }
-      if name.class.has_gallery?
-        options[:html][:"data-parent-object-class"] = name.class.to_s
-        options[:html][:"data-parent-object-id"] = name.id
-        options[:html][:"data-dropzone"] = name.class.to_s.demodulize.underscore
-        options[:html][:"data-dropzone-galleries"] = name.class.galleries.to_json
-        options[:html][:"data-dropzone-url"] = url_for(controller: name.class.to_controller_name, action: :add_to_gallery)
-        options[:html][:"data-dropzone-delete-url"] = url_for(controller: name.class.to_controller_name, action: :remove_image)
+      if @model.has_gallery?
+        options[:html][:"data-parent-object-class"] = @model.to_s
+        options[:html][:"data-parent-object-id"] = object.id
+        options[:html][:"data-dropzone"] = @model.to_s.demodulize.underscore
+        options[:html][:"data-dropzone-galleries"] = @model.galleries.to_json
+        options[:html][:"data-dropzone-url"] = url_for(controller: @model.to_controller_name, action: :add_to_gallery)
+        options[:html][:"data-dropzone-delete-url"] = url_for(controller: @model.to_controller_name, action: :remove_image)
+      end
+      if @model.has_trix_gallery?
+        options[:html][:"data-trix-url"] = url_for(controller: @model.to_controller_name, action: :add_to_gallery)
+        options[:html][:"data-parent-class"] ||= @model.to_s
+        options[:html][:"data-params-key"] ||= @model.to_s.demodulize.underscore
       end
 
-      form_for(name, *(args << options), &block)
+      form_for(object, *(args << options), &block)
     end
 
     def full_title(page_title)

data/app/helpers/adminpanel/router_helper.rb

@@ -21,7 +21,7 @@ module Adminpanel
     end
 
     def has_gallery?(resource)
-      resource_class(resource).has_gallery?
+      resource_class(resource).has_gallery? || resource_class(resource).has_trix_gallery?
     end
 
     def resource_is_sortable?(resource)

data/app/models/adminpanel/image.rb

@@ -5,7 +5,7 @@ module Adminpanel
     belongs_to :model, polymorphic: true
 
     before_save :store_file_size_and_content_type
-    # after_save :delete_old_unused_images
+
     before_destroy :remove_attachment
 
     private
@@ -20,12 +20,5 @@ module Adminpanel
         end
       end
 
-      # def delete_old_unused_images
-      #   self.class.where('created_at < ?', Time.now - 30.minutes)
-      #             .delete_all(
-      #               model_id: nil,
-      #               type: self.type
-      #             )
-      # end
   end
 end

data/app/models/concerns/adminpanel/base.rb

@@ -1,12 +1,14 @@
+# Adminpanel API
+# This file must be included on every adminpanel resource.
+
 module Adminpanel
   module Base
     extend ActiveSupport::Concern
 
     module ClassMethods
-    FILE_FIELD_NAME = 'adminpanel_file_field'
+      FILE_FIELD_NAME = 'adminpanel_file_field'
 
 
-      # Adminpanel API
       def mount_images(relation)
         has_many relation, dependent: :destroy, as: :model
         accepts_nested_attributes_for relation, allow_destroy: true
@@ -31,7 +33,7 @@ module Adminpanel
         'please overwrite self.display_name'
       end
 
-      # side menu icon
+      # fontawesome icon to be used in the side-menu
       def icon
         'truck'
       end
@@ -59,7 +61,7 @@ module Adminpanel
       def display_attributes(type)
         display_attributes = []
         form_attributes.each do |attribute|
-          attribute.each do |name, properties|
+          attribute.each do |_, properties|
             if (
               properties['show'].nil? ||
               properties['show'] == 'true' ||
@@ -75,8 +77,8 @@ module Adminpanel
         return display_attributes
       end
 
-      # return true if model has adminpanel_file_field in
-      # it's attributes
+      # Check if this models has a gallery in its attributes
+      # @return boolean
       def has_gallery?
         form_attributes.each do |fields|
           fields.each do |attribute, properties|
@@ -85,16 +87,32 @@ module Adminpanel
             end
           end
         end
-        return false
+        false
       end
 
-      #Returns an array of all the adminpanel_field_field fields found in form_attributes
+      # Check if this models has a trix editor with a gallery in its attributes
+      # @return boolean
+      def has_trix_gallery?
+        form_attributes.each do |fields|
+          fields.each do |attribute, properties|
+            if properties['type'] == 'wysiwyg_field' || properties['uploader'].present?
+              return true
+            end
+          end
+        end
+        false
+      end
+
+      # Returns an array with all the adminpanel_file_field`s attributes found
+      # in form_attributes
+      # @return Hash
+      # => { sectionfiles: Adminpanel::SectionFile, ... }
       def galleries
         galleries = {}
         form_attributes.each do |fields|
-          fields.each do |attribute, properties|
+          fields.each do |relation, properties|
             if properties['type'] == FILE_FIELD_NAME
-              galleries["#{attribute.singularize}"] = "adminpanel/#{attribute}".classify.constantize.to_s
+              galleries["#{relation.singularize}"] = "adminpanel/#{relation}".classify.constantize.to_s
             end
           end
         end
@@ -102,12 +120,15 @@ module Adminpanel
         return galleries
       end
 
+      # Returns an array with all the adminpanel_file_field`s attributes who are
+      # sortable found in form_attributes
+      # @return Hash
       def sortable_galleries
         galleries = {}
         form_attributes.each do |fields|
-          fields.each do |attribute, properties|
-            if properties['type'] == FILE_FIELD_NAME && "adminpanel/#{attribute}".classify.constantize.is_sortable?
-              galleries["#{attribute.singularize}"] = "adminpanel/#{attribute}".classify.constantize.to_s
+          fields.each do |relation, properties|
+            if properties['type'] == FILE_FIELD_NAME && "adminpanel/#{relation}".classify.constantize.is_sortable?
+              galleries["#{relation.singularize}"] = "adminpanel/#{relation}".classify.constantize.to_s
             end
           end
         end
@@ -133,7 +154,8 @@ module Adminpanel
         "adminpanel/#{gallery_relationship}".classify.constantize
       end
 
-      # returns all the class of the attributes of a given type.
+      # Search for a model attribute's that are of a given type
+      # @return Array
       # Usage:
       # To get all classes of all belongs_to attributes:
       #   @model.relationships_of('belongs_to')
@@ -150,12 +172,14 @@ module Adminpanel
         return classes_of_relation
       end
 
+      # routes options to be used when generating this model routes
+      # @return Hash
       def routes_options
         { path: collection_name.parameterize }
       end
 
       def has_route?(route)
-        if (!exclude?(route)) && include_route(route)
+        if (!exclude_route?(route)) && include_route?(route)
           true
         else
           false
@@ -170,10 +194,12 @@ module Adminpanel
         false
       end
 
+      # Additional member routes for this resource
       def member_routes
         []
       end
 
+      # Additional collection routes for this resource
       def collection_routes
         []
       end
@@ -192,34 +218,34 @@ module Adminpanel
 
       private
 
-      def exclude?(route)
-        if routes_options[:except].nil?
-          false
-        elsif routes_options[:except].include?(route)
-          true
-        else
-          false
+        def exclude_route?(route)
+          if routes_options[:except].nil?
+            false
+          elsif routes_options[:except].include?(route)
+            true
+          else
+            false
+          end
         end
-      end
 
-      def include_route(route)
-        if routes_options[:only].nil? || routes_options[:only].include?(route)
-          true
-        else
-          false
+        def include_route?(route)
+          if routes_options[:only].nil? || routes_options[:only].include?(route)
+            true
+          else
+            false
+          end
         end
-      end
 
-    end
+      end
 
-    def destroy_unattached_images
-      self.class.galleries.each{|gallery| gallery.last.constantize.delete_all(model_id: nil) }
-    end
+      def destroy_unattached_images
+        self.class.galleries.each{|gallery| gallery.last.constantize.delete_all(model_id: nil) }
+      end
 
-    def correlative_order_gallery
-      self.class.galleries.each do |gallery|
-        self.send(gallery.first.pluralize).ordered.each_with_index{ |image, index| image.update(position: index + 1) }
+      def correlative_order_gallery
+        self.class.galleries.each do |gallery|
+          self.send(gallery.first.pluralize).ordered.each_with_index{ |image, index| image.update(position: index + 1) }
+        end
       end
-    end
   end
 end

data/app/views/adminpanel/icons/_delete.html.erb

@@ -12,6 +12,9 @@
       method: :delete,
       remote: true,
       data: {
+        toggle: :tooltip,
+        placement: :left,
+        title: I18n.t('action.delete', resource: resource.name),
         confirm: I18n.t('action.delete_confirmation', resource: resource.name)
       }
     )

data/app/views/adminpanel/icons/_edit.html.erb

@@ -8,7 +8,12 @@
       ),
       [:edit, resource],
       title: I18n.t('action.update', resource: resource.name),
-      class: 'spinner-link'
+      data: {
+        toggle: :tooltip,
+        placement: :left,
+        title: I18n.t('action.update', resource: resource.name)
+      },
+      class: 'tip spinner-link'
     )
   %>
 <% end %>

data/app/views/adminpanel/icons/_facebook.html.erb

@@ -6,8 +6,10 @@ if @model.fb_share? && can?(:publish, @model)
   else
     link = '#'
     options = { target: "#fb-#{resource.id}", toggle: 'modal' }
-
   end
+  options[:toggle] ||= ''
+  options[:toggle] << ' tooltip'
+  options[:title] = 'Compartir en Facebook'
 %>
   <%=
     link_to(

data/app/views/adminpanel/icons/_new.html.erb

@@ -11,7 +11,12 @@
         action: :new
       },
       title: I18n.t('action.create', resource: @model.display_name),
-      class: 'spinner-link'
+      class: 'spinner-link',
+      data: {
+        toggle: :tooltip,
+        placement: :left,
+        title: I18n.t('action.create', resource: @model.display_name),
+      }
     )
   %>
 <% end %>

data/app/views/adminpanel/icons/_show.html.erb

@@ -9,7 +9,12 @@
       [resource],
       class: 'spinner-link',
       title: I18n.t('action.show', resource: resource.name),
-      id: 'show-resource-icon'
+      id: 'show-resource-icon',
+      data: {
+        toggle: :tooltip,
+        placement: :left,
+        title: I18n.t('action.show', resource: resource.name)
+      }
     )
   %>
 <% end %>

data/app/views/adminpanel/icons/_twitter.html.erb

@@ -7,6 +7,9 @@ if @model.twitter_share?
     link = '#'
     options = { target: "#twitter-#{resource.id}", toggle: 'modal' }
   end
+  options[:toggle] ||= ''
+  options[:toggle] << ' tooltip'
+  options[:title] = 'Compartir en Facebook'
 %>
   <%=
     link_to(

data/config/routes.rb

@@ -47,7 +47,7 @@ Adminpanel::Engine.routes.draw do
           if has_fb_share?(resource)
             # include facebook concern
             get :fb_choose_page, as: 'fb_choose_page', path: I18n.t('routes.publish', location: I18n.t('routes.facebook_page'))
-            post :fb_save_token, as: 'fb_save_token', path: 'guardar-token-fb'
+            post :fb_save_token, as: 'fb_save_token',  path: 'guardar-token-fb'
             post :fb_publish, to: "#{resource}#fb_publish", as: 'fb_publish', path: I18n.t('routes.publish', location: 'facebook')
           end
 
@@ -67,7 +67,7 @@ Adminpanel::Engine.routes.draw do
 
           if has_gallery?(resource)
             post :add_to_gallery, to: "#{resource}#add_to_gallery", as: 'add_to_gallery', path: I18n.t('routes.add_to_gallery')
-            delete :remove_image, to: "#{resource}#remove_image", as: 'remove_image', path: I18n.t('routes.remove_image')
+            delete :remove_image, to: "#{resource}#remove_image",   as: 'remove_image',   path: I18n.t('routes.remove_image')
           end
         end
       end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/test/dummy/app/controllers/adminpanel/test_objects_controller.rb

@@ -0,0 +1,4 @@
+module Adminpanel
+  class TestObjectsController < Adminpanel::ApplicationController
+  end
+end

data/test/dummy/app/models/adminpanel/test_object.rb

@@ -4,6 +4,8 @@ module Adminpanel
     has_and_belongs_to_many :categories,
         join_table: "adminpanel_test_object_category"
 
+    mount_images :textfiles
+
     def self.form_attributes
       [
         {
@@ -29,6 +31,7 @@ module Adminpanel
         {
           'text' => {
             'type' => 'wysiwyg_field',
+            'uploader' => 'textfiles',
             'label' => 'wysi'
           }
         },

data/test/dummy/app/models/adminpanel/textfile.rb

@@ -0,0 +1,7 @@
+module Adminpanel
+  class Textfile < Image
+    include Adminpanel::Base
+    mount_uploader :file, FileResourcefileUploader
+
+  end
+end

data/test/dummy/config/initializers/adminpanel_setup.rb

@@ -23,6 +23,7 @@ Adminpanel.setup do |config|
     :users,
     :mugs,
     :salesmen,
+    :test_objects,
     :file_resources
   ]
 end

data/test/features/shared/form/checkbox_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class CheckboxTest < ViewCase
-  fixtures :all
 
   setup :sign_in
   teardown :teardown

data/test/features/shared/form/enum_field_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class EnumFieldTest < ViewCase
-  fixtures :all
 
   setup :sign_in
 

data/test/features/shared/form/has_many_through_remote_test.rb

@@ -1,6 +1,5 @@
 require 'test_helper'
-require 'adminpanel/product'
-require 'adminpanel/category'
+
 class HasManyThroughRemoteTest < ViewCase
 
   setup :visit_adminpanel_new_department_path

data/test/features/shared/form/modal_contents_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class ModalContentsTest < ViewCase
-  fixtures :all
 
   setup :visit_adminpanel_new_user
 

data/test/features/shared/form/resource_field_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class ResourceFieldTest < ViewCase
-  fixtures :all
 
   setup :sign_in
 

data/test/features/shared/form/select_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class SelectTest < ViewCase
-  fixtures :all
 
   setup :sign_in
   teardown :teardown

data/test/features/shared/form/wysiwyg_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class WysiwygTest < ViewCase
+
+  setup :sign_in
+  teardown :teardown
+
+  def test_form_with_trix_data_attributes_when_uploader
+    visit adminpanel.new_test_object_path
+
+    assert_equal '/adminpanel/please-overwrite-self-display_names/agregar-a-galeria', find('form')['data-trix-url'], "data-trix-url not correct"
+    assert_equal 'Adminpanel::TestObject', find('form')['data-parent-class'], "data-parent-class not correct"
+    assert_equal 'test_object', find('form')['data-params-key'], "data-params-key not correct"
+
+    assert_selector 'input[name="test_object[textfile_ids][]"]'
+  end
+
+  private
+    def sign_in
+      visit adminpanel.signin_path
+      login
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -424,6 +424,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.10
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Gem that focus on making a public site's resources very quickly while being very configurable!,
       supports facebook sharing, twitter, instagram and google analytics integration
@@ -491,6 +505,7 @@ files:
 - app/assets/javascripts/adminpanel/sortable.js.coffee
 - app/assets/javascripts/adminpanel/spinner.js.coffee
 - app/assets/javascripts/adminpanel/tables.js
+- app/assets/javascripts/adminpanel/trix-upload.coffee
 - app/assets/javascripts/adminpanel/trix.js.erb
 - app/assets/stylesheets/adminpanel/_clearfix.css
 - app/assets/stylesheets/adminpanel/_search-input.scss.erb
@@ -641,6 +656,7 @@ files:
 - test/dummy/app/controllers/adminpanel/mugs_controller.rb
 - test/dummy/app/controllers/adminpanel/products_controller.rb
 - test/dummy/app/controllers/adminpanel/salesmen_controller.rb
+- test/dummy/app/controllers/adminpanel/test_objects_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/adminpanel/categorization.rb
@@ -656,6 +672,7 @@ files:
 - test/dummy/app/models/adminpanel/product.rb
 - test/dummy/app/models/adminpanel/salesman.rb
 - test/dummy/app/models/adminpanel/test_object.rb
+- test/dummy/app/models/adminpanel/textfile.rb
 - test/dummy/app/uploader/adminpanel/file_resourcefile_uploader.rb
 - test/dummy/app/uploader/adminpanel/photo_uploader.rb
 - test/dummy/app/uploader/adminpanel/section_uploader.rb
@@ -705,6 +722,7 @@ files:
 - test/features/shared/form/modal_contents_test.rb
 - test/features/shared/form/resource_field_test.rb
 - test/features/shared/form/select_test.rb
+- test/features/shared/form/wysiwyg_test.rb
 - test/features/shared/resource/edit_test.rb
 - test/features/shared/resource/index_test.rb
 - test/features/shared/resource/new_test.rb
@@ -753,7 +771,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick installed
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Made with <3 by CoDN
@@ -770,6 +788,7 @@ test_files:
 - test/dummy/app/controllers/adminpanel/mugs_controller.rb
 - test/dummy/app/controllers/adminpanel/products_controller.rb
 - test/dummy/app/controllers/adminpanel/salesmen_controller.rb
+- test/dummy/app/controllers/adminpanel/test_objects_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/adminpanel/categorization.rb
@@ -785,6 +804,7 @@ test_files:
 - test/dummy/app/models/adminpanel/product.rb
 - test/dummy/app/models/adminpanel/salesman.rb
 - test/dummy/app/models/adminpanel/test_object.rb
+- test/dummy/app/models/adminpanel/textfile.rb
 - test/dummy/app/uploader/adminpanel/file_resourcefile_uploader.rb
 - test/dummy/app/uploader/adminpanel/photo_uploader.rb
 - test/dummy/app/uploader/adminpanel/section_uploader.rb
@@ -834,6 +854,7 @@ test_files:
 - test/features/shared/form/modal_contents_test.rb
 - test/features/shared/form/resource_field_test.rb
 - test/features/shared/form/select_test.rb
+- test/features/shared/form/wysiwyg_test.rb
 - test/features/shared/resource/edit_test.rb
 - test/features/shared/resource/index_test.rb
 - test/features/shared/resource/new_test.rb
@@ -860,4 +881,3 @@ test_files:
 - test/support/view_case.rb
 - test/tasks/adminpanel_rake_test.rb
 - test/test_helper.rb
-has_rdoc: