decko 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b604632f8bbd252bc7f954c977c4aa1cd92da44ac5e67b6f1ec1e4d34742efb
-  data.tar.gz: a5c7188dae289ac477aeb0ee0773b9333787d057f249b6a6d881c5e6e6d06460
+  metadata.gz: 98dd5887f73f65f3b84bab40ddf902f93c56dfbfeea2da826d8eaa2aee9d7bd4
+  data.tar.gz: b4c0bdf1ee67823675b78aa04ab11dc4f69f5a6b45f35ae85775dad115b965be
 SHA512:
-  metadata.gz: afdedb51ec7ee684555e98bcf8635ab85c6d04aaea8bb28a00adcb883b62a4394a39258bb96954138721df39c442153ae284e597b3ad23d7f509f410cba234ff
-  data.tar.gz: ffab9d6259685a51460853a0707ff89221aba038de09d53d975ceca71f2aaa2230c98853766653745315157a03cd5f29d69cd1abdf57637ad681c2efeee8b34e
+  metadata.gz: 2a9f0f9de1c86d450689c19766436f7d001437603a55bbd7c040ce0655fd60004408357ebe5deb5577836dcb08aa2c89cfd6233066dc1812a62c4204327f9482
+  data.tar.gz: 61af0fa92f3dae055ca3c8278cde3a924e1882dc13dccd46d16ff130c69323396b476c5be7fca2dc560dd6b12b36f8ce5e3f6999ce3ea2f39733eb8c02f5398c

data/lib/decko/application.rb

@@ -63,7 +63,9 @@ module Decko
         config.filter_parameters += [:password]
 
         # Rails.autoloaders.log!
-        Rails.autoloaders.main.ignore(File.join(Cardio.gem_root, "lib/card/seed_consts.rb"))
+        Rails.autoloaders.main.ignore(
+          File.join(Cardio.gem_root, "lib/card/seed_consts.rb")
+        )
         config
       end
     end

data/lib/decko/cli.rb

@@ -3,7 +3,7 @@ require "decko/script_decko_loader"
 
 # If we are inside a Decko application this method performs an exec and thus
 # the rest of this script is not run.
-Decko::ScriptDeckoLoader.exec_script_decko!
+Decko::ScriptDeckoLoader.exec!
 
 require "rails/ruby_version_check"
 Signal.trap("INT") { puts; exit(1) }

data/lib/decko/generators/deck/templates/config/application.rb.erb

@@ -36,11 +36,11 @@ module <%= app_const_base %>
     # CACHING
     # config.cache_store = :file_store, "tmp/cache"
     # determines caching mechanism.  options include: file_store, memory_store,
-    # mem_cache_store, dalli_store...
+    # mem_cache_store...
     #
     # for production, we highly recommend memcache
     # here's a sample configuration for use with the dalli gem
-    # config.cache_store = :dalli_store, []
+    # config.cache_store = :mem_cache_store, []
 
 
     # FILES

data/lib/decko/response.rb

@@ -75,12 +75,6 @@ module Decko
       raise Card::Error, "tried to do soft redirect without a card"
     end
 
-    # (obviously) deprecated
-    def send_deprecated_asset
-      filename = [params[:mark], params[:format]].compact.join(".")
-      send_file asset_file_path(filename), x_sendfile: true
-    end
-
     def asset_file_path filename
       path = Decko::Engine.paths["gem-assets"].existent.first
       path = File.join path, filename

data/lib/decko/script_decko_loader.rb

@@ -6,26 +6,40 @@ module Decko
            RbConfig::CONFIG["EXEEXT"]
     SCRIPT_DECKO = File.join("script", "decko")
 
-    def self.exec_script_decko!
-      cwd = Dir.pwd
-      return unless in_decko_application? || in_decko_application_subdirectory?
-      exec RUBY, SCRIPT_DECKO, *ARGV if in_decko_application?
-      Dir.chdir("..") do
-        # Recurse in a chdir block: if the search fails we want to be sure
-        # the application is generated in the original working directory.
-        exec_script_decko! unless cwd == Dir.pwd
+    class << self
+      def exec!
+        cwd = Dir.pwd
+        return unless continue?
+        exec_decko_script
+        recurse cwd
+      rescue SystemCallError
+        # could not chdir, no problem just return
       end
-    rescue SystemCallError
-      # could not chdir, no problem just return
-    end
 
-    def self.in_decko_application?
-      File.exist?(SCRIPT_DECKO)
-    end
+      def recurse cwd
+        Dir.chdir("..") do
+          # Recurse in a chdir block: if the search fails we want to be sure
+          # the application is generated in the original working directory.
+          exec! unless cwd == Dir.pwd
+        end
+      end
+
+      def exec_decko_script
+        exec RUBY, SCRIPT_DECKO, *ARGV if in_application?
+      end
 
-    def self.in_decko_application_subdirectory? path=Pathname.new(Dir.pwd)
-      File.exist?(File.join(path, SCRIPT_DECKO)) ||
-        !path.root? && in_decko_application_subdirectory?(path.parent)
+      def continue?
+        in_application? || in_application_subdirectory?
+      end
+
+      def in_application?
+        File.exist?(SCRIPT_DECKO)
+      end
+
+      def in_application_subdirectory? path=Pathname.new(Dir.pwd)
+        File.exist?(File.join(path, SCRIPT_DECKO)) ||
+          !path.root? && in_application_subdirectory?(path.parent)
+      end
     end
   end
 end

data/rails/controllers/card_controller.rb

@@ -29,11 +29,10 @@ class CardController < ApplicationController
     handle { card.delete! }
   end
 
-  # @deprecated
   def asset
-    Rails.logger.info "Routing assets through Card. Recommend symlink from " \
-                      'Deck to Card gem using "rake decko:update_assets_symlink"'
-    send_deprecated_asset
+    body = "Decko installation error: missing asset symlinks"
+    Rails.logger.info "#{body}.\n  >>> Try `rake decko:update_assets_symlink`"
+    render body: body, status: 404
   end
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -57,7 +56,7 @@ class CardController < ApplicationController
   end
 
   def authenticate
-    Card::Auth.signin_with token: params[:token], api_key: params[:api_key]
+    Card::Auth.signin_with params
   end
 
   def load_mark
@@ -117,6 +116,7 @@ class CardController < ApplicationController
   end
 
   def view_from_params
-    params[:view] || params[:v]
+    %i[view v].each { |k| return params[k] if params[k].present? }
+    nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.3
+        version: 1.101.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.3
+        version: 1.101.4
 - !ruby/object:Gem::Dependency
   name: card-mod-defaults
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
 description: a wiki approach to structured data, dynamic interaction,  and web design
 email:
 - info@decko.org