rails_admin_image_manager 0.1.3 → 0.1.15

data/app/assets/stylesheets/rails_admin_image_manager/global.css.erb

@@ -6,8 +6,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url("<%= font_path('fontawesome-webfont.eot?v=4.7.0') %>");
-  src: url("<%= font_path('fontawesome-webfont.eot?#iefix&v=4.7.0') %>") format("embedded-opentype"), url("<%= font_path('fontawesome-webfont.woff2?v=4.7.0') %>") format("woff2"), url("<%= font_path('fontawesome-webfont.woff?v=4.7.0') %>") format("woff"), url("<%= font_path('fontawesome-webfont.ttf?v=4.7.0') %>") format("truetype"), url("<%= font_path('fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') %>") format("svg");
+  src: url("fonts/fontawesome-webfont.eot?v=4.7.0");
+  src: url("fonts/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"), url("fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"), url("fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"), url("fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"), url("fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular") format("svg");
   font-weight: normal;
   font-style: normal;
 }

data/app/controllers/rails_admin_image_manager/application_controller.rb

@@ -5,11 +5,6 @@ module RailsAdminImageManager
 
     before_action :_authenticate!
     before_action :_authorize!
-    before_action :_check_permissions
-
-    def _current_user
-      instance_eval(&RailsAdmin::Config.current_user_method)
-    end
 
    private
 
@@ -21,18 +16,6 @@ module RailsAdminImageManager
       instance_eval(&RailsAdmin::Config.authorize_with)
     end
 
-    def _check_permissions(action=:read)
-      @authorization_adapter.try(:authorize, action, file_model)
-    end
-
-    def file_model
-      RailsAdmin::AbstractModel.new(to_model_name("::RailsAdminImageManager::File"))
-    end
-
-    def to_model_name(param)
-      param.split('~').collect(&:camelize).join('::')
-    end
-
     def filter_by?(param)
       params[param].present?
     end

data/app/controllers/rails_admin_image_manager/images_controller.rb

@@ -8,23 +8,19 @@ module RailsAdminImageManager
         }
 
         format.json {
-          images  = RailsAdminImageManager::File.select(:id, :name, :image_file_name, :created_at).order(:name).page(params[:page])
+          images  = RailsAdminImageManager::File.select(:id, :name, :image_file_name).page(params[:page])
           images  = images.filter_by_text(params[:search]) if filter_by?(:search)
           images  = images.filter_by_tags(params[:tags].map{|i| i.to_i }) if filter_by?(:tags)
-          images  = images.order_by_date(params[:date]) if filter_by?(:date)
-          images  = images.order_by_title(params[:title]) if filter_by?(:title)
-
           images.each do |image|
-            image.src = image.image.url(:index)
+              image.src = image.image.url(:index)
           end
 
-          data    = { items: images, total_count: images.total_count, limit_value: images.limit_value, readonly: readonly? }
+          data    = { items: images, total_count: images.total_count, limit_value: images.limit_value }
 
           render json: data, methods: [:src, :tags_list], status: :ok
         }
       end
     end
-
     def tags
       respond_to do |format|
         format.json {
@@ -34,26 +30,15 @@ module RailsAdminImageManager
       end
     end
 
-    def new
-      _check_permissions(:create)
-      render json: {msg: 'ok'}, status: :ok
-    end
-
     def show
-      _check_permissions(:update)
-
       image                 = RailsAdminImageManager::File.select(:id, :name, :description, :copyright, :image_file_name).find_by!(id: params[:id])
       image.src             = image.image.url(:show)
       image.src_for_wysiwyg = {width: params[:width], height: params[:height]} if filter_by?(:width) && filter_by?(:height)
 
-      data                  = { image: image, readonly: readonly? }
-
-      render json: data, methods: [:src, :src_for_wysiwyg, :tags_list], status: :ok
+      render json: image, methods: [:src, :src_for_wysiwyg, :tags_list], status: :ok
     end
 
     def update
-      _check_permissions(:update)
-
       my_params = images_params
       image = RailsAdminImageManager::File.find(my_params[:id])
 
@@ -73,8 +58,6 @@ module RailsAdminImageManager
     end
 
     def create
-      _check_permissions(:create)
-
       my_params = images_params
 
       # Handling dynamic tag creating when receiving a string
@@ -93,25 +76,17 @@ module RailsAdminImageManager
     end
 
     def destroy
-      _check_permissions(:destroy)
-
       image = RailsAdminImageManager::File.find(params[:id])
       if image.destroy
         render json: image, status: :ok
       else
         render json: image.errors, status: :unprocessable_entity
       end
-    end
-
-   private
 
-    def readonly?
-      return false if @authorization_adapter.nil?
-      !@authorization_adapter.authorized?(:update, file_model)
     end
 
     def images_params
-      params.require(:image).permit(:id, :name, :description, :copyright, :src, :image_file_name, tags: [])
+      params.require(:image).permit(:id, :name, :description, :copyright, :src, tags: [])
     end
   end
 end

data/app/models/rails_admin_image_manager/file.rb

@@ -11,7 +11,7 @@ module RailsAdminImageManager
 
     # == Attributes ===========================================================
 
-    has_dynamic_attached_file :image, styles: { show: '680x480', index: '250x250#', rails_admin: '75x75' }, url: '/rails_admin_image_manager/:id/:style/:filename'
+    has_dynamic_attached_file :image, styles: { show: '680x480', index: '250x250#', rails_admin: '75x75' }, url: '/rails_admin_image_manager/:id/:style_:filename'
 
     attr_accessor :src
     attr_accessor :src_for_wysiwyg
@@ -34,8 +34,6 @@ module RailsAdminImageManager
 
     scope :filter_by_text, -> (text) { where("image_manager_files.name LIKE ? OR image_manager_files.description LIKE ?", "%#{text}%", "%#{text}%") }
     scope :filter_by_tags, -> (tags) { joins(:tags).where('image_manager_files_tags.image_manager_tag_id IN (?)', tags).distinct }
-    scope :order_by_date, -> (term) { order("created_at #{term}") }
-    scope :order_by_title, -> (term) { order("name #{term}") }
 
     # == Instance Methods =====================================================
 
@@ -51,7 +49,7 @@ module RailsAdminImageManager
     def decode_base64_image
       if src.present? && src.include?('data:image')
         new_image = Paperclip.io_adapters.for(src)
-        new_image.original_filename = image_file_name
+        new_image.original_filename = "base64.png"
         self.image = new_image
       end
     end

data/config/routes.rb

@@ -3,7 +3,6 @@ RailsAdminImageManager::Engine.routes.draw do
   root    'home#index'
   get     '/tags'       => 'images#tags',  as: 'image_manager_tag_index'
   get     '/images'     => 'images#index',  as: 'image_manager_index'
-  get     '/images/new' => 'images#new'
   get     '/images/:id' => 'images#show'
   put     '/images'     => 'images#update'
   post    '/images'     => 'images#create'

data/lib/dynamic_paperclip_patch.rb

@@ -1,20 +1,3 @@
-module DynamicPaperclip
-  # Patch to avoid the following error :
-  # actionpack-5.1.4/lib/action_dispatch/middleware/stack.rb:35:in `build': undefined method `new' for "DynamicPaperclip::AttachmentStyleGenerator":String (NoMethodError). Did you mean? next
-  # https://github.com/mbouchard/dynamic_paperclip/commit/ad6c209cdd08efb202140faaa6aa647987726409
-  class Railtie < Rails::Railtie
-    initializer 'dynamic_paperclip_patch.insert_middleware' do |app|
-      app.config.middleware.use DynamicPaperclip::AttachmentStyleGenerator
-    end
-
-    config.before_configuration do
-      initializers.delete_if do |initializer|
-        true if initializer.name == 'dynamic_paperclip.insert_middleware'
-      end
-    end
-  end
-end
-
 module DynamicPaperclip
   class Attachment < Paperclip::Attachment
     def dynamic_url(definition)

data/lib/generators/rails_admin_image_manager/install/install_generator.rb

@@ -17,6 +17,6 @@ module RailsAdminImageManager
         generate "dynamic_paperclip:install"
       end
 
-    end
   end
+ end
 end

data/lib/paperclip_patch.rb

@@ -6,12 +6,6 @@
 module Paperclip
   class FilenameCleaner
     def call(filename)
-      # Dirty hack to keep the dot in the filename (it's removed by the parameterize function)
-      placeholder = '-p-l-a-c-e-h-o-l-d-e-r-'
-      filename.sub!('.', placeholder)
-      filename = filename.parameterize()
-      filename.sub!(placeholder, '.')
-
       if @invalid_character_regex
         filename = filename.gsub(@invalid_character_regex, "_").gsub("_", "-")
       else

data/lib/rails_admin_image_manager/has_managed_file.rb

@@ -36,11 +36,6 @@ module RailsAdminImageManager
     def add_managed_file_before_validation(attribute, id)
       attr_accessor "#{id}_deselect"
 
-      define_method "#{id}_deselect=" do |val|
-        attribute_will_change!("#{id}_deselect") if val == '1'
-        instance_variable_set("@#{id}_deselect", val)
-      end
-
       before_validation { send("#{attribute}=", nil) if send("#{id}_deselect") == '1' }
     end
   end

data/lib/rails_admin_image_manager/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminImageManager
-  VERSION = '0.1.3'
+  VERSION = '0.1.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_image_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.15
 platform: ruby
 authors:
 - iXmedia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,22 +108,22 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -149,21 +149,6 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/rails_admin_image_manager_manifest.js
-- app/assets/fonts/FontAwesome.otf
-- app/assets/fonts/Simple-Line-Icons.eot
-- app/assets/fonts/Simple-Line-Icons.svg
-- app/assets/fonts/Simple-Line-Icons.ttf
-- app/assets/fonts/Simple-Line-Icons.woff
-- app/assets/fonts/fontawesome-webfont.eot
-- app/assets/fonts/fontawesome-webfont.svg
-- app/assets/fonts/fontawesome-webfont.ttf
-- app/assets/fonts/fontawesome-webfont.woff
-- app/assets/fonts/fontawesome-webfont.woff2
-- app/assets/fonts/glyphicons-halflings-regular.eot
-- app/assets/fonts/glyphicons-halflings-regular.svg
-- app/assets/fonts/glyphicons-halflings-regular.ttf
-- app/assets/fonts/glyphicons-halflings-regular.woff
-- app/assets/fonts/glyphicons-halflings-regular.woff2
 - app/assets/images/rails_admin_image_manager/image.png
 - app/assets/javascripts/rails_admin_image_manager/app-compiled.js.erb
 - app/assets/javascripts/rails_admin_image_manager/app-vue.js
@@ -177,12 +162,10 @@ files:
 - app/assets/javascripts/rails_admin_image_manager/components/imageShow.vue
 - app/assets/javascripts/rails_admin_image_manager/components/imageTagSelector.vue
 - app/assets/javascripts/rails_admin_image_manager/components/imageUpload.vue
-- app/assets/javascripts/rails_admin_image_manager/components/listingFilter.vue
 - app/assets/javascripts/rails_admin_image_manager/components/notificationOverlay.vue
 - app/assets/javascripts/rails_admin_image_manager/components/progressOverlay.vue
 - app/assets/javascripts/rails_admin_image_manager/components/searchAutocomplete.vue
 - app/assets/javascripts/rails_admin_image_manager/editor/image_manager_picker.js.erb
-- app/assets/javascripts/rails_admin_image_manager/filters/index.js
 - app/assets/javascripts/rails_admin_image_manager/libs/helpers.js
 - app/assets/javascripts/rails_admin_image_manager/libs/lazyload.js
 - app/assets/javascripts/rails_admin_image_manager/router/index.js
@@ -196,6 +179,21 @@ files:
 - app/assets/javascripts/rails_admin_image_manager/vendors/underscore.min.js
 - app/assets/stylesheets/rails_admin_image_manager/_font.scss
 - app/assets/stylesheets/rails_admin_image_manager/application.css
+- app/assets/stylesheets/rails_admin_image_manager/fonts/FontAwesome.otf
+- app/assets/stylesheets/rails_admin_image_manager/fonts/Simple-Line-Icons.eot
+- app/assets/stylesheets/rails_admin_image_manager/fonts/Simple-Line-Icons.svg
+- app/assets/stylesheets/rails_admin_image_manager/fonts/Simple-Line-Icons.ttf
+- app/assets/stylesheets/rails_admin_image_manager/fonts/Simple-Line-Icons.woff
+- app/assets/stylesheets/rails_admin_image_manager/fonts/fontawesome-webfont.eot
+- app/assets/stylesheets/rails_admin_image_manager/fonts/fontawesome-webfont.svg
+- app/assets/stylesheets/rails_admin_image_manager/fonts/fontawesome-webfont.ttf
+- app/assets/stylesheets/rails_admin_image_manager/fonts/fontawesome-webfont.woff
+- app/assets/stylesheets/rails_admin_image_manager/fonts/fontawesome-webfont.woff2
+- app/assets/stylesheets/rails_admin_image_manager/fonts/glyphicons-halflings-regular.eot
+- app/assets/stylesheets/rails_admin_image_manager/fonts/glyphicons-halflings-regular.svg
+- app/assets/stylesheets/rails_admin_image_manager/fonts/glyphicons-halflings-regular.ttf
+- app/assets/stylesheets/rails_admin_image_manager/fonts/glyphicons-halflings-regular.woff
+- app/assets/stylesheets/rails_admin_image_manager/fonts/glyphicons-halflings-regular.woff2
 - app/assets/stylesheets/rails_admin_image_manager/global.css.erb
 - app/assets/stylesheets/rails_admin_image_manager/global.sass
 - app/assets/stylesheets/rails_admin_image_manager/vendors/bootstrap.min.css
@@ -246,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Image manager.

data/app/assets/javascripts/rails_admin_image_manager/components/listingFilter.vue

@@ -1,32 +0,0 @@
-<template>
-  <span class="listing-filter" @click.prevent="filter()">{{label}}
-    <i v-if="activeFilters[type] == 'ASC'" class="fa fa-arrow-down"></i>
-    <i v-if="activeFilters[type] == 'DESC'" class="fa fa-arrow-up"></i>
-  </span>
-</template>
-
-<script>
-import {mapState} from 'vuex'
-
-export default {
-  props: ['label', 'type'],
-  data () {
-    return {}
-  },
-  computed: {
-    ...mapState('mediasStore', ['activeFilters'])
-  },
-  methods: {
-    filter () {
-      this.$store.dispatch('mediasStore/setSearchPage', 1)
-      this.$store.dispatch('mediasStore/clearImgListing')
-      this.$store.dispatch('mediasStore/toggleFilter', this.type)
-      this.$store.dispatch('mediasStore/fetchImage')
-    }
-  }
-}
-</script>
-<style media="screen" lang="sass">
-  .listing-filter
-    cursor: pointer
-</style>

data/app/assets/javascripts/rails_admin_image_manager/filters/index.js

@@ -1,7 +0,0 @@
-import Vue from 'vue'
-import moment from 'moment'
-
-moment.locale('fr');
-Vue.filter('formatDate', (date) => {
-  return moment(date).format('D MMMM YYYY')
-})