c80_features 0.1.3 → 0.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5262e4ca7d3ba03541e0b3e0f633d07f86bb6368
-  data.tar.gz: 4615057c6bed5b839d542f694b27dbc9f8bf3b7b
+  metadata.gz: c009745a9723d00ec1e57f41ab39c08065e31acc
+  data.tar.gz: 253bd9b34bd795c055ba54d9a1e85fe49f72f04f
 SHA512:
-  metadata.gz: dcb4fa087b9c442ffbe7b8878d50bf704c4fcc8c691883d9b215777fc47e0c817d21dcafe6cbc3830a94104a414a0e87ee628857201a5ed55747609d67a504d5
-  data.tar.gz: afb485d96a662a3a341a663fc9619edac3f68c2a97b78cf9a5459621a25e2e4eecb1b8362da6dbef2f9b4e2879459c81ffd12b3948e843c6c990c8949eb07a0b
+  metadata.gz: 4f8e41af6b412e2d3cc7e0a847dd331084eb0432ee7e11ea5e418acb97761a48915f8a44f2f3527c3d0ea945cfe8f612fb1806d53f9910d6f8602673be8f09cb
+  data.tar.gz: 065935428ee17b67e9f63dfd3239a5995c59f50c2a84762023055c205c4c0f34e16f26db342538c2f1206c7adc934a6e09fc303b1debf5dbbf024a599554a8df

data/app/admin/c80_features/paras.rb

@@ -13,7 +13,7 @@ ActiveAdmin.register C80Features::Para, :as => 'Para' do
   index do
     selectable_column
     column :image do |ab|
-      image_tag("#{ab.image.thumb_fill.url}")
+      image_tag("#{ab.image.thumb_preview.url}")
     end
     column :title
     column :content do |about|

data/app/models/c80_features/prop.rb

@@ -0,0 +1,5 @@
+module C80Features
+  class Prop < ActiveRecord::Base
+    mount_uploader :image_container_bg, ImageContainerBgUploader
+  end
+end

data/app/uploaders/c80_features/image_container_bg_uploader.rb

@@ -0,0 +1,102 @@
+# загрузка картинки для фона блока, в котором содержится контент виджета "преимущества"
+module C80Features
+
+  # грузит картинку слайдера
+  class ImageContainerBgUploader < CarrierWave::Uploader::Base
+
+    include CarrierWave::MiniMagick
+
+    storage :file
+
+    process :resize_to_limit_my
+
+    version :thumb_big do
+      process :resize_to_big_by_width
+    end
+
+    version :thumb_preview do
+      process :resize_to_preview
+    end
+
+    def store_dir
+      'uploads/features/bg'
+    end
+
+    def filename
+      if original_filename
+        "image_#{secure_token(4)}.#{file.extension}"
+      end
+    end
+
+    def resize_to_limit_my
+
+      manipulate! do |img|
+
+        # извлекаем ширину и подгоняем высоту
+        w = C80Features::Prop.first.bg_image_limit_width
+        h = C80Features::Prop.first.bg_image_limit_height
+
+        # меняем размер
+        img.resize "#{w}x#{h}<"
+        img = yield(img) if block_given?
+        img
+
+      end
+    end
+
+    # меням размер оригинальной картинки, подгоняя её к требуемой ширине (высота рассчитается автоматом)
+    def resize_to_big_by_width
+
+      manipulate! do |img|
+
+        # извлекаем ширину и подгоняем высоту
+        w = C80Features::Prop.first.bg_big_width
+        h = calc_height_of_image(w)
+
+        # меняем размер
+        img.resize "#{w}x#{h}<"
+        img = yield(img) if block_given?
+        img
+
+      end
+
+    end
+
+    # пока используется только для показа картинки в админке
+    def resize_to_preview
+      manipulate! do |img|
+
+        w = C80Features::Prop.first.bg_preview_width
+        h = C80Features::Prop.first.bg_preview_height
+
+        img.resize "#{w}x#{h}>"
+        img = yield(img) if block_given?
+        img
+
+      end
+    end
+
+    protected
+
+    def secure_token(length=16)
+      var = :"@#{mounted_as}_secure_token"
+      model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
+    end
+
+    private
+
+    # рассчитаем высоту картинки, которая получится, когда подгоняем картинку по ширине w
+    def calc_height_of_image(w)
+      model_image = ::MiniMagick::Image.open(model.image.current_path)
+      calc_height(w, model_image["width"], model_image["height"])
+    end
+
+    # подгоняем по ширине, рассчитываем высоту
+    def calc_height(width, original_w, original_h)
+      k = width.to_f/original_w
+      original_h * k
+    end
+
+  end  
+  
+end

data/app/uploaders/c80_features/para_uploader.rb

@@ -1,30 +1,81 @@
 # загрузка иконок в блоки "о нас"
-class C80Features::ParaUploader < CarrierWave::Uploader::Base
 
-  include CarrierWave::MiniMagick
+module C80Features
 
-  storage :file
+  # грузит картинку слайдера
+  class ParaUploader < CarrierWave::Uploader::Base
 
-  def store_dir
-    "uploads/features"
-  end
+    include CarrierWave::MiniMagick
+
+    storage :file
 
-  def filename
-    if original_filename
-      "photo_#{model.id}.#{file.extension}"
+    process :resize_to_limit_my
+
+    version :thumb_preview do
+      process :resize_to_preview
     end
-  end
 
-  # TODO:: размеры картинок вынести в отдельную модель Props
+    def store_dir
+      'uploads/features'
+    end
 
-  process :resize_to_limit => [121,107]
+    def filename
+      if original_filename
+        "image_#{secure_token(4)}.#{file.extension}"
+      end
+    end
 
-  version :thumb_fill do
-    process :resize_to_fill => [121,107]
-  end
+    def resize_to_limit_my
+
+      manipulate! do |img|
+
+        # извлекаем ширину и подгоняем высоту
+        w = C80Features::Prop.first.para_image_limit_width
+        h = C80Features::Prop.first.para_image_limit_height
+
+        # меняем размер
+        img.resize "#{w}x#{h}<"
+        img = yield(img) if block_given?
+        img
+
+      end
+    end
+
+    # пока используется только для показа картинки в админке
+    def resize_to_preview
+      manipulate! do |img|
+
+        w = C80Features::Prop.first.para_preview_width
+        h = C80Features::Prop.first.para_preview_height
+
+        img.resize "#{w}x#{h}>"
+        img = yield(img) if block_given?
+        img
+
+      end
+    end
+
+    protected
+
+    def secure_token(length=16)
+      var = :"@#{mounted_as}_secure_token"
+      model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
+    end
+
+    private
+
+    # рассчитаем высоту картинки, которая получится, когда подгоняем картинку по ширине w
+    def calc_height_of_image(w)
+      model_image = ::MiniMagick::Image.open(model.image.current_path)
+      calc_height(w, model_image["width"], model_image["height"])
+    end
+
+    # подгоняем по ширине, рассчитываем высоту
+    def calc_height(width, original_w, original_h)
+      k = width.to_f/original_w
+      original_h * k
+    end
 
-  version :thumb_fit do
-    process :resize_to_fit => [121,107]
   end
 
-end
+end

data/db/migrate/20161002170707_create_c80_features_props.rb

@@ -0,0 +1,16 @@
+class CreateC80FeaturesProps < ActiveRecord::Migration
+  def change
+    create_table :c80_features_props, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.integer :bg_image_limit_width
+      t.integer :bg_image_limit_height
+      t.integer :bg_big_width
+      t.integer :bg_preview_width
+      t.integer :bg_preview_height
+      t.integer :para_image_limit_width
+      t.integer :para_image_limit_height
+      t.integer :para_preview_width
+      t.integer :para_preview_height
+      t.string :image_container_bg
+    end
+  end
+end

data/db/seeds/c80_features_01_fill_props.rb

@@ -0,0 +1,14 @@
+# rake db:seed:c80_features_01_fill_props
+
+C80Features::Prop.delete_all
+C80Features::Prop.create!({
+                              bg_image_limit_width:1600,
+                              bg_image_limit_height:1600,
+                              bg_big_width: 1600,
+                              bg_preview_width: 400,
+                              bg_preview_height: 280,
+                              para_image_limit_width:300,
+                              para_image_limit_height:300,
+                              para_preview_width: 300,
+                              para_preview_height: 300
+                          })

data/lib/c80_features/version.rb

@@ -1,3 +1,3 @@
 module C80Features
-  VERSION = "0.1.3"
+  VERSION = "0.1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_features
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.3.1
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,8 @@ files:
 - app/helpers/c80_features/application_helper.rb
 - app/models/c80_features/para.rb
 - app/models/c80_features/para_validator.rb
+- app/models/c80_features/prop.rb
+- app/uploaders/c80_features/image_container_bg_uploader.rb
 - app/uploaders/c80_features/para_uploader.rb
 - app/views/c80_features/_features_block.html.erb
 - app/views/c80_features/_features_block_with_images.html.erb
@@ -115,6 +117,8 @@ files:
 - c80_features.gemspec
 - config/locales/ru.yml
 - db/migrate/20151216132727_create_c80_features_paras.rb
+- db/migrate/20161002170707_create_c80_features_props.rb
+- db/seeds/c80_features_01_fill_props.rb
 - lib/c80_features.rb
 - lib/c80_features/engine.rb
 - lib/c80_features/version.rb