adminos 1.0.0.pre.rc.1 → 1.0.0.pre.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d81796250feb6e1aa2d2fd09cdef36acd168b8c92f05af8dc6854db9b8106529
-  data.tar.gz: 421a234d3f208e98c497f941b591dcec9c5141801bec1605db40434108fa1ea2
+  metadata.gz: 1dd7956b8e247ace0302f2da00df9bd1a437de8b0ed52bc1e5bb575fe4889fcc
+  data.tar.gz: 2980ad30232cc36f622c1059c6c77e0273500a6ba53cd9513e4c66e10aedd012
 SHA512:
-  metadata.gz: 2c813a2d485a528460f3507f61fa404d610e035547b2c6bae80af35ed432e84a6d7d282ad45826cefcdecf2d1edb3af2135810426de909ecf786e660f7de61c0
-  data.tar.gz: ff2d6772b3b57eee01438148bb9a6c503df2a3a9d7302b08dea521b6ce8ca6437bf456d2a12824698f34f46630b72bd453b68de4970049d7ac0216cfd1570f92
+  metadata.gz: 7271cb01c26fc3fc4471fffa46ee1250934f85872b2438eb7d590d13334585ca78a1347968254913e0a00383e9ee0a90041b46e33b046149f326c75b509750cc
+  data.tar.gz: 50b733a689694add1c82c11b26eadb3fc8abf3a7212fe1bca1dc22ffa8395d9335b7c4feb073a5c380748dd4db6782113c9d1091d1383b4bf2ca3a23c6fc5ec2

data/README.md

@@ -60,7 +60,11 @@ If no need in SEO fields, switch it off using `--no-seo`.
       has_one_attached :avatar
       has_one_attached :photo
 
-      cropped :avatar
+      cropped :avatar, version: :default, coord_attribute: :avatar_coord 
+      cropped :avatar, version: :mobile, coord_attribute: :avatar_mobile_coord
+
+      # default versions name is :default
+      # default coord_attribute attribute name is has_one_attached attribute + '_coord'
       cropped :photo
     end
   ```
@@ -68,7 +72,8 @@ If no need in SEO fields, switch it off using `--no-seo`.
   ```slim
     # admin
     # aspect_ratio default 16/9
-    = f.input :avatar, as: :cropp, input_html: { aspect_ratio: 2/3 }
+    = f.input :avatar, as: :cropp, input_html: { coord_attribute: :avatar_coord, version: :default, aspect_ratio: 16/9 }
+    = f.input :avatar, as: :cropp, input_html: { coord_attribute: :avatar_mobile_coord, version: :mobile, aspect_ratio: 2/3 }
     = f.input :photo, as: :cropp
 
     # public

data/adminos.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'adminos'
-  gem.version       = '1.0.0-rc.1'
+  gem.version       = '1.0.0-rc.2'
   gem.authors       = ['RavWar', 'milushov', 'abuhtoyarov', 'SiebenSieben']
   gem.email         = ['studio@molinos.ru']
   gem.homepage      = 'https://gitlab.molinos.ru/global/adminos'

data/app/inputs/cropp_input.rb

@@ -1,11 +1,14 @@
 class CroppInput < SimpleForm::Inputs::Base
   def input(wrapper_options = nil)
+    @version = input_html_options.delete(:version) || :default
+    @coord_attribute = input_html_options.delete(:coord_attribute) || object.send("#{@version}_#{attribute_name}_attr_coord")
+
     out = []
     out << %{<div class="f-file">}
     out << %{  <label class="f-file__selection js-file">}
     out << %{    <span class="f-file__button">Выбрать</span>}
     out << @builder.file_field(attribute_name, input_html_options)
-    out << @builder.hidden_field(object.send("#{attribute_name}_attr_coord"))
+    out << @builder.hidden_field(@coord_attribute)
     out << %{    <span class="f-file__selected"></span>}
     out << %{  </label>}
     out << %{</div>}
@@ -17,14 +20,18 @@ class CroppInput < SimpleForm::Inputs::Base
   def preview
     return unless object.send(attribute_name).attached?
     out = []
-    aspect_ratio = input_html_options.delete(:aspect_ratio) || 16/9
+
+    aspect_ratio = input_html_options.delete(:aspect_ratio) || '16/9'
+    aspect_ratio = aspect_ratio.split('/').map(&:to_f)
+    aspect_ratio = aspect_ratio[0]/aspect_ratio[1]
+
     out << %{<div class="row"><div class="col-md-8"><div class="img-container">}
 
-    out << template.image_tag(object.send(attribute_name), data: { aspect_ratio: aspect_ratio, preview: ".#{attribute_name}_preview", toggle: 'cropp', coord: object.send("#{attribute_name}_attr_coord") })
+    out << template.image_tag(object.send(attribute_name), data: { aspect_ratio: aspect_ratio, preview: ".#{@version}_#{attribute_name}_preview", toggle: 'cropp', coord: @coord_attribute })
 
     out << %{</div></div><div class="col-md-4">}
     out << %{<div class="docs-preview clearfix">}
-    out << %{<div class="img-preview preview-lg #{attribute_name}_preview"></div>}
+    out << %{<div class="img-preview preview-lg #{@version}_#{attribute_name}_preview"></div>}
     out << cropped
 
     out << %{</div></div></div>}
@@ -32,12 +39,12 @@ class CroppInput < SimpleForm::Inputs::Base
   end
 
   def cropped
-    return if object.send("#{attribute_name}_attr_coord").blank?
+    return if @coord_attribute.blank?
 
     out = []
     out << %{<div class="preview-cropped"><figure class="figure">}
 
-    out << template.image_tag(object.send("#{attribute_name}_cropped"))
+    out << template.image_tag(object.send("#{@version}_#{attribute_name}_cropped"))
 
     out << %{<figcaption class="figure-caption text-center">Cropped image</figcaption></figure></div>}
     out.join

data/lib/adminos/helpers/models/cropped.rb

@@ -2,18 +2,22 @@ module Adminos::Cropped
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def cropped(as_attribute, coord_attribute = nil)
+    def cropped(as_attribute, *args)
+      options = args.extract_options!
 
-      define_method "#{as_attribute}_cropped" do
-        public_send(as_attribute).variant(combine_options: { crop: public_send("#{as_attribute}_cropped_coord") })
+      version = options.delete(:version) || :default
+      coord_attribute = options.delete(:coord_attribute) || "#{as_attribute}_coord"
+
+      define_method "#{version}_#{as_attribute}_cropped" do
+        public_send(as_attribute).variant(combine_options: { crop: public_send("#{version}_#{as_attribute}_coord") })
       end
 
-      define_method "#{as_attribute}_attr_coord" do
-        coord_attribute || "#{as_attribute}_coord"
+      define_method "#{version}_#{as_attribute}_attr_coord" do
+        coord_attribute
       end
 
-      define_method "#{as_attribute}_cropped_coord" do
-        public_send(public_send("#{as_attribute}_attr_coord"))
+      define_method "#{version}_#{as_attribute}_coord" do
+        public_send(public_send("#{version}_#{as_attribute}_attr_coord"))
       end
     end
   end

data/lib/generators/adminos/install_generator.rb

@@ -76,9 +76,7 @@ module Adminos::Generators
 
     def install_webpacker
       run 'bundle exec rails webpacker:install'
-      run "yarn add resolve-url-loader adminos"
 
-      copy_file 'webpack/custom.js', 'config/webpack/custom.js'
       copy_file 'webpack/javascript/packs/admin.js', 'app/javascript/packs/admin.js'
       directory 'webpack/javascript/admin', 'app/javascript/admin'
       inject_into_file 'config/webpack/environment.js', file_content('webpack/environment.js'), before: /\nmodule.exports/
@@ -89,7 +87,12 @@ module Adminos::Generators
     end
 
     def install_actiontext
-      run 'bundle exec rails action_text:install'
+      # Assets are stored in adminos-assets
+      run 'bundle exec rails action_text:copy_migrations'
+    end
+
+    def install_adminos_assets
+      run "yarn add adminos"
     end
 
     def install_devise

data/lib/generators/templates/install/Gemfile

@@ -7,7 +7,7 @@ gem 'puma', '~> 3.7'
 gem 'jbuilder', '~> 2.5'
 gem 'role_model'
 gem 'webpacker', '~> 3.5'
-gem "actiontext", github: "rails/actiontext", require: "action_text"
+gem "actiontext", github: "rails/actiontext", require: "action_text", ref: "cfe4674d3637c746cdb3c2b5131e2de498775529"
 gem "image_processing", "~> 1.2" # for Active Storage variants
 
 group :production, :staging do

data/lib/generators/templates/install/admin.slim

@@ -27,7 +27,6 @@ html#no-js lang="ru"
 
     = csrf_meta_tag
 
-    = javascript_pack_tag 'vendor', rel: "prefetch"
     = javascript_pack_tag 'admin'
 
     = yield :javascript

data/lib/generators/templates/install/prepare_settings.rb

@@ -1,4 +1,3 @@
 
 
-Settings.reset_column_information
 Settings.first_or_initialize.update_attributes email: 'studio@molinos.ru', email_header_from: 'studio@molinos.ru', company_name: 'Molinos'

data/lib/generators/templates/install/webpack/environment.js

@@ -1,4 +1,3 @@
-const customConfig = require('./custom')
+const setupAdminos = require('adminos/webpacker');
 
-// Merge custom config
-environment.config.merge(customConfig)
+setupAdminos(environment);

data/lib/generators/templates/install/webpack/javascript/admin/js/index.js

@@ -1,2 +1 @@
 import 'adminos/adminos'
-import 'actiontext';

data/lib/generators/templates/install/webpack/javascript/admin/styles/admin.scss

@@ -1,2 +1 @@
 @import '~adminos/src/scss/adminos_base.scss';
-@import 'trix/dist/trix.css';

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminos
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.1
+  version: 1.0.0.pre.rc.2
 platform: ruby
 authors:
 - RavWar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: path
@@ -562,7 +562,6 @@ files:
 - lib/generators/templates/install/routes.rb.erb
 - lib/generators/templates/install/routes/pages.rb
 - lib/generators/templates/install/settings_migration.rb
-- lib/generators/templates/install/webpack/custom.js
 - lib/generators/templates/install/webpack/environment.js
 - lib/generators/templates/install/webpack/javascript/admin/js/index.js
 - lib/generators/templates/install/webpack/javascript/admin/styles/admin.scss

data/lib/generators/templates/install/webpack/custom.js

@@ -1,36 +0,0 @@
-const {
-  environment
-} = require('@rails/webpacker')
-const webpack = require('webpack')
-
-module.exports = {
-  resolve: {
-    alias: {
-      jquery: 'jquery/src/jquery'
-    }
-  }
-}
-
-// resolve-url-loader must be used before sass-loader
-environment.loaders.get('sass').use.splice(-1, 0, {
-  loader: 'resolve-url-loader'
-});
-
-
-// Insert before a given plugin
-environment.plugins.insert('CommonChunkVendor',
-  new webpack.optimize.CommonsChunkPlugin({
-    name: 'vendor', // Vendor code
-    minChunks: (module) => module.context && module.context.indexOf('node_modules') !== -1
-  }), {
-    before: 'manifest'
-  })
-
-// Add an additional plugin of your choosing : ProvidePlugin
-environment.plugins.prepend(
-  'Provide',
-  new webpack.ProvidePlugin({
-    $: 'jquery',
-    jQuery: 'jquery'
-  })
-)