c80_yax 0.1.0.3 → 0.1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c1babe3e4c6239617ef6d4318770105186fb00c
-  data.tar.gz: 83a06df3d5a039cba4b75bb733fb4cdc610ba99c
+  metadata.gz: d8896703e173f7ebc35c9c9bb777b505e3cd76d3
+  data.tar.gz: 14fe702299e0a2057d8bfa37cfe20a270415c363
 SHA512:
-  metadata.gz: 1daca052cdc67e37d9e18b4bef01eedd23d5c03b683386fd10006a7b06b3655c6f89a4dd40417e87cb4f0aca2a098f1652f0d886d210af49c95ff504e77d9d8a
-  data.tar.gz: 8221ce3523da4216eac3fd792e260a61a719682d4f133186e182465692f100f41f5eb4da70be1da3e05c91ea2a95a6d8067ea59f611cc7944d9955b61481db3b
+  metadata.gz: 11abc62b900d27625364db159894c648727086b793d6550e2955b5540b6a2fbc91df9aed4137352bc246442ae03e5c3edfe90020a1f3446fe5f96c93b1e450bf
+  data.tar.gz: 9117242d0ecf263ebd5dd09b4483c79f5a17346ff73e7bf2fcee3f059714332668c0007e98fe874679d6d30c8e5ace6681e21787430133c88d5d29981843376c

data/app/admin/c80_yax/cats.rb

@@ -8,6 +8,7 @@ ActiveAdmin.register C80Yax::Cat, as: 'Cat' do
   permit_params :title,
                 :slug,
                 :ord,
+                :image,
                 :strsubcat_ids => []
 
   config.batch_actions = false
@@ -18,7 +19,9 @@ ActiveAdmin.register C80Yax::Cat, as: 'Cat' do
     id_column
     column :ord
     column :title
-
+    column :image do |cat|
+      cat_image(cat)
+    end
     column :strsubcats do |cat|
       res = '-'
       if cat.strsubcats.count > 0
@@ -38,6 +41,7 @@ ActiveAdmin.register C80Yax::Cat, as: 'Cat' do
     f.inputs 'Свойства категории' do
       f.input :title
       f.input :ord
+      f.input :image, :as => :file, :hint => cat_image(f.object)
       f.input :strsubcats, :as => :check_boxes
     end
 

data/app/helpers/c80_yax/cats/cat_view_helper.rb

@@ -0,0 +1,15 @@
+module C80Yax
+  module Cats
+    module CatViewHelper
+
+      def cat_image(cat)
+        res = ''
+        if cat.image.present?
+          res = image_tag cat.image.thumb_md
+        end
+        res.html_safe
+      end
+
+    end
+  end
+end

data/app/models/c80_yax/cat.rb

@@ -1,25 +1,29 @@
 require 'babosa'
 
-class C80Yax::Cat < ActiveRecord::Base
+module C80Yax
+  class Cat < ActiveRecord::Base
 
-  validates :title,
-            presence: true,
-            uniqueness: true,
-            length: { in: 6..50 }
+    validates :title,
+              presence: true,
+              uniqueness: true,
+              length: { in: 6..50 }
 
-  has_and_belongs_to_many :strsubcats
+    has_and_belongs_to_many :strsubcats
+    mount_uploader :image, IcatUploader
 
-  extend FriendlyId
-  friendly_id :slug_candidates, :use => :slugged
+    extend FriendlyId
+    friendly_id :slug_candidates, :use => :slugged
 
-  def slug_candidates
-    [:title] + Array.new(6) {|index| [:title, index+2]}
-  end
+    def slug_candidates
+      [:title] + Array.new(6) {|index| [:title, index+2]}
+    end
 
-  def normalize_friendly_id(input)
-    input.to_s.to_slug.normalize(transliterations: :russian).to_s
-  end
+    def normalize_friendly_id(input)
+      input.to_s.to_slug.normalize(transliterations: :russian).to_s
+    end
 
-  scope :menu_order, -> {order(:ord => :asc)}
+    scope :menu_order, -> {order(:ord => :asc)}
+
+  end
 
-end
+end

data/app/uploaders/c80_yax/icat_uploader.rb

@@ -0,0 +1,23 @@
+module C80Yax
+
+  # грузит картинку категории
+  class IcatUploader < BaseFileUploader
+
+    process :resize_to_limit => [1024,768]
+
+    version :thumb_md do
+      begin
+        p = C80Yax::Prop.first
+        process :resize_to_fill => [p.thumb_md_width, p.thumb_md_height]
+      rescue => e
+        Rails.logger.debug "[TRACE] <icat_uploader.thumb_md> [ERROR] #{e}"
+      end
+    end
+
+    def store_dir
+      'uploads/cats'
+    end
+
+  end
+
+end

data/db/migrate/20170620111100_create_c80_yax_cats.rb

@@ -2,6 +2,7 @@ class CreateC80YaxCats < ActiveRecord::Migration
   def change
     create_table :c80_yax_cats do |t|
       t.string :title
+      t.string :image
       t.string :slug
       t.integer :ord
 

data/lib/c80_yax/version.rb

@@ -1,3 +1,3 @@
 module C80Yax
-  VERSION = '0.1.0.3'
+  VERSION = '0.1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_yax
 version: !ruby/object:Gem::Version
-  version: 0.1.0.3
+  version: 0.1.0.4
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,7 @@ files:
 - app/assets/stylesheets/c80_yax_backend.scss
 - app/controllers/c80_yax/admin_data_controller.rb
 - app/controllers/c80_yax/app_controller.rb
+- app/helpers/c80_yax/cats/cat_view_helper.rb
 - app/helpers/c80_yax/data_helper.rb
 - app/helpers/c80_yax/items/asterix_helper.rb
 - app/helpers/c80_yax/items/buy_options_helper.rb
@@ -181,6 +182,7 @@ files:
 - app/models/c80_yax/strsubcat_observer.rb
 - app/models/c80_yax/uom.rb
 - app/models/c80_yax/vendor.rb
+- app/uploaders/c80_yax/icat_uploader.rb
 - app/uploaders/c80_yax/iphoto_uploader.rb
 - app/views/admin/strsubcats/_view.html.erb
 - app/views/c80_yax/items/_buy_options.html.erb