c80_yax 0.1.0.2 → 0.1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74f206b661d9c2327e4e9f26b94b7d787593230a
-  data.tar.gz: 0b70a2734ea7e66e2ce0fcc72b52bbba1a1dffa7
+  metadata.gz: 7c1babe3e4c6239617ef6d4318770105186fb00c
+  data.tar.gz: 83a06df3d5a039cba4b75bb733fb4cdc610ba99c
 SHA512:
-  metadata.gz: 8106e294dc7c8a9175cde3c26cbe0fc79d0d0f7a4f95ee4f2141270df3b0a476e201b15f58582026b44aa27ef6f3f00923ef4cbc373fc25dddd90801b9a380aa
-  data.tar.gz: 7fa219ce73051ce3e0431feacbcffb0629d1cf9d45565d88deba6f75ebc88a280aa149b5699bfc41fe9d1dd3dfe33baf7c5c6c311c5a9635ee692675ac0d9a98
+  metadata.gz: 1daca052cdc67e37d9e18b4bef01eedd23d5c03b683386fd10006a7b06b3655c6f89a4dd40417e87cb4f0aca2a098f1652f0d886d210af49c95ff504e77d9d8a
+  data.tar.gz: 8221ce3523da4216eac3fd792e260a61a719682d4f133186e182465692f100f41f5eb4da70be1da3e05c91ea2a95a6d8067ea59f611cc7944d9955b61481db3b

data/app/models/c80_yax/concerns/props/parsable.rb

@@ -15,6 +15,7 @@ module C80Yax
           # +item_as_hash+ это результат запроса к runtime таблице
 
           def get_props_parsed(strsubcat_id, item_as_hash)
+            Rails.logger.debug "[TRACE] <Parsable.get_props_parsed> self.name = #{self.name}, item_as_hash: #{item_as_hash}"
             rows = self.select_props_sql(strsubcat_id)
             meth =  (self.name == 'C80Yax::PriceProp') ? '__parse_sql_price_props' : '__parse_sql_props'
             self.send(meth, rows, item_as_hash)
@@ -41,12 +42,15 @@ module C80Yax
                 uoms:   []
             }
 
-            rows.each(:as => :hash) do |row|
+            if item_as_hash.size.zero?
+              Rails.logger.debug '[ERROR] <Parsable.__parse_sql_props> item_as_hash пуст.'
+              return result
+            end
 
+            rows.each(:as => :hash) do |row|
               result[:titles] << row['title']
-              result[:values] << item_as_hash['prop_'+row['prop_name_id'].to_s]
+              result[:values] << item_as_hash["prop_#{row['prop_name_id']}"]
               result[:uoms] << row['uom_title']
-
             end
 
             result
@@ -66,7 +70,7 @@ module C80Yax
           # }
 
           def __parse_sql_price_props(rows, item_as_hash)
-
+            Rails.logger.debug '[TRACE] <Parsable.__parse_sql_price_props>'
             result = {
                 titles:     [],
                 values:     [],
@@ -74,6 +78,11 @@ module C80Yax
                 uoms:       []
             }
 
+            if item_as_hash.size.zero?
+              Rails.logger.debug '[ERROR] <Parsable.__parse_sql_props> item_as_hash пуст.'
+              return result
+            end
+
             rows.each(:as => :hash) do |row|
 
               if item_as_hash['prop_'+row['prop_name_id'].to_s].to_i != 0

data/app/models/c80_yax/item_observer.rb

@@ -4,8 +4,8 @@ module C80Yax
 
     # Админ создаёт вещь:
     #   • в таблице типа str_111_items должна появиться строка, описывающая эту вещь
-    def after_create(item)
-      Rails.logger.debug "[TRACE] <ItemObserver.after_create> Создан предмет '#{item.title}'."
+    def after_commit(item)
+      Rails.logger.debug "[TRACE] <ItemObserver.after_commit> Создан предмет '#{item.title}'."
       StrsubcatRuntimeTables.table_check_and_build(item.strsubcat)
       StrsubcatRuntimeTables.table_fill(item.strsubcat.id) # TODO-5:: оптимизировать: не надо совершать операцию "заполнить таблицу", надо совершить операцию "вставлять в таблицу строку"
     end

data/app/models/c80_yax/main_prop.rb

@@ -16,6 +16,7 @@ module C80Yax
     # +--------------+--------------+--------------+---------------------------+-----------+
 
     def self.select_props_sql(strsubcat_id)
+      Rails.logger.debug "[TRACE] <MainProp.select_props_sql> strsubcat_id = #{strsubcat_id}"
       sql = "
       SELECT
         c80_yax_main_props.strsubcat_id,

data/app/models/c80_yax/mixins/item/database/props.rb

@@ -16,6 +16,7 @@ module C80Yax
 
           # сформировать список main свойств предмета
           def main_props
+            Rails.logger.debug '[TRACE] <Item::Database.main_props>'
             C80Yax::MainProp.get_props_parsed(self.strsubcat_id, item_as_hash)
           end
 

data/app/uploaders/c80_yax/iphoto_uploader.rb

@@ -5,6 +5,9 @@ module C80Yax
 
     process :resize_to_limit => [1024,768]
 
+    # накладываем watermark
+    process :watermark => [Rails.root.join('public/watermark.png')]
+
     version :thumb_sm do
       begin
         p = C80Yax::Prop.first
@@ -32,6 +35,11 @@ module C80Yax
       end
     end
 
+    def watermark(watermark_image, options={})
+      cache_stored_file! unless cached?
+      C80Yax::Watermarker.new(current_path, watermark_image).watermark!(options)
+    end
+
     def store_dir
       'uploads/items'
     end

data/c80_yax.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug"
   spec.add_dependency 'activesupport', ['>= 3.0.0']
   spec.add_dependency 'rails-observers'
+  spec.add_dependency 'mini_magick'
 
 end

data/lib/c80_yax/version.rb

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

data/lib/c80_yax/watermarker.rb

@@ -0,0 +1,24 @@
+module C80Yax
+  class Watermarker
+
+    def initialize(original_path, watermark_path)
+      @original_path = original_path.to_s
+      @watermark_path = watermark_path.to_s
+    end
+
+    def watermark!(options={})
+      options[:gravity] ||= 'center'
+
+      image = MiniMagick::Image.open(@original_path)
+      watermark_image = MiniMagick::Image.open(@watermark_path)
+
+      result = image.composite(watermark_image) do |c|
+        c.gravity options[:gravity]
+      end
+
+      result.write @original_path
+
+    end
+
+  end
+end

data/lib/c80_yax.rb

@@ -1,7 +1,9 @@
 require 'c80_yax/version'
 require 'c80_yax/engine'
 require 'c80_yax/strsubcat_runtime_tables'
+require 'c80_yax/watermarker'
 require 'rails-observers'
+require 'mini_magick'
 
 module C80Yax
   def self.table_name_prefix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_yax
 version: !ruby/object:Gem::Version
-  version: 0.1.0.2
+  version: 0.1.0.3
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  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: Gem adds yax to site
 email:
 - c080609a@gmail.com
@@ -200,6 +214,7 @@ files:
 - lib/c80_yax/engine.rb
 - lib/c80_yax/strsubcat_runtime_tables.rb
 - lib/c80_yax/version.rb
+- lib/c80_yax/watermarker.rb
 - lib/generators/c80_yax/install_generator.rb
 - lib/generators/c80_yax/templates/app/helpers/c80_yax/items/show_item_helper.rb
 homepage: https://github.com/c080609a/c80_yax