enjoy_cms 0.3.1.1 → 0.3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3f29137b7ac35d8921eb0200477981029256e54
-  data.tar.gz: 020deef61cffbbb240e3687e987e6271f8a0f5b2
+  metadata.gz: 450bfca66a304970d20076882809a8d12036c27d
+  data.tar.gz: 497f597e35f6e549d6305aaadf9615663517e5ab
 SHA512:
-  metadata.gz: 6398bd0676dd142f1bba1f54c8de0768cd5b44bbd7791f59b94963f42433bfa9507c1fb3e83c8776cac382342ca20a606d0a7703f7a9e56c3b6d6ca607a1d428
-  data.tar.gz: 3461aa661d5bb8ca3d116f8e02fe1df1236559c1cc499051f2d2bc11e8b9ace2b9026301e4d4daae5b10072430f8ddd6609162dc51e0cb6b24b0477bc8f67695
+  metadata.gz: a8a60ec96ee9702d5f936a7d04cdff907c20931a82a9e4114076ee037cdc2872e7499a4903f865a0fbd4be5271e2480ada7cfde7806b43b44084e9194ffeaac4
+  data.tar.gz: 4392affe4373c6ce16b5a49a4b308651f900b0c907e46565cdeaa7c99535662c693c14531abe37084cbe22a8766784f1089b587389562fd134f36f37fd46c957

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.1.1)
+    enjoy_cms (0.3.1.2)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -9,11 +9,8 @@ PATH
       devise
       geocoder
       glebtv-simple_captcha
-      image_optim
-      image_optim_pack
       jquery-rails
       kaminari
-      paperclip-optimizer
       rails (= 4.2.4)
       rails_admin
       rails_admin_mongoid_localize_field
@@ -102,10 +99,8 @@ GEM
       warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.6.0)
-    exifr (1.2.4)
     font-awesome-rails (4.5.0.1)
       railties (>= 3.2, < 5.1)
-    fspath (2.1.1)
     geocoder (1.3.1)
     glebtv-simple_captcha (0.6.7)
     globalid (0.3.6)
@@ -114,17 +109,6 @@ GEM
       tilt
     htmlentities (4.3.4)
     i18n (0.7.0)
-    image_optim (0.22.1)
-      exifr (~> 1.2, >= 1.2.2)
-      fspath (~> 2.1)
-      image_size (~> 1.3)
-      in_threads (~> 1.3)
-      progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.2.1.20160221)
-      fspath (~> 2.1)
-      image_optim (~> 0.19)
-    image_size (1.4.2)
-    in_threads (1.3.1)
     jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -140,11 +124,10 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.99.1)
-    mimemagic (0.3.0)
     mini_magick (4.4.0)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
-    mongo (2.2.3)
+    mongo (2.2.4)
       bson (~> 4.0)
     mongoid (5.1.1)
       activemodel (~> 4.0)
@@ -156,16 +139,6 @@ GEM
       mini_portile2 (~> 2.0.0.rc2)
     origin (2.2.0)
     orm_adapter (0.5.0)
-    paperclip (4.3.5)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
-      mime-types
-      mimemagic (= 0.3.0)
-    paperclip-optimizer (2.0.0)
-      image_optim (~> 0.19)
-      paperclip (>= 3.4)
-    progress (3.1.1)
     rack (1.6.4)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)

data/enjoy_cms.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'rails', '4.2.4' #'~> 5.0.0.beta1'
+  spec.add_dependency 'rails', '4.2.4' #'~> 5.0.0.beta3'
 
   spec.add_dependency 'jquery-rails'
   spec.add_dependency 'simple_form'
@@ -52,7 +52,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'smart_excerpt'
 
   spec.add_dependency 'rails_admin_sort_embedded'
-  spec.add_dependency 'image_optim'
-  spec.add_dependency 'image_optim_pack'
-  spec.add_dependency 'paperclip-optimizer'
 end

data/lib/enjoy/configuration.rb

@@ -11,7 +11,6 @@ module Enjoy
   end
 
   class Configuration
-    attr_accessor :news_image_convert_options
     attr_accessor :news_image_styles
     attr_accessor :news_per_page
     attr_accessor :news_excerpt
@@ -38,7 +37,6 @@ module Enjoy
     attr_accessor :routes_config
 
     def initialize
-      @news_image_convert_options = {}
       @news_image_styles = {
           main:  '400x200>',
           thumb: '200x100>'

data/lib/enjoy/models/mongoid/embedded_gallery_image.rb

@@ -9,7 +9,6 @@ module Enjoy
 
           enjoy_cms_mongoid_attached_file(:image,
                     styles: lambda { |attachment| attachment.instance.image_styles },
-                    convert_options: lambda { |attachment| attachment.instance.image_convert_options },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
@@ -18,9 +17,6 @@ module Enjoy
         def image_styles
           {}
         end
-        def image_convert_options
-          {}
-        end
 
       end
     end

data/lib/enjoy/models/mongoid/gallery.rb

@@ -18,7 +18,6 @@ module Enjoy
 
           enjoy_cms_mongoid_attached_file(:image,
                     styles: lambda { |attachment| attachment.instance.image_styles },
-                    convert_options: lambda { |attachment| attachment.instance.image_convert_options },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
@@ -26,9 +25,6 @@ module Enjoy
         def image_styles
           {}
         end
-        def image_convert_options
-          {}
-        end
 
       end
     end

data/lib/enjoy/models/mongoid/gallery_image.rb

@@ -16,7 +16,6 @@ module Enjoy
 
           enjoy_cms_mongoid_attached_file(:image,
                     styles: lambda { |attachment| attachment.instance.image_styles },
-                    convert_options: lambda { |attachment| attachment.instance.image_convert_options },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
@@ -24,9 +23,6 @@ module Enjoy
         def image_styles
           {}
         end
-        def image_convert_options
-          {}
-        end
       end
     end
   end

data/lib/enjoy/models/mongoid/news.rb

@@ -21,7 +21,6 @@ module Enjoy
           unless Enjoy.config.news_image_styles.nil?
             enjoy_cms_mongoid_attached_file(:image,
                       styles: Enjoy.configuration.news_image_styles,
-                      convert_options: Enjoy.configuration.news_image_convert_options,
                       content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
             )
           end

data/lib/enjoy/models/mongoid/seo.rb

@@ -21,7 +21,6 @@ module Enjoy
           field :og_title, type: String, localize: Enjoy.config.localize
           enjoy_cms_mongoid_attached_file(:og_image,
                     styles: lambda { |attachment| attachment.instance.og_image_styles },
-                    convert_options: lambda { |attachment| attachment.instance.og_image_convert_options },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
@@ -29,9 +28,6 @@ module Enjoy
         def og_image_styles
           {thumb: "800x600>"}
         end
-        def og_image_convert_options
-          {}
-        end
 
       end
     end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.1.1"
+  VERSION = "0.3.1.2"
 end

data/lib/enjoy_cms.rb

@@ -29,8 +29,6 @@ require 'turbolinks'
 require 'simple-navigation'
 require 'ack_rails_admin_jcrop'
 
-require 'paperclip-optimizer'
-
 require 'enjoy/configuration'
 require 'enjoy/elastic_search'
 require 'enjoy/model'

data/template.rb

@@ -14,7 +14,7 @@ remove_file 'Gemfile'
 create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.4' #'~> 5.0.0.beta1'
+gem 'rails', '4.2.4' #'~> 5.0.0.beta3'
 #{if mongoid then "gem 'mongoid'" else "gem 'pg'" end}
 
 gem 'sass'
@@ -83,6 +83,11 @@ group :production do
   gem "god"
 end
 
+
+gem 'image_optim'
+gem 'image_optim_pack'
+gem 'paperclip-optimizer'
+
 TEXT
 end
 
@@ -191,6 +196,90 @@ Rails.application.config.session_store :mongoid_store
   end
 end
 
+remove_file 'paperclip_optimizer.rb'
+create_file 'paperclip_optimizer.rb' do <<-TEXT
+# Set global optimisation options for all Paperclip models
+
+# By default, image_optim enables all the compression binaries it supports and
+# requires them to be present on your system, failing if one is actually missing.
+
+# We disable everything by default and ignore missing ones with `skip_missing_workers`.
+# This way, should a new version add support for a library we do not yet disable here,
+# things won't suddenly break.
+
+Paperclip::PaperclipOptimizer.default_options = {
+  skip_missing_workers: true,
+  advpng: true,
+  gifsicle: true,
+  jhead: true,
+  jpegoptim: true,
+  jpegrecompress: true,
+  jpegtran: true,
+  optipng: true,
+  pngcrush: true,
+  pngout: false,
+  pngquant: true,
+  svgo: false,
+
+  nice: 5,
+  verbose: true
+}
+
+# All available image_optim options. See https://github.com/toy/image_optim for more information
+
+# Paperclip::PaperclipOptimizer.default_options = {
+#   skip_missing_workers: false, # Skip workers with missing or problematic binaries (defaults to false)
+#   nice: 10,             # Nice level (defaults to 10)
+#   threads: 1,           # Number of threads or disable (defaults to number of processors)
+#   verbose: false,       # Verbose output (defaults to false)
+#   pack: nil,            # Require image_optim_pack or disable it, by default image_optim_pack will be used if available,
+#                         # will turn on :skip-missing-workers unless explicitly disabled (defaults to nil)
+#   allow_lossy: false,   # Allow lossy workers and optimizations (defaults to false)
+#   advpng: {
+#     leve: 4             # Compression level: 0 - don't compress, 1 - fast, 2 - normal, 3 - extra, 4 - extreme (defaults to 4)
+#   },
+#   gifsicle: {
+#     interlace: true,    # Interlace: true - interlace on, false - interlace off, nil - as is in original image
+#                         # (defaults to running two instances, one with interlace off and one with on)
+#     level: 3,           # Compression level: 1 - light and fast, 2 - normal, 3 - heavy (slower) (defaults to 3)
+#     careful: false      # Avoid bugs with some software (defaults to false)
+#   },
+#   jhead: true,          # no options
+#   jpegoptim: {
+#     strip: :all,        # List of extra markers to strip: :comments, :exif, :iptc, :icc or :all (defaults to :all)
+#     max_quality: 100    # Maximum image quality factor 0..100 (defaults to 100)
+#   },
+#   jpegrecompress: {
+#     quality: 3          # JPEG quality preset: 0 - low, 1 - medium, 2 - high, 3 - veryhigh (defaults to 3)
+#   },
+#   jpegtran: {
+#     copy_chunks: false, # Copy all chunks (defaults to false)
+#     progressive: true,  # Create progressive JPEG file (defaults to true)
+#     jpegrescan: false   # Use jpegtran through jpegrescan, ignore progressive option (defaults to false)
+#   },
+#   optipng: {
+#     level: 6,           # Optimization level preset: 0 is least, 7 is best (defaults to 6)
+#     interlace: false    # Interlace: true - interlace on, false - interlace off, nil - as is in original image (defaults to false)
+#   },
+#   pngcrush: {
+#     chunks: :alla,      # List of chunks to remove or :alla - all except tRNS/transparency or
+#                         # :allb - all except tRNS and gAMA/gamma (defaults to :alla)
+#     fix: false,         # Fix otherwise fatal conditions such as bad CRCs (defaults to false)
+#     brute: false        # Brute force try all methods, very time-consuming and generally not worthwhile (defaults to false)
+#   },
+#   pngout: {
+#     copy_chunks: false, # Copy optional chunks (defaults to false)
+#     strategy: 0         # Strategy: 0 - xtreme, 1 - intense, 2 - longest Match, 3 - huffman Only, 4 - uncompressed (defaults to 0)
+#   },
+#   pngquant: {
+#     quality: 100..100,  # min..max - don't save below min, use less colors below max (both in range 0..100; in yaml - !ruby/range 0..100) (defaults to 100..100)
+#     speed: 3            # speed/quality trade-off: 1 - slow, 3 - default, 11 - fast & rough (defaults to 3)
+#   },
+#   svgo: true            # no options
+# }
+TEXT
+end
+
 remove_file 'app/controllers/application_controller.rb'
 create_file 'app/controllers/application_controller.rb' do <<-TEXT
 class ApplicationController < ActionController::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.1.1
+  version: 0.3.1.2
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -388,48 +388,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: image_optim
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: image_optim_pack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: paperclip-optimizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 'EnjoyCMS '
 email:
 - dev@enjoycreate.ru
@@ -544,7 +502,6 @@ files:
 - app/views/shared/_obj.html.slim
 - app/views/shared/_og.html.slim
 - app/views/simple_captcha/_simple_captcha.html.slim
-- config/initializers/paperclip_optimizer.rb
 - config/initializers/simple_captcha.rb
 - config/locales/en.enjoy.yml
 - config/locales/en.enjoy_admin.yml

data/config/initializers/paperclip_optimizer.rb

@@ -1,79 +0,0 @@
-# Set global optimisation options for all Paperclip models
-
-# By default, image_optim enables all the compression binaries it supports and
-# requires them to be present on your system, failing if one is actually missing.
-
-# We disable everything by default and ignore missing ones with `skip_missing_workers`.
-# This way, should a new version add support for a library we do not yet disable here,
-# things won't suddenly break.
-
-Paperclip::PaperclipOptimizer.default_options = {
-  skip_missing_workers: true,
-  advpng: true,
-  gifsicle: true,
-  jhead: true,
-  jpegoptim: true,
-  jpegrecompress: true,
-  jpegtran: true,
-  optipng: true,
-  pngcrush: true,
-  pngout: false,
-  pngquant: true,
-  svgo: false,
-
-  nice: 5,
-  verbose: true
-}
-
-# All available image_optim options. See https://github.com/toy/image_optim for more information
-
-# Paperclip::PaperclipOptimizer.default_options = {
-#   skip_missing_workers: false, # Skip workers with missing or problematic binaries (defaults to false)
-#   nice: 10,             # Nice level (defaults to 10)
-#   threads: 1,           # Number of threads or disable (defaults to number of processors)
-#   verbose: false,       # Verbose output (defaults to false)
-#   pack: nil,            # Require image_optim_pack or disable it, by default image_optim_pack will be used if available,
-#                         # will turn on :skip-missing-workers unless explicitly disabled (defaults to nil)
-#   allow_lossy: false,   # Allow lossy workers and optimizations (defaults to false)
-#   advpng: {
-#     leve: 4             # Compression level: 0 - don't compress, 1 - fast, 2 - normal, 3 - extra, 4 - extreme (defaults to 4)
-#   },
-#   gifsicle: {
-#     interlace: true,    # Interlace: true - interlace on, false - interlace off, nil - as is in original image
-#                         # (defaults to running two instances, one with interlace off and one with on)
-#     level: 3,           # Compression level: 1 - light and fast, 2 - normal, 3 - heavy (slower) (defaults to 3)
-#     careful: false      # Avoid bugs with some software (defaults to false)
-#   },
-#   jhead: true,          # no options
-#   jpegoptim: {
-#     strip: :all,        # List of extra markers to strip: :comments, :exif, :iptc, :icc or :all (defaults to :all)
-#     max_quality: 100    # Maximum image quality factor 0..100 (defaults to 100)
-#   },
-#   jpegrecompress: {
-#     quality: 3          # JPEG quality preset: 0 - low, 1 - medium, 2 - high, 3 - veryhigh (defaults to 3)
-#   },
-#   jpegtran: {
-#     copy_chunks: false, # Copy all chunks (defaults to false)
-#     progressive: true,  # Create progressive JPEG file (defaults to true)
-#     jpegrescan: false   # Use jpegtran through jpegrescan, ignore progressive option (defaults to false)
-#   },
-#   optipng: {
-#     level: 6,           # Optimization level preset: 0 is least, 7 is best (defaults to 6)
-#     interlace: false    # Interlace: true - interlace on, false - interlace off, nil - as is in original image (defaults to false)
-#   },
-#   pngcrush: {
-#     chunks: :alla,      # List of chunks to remove or :alla - all except tRNS/transparency or
-#                         # :allb - all except tRNS and gAMA/gamma (defaults to :alla)
-#     fix: false,         # Fix otherwise fatal conditions such as bad CRCs (defaults to false)
-#     brute: false        # Brute force try all methods, very time-consuming and generally not worthwhile (defaults to false)
-#   },
-#   pngout: {
-#     copy_chunks: false, # Copy optional chunks (defaults to false)
-#     strategy: 0         # Strategy: 0 - xtreme, 1 - intense, 2 - longest Match, 3 - huffman Only, 4 - uncompressed (defaults to 0)
-#   },
-#   pngquant: {
-#     quality: 100..100,  # min..max - don't save below min, use less colors below max (both in range 0..100; in yaml - !ruby/range 0..100) (defaults to 100..100)
-#     speed: 3            # speed/quality trade-off: 1 - slow, 3 - default, 11 - fast & rough (defaults to 3)
-#   },
-#   svgo: true            # no options
-# }