adminpanel 3.3.4 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71fc1571c43fbe32e33c53a608731c6891753895
-  data.tar.gz: ec17badd558f43287f3877f28cacc8731ba4cdc2
+  metadata.gz: c33f9d543bfc5b175732944bcd0901b1b4146839
+  data.tar.gz: 9211446d561d7da413da1c861b1fd84cf928f23d
 SHA512:
-  metadata.gz: 8ff59894280623c10098eec46b9bf21108880675e2001b540ccbc0b552460fc3a2c735a04d3cbc6085f00bc015507060c960fe53ff87212f1efe107f5b89b795
-  data.tar.gz: 21be56b1f76a1661117308d9f4d193aafb26627aedb25b3534063c43ea3bfa28804e43e1a0dec8441dccd95c195d1bacbeb369c6ebb0802f565f67f04062adc1
+  metadata.gz: 54dd5f764c3aad38c9e637de87dda3f6d9b5fe9e08d8a29570149f3b3bc6ffe514cb23742a0832aa067eeb728b11bcd4fbc5fd537c1c71dd8d6a20ba41ab4b55
+  data.tar.gz: e400b3a5dc0bf3cba3025ac74409f98379a8a3190ba89adc073cfa8dab6d412c1b6107c234507b4e2ca671346034d6ed9f60d61f76496c4e7080a8c92abe9a36

data/adminpanel.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mini_magick', '4.3.6'
   spec.add_runtime_dependency 'bcrypt',      '~> 3.1',   '>= 3.1.7'
   spec.add_runtime_dependency 'carrierwave', '~> 0.10',  '>= 0.10.0'
-  spec.add_runtime_dependency 'cancancan',   '~> 1.13.0','>= 1.13.0'
+  spec.add_runtime_dependency 'cancancan',   '~> 1.16.0'
   spec.add_runtime_dependency 'friendly_id', '~> 5.1.0',   '>= 5.1.0'
 
   # Implemented APIs

data/app/controllers/adminpanel/pages_controller.rb

@@ -0,0 +1,32 @@
+module Adminpanel
+  class PagesController < Adminpanel::ApplicationController
+    before_action :redefine_model
+
+    def show
+    end
+
+    def edit
+      params[:skip_breadcrumb] = true
+      super
+    end
+
+    def update
+      if @resource_instance.update(page_params)
+        redirect_to page_path(@resource_instance)
+      else
+        params[:skip_breadcrumb] = true
+        render 'adminpanel/templates/edit'
+      end
+    end
+
+    private
+
+      def redefine_model
+        @model = @resource_instance.class
+      end
+
+      def page_params
+        @model.whitelisted_attributes(params)
+      end
+  end
+end

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

@@ -13,8 +13,6 @@ module Adminpanel
           id: image.id,
           image_url: image.file_url(:thumb)
         }
-        p 'jaja'
-        p response
         respond_to do |f|
           f.json{ render status: :ok, json: response.to_json }
         end

data/app/helpers/adminpanel/adminpanel_form_builder.rb

@@ -308,7 +308,7 @@ module Adminpanel
       def title_layout(attribute)
         @template.content_tag :div, class: 'control-group' do
           @template.content_tag :div, class: 'controls' do
-            @template.content_tag(:i, I18n.t('adminpanel.form.server_file', file: self.object["#{attribute}"]))
+            @template.content_tag(:i, I18n.t('adminpanel.form.server_file', file: self.object.send(attribute).to_s.split('/').last))
           end
         end
       end

data/app/helpers/adminpanel/application_helper.rb

@@ -12,14 +12,22 @@ module Adminpanel
         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)
+        if @resource_instance.is_a? Adminpanel::Page
+          options[:html][:"data-dropzone-url"] = url_for(controller: :pages, action: :add_to_gallery)
+          options[:html][:"data-dropzone-delete-url"] = url_for(controller: :pages, action: :remove_image)
+        else
+          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
       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
+      if @resource_instance.is_a? Adminpanel::Page
+        options[:url] = adminpanel.page_path(@resource_instance)
+      end
 
       form_for(object, *(args << options), &block)
     end

data/app/helpers/adminpanel/shared_pages_helper.rb

@@ -65,7 +65,7 @@ module Adminpanel
           li_tags.html_safe
         end
       when 'file_field'
-        link_to(object[attribute], object.try(:send, "#{attribute}_url")) unless object[attribute].nil?
+        link_to(object.send("#{attribute}_url").split('/').last, object.try(:send, "#{attribute}_url")) if object.send("#{attribute}_url").present?
       when 'image_field'
         content_tag :ul do
           image_tag(object.send("#{attribute}_url", :thumb))

data/app/models/adminpanel/page.rb

@@ -0,0 +1,10 @@
+module Adminpanel
+  class Page < ActiveRecord::Base
+    include Adminpanel::Base
+
+
+    def self.whitelisted_attributes(params)
+      params.require(self.name.to_s.underscore.split('/').last).permit!
+    end
+  end
+end

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

@@ -95,7 +95,7 @@ module Adminpanel
       def has_trix_gallery?
         form_attributes.each do |fields|
           fields.each do |attribute, properties|
-            if properties['type'] == 'wysiwyg_field' || properties['uploader'].present?
+            if properties['type'] == 'wysiwyg_field' && properties['uploader'].present?
               return true
             end
           end
@@ -212,6 +212,10 @@ module Adminpanel
         to_s.demodulize.underscore.pluralize
       end
 
+      def form_url
+        self
+      end
+
       private
 
         def exclude_route?(route)

data/app/views/adminpanel/pages/show.html.erb

@@ -0,0 +1,94 @@
+<% provide(
+  :page_title,
+  I18n.t('action.show', resource: @resource_instance.name)
+) -%>
+
+<div class="row-fluid">
+  <div class="widget span12">
+    <div class="widget-header">
+      <%= content_tag(:i, nil, class: "fa fa-#{@model.icon}") %>
+      <h5>
+        <%= @model.display_name.humanize %>
+      </h5>
+      <div class="widget-buttons">
+        <%= render 'adminpanel/icons/edit',     resource: @resource_instance.becomes(Adminpanel::Page) %>
+      </div>
+    </div>
+    <div class="widget-body">
+      <div class="widget-tickets widget-tickets-large clearfix">
+        <ul>
+          <% @model.display_attributes('show').each do |fields| %>
+            <% fields.each do |attribute, properties| %>
+              <li class="priority-high">
+                <div class="span3">
+                  <h6><%= properties['label'] %></h6>
+                </div>
+                <div class="span8">
+                  <%= field_value(properties['type'], attribute, @resource_instance) %>
+                </div>
+              </li>
+            <% end %>
+          <% end %>
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <% if @model.has_gallery? %>
+    <% @model.galleries.each do |gallery| %>
+      <% gallery_class = gallery.last.constantize %>
+      <% gallery_relationship = gallery.first.pluralize %>
+      <div class="gallery-widget widget widget-padding span6">
+        <div class="widget-header">
+          <%= content_tag(:i, nil, class: "fa fa-#{@model.icon}") %>
+          <h5><%= I18n.t('gallery.container') %>: <%= @model.display_name.humanize %>
+            <%= render 'adminpanel/icons/edit', resource: @resource_instance.becomes(Adminpanel::Page) %>
+          </h5>
+        </div>
+        <% if gallery_class.is_sortable? %>
+          <div class="widget-body widget-tasks-assigned clearfix">
+            <table class="table table-striped table-bordered">
+              <thead>
+                <tr>
+                  <td class="draggable-header"></td>
+                  <td><i class="fa fa-picture-o"></i></td>
+                </tr>
+              </thead>
+              <tbody id="sortable">
+                <% collection = @resource_instance.send(gallery_relationship).ordered %>
+                <% collection.each do |image| %>
+                  <tr
+                    data-id="<%= image.id %>"
+                    data-url="<%= url_for [:move_to_position, image] %>"
+                  >
+                    <td class="draggable img"><i class="fa fa-bars fa-2x"></i></td>
+                    <td>
+                      <%= link_to(
+                        image_tag(image.file_url(:thumb)),
+                        image.file.to_s,
+                        rel: "group",
+                        name: gallery_class.display_name
+                      ) %>
+                    </td>
+                  </tr>
+                <% end %>
+              </tbody>
+            </table>
+          </div>
+        <% else %>
+          <div class="widget-body row-fluid">
+            <% @resource_instance.send(gallery_relationship).each do |image| %>
+              <%= link_to(
+                image_tag( image.file_url(:thumb) ),
+                image.file_url.to_s,
+                rel: 'group',
+                name: @model.display_name
+              ) %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+</div>

data/app/views/adminpanel/templates/edit.html.erb

@@ -8,7 +8,7 @@
     controller: params[:controller],
     action: 'index'
   }
-) %>
+) unless params[:skip_breadcrumb].present? %>
 
 <div class = "row-fluid">
   <div class = "widget widget-padding span12">

data/app/views/layouts/adminpanel/_side_menu.html.erb

@@ -25,6 +25,7 @@
       </div>
     </div>
 
+    <!-- Render models -->
     <% Adminpanel.displayable_resources.each do |resource| %>
       <% resource_class = symbol_class(resource) %>
       <% if resource_class.has_route?(:index) && (can?(:read, resource_class) || can?( :publish, resource_class)) %>
@@ -49,5 +50,29 @@
         </div>
       <% end %>
     <% end %>
+
+    <!-- Render pages -->
+    <% Adminpanel.displayable_pages.each do |page_class| %>
+      <div class="accordion-group" data-filter="<%= page_class.instance.name -%>">
+        <div class="accordion-heading">
+          <%= link_to(
+            page_path(page_class.instance),
+            data: {
+              no_transition_cache: true
+            },
+            class: "accordion-toggle accordion-navigation
+                    #{params[:controller] == 'adminpanel/pages' && page_class.instance.id.to_s == params[:id].to_s ? 'active' : ''}
+                    spinner-link".squish
+          ) do %>
+            <%= content_tag(
+              :i,
+              nil,
+              class: "fa fa-#{page_class.icon}"
+            ) %>
+            <%= page_class.instance.name %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
   </div>
 </div>

data/config/routes.rb

@@ -65,6 +65,12 @@ Adminpanel::Engine.routes.draw do
   end
 
   root to: "#{Adminpanel.displayable_resources.first}#index"
+  resources :pages, only: [:show, :edit, :update] do
+    collection do
+      post :add_to_gallery, to: "pages#add_to_gallery", as: 'add_to_gallery', path: I18n.t('routes.add_to_gallery')
+      delete :remove_image, to: "pages#remove_image",   as: 'remove_image',   path: I18n.t('routes.remove_image')
+    end
+  end
   resources :sessions, only: [:new, :create, :destroy] do
     collection do
       get 'instagram_login'

data/lib/adminpanel/engine.rb

@@ -11,6 +11,7 @@ module Adminpanel
     :analytics_application_name,
     :analytics_application_version,
     :displayable_resources,
+    :displayable_pages,
     :fb_app_id,
     :fb_app_secret,
     :instagram_client_id,
@@ -27,6 +28,8 @@ module Adminpanel
       :users
     ]
 
+    self.displayable_pages = []
+
     self.fb_app_id = nil
     self.fb_app_secret = nil
 

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = '3.3.4'
+  VERSION = '3.4.0'
 end

data/lib/generators/adminpanel/initialize/templates/adminpanel_setup.rb

@@ -44,4 +44,10 @@ Adminpanel.setup do |config|
     #:auths,
     :sections
   ]
+
+  config.displayable_pages = [
+    # Adminpanel::HomePage,
+    # Adminpanel::AboutUsPage,
+    # Adminpanel::ContactPage
+  ]
 end

data/lib/generators/adminpanel/initialize/templates/create_adminpanel_tables.rb

@@ -17,6 +17,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
     create_auths
     create_sections
     create_images
+    create_pages
   end
 
   private
@@ -73,6 +74,14 @@ class CreateAdminpanelTables < ActiveRecord::Migration
     add_index :adminpanel_auths, [:key]
   end
 
+  def create_pages
+    create_table :adminpanel_pages do |t|
+      t.string :name
+      t.string :type
+      t.text :fields
+    end
+  end
+
   def create_sections
     create_table :adminpanel_sections do |t|
       t.string  :name

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

@@ -0,0 +1,53 @@
+module Adminpanel
+  class RandomPage < Page
+    def self.instance
+      first || create!(name: 'Random Page', type: 'Adminpanel::RandomPage')
+    end
+
+    mount_images :random_pagefiles
+
+    store :fields, accessors: [
+      :header,
+      :slogan,
+      :body,
+    ]
+
+    def self.form_attributes
+      [
+        {
+          'header' => {
+            'type' => 'text_field',
+            'label' => 'Cabecera'
+          }
+        },
+        {
+          'slogan' => {
+            'type' => 'text_field',
+            'label' => 'Slogan'
+          }
+        },
+        {
+          'body' => {
+            'type' => 'wysiwyg_field',
+            'label' => 'Contenido'
+          }
+        },
+        {
+          'random_pagefiles' => {
+            'type' => 'adminpanel_file_field',
+            'label' => 'Galería'
+          }
+        }
+      ]
+    end
+
+    def self.display_name
+      'Random Page'
+    end
+
+    def self.icon
+      'puzzle-piece'
+    end
+
+  end
+end

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

@@ -0,0 +1,13 @@
+module Adminpanel
+  class RandomPagefile < Image
+    # include Adminpanel::SortableGallery
+
+    mount_uploader :file, RandomPagefileUploader
+
+    # Warning: This method prevents the file from recreating versions,
+    # use it at your own risk delete the original file
+    # def remove_original attachment
+    #   File.delete "#{Rails.root.join('public')}#{file_url}" if file
+    # end
+  end
+end

data/test/dummy/app/uploader/adminpanel/random_pagefile_uploader.rb

@@ -0,0 +1,23 @@
+module Adminpanel
+  class RandomPagefileUploader < CarrierWave::Uploader::Base
+    include CarrierWave::MiniMagick
+
+    storage :file
+
+    def root
+      Rails.root.join 'public/'
+    end
+
+    def store_dir
+      "uploads/image/#{model.class.name.demodulize}/#{model.id}"
+    end
+
+    version :thumb do
+      process resize_to_fill: [120, 120]
+    end
+
+    def extension_white_list
+      %w(jpg jpeg png)
+    end
+  end
+end

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

@@ -26,4 +26,11 @@ Adminpanel.setup do |config|
     :test_objects,
     :file_resources
   ]
+
+  config.displayable_pages = [
+    # Adminpanel::HomePage,
+    # Adminpanel::AboutUsPage,
+    # Adminpanel::ContactPage
+    Adminpanel::RandomPage
+  ]
 end

data/test/dummy/db/schema.rb

@@ -126,6 +126,11 @@ ActiveRecord::Schema.define do
       t.integer  :test_object_id
       t.integer  :category_id
   end
+  create_table :adminpanel_pages do |t|
+    t.string :name
+    t.string :type
+    t.text :fields
+  end
   create_table :adminpanel_file_resources do |t|
     t.string :name
     t.datetime :created_at

data/test/features/pages/pages_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class PagesTest < ViewCase
+
+  setup :sign_in
+
+  test "when root path Admipnanel.displayed_pages are in the menu" do
+    visit adminpanel.root_path
+    assert page.has_selector?('.accordion-toggle.accordion-navigation.spinner-link', text: 'Random Page')
+    assert page.has_link?('Random Page', href: adminpanel.page_path(Adminpanel::RandomPage.instance))
+  end
+
+  test "when visiting a random page it should display all its form fields" do
+    Adminpanel::RandomPage.instance.update(header: 'Hola', slogan: 'Saludo cordial', body: '<div>lorem</div>')
+    visit adminpanel.page_path(Adminpanel::RandomPage.instance)
+    assert page.has_content?('Cabecera')
+    assert page.has_content?('Hola')
+    assert page.has_content?('Slogan')
+    assert page.has_content?('Saludo cordial')
+    assert page.has_content?('lorem')
+    assert page.has_link?('', href: adminpanel.edit_page_path(Adminpanel::RandomPage.instance))
+  end
+
+  test "when editing a random page it should display and update form fields" do
+    Adminpanel::RandomPage.instance.update(header: '', slogan: '', body: '')
+    visit adminpanel.edit_page_path(Adminpanel::RandomPage.instance)
+    fill_in 'random_page_header', with: 'sum header'
+    fill_in 'random_page_slogan', with: 'a fine slogan'
+    page.execute_script(
+      %Q(
+        var editor = $('#body-trix-editor')[0].editor;
+        editor.insertString("a fine body");
+      )
+    ) # to fill the wysiwyg editor
+    click_button 'Actualizar Random Page'
+
+    assert_equal 'sum header', Adminpanel::RandomPage.instance.header
+    assert_equal 'a fine slogan', Adminpanel::RandomPage.instance.slogan
+    assert_equal '<div>a fine body</div>', Adminpanel::RandomPage.instance.body
+    assert 1, Adminpanel::RandomPage.count
+    assert_equal adminpanel.page_path(Adminpanel::RandomPage.instance), page.current_path
+  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.3.4
+  version: 3.4.0
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,20 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -512,6 +506,7 @@ files:
 - app/controllers/adminpanel/analytics_controller.rb
 - app/controllers/adminpanel/application_controller.rb
 - app/controllers/adminpanel/auths_controller.rb
+- app/controllers/adminpanel/pages_controller.rb
 - app/controllers/adminpanel/permissions_controller.rb
 - app/controllers/adminpanel/roles_controller.rb
 - app/controllers/adminpanel/sections_controller.rb
@@ -534,6 +529,8 @@ files:
 - app/models/adminpanel/analytic.rb
 - app/models/adminpanel/auth.rb
 - app/models/adminpanel/image.rb
+- app/models/adminpanel/page.rb
+- app/models/adminpanel/pagefile.rb
 - app/models/adminpanel/permission.rb
 - app/models/adminpanel/role.rb
 - app/models/adminpanel/section.rb
@@ -562,6 +559,7 @@ files:
 - app/views/adminpanel/icons/_facebook.html.erb
 - app/views/adminpanel/icons/_new.html.erb
 - app/views/adminpanel/icons/_show.html.erb
+- app/views/adminpanel/pages/show.html.erb
 - app/views/adminpanel/sections/_sections_table.html.erb
 - app/views/adminpanel/sections/edit.html.erb
 - app/views/adminpanel/sections/index.html.erb
@@ -647,11 +645,14 @@ files:
 - test/dummy/app/models/adminpanel/mug.rb
 - test/dummy/app/models/adminpanel/photo.rb
 - test/dummy/app/models/adminpanel/product.rb
+- test/dummy/app/models/adminpanel/random_page.rb
+- test/dummy/app/models/adminpanel/random_pagefile.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/random_pagefile_uploader.rb
 - test/dummy/app/uploader/adminpanel/section_uploader.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
@@ -688,6 +689,7 @@ files:
 - test/dummy/test/fixtures/attachments/dog-fries.png
 - test/dummy/test/fixtures/attachments/hipster.jpg
 - test/dummy/test/fixtures/attachments/thumb_hipster.jpg
+- test/features/pages/pages_test.rb
 - test/features/session/login_test.rb
 - test/features/shared/concerns/friendly_test.rb
 - test/features/shared/concerns/sortable_gallery_ui_test.rb
@@ -779,11 +781,14 @@ test_files:
 - test/dummy/app/models/adminpanel/mug.rb
 - test/dummy/app/models/adminpanel/photo.rb
 - test/dummy/app/models/adminpanel/product.rb
+- test/dummy/app/models/adminpanel/random_page.rb
+- test/dummy/app/models/adminpanel/random_pagefile.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/random_pagefile_uploader.rb
 - test/dummy/app/uploader/adminpanel/section_uploader.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
@@ -820,6 +825,7 @@ test_files:
 - test/dummy/test/fixtures/attachments/dog-fries.png
 - test/dummy/test/fixtures/attachments/hipster.jpg
 - test/dummy/test/fixtures/attachments/thumb_hipster.jpg
+- test/features/pages/pages_test.rb
 - test/features/session/login_test.rb
 - test/features/shared/concerns/friendly_test.rb
 - test/features/shared/concerns/sortable_gallery_ui_test.rb