decko 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b570615d3229e0e2787a1852b4ee244ab253b90d84b94fbf5f8f0768d4bcfc41
-  data.tar.gz: 7dffd146a253b8be1d93e1912ef89a4aca2d7f4d26d865565ad50f0e98065d03
+  metadata.gz: '0009a6016bd8f767f1d76e388b713edad0abcaaf85a6c77c6bdc03e83c8407d4'
+  data.tar.gz: 802012ba6e744887a7b2f6a00e38ee0e9f981a39cdf384511806b76f8703d77d
 SHA512:
-  metadata.gz: 8a7df9387389e0d937499a03d9ddd61784dada32213e17bc3f50de9ba5e28add135bfcdbfed692c8b142b372d5be8b34cbf6052318a3920a7c5d17d221a5cbd2
-  data.tar.gz: 37ad575bd07c5e565eeb439757172ca733b74db9c9c105006306a5876457bcd008e334dba1bdf7873db61917bcdd056746a6de6e9a40c8df8cf0b558a107204a
+  metadata.gz: 36a24c6d78443dd2a9b8fdda3b7ea47b0fb613bb8ae1d3da9d886bfea541d7bb2514f176ecf997940cb40f5f677bc810ac021e9cd185135697a23924a53155ab
+  data.tar.gz: 2e4b4e98775847928a52f39f5597eb2814c9c2fc83deee743a2eac3c4fdcc51b5f31c9a810e9cd7e495664d60ac5530f15072f8244f7d290764484899f5e2af2

data/lib/decko/application.rb

@@ -20,10 +20,6 @@ module Decko
       end
     end
 
-    initializer :load_card, after: :load_config_initializers, group: :all do
-      Card if Cardio.load_card?
-    end
-
     class << self
       def inherited base
         super
@@ -53,12 +49,15 @@ module Decko
         # therefore, in general, they should be restricted to settings that
         # (1) are specific to the web environment, and
         # (2) should not be overridden
-        # ...and we should address (c) above!
+        # ..and we should address (c) above!
 
         # general card settings (overridable and not) should be in cardio.rb
         # overridable decko-specific settings don't have a place yet
         # but should probably follow the cardio pattern.
 
+        # config.load_defaults "6.0"
+        config.autoloader = :zeitwerk
+        config.load_default = "6.0"
         config.i18n.enforce_available_locales = true
         # config.active_record.raise_in_transactional_callbacks = true
 
@@ -67,6 +66,9 @@ module Decko
         config.assets.version = "1.0"
 
         config.filter_parameters += [:password]
+
+        # Rails.autoloaders.log!
+        Rails.autoloaders.main.ignore(File.join(Cardio.gem_root, "lib/card/seed_consts.rb"))
         config
       end
     end

data/lib/decko/config/environments/cypress.rb

@@ -20,13 +20,13 @@ Decko.application.class.configure do
   config.cache_classes = false
   config.reload_classes_only_on_change = false
 
-  if defined?(RailsDevTweaks)
-    config.dev_tweaks.autoload_rules do
-      skip "/files"
-      skip "/favicon.ico"
-      skip /view\=status/
-    end
-  end
+  # if defined?(RailsDevTweaks)
+  #   config.dev_tweaks.autoload_rules do
+  #     skip "/files"
+  #     skip "/favicon.ico"
+  #     skip /view\=status/
+  #   end
+  # end
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true

data/lib/decko/config/environments/development.rb

@@ -20,15 +20,17 @@ Decko.application.class.configure do
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
-  config.reload_classes_only_on_change = false
-
-  if defined?(RailsDevTweaks)
-    config.dev_tweaks.autoload_rules do
-      skip "/files"
-      skip "/favicon.ico"
-      skip /view\=status/
-    end
-  end
+  config.reload_classes_only_on_change = true
+
+  config.reload_sets = true
+
+  # if defined?(RailsDevTweaks)
+  #   config.dev_tweaks.autoload_rules do
+  #     skip "/files"
+  #     skip "/favicon.ico"
+  #     skip /view\=status/
+  #   end
+  # end
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true

data/lib/decko/engine.rb

@@ -48,7 +48,8 @@ module Decko
         ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
       end
       ActiveSupport.on_load(:after_initialize) do
-        require_dependency "card" if Cardio.load_card?
+        # require "card" if Cardio.load_card?
+        Card if Cardio.load_card?
       rescue ActiveRecord::StatementInvalid => e
         ::Rails.logger.warn "database not available[#{::Rails.env}] #{e}"
       end

data/lib/decko/generators/decko/templates/Gemfile

@@ -45,7 +45,6 @@ group :test, :development do
   gem 'colorize'
   gem 'delayed_job_active_record', '~> 4.1'
   gem 'html2haml'
-  gem 'rails-dev-tweaks'
   # gem 'jasmine'
   # gem 'jasmine-rails'
   # gem 'jasmine-jquery-rails'

data/lib/decko/tasks/decko.rake

@@ -171,7 +171,7 @@ decko_namespace = namespace :decko do
       follower_hash.each do |user, items|
         next unless (card = Card.fetch(user)) && card.account
         Card::Auth.as(user) do
-          following = card.fetch trait: "following", new: {}
+          following = card.fetch "following", new: {}
           following.items = items
         end
       end

data/rails/controllers/card_controller.rb

@@ -1,15 +1,10 @@
 # -*- encoding : utf-8 -*-
 
-require_dependency "card"
-require_dependency "decko/response"
-require_dependency "card/mailer"  # otherwise Net::SMTPError rescues can cause
-# problems when error raised comes before Card::Mailer is mentioned
-
 # Decko's only controller.
 class CardController < ApplicationController
-  include Card::Env::Location
-  include Recaptcha::Verify
-  include Decko::Response
+  include ::Card::Env::Location
+  include ::Recaptcha::Verify
+  include ::Decko::Response
 
   layout nil
   attr_reader :card
@@ -55,13 +50,14 @@ class CardController < ApplicationController
   before_action :refresh_card, only: [:create, :update, :delete]
 
   def setup
+    Card::Mod::Loader.reload_sets if Cardio.config.reload_sets
     Card::Machine.refresh_script_and_style unless params[:explicit_file]
     Card::Cache.renew
     Card::Env.reset controller: self
   end
 
   def authenticate
-    Card::Auth.set_current token: params[:token], api_key: params[:api_key]
+    Card::Auth.signin_with token: params[:token], api_key: params[:api_key]
   end
 
   def load_mark
@@ -136,6 +132,7 @@ class CardController < ApplicationController
   def debug_exception? e
     !e.is_a?(Card::Error::UserError) &&
       !e.is_a?(ActiveRecord::RecordInvalid) &&
+      Card::Codename[:debugger] &&
       Card[:debugger]&.content =~ /on/  # && !Card::Env.ajax?
   end
 
@@ -147,7 +144,7 @@ class CardController < ApplicationController
     end
 
     def rescue_all?
-      Card.config.rescue_all_in_controller
+      Cardio.config.rescue_all_in_controller
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.99.1
+        version: 1.99.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.99.1
+        version: 1.99.2
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org