adminpanel 2.6.1 → 3.0.0

data/config/routes.rb

@@ -9,8 +9,6 @@ Adminpanel::Engine.routes.draw do
         collection do
           get :google,               to: 'analytics#google', path: 'google'
 
-          get :fb,                   to:'analytics#fb',      path:'facebook'
-
           get :twitter,              to:'analytics#twitter', path:'twitter'
           post 'reply_to_tweet/:id', to: 'analytics#reply_to_tweet', as: 'reply_to', path: "twitter/#{I18n.t('routes.reply')}/:id"
           post 'favorite_tweet/:id', to: 'analytics#favorite_tweet', as: 'favorite', path: "twitter/#{I18n.t('routes.favorite')}/:id"
@@ -22,10 +20,12 @@ Adminpanel::Engine.routes.draw do
       end
     else
       if gallery_is_sortable?(resource)
+        sortable_galleries(resource).each do |sortable_gallery_resource|
         # included sortable_gallery
-        resources sortable_gallery(resource), only: [:index] do
-          member do
-            put :move_to_position, as: 'move_to_position', path: I18n.t('routes.move_to_position')
+          resources sortable_gallery_resource.first.pluralize, only: [:index] do
+            member do
+              put :move_to_position, as: 'move_to_position', path: I18n.t('routes.move_to_position')
+            end
           end
         end
       end
@@ -64,6 +64,11 @@ Adminpanel::Engine.routes.draw do
               send(request_type, args['path'].to_sym, args['args'])
             end
           end
+
+          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')
+          end
         end
       end
     end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = '2.6.1'
+  VERSION = '3.0.0'
 end

data/lib/generators/adminpanel/gallery/gallery_generator.rb

@@ -12,14 +12,6 @@ module Adminpanel
       template 'uploader.rb', "app/uploaders/adminpanel/#{lower_name}_uploader.rb"
     end
 
-    def generate_migration
-      migration_template(
-        'gallery_migration.rb',
-        "db/migrate/create_adminpanel_#{lower_name.pluralize}.rb"
-      )
-      puts "don't forget to add the form_field, the relationship and #{lower_name}s_attributes it to the permited params"
-    end
-
   private
     def reference_name
       name.singularize.downcase

data/lib/generators/adminpanel/gallery/templates/gallery_template.rb

@@ -1,25 +1,14 @@
 module Adminpanel
-  class <%= class_name %> < ActiveRecord::Base
-    include Adminpanel::Base
+  class <%= class_name %> < Image
     # include Adminpanel::SortableGallery
 
-    belongs_to :<%= reference_name %>
-
     mount_uploader :file, <%= class_name %>Uploader
-
-    before_destroy :remove_attachment
-
-    # def self.relation_field
-    #   '<%= reference_name %>_id'
+    
+    
+    # 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
-
-    # def self.display_name
-    #   '<%= class_name %>'
-    # end
-
-    private
-      def remove_attachment
-        self.remove_file!
-      end
   end
 end

data/lib/generators/adminpanel/gallery/templates/uploader.rb

@@ -20,7 +20,7 @@ module Adminpanel
 
     # THE THUMB VERSION IS NECESSARY BY ADMINPANEL, DON'T REMOVE IT!!!!
     version :thumb do
-      process resize_to_limit: [80, 80]
+      process resize_to_fill: [120, 120]
     end
 
     # however, you can create your own versions:

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

@@ -16,7 +16,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
     create_permissions
     create_auths
     create_sections
-    create_sectionfiles
+    create_images
   end
 
   private
@@ -33,10 +33,14 @@ class CreateAdminpanelTables < ActiveRecord::Migration
     add_index :adminpanel_users, [:remember_token]
   end
 
-  def create_sectionfiles
-    create_table :adminpanel_sectionfiles do |t|
-      t.string  :file
-      t.integer :section_id
+  def create_images
+    create_table :adminpanel_images do |t|
+      t.string :file
+      t.integer :model_id
+      t.string :model_type
+      t.string :type
+      t.string :file_size
+      t.string :content_type
       t.timestamps
     end
   end

data/lib/generators/adminpanel/resource/resource_generator.rb

@@ -17,26 +17,21 @@ module Adminpanel
       banner: 'field[:type][:index] field[:type][:index]'
 
     def change_fields_aliases
-      fields_to_delete = []
+      attrs_to_delete = []
       fields.each do |attribute|
         case attribute.split(':').second
         when 'wysiwyg'
-          fields_to_delete << attribute
+          attrs_to_delete << attribute
           fields << attribute.split(':').first + ':' + 'text'
         when 'datepicker'
-          fields_to_delete << attribute
+          attrs_to_delete << attribute
           fields << attribute.split(':').first + ':' + 'date'
-        when 'belongs_to'
-          fields_to_delete << attribute
-          fields << attribute.split(':').first + ':' + 'select'
         when 'has_many'
-          fields_to_delete << attribute
+          attrs_to_delete << attribute
           fields << attribute.split(':').first + ':' + 'checkbox'
         end
       end
-      fields_to_delete.each do |field|
-        fields.delete(field)
-      end
+      attrs_to_delete.each { |f| fields.delete(f) }
     end
 
     def generate_model
@@ -51,17 +46,18 @@ module Adminpanel
 
     def generate_migration
       parameters = fields.dup
-      parameters.delete_if do |pair|
-        pair.split(':').second == 'has_many'
-      end
+      parameters.delete_if { |pair| pair.split(':').second == 'checkbox' }
+      attrs_to_delete = []
       parameters.each do |attribute|
         case attribute.split(':').second
-        when 'file'
-          parameters.delete(attribute)
+        when 'file', 'image'
+          attrs_to_delete << attribute
           parameters << attribute.split(':').first + ':' + 'string'
         end
       end
+      attrs_to_delete.each { |a| parameters.delete(a) }
       parameters << 'created_at:datetime' << 'updated_at:datetime'
+
       invoke :migration, ["create_adminpanel_#{pluralized_name}", parameters]
     end
 
@@ -75,7 +71,7 @@ module Adminpanel
       fields.each do |attribute|
         assign_attributes_variables(attribute)
         case @attr_type
-        when 'file'
+        when 'file', 'image'
           template '../../gallery/templates/uploader.rb', "app/uploaders/adminpanel/#{class_name.underscore}_uploader.rb"
         end
       end

data/lib/generators/adminpanel/resource/resource_generator_helper.rb

@@ -11,7 +11,7 @@ module Adminpanel
       "#{resource_name}_#{@attr_field}".camelize
     end
 
-    def select_field(resource)
+    def belongs_to_field(resource)
       "#{resource.singularize.downcase}_id"
     end
 
@@ -35,7 +35,7 @@ module Adminpanel
     def is_a_resource?
       fields.each do |attribute|
         assign_attributes_variables(attribute)
-        if @attr_type != 'select'
+        if @attr_type != 'belongs_to'
           return true
         end
       end
@@ -66,8 +66,8 @@ module Adminpanel
       fields.map do |attribute|
         assign_attributes_variables(attribute)
         case @attr_type
-        when 'select'
-          ":#{select_field(@attr_field)}"
+        when 'belongs_to'
+          ":#{belongs_to_field(@attr_field)}"
         when 'checkbox'
           "{ #{checkbox_field(@attr_field)}: [] }"
         else
@@ -103,6 +103,10 @@ module Adminpanel
       attribute_hash(@attr_field, 'file_field')
     end
 
+    def image_form_hash
+      attribute_hash(@attr_field, 'image_field')
+    end
+
     def boolean_form_hash
       attribute_hash(@attr_field, 'boolean')
     end
@@ -115,12 +119,16 @@ module Adminpanel
       attribute_hash(gallery_name.pluralize, 'adminpanel_file_field')
     end
 
-    def select_form_hash
-      attribute_hash(select_field(@attr_field), 'select', resource_class_name(@attr_field))
+    def belongs_to_form_hash
+      attribute_hash(belongs_to_field(@attr_field), 'select', resource_class_name(@attr_field))
     end
 
     def checkbox_form_hash
-      attribute_hash(checkbox_field(resource_class_name(@attr_field.downcase.singularize + 's')), 'checkbox', @attr_field.capitalize.singularize)
+      attribute_hash(
+        checkbox_field(resource_class_name(@attr_field.downcase.singularize + 's')),
+        'checkbox',
+        @attr_field.capitalize.singularize
+      )
     end
 
     def attribute_hash(name, type, model = '')
@@ -156,11 +164,10 @@ module Adminpanel
     def has_associations?
       fields.each do |attribute|
         assign_attributes_variables(attribute)
-        if( @attr_type == 'images' ||
-            @attr_type == 'select' ||
+        if( @attr_type == 'belongs_to' ||
             @attr_type == 'checkbox' ||
             @attr_type == 'file' ||
-            has_gallery? )
+            has_gallery?)
           return true
         end
       end
@@ -172,12 +179,12 @@ module Adminpanel
       fields.each do |attribute|
         assign_attributes_variables(attribute)
         case @attr_type
-        when 'select'
-          association = "#{association}#{select_association(@attr_field)}"
+        when 'belongs_to'
+          association = "#{association}#{belongs_to_association(@attr_field)}"
         when 'checkbox'
           association = "#{association}#{checkbox_association(@attr_field)}"
-        when 'file'
-          association = "#{association}#{file_assocation(@attr_field)}"
+        when 'image', 'file'
+          association = "#{association}#{file_association(@attr_field)}"
         end
       end
 
@@ -188,7 +195,7 @@ module Adminpanel
       association
     end
 
-    def select_association(field)
+    def belongs_to_association(field)
       "belongs_to :#{field.singularize.downcase}\n\t\t"
     end
 
@@ -199,7 +206,7 @@ module Adminpanel
       "dependent: :destroy\n\t\t"
     end
 
-    def file_assocation(field)
+    def file_association(field)
       "mount_uploader :#{field}, #{class_name}Uploader\n\t\t"
     end
 

data/test/dummy/.gitignore

@@ -6,14 +6,14 @@ capybara-*.html
 /tmp/test.log
 /tmp/development.log
 /db/*.sqlite3
-/public/system
+/public/uploads
 /coverage/
 /spec/tmp
 **.orig
 rerun.txt
 pickle-email-*.html
 config/initializers/secret_token.rb
-/public/uploads/
+/public/uploads/tmp
 
 ## Environment normalisation:
 /.bundle

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

@@ -8,7 +8,7 @@ module Adminpanel
         :name,
         :category_ids,
         :description,
-        :photos_attributes => [:product_id, :file]
+        photo_ids: []
       )
     end
 

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

@@ -1,19 +1,7 @@
 module Adminpanel
-  class Galleryfile < ActiveRecord::Base
-    include Adminpanel::Base
+  class Galleryfile < Image
     include Adminpanel::SortableGallery
 
-    belongs_to :gallery
-
     mount_uploader :file, Adminpanel::PhotoUploader
-
-    def self.relation_field
-      'gallery_id'
-    end
-
-    def self.display_name
-      'galleryfile'
-    end
-
   end
 end

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

@@ -1,13 +1,6 @@
 module Adminpanel
-  class Photo < ActiveRecord::Base
-    include Adminpanel::Base
+  class Photo < Image
     # include Adminpanel::SortableGallery
-    mount_uploader :file, PhotoUploader
-    belongs_to :product
-
-    def self.relation_method
-      'product_id'
-    end
-
+    mount_uploader :file, Adminpanel::PhotoUploader
   end
 end

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

@@ -7,6 +7,7 @@ module Adminpanel
 
     has_many :categorizations
     has_many :categories, through: :categorizations
+
     mount_images :photos
 
     validates_presence_of :name

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

@@ -0,0 +1,5 @@
+if Rails.env.test?
+  CarrierWave.configure do |config|
+    config.root = 'test/fixtures/attachments'
+  end
+end

data/test/dummy/db/schema.rb

@@ -26,18 +26,16 @@ ActiveRecord::Schema.define do
       t.datetime :created_at,      null: false
       t.datetime :updated_at,      null: false
   end
-  create_table :adminpanel_galleryfiles do |t|
-      t.string   :file
-      t.integer  :position
-      t.integer  :gallery_id
-      t.datetime :created_at,      null: false
-      t.datetime :updated_at,      null: false
-  end
-  create_table :adminpanel_sectionfiles do |t|
-      t.string   :file
-      t.string   :section_id
-      t.datetime :created_at,      null: false
-      t.datetime :updated_at,      null: false
+  create_table :adminpanel_images do |t|
+    t.string   :file
+    t.integer  :model_id
+    t.string   :model_type
+    t.string   :type
+    t.string   :file_size
+    t.string   :content_type
+    t.integer  :position
+    t.datetime :created_at,        null: false
+    t.datetime :updated_at,        null: false
   end
   create_table :adminpanel_products do |t|
       t.string   :price
@@ -47,12 +45,6 @@ ActiveRecord::Schema.define do
       t.datetime :created_at,      null: false
       t.datetime :updated_at,      null: false
   end
-  create_table :adminpanel_photos do |t|
-      t.string   :file
-      t.text     :product_id
-      t.datetime :created_at,      null: false
-      t.datetime :updated_at,      null: false
-  end
   create_table :adminpanel_categories do |t|
       t.string   :name
       t.string   :model

data/test/dummy/test/fixtures/adminpanel/galleries.yml

@@ -1,15 +1,15 @@
 one:
-  file: <%= File.open(Rails.root.join("app/assets/images/hipster.jpg")) %>
+  file: <%= File.open(Rails.root.join("test", "fixtures", "attachments", "hipster.jpg")) %>
   position: 1
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 two:
-  file: <%= File.open(Rails.root.join("app/assets/images/hipster.jpg")) %>
+  file: <%= File.open(Rails.root.join("test", "fixtures", "attachments", "hipster.jpg")) %>
   position: 2
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 three:
-  file: <%= File.open(Rails.root.join("app/assets/images/hipster.jpg")) %>
+  file: <%= File.open(Rails.root.join("test", "fixtures", "attachments", "hipster.jpg")) %>
   position: 3
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>