yarii-cloudinary 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2115382b22cd6ec1f837726a9833a5622b183ca9418d38e9a9cd59e32c1b81
-  data.tar.gz: eb99a32df5167f42dfbba216c0f4760376b946010caace3c36ef1d4d0381de1d
+  metadata.gz: cf44fd307805a0b809d541cebcedc9c78647ae2e4e768c04cfe33179f067193d
+  data.tar.gz: b685f67566d287bb5061f183969d67cc02a56f78f2189d4085ee291a3c6d7501
 SHA512:
-  metadata.gz: a6d7f2eecf836e21b4b9752044aa61f0f92893fc7e08a378f15d27b9b165f852373ea77acf951f3c6bc6651af37bb0b5c5733fe050c6697703a493b28f8b3d21
-  data.tar.gz: ad83d05e4d0618d614d3d2787398acf6d30283e87d5c6b7ac094e0e1c8a8c2dfbc9be565b6dd52f2c8def9d69c6abfc2db65d332d0f0dd80d5a4975e67e8f905
+  metadata.gz: b27fc372cf45960977c0909db4992abdcdde8a83596f5d17b094e29b8745edd5c30642b27085c77c696bbb32126417a67dc42b15b6194a5b4675e28215c132a8
+  data.tar.gz: f263dd85b3b1d320fca0564ae87e5375dd8993bf30eaece1dcb1addc41bb9e20c79cf1dc757fc64d17334538e68da1939e9541c246541e707eb1b11da3663436

data/README.md

@@ -6,8 +6,8 @@ Short description and motivation. Etc.
 
 * `yarii_editor` upload preset needed in Cloudinary (also media needs to be tagged 'yarii_editor')
 * Add the modal to dashboard extras
-* Add the head renderer (yarii_extra_head)
-* Add the gem initializer
+* Add `import "yarii-cloudinary"` to your Yarii extras pack (`app/javascript/packs/yariiextras.js`)
+* Add the gem initializer (?)
 * Add the route
 
 ## Usage

data/app/javascript/index.js

@@ -0,0 +1,7 @@
+import "../styles/index.scss"
+import { Application } from "stimulus"
+import { definitionsFromContext } from "stimulus/webpack-helpers"
+
+const application = Application.start()
+const context = require.context("./controllers", true, /_controller\.js$/)
+application.load(definitionsFromContext(context))

data/lib/yarii-cloudinary.rb

@@ -1,15 +1,15 @@
 require "yarii-cloudinary/engine"
 
 module YariiCloudinary
-  ROOT_PATH = Pathname.new(File.join(__dir__, ".."))
+  # ROOT_PATH = Pathname.new(File.join(__dir__, ".."))
 
-  class << self
-    def webpacker
-      @webpacker ||= ::Webpacker::Instance.new(
-        root_path: ROOT_PATH,
-        config_path: ROOT_PATH.join("config/webpacker.yml")
-      )
-    end
-  end
+  # class << self
+  #   def webpacker
+  #     @webpacker ||= ::Webpacker::Instance.new(
+  #       root_path: ROOT_PATH,
+  #       config_path: ROOT_PATH.join("config/webpacker.yml")
+  #     )
+  #   end
+  # end
 end
 

data/lib/yarii-cloudinary/engine.rb

@@ -1,12 +1,14 @@
+require "cloudinary"
+
 module YariiCloudinary
   class Engine < ::Rails::Engine
     isolate_namespace YariiCloudinary
 
-    ROOT_PATH = Pathname.new(File.join(__dir__, "..", ".."))
+    # ROOT_PATH = Pathname.new(File.join(__dir__, "..", ".."))
 
-    config.app_middleware.use(
-      Rack::Static,
-      urls: ["/yarii-cloudinary-packs"], root: ROOT_PATH.join("public")
-    )
+    # config.app_middleware.use(
+    #   Rack::Static,
+    #   urls: ["/yarii-cloudinary-packs"], root: ROOT_PATH.join("public")
+    # )
   end
 end

data/lib/yarii-cloudinary/version.rb

@@ -1,3 +1,3 @@
 module YariiCloudinary
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end

data/package.json

@@ -1,15 +1,27 @@
 {
   "name": "yarii-cloudinary",
-  "private": true,
+  "version": "0.2.5",
+  "main": "app/javascript/index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/whitefusionhq/yarii-cloudinary"
+  },
+  "author": "Jared White <jared@whitefusion.io>",
+  "homepage": "https://whitefusion.io",
+  "license": "MIT",
+  "private": false,
   "dependencies": {
-    "@rails/webpacker": "^4.0.7",
     "axios": "^0.18.0",
     "cloudinary-core": "^2.7.4",
     "html-loader": "^0.5.5",
     "stimulus": "^1.1.1"
   },
-  "version": "0.1.0",
   "devDependencies": {
+    "@rails/webpacker": "^4.0.7",
     "webpack-dev-server": "^3.8.1"
-  }
+  },
+  "files": [
+    "app/javascript",
+    "app/styles"
+  ]
 }

data/yarii-cloudinary.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.name        = "yarii-cloudinary"
   spec.version     = YariiCloudinary::VERSION
   spec.authors     = ["Jared White"]
-  spec.email       = ["jared@jaredwhite.com"]
-  spec.homepage    = "https://whitefusion.io"
+  spec.email       = ["jared@whitefusion.io"]
+  spec.homepage    = "https://github.com/whitefusionhq/yarii-cloudinary"
   spec.summary     = "Allows images to be loaded and viewed in Yarii via the Cloudinary service"
   spec.description = spec.summary
   spec.license     = "MIT"
@@ -17,6 +17,5 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|script|spec|features)/!) }
 
   spec.add_dependency "rails", "~> 6.0.0"
-  spec.add_dependency "webpacker", "~> 4.0"
   spec.add_dependency "cloudinary", "~> 1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarii-cloudinary
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Jared White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.0
-- !ruby/object:Gem::Dependency
-  name: webpacker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cloudinary
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +40,7 @@ dependencies:
         version: '1.12'
 description: Allows images to be loaded and viewed in Yarii via the Cloudinary service
 email:
-- jared@jaredwhite.com
+- jared@whitefusion.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -66,18 +52,13 @@ files:
 - Procfile.staging
 - README.md
 - Rakefile
-- app/assets/images/yarii_cloudinary/.keep
 - app/controllers/yarii_cloudinary/application_controller.rb
 - app/controllers/yarii_cloudinary/media_controller.rb
-- app/helpers/yarii_cloudinary/application_helper.rb
 - app/javascript/controllers/cloudinary_browse_media_controller.js
 - app/javascript/controllers/cloudinary_multiple_media_controller.js
 - app/javascript/controllers/cloudinary_single_media_controller.js
-- app/javascript/controllers/index.js
-- app/javascript/packs/application.js
-- app/jobs/yarii_cloudinary/application_job.rb
+- app/javascript/index.js
 - app/styles/index.scss
-- app/views/yarii_cloudinary/application/yarii_cloudinary_head.erb
 - app/views/yarii_cloudinary/media/_browse_thumbnail.html.erb
 - app/views/yarii_cloudinary/media/_form_thumbnail.html.erb
 - app/views/yarii_cloudinary/media/_modal.html.erb
@@ -89,14 +70,7 @@ files:
 - bin/rails
 - bin/webpack
 - config/routes.rb
-- config/webpack/development.js
-- config/webpack/environment.js
-- config/webpack/production.js
-- config/webpack/staging.js
-- config/webpack/test.js
-- config/webpacker.yml
 - db/migrate/20190923000809_create_yarii_sites.rb
-- lib/tasks/yarii_cloudinary_tasks.rake
 - lib/yarii-cloudinary.rb
 - lib/yarii-cloudinary/engine.rb
 - lib/yarii-cloudinary/version.rb
@@ -104,7 +78,7 @@ files:
 - postcss.config.js
 - yarii-cloudinary.gemspec
 - yarn.lock
-homepage: https://whitefusion.io
+homepage: https://github.com/whitefusionhq/yarii-cloudinary
 licenses:
 - MIT
 metadata: {}

data/app/helpers/yarii_cloudinary/application_helper.rb

@@ -1,9 +0,0 @@
-module YariiCloudinary
-  module ApplicationHelper
-    include ::Webpacker::Helper
-
-    def current_webpacker_instance
-      YariiCloudinary.webpacker
-    end
-  end
-end

data/app/javascript/controllers/index.js

@@ -1,11 +0,0 @@
-// Load all the controllers within this directory and all subdirectories. 
-// Controller files must be named *_controller.js.
-
-import { Application } from "stimulus"
-import { definitionsFromContext } from "stimulus/webpack-helpers"
-
-const application = Application.start()
-const context = require.context("controllers", true, /_controller\.js$/)
-application.load(definitionsFromContext(context))
-
-console.info("cloudinary II:!")

data/app/javascript/packs/application.js

@@ -1,2 +0,0 @@
-import '../../styles/index.scss'
-import "controllers"

data/app/jobs/yarii_cloudinary/application_job.rb

@@ -1,4 +0,0 @@
-module YariiCloudinary
-  class ApplicationJob < ActiveJob::Base
-  end
-end

data/app/views/yarii_cloudinary/application/yarii_cloudinary_head.erb

@@ -1,2 +0,0 @@
-<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
-<%= stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload' %>

data/config/webpack/development.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpack/environment.js

@@ -1,3 +0,0 @@
-const { environment } = require('@rails/webpacker')
-
-module.exports = environment

data/config/webpack/production.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'production'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpack/staging.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'staging'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpack/test.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpacker.yml

@@ -1,110 +0,0 @@
-# Note: You must restart bin/webpack-dev-server for changes to take effect
-
-default: &default
-  source_path: app/javascript
-  source_entry_path: packs
-  public_root_path: public
-  # use a different sub-folder name
-  public_output_path: yarii-cloudinary-packs
-
-  cache_path: tmp/cache/webpacker
-  check_yarn_integrity: false
-  webpack_compile_output: false
-
-  # Additional paths webpack should lookup modules
-  # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths: []
-
-  # Reload manifest.json on all requests so we reload latest compiled packs
-  cache_manifest: false
-
-  # Extract and emit a css file
-  extract_css: true
-
-  static_assets_extensions:
-    - .jpg
-    - .jpeg
-    - .png
-    - .gif
-    - .tiff
-    - .ico
-    - .svg
-    - .eot
-    - .otf
-    - .ttf
-    - .woff
-    - .woff2
-
-  extensions:
-    - .mjs
-    - .js
-    - .sass
-    - .scss
-    - .css
-    - .module.sass
-    - .module.scss
-    - .module.css
-    - .png
-    - .svg
-    - .gif
-    - .jpeg
-    - .jpg
-
-development:
-  <<: *default
-  compile: true
-
-  # Verifies that versions and hashed value of the package contents in the project's package.json
-  check_yarn_integrity: true
-
-  # Reference: https://webpack.js.org/configuration/dev-server/
-  dev_server:
-    https: false
-    host: localhost
-    port: 3035
-    public: localhost:3035
-    hmr: false
-    # Inline should be set to true if using HMR
-    inline: true
-    overlay: true
-    compress: true
-    disable_host_check: true
-    use_local_ip: false
-    quiet: false
-    headers:
-      'Access-Control-Allow-Origin': '*'
-    watch_options:
-      ignored: '**/node_modules/**'
-
-
-test:
-  <<: *default
-  compile: true
-
-  # Compile test packs to a separate directory
-  public_output_path: packs-test
-
-staging:
-  <<: *default
-
-  # Staging, like Production, depends on precompilation of packs prior to booting for performance.
-  compile: false
-
-  # Extract and emit a css file
-  extract_css: true
-
-  # Cache manifest.json for performance
-  cache_manifest: true
-
-
-production:
-  <<: *default
-
-  # Production depends on precompilation of packs prior to booting for performance.
-  compile: false
-
-  # Extract and emit a css file
-  extract_css: true
-
-  # Cache manifest.json for performance
-  cache_manifest: true

data/lib/tasks/yarii_cloudinary_tasks.rake

@@ -1,61 +0,0 @@
-def ensure_log_goes_to_stdout
-  old_logger = Webpacker.logger
-  Webpacker.logger = ActiveSupport::Logger.new(STDOUT)
-  yield
-ensure
-  Webpacker.logger = old_logger
-end
-
-
-namespace :yarii_cloudinary do
-  namespace :webpacker do
-    desc "Install deps with yarn"
-    task :yarn_install do
-      Dir.chdir(File.join(__dir__, "../..")) do
-        system "yarn install --no-progress --production"
-      end
-    end
-
-    desc "Compile JavaScript packs using webpack for production with digests"
-    task compile: [:yarn_install, :environment] do
-      Webpacker.with_node_env("production") do
-        ensure_log_goes_to_stdout do
-          if YariiCloudinary.webpacker.commands.compile
-            # Successful compilation!
-            puts "YariiCloudinary Plugin -- Webpacker success"
-          else
-            # Failed compilation
-            puts "YariiCloudinary Plugin -- something's wrong with Webpacker!"
-            exit!
-          end
-        end
-      end
-    end
-  end
-end
-
-def yarn_install_available?
-  rails_major = Rails::VERSION::MAJOR
-  rails_minor = Rails::VERSION::MINOR
-
-  rails_major > 5 || (rails_major == 5 && rails_minor >= 1)
-end
-
-def enhance_assets_precompile
-  # yarn:install was added in Rails 5.1
-  deps = yarn_install_available? ? [] : ["yarii_cloudinary:webpacker:yarn_install"]
-  Rake::Task["assets:precompile"].enhance(deps) do
-    Rake::Task["yarii_cloudinary:webpacker:compile"].invoke
-  end
-end
-
-# Compile packs after we've compiled all other assets during precompilation
-skip_webpacker_precompile = %w(no false n f).include?(ENV["WEBPACKER_PRECOMPILE"])
-
-unless skip_webpacker_precompile
-  if Rake::Task.task_defined?("assets:precompile")
-    enhance_assets_precompile
-  else
-    Rake::Task.define_task("assets:precompile" => "yarii_cloudinary:webpacker:compile")
-  end
-end