camaleon_image_optimizer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 867ba9921e9adf85de5414f060ad9334c6d45b4b5386125c074a203772d9f146
-  data.tar.gz: 7327557f0b96194031ce99813d437369ce6c8f62a59dc56d7d9188cafb572dcb
+  metadata.gz: 558b329de97ae0c60960f04bfaa2a00985aeaa517e4658318615885934c23197
+  data.tar.gz: b2133d331c8c4a7529bca995111985106bf8675381626cdbe6fd85036e4f4d0b
 SHA512:
-  metadata.gz: fe873c0db1e3eb96103586df94be7c98cb6f801653254bf63a0cbc4b6379a5a17b09c847540977b3857c06f158c6e267b1f17b590488ff416f57e909f60db129
-  data.tar.gz: 7f918fb5289319ddeb6a7fa7d7b69b7ec4687735ad86df632b36c8c73f263a61674a34916294fa5492be70c5f3b33682b49781bfd6842a7d4a50e809832b98ec
+  metadata.gz: 6bf54d5f1ba4e21c8abe0578fe72e5fb27cc49a48ed5b5b49b8a533e6823c681689945cf1d1821173fb3152c48a7cf265b662df05393439775744090d7c698ed
+  data.tar.gz: 3d14156b6f0e1646f46da31a752a667cfe32e9b344eb7012c571391544a99e9797374e1fc53a9dbaec995acce3f48e9a10d1a649bd434652d2e22713cdd3f725

data/README.md

@@ -5,7 +5,7 @@ This is a convenient image optimizer plugin for Camaleon CMS. Compressing images
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'camaleon_image_optimizer', github: 'brian-kephart/camaleon_image_optimizer'
+gem 'camaleon_image_optimizer'
 ```
 
 And then execute:

data/app/controllers/plugins/camaleon_image_optimizer/admin_controller.rb

@@ -14,5 +14,4 @@ class Plugins::CamaleonImageOptimizer::AdminController < CamaleonCms::Apps::Plug
     @plugin.set_field_values(params[:field_options]) if params[:field_options].present? # save custom field values
     redirect_to url_for(action: :settings), notice: 'Settings Saved Successfully'
   end
-  # add custom methods below ....
 end

data/app/helpers/plugins/camaleon_image_optimizer/main_helper.rb

@@ -5,37 +5,46 @@ module Plugins::CamaleonImageOptimizer::MainHelper
     # klass.helper_method [:my_helper_method] rescue "" # here your methods accessible from views
   end
 
-  # here all actions on going to active
-  # you can run sql commands like this:
-  # results = ActiveRecord::Base.connection.execute(query);
-  # plugin: plugin model
   def camaleon_image_optimizer_on_active(plugin)
+    camaleon_image_optimizer_options plugin
   end
 
-  # here all actions on going to inactive
-  # plugin: plugin model
   def camaleon_image_optimizer_on_inactive(plugin)
   end
 
-  # here all actions to upgrade for a new version
-  # plugin: plugin model
   def camaleon_image_optimizer_on_upgrade(plugin)
+    camaleon_image_optimizer_options plugin
   end
 
-  # hook listener to add settings link below the title of current plugin (if it is installed)
-  # args: {plugin (Hash), links (Array)}
-  # permit to add unlimmited of links...
   def camaleon_image_optimizer_on_plugin_options(args)
     args[:links] << link_to('Settings', admin_plugins_camaleon_image_optimizer_settings_path)
   end
 
   def cama_optimize_image(settings)
-    # settings in config/image_optim.yml
-    spec = Gem::Specification.find_by_name("camaleon_image_optimizer")
-    gem_root = Pathname.new spec.gem_dir
-    image_optim = ImageOptim.new YAML.load_file(gem_root.join('config', 'image_optim.yml'))
+    image_optim = ImageOptim.new camaleon_image_optimizer_settings
     image_optim.optimize_image! settings[:uploaded_io].path
     settings[:uploaded_io] = File.open settings[:uploaded_io].path
   end
 
+private
+
+  def camaleon_image_optimizer_options(plugin)
+    plugin.set_option('quality', camaleon_image_optimizer_default_settings['jpegoptim']['max_quality']) unless plugin.get_option('quality').present?
+  end
+
+  def camaleon_image_optimizer_settings
+    @camaleon_image_optimizer_settings ||= camaleon_image_optimizer_default_settings.tap do |cios|
+      cios['jpegoptim']['max_quality'] = current_plugin.get_option('quality') unless current_plugin.get_option('quality').blank?
+    end
+  end
+
+  def camaleon_image_optimizer_default_settings
+    @camaleon_image_optimizer_default_settings ||= begin
+      # default settings in config/image_optim.yml
+      spec = Gem::Specification.find_by_name 'camaleon_image_optimizer'
+      gem_root = Pathname.new spec.gem_dir
+      YAML.load_file gem_root.join('config', 'image_optim.yml')
+    end
+  end
+
 end

data/app/views/plugins/camaleon_image_optimizer/admin/settings.html.erb

@@ -1,21 +1,17 @@
 <div class="panel panel-default">
-    <div class="panel-heading">
-        <h4>My Plugin Settings</h4>
-    </div>
-    <div class="panel-body">
-        <%= form_tag(url_for(action: :save_settings), class: 'validate') do %>
-            <div class="form-group">
-                <label>My Option Setting</label>
-                <%= text_field_tag 'options[my_setting]', @plugin.get_option('my_setting'), class: 'form-control required' %>
-            </div>
-            <div class="form-group">
-                <label>My Meta Setting</label>
-                <%= text_field_tag 'metas[my_setting]', @plugin.get_meta('my_setting'), class: 'form-control required' %>
-            </div>
-            <%= render partial: "camaleon_cms/admin/settings/custom_fields/render", locals: {record: @plugin, field_groups: @plugin.get_field_groups} %>
-            <div class="form-group text-right">
-                <%= submit_tag 'Save Settings', class: 'btn btn-primary' %>
-            </div>
-        <% end %>
-    </div>
-</div>
+  <div class="panel-heading">
+    <h4><%= cama_t 'image_optimizer_settings' %></h4>
+  </div>
+  <div class="panel-body">
+    <%= form_tag(url_for(action: :save_settings), class: 'validate') do %>
+      <div class="form-group">
+        <label><%= cama_t 'max_quality' %>: 1 (<%= cama_t 'most_compressed' %>) – 100 (<%= cama_t 'highest_quality' %>), <%= cama_t 'default_is' %> 70.</label>
+        <%= number_field_tag 'options[quality]', @plugin.get_option('quality'), class: 'form-control required', min: 1, max: 100, step: 1, value: @plugin.get_option('quality') %>
+      </div>
+      <%= render partial: "camaleon_cms/admin/settings/custom_fields/render", locals: { record: @plugin, field_groups: @plugin.get_field_groups } %>
+      <div class="form-group text-right">
+        <%= submit_tag 'Save Settings', class: 'btn btn-primary' %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/config/camaleon_plugin.json

@@ -8,7 +8,7 @@
   "hooks": {
     "on_active": ["camaleon_image_optimizer_on_active"],
     "on_inactive": ["camaleon_image_optimizer_on_inactive"],
-    /* "plugin_options": ["camaleon_image_optimizer_on_plugin_options"], */
+    "plugin_options": ["camaleon_image_optimizer_on_plugin_options"],
     "before_upload": ["cama_optimize_image"]
   }
 }

data/config/locales/en.yml

@@ -0,0 +1,6 @@
+en:
+  image_optimizer_settings: "Image Optimizer Settings"
+  max_quality: "Maximum Quality"
+  most_compressed: "most compressed"
+  highest_quality: "highest quality"
+  default_is: "default is"

data/config/routes.rb

@@ -1,15 +1,6 @@
 Rails.application.routes.draw do
 
     scope PluginRoutes.system_info["relative_url_root"] do
-      scope '(:locale)', locale: /#{PluginRoutes.all_locales}/, :defaults => {  } do
-        # frontend
-        namespace :plugins do
-          namespace 'camaleon_image_optimizer' do
-            get 'index' => 'front#index'
-          end
-        end
-      end
-
       #Admin Panel
       scope :admin, as: 'admin', path: PluginRoutes.system_info['admin_path_name'] do
         namespace 'plugins' do
@@ -22,10 +13,5 @@ Rails.application.routes.draw do
           end
         end
       end
-
-      # main routes
-      #scope 'camaleon_image_optimizer', module: 'plugins/camaleon_image_optimizer/', as: 'camaleon_image_optimizer' do
-      #  Here my routes for main routes
-      #end
     end
   end

data/lib/camaleon_image_optimizer/version.rb

@@ -1,3 +1,3 @@
 module CamaleonImageOptimizer
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_image_optimizer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Kephart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: camaleon_cms
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: image_optim_rails
+  name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.26'
 - !ruby/object:Gem::Dependency
   name: image_optim_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -90,23 +76,16 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/camaleon_image_optimizer_manifest.js
 - app/controllers/plugins/camaleon_image_optimizer/admin_controller.rb
-- app/controllers/plugins/camaleon_image_optimizer/front_controller.rb
 - app/helpers/plugins/camaleon_image_optimizer/main_helper.rb
-- app/models/plugins/camaleon_image_optimizer/camaleon_image_optimizer.rb
-- app/views/plugins/camaleon_image_optimizer/admin/index.html.erb
 - app/views/plugins/camaleon_image_optimizer/admin/settings.html.erb
-- app/views/plugins/camaleon_image_optimizer/front/index.html.erb
-- app/views/plugins/camaleon_image_optimizer/layouts/readme.txt
 - config/camaleon_plugin.json
 - config/image_optim.yml
-- config/initializers/custom_models.rb
+- config/locales/en.yml
 - config/routes.rb
 - lib/camaleon_image_optimizer.rb
 - lib/camaleon_image_optimizer/engine.rb
 - lib/camaleon_image_optimizer/version.rb
-- lib/tasks/camaleon_image_optimizer_tasks.rake
 homepage: ''
 licenses:
 - MIT

data/app/controllers/plugins/camaleon_image_optimizer/front_controller.rb

@@ -1,8 +0,0 @@
-class Plugins::CamaleonImageOptimizer::FrontController < CamaleonCms::Apps::PluginsFrontController
-  include Plugins::CamaleonImageOptimizer::MainHelper
-  def index
-    # actions for frontend module
-  end
-
-  # add custom methods below
-end

data/app/models/plugins/camaleon_image_optimizer/camaleon_image_optimizer.rb

@@ -1,6 +0,0 @@
-# class Plugins::CamaleonImageOptimizer::CamaleonImageOptimizer < ActiveRecord::Base
-  # belongs_to :site, class_name: "CamleonCms::Site"
-
-  # here create your models normally
-  # notice: your tables in database will be plugins_camaleon_image_optimizer in plural (check rails documentation)
-# end

data/app/views/plugins/camaleon_image_optimizer/admin/index.html.erb

@@ -1,9 +0,0 @@
-<%#= javascript_include_tag plugin_asset("my_file.js") %>
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <h4>My Title</h4>
-    </div>
-    <div class="panel-body">
-        <p>Plugin ready to use in admin panel!.</p>
-    </div>
-</div>

data/app/views/plugins/camaleon_image_optimizer/front/index.html.erb

@@ -1,2 +0,0 @@
-<%#= javascript_include_tag plugin_gem_asset("js/my_file.js") %>
-Plugin ready to use! in frontend.

data/app/views/plugins/camaleon_image_optimizer/layouts/readme.txt

@@ -1,2 +0,0 @@
-You can create your layouts here.
-To load your custom layout you can use: layout: plugin_layout(<layout_name>) in your controller

data/config/initializers/custom_models.rb

@@ -1,5 +0,0 @@
-#Rails.application.config.to_prepare do
-#   CamaleonCms::Site.class_eval do
-#     has_many :attack, class_name: "Plugins::Attack::Models::Attack"
-#   end
-# end

data/lib/tasks/camaleon_image_optimizer_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :camaleon_image_optimizer do
-#   # Task goes here
-# end