decko 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0009a6016bd8f767f1d76e388b713edad0abcaaf85a6c77c6bdc03e83c8407d4'
-  data.tar.gz: 802012ba6e744887a7b2f6a00e38ee0e9f981a39cdf384511806b76f8703d77d
+  metadata.gz: 5c4d11e173080926b6090e4ea9956b6a66ea0e586ea7e4a7bfb153024c31bc66
+  data.tar.gz: 2f8758155c3a1928289471ea51dffe4e7db96979786224b625df279785eeb702
 SHA512:
-  metadata.gz: 36a24c6d78443dd2a9b8fdda3b7ea47b0fb613bb8ae1d3da9d886bfea541d7bb2514f176ecf997940cb40f5f677bc810ac021e9cd185135697a23924a53155ab
-  data.tar.gz: 2e4b4e98775847928a52f39f5597eb2814c9c2fc83deee743a2eac3c4fdcc51b5f31c9a810e9cd7e495664d60ac5530f15072f8244f7d290764484899f5e2af2
+  metadata.gz: 467dfe8fd38663262c3bdb979315799ea0f79c3788084b7e2fe441a4fd08a284d66357baac04ea01de4aebf9f0b51507dd35de755b5d18945a2e0755b4c13e3d
+  data.tar.gz: 626d9a6ece3f0a4c601aa50327d6245bdc119c8a6743450c87b446f05d97edf31993e7fb8d3f6cb6b5d4747452fc220809a7947656e61d363e42f32ef01aad4e

data/README.rdoc

@@ -1,6 +1,6 @@
 =Decko: you hold the cards
 
-{<img src="https://semaphoreci.com/api/v1/projects/0d61c1f9-5ef0-4c5c-89c6-7664e247e4be/294670/shields_badge.svg" />}[https://semaphoreci.com/ethan/decko]
+{<img src="https://semaphoreci.com/api/v1/ethan/decko/branches/master/shields_badge.svg" />}[https://semaphoreci.com/ethan/decko]
 {<img src="https://badge.fury.io/rb/decko.svg" alt="Gem Version" />}[https://badge.fury.io/rb/decko]
 {<img src="https://codeclimate.com/repos/56548cb6fafb98574e013c39/badges/be88db3f72d0fd06ace3/gpa.svg" />}[https://codeclimate.com/repos/56548cb6fafb98574e013c39/feed]
 
@@ -22,7 +22,7 @@ Try it out!
 
 ===1. install dependencies
 
-Ruby[http://www.ruby-lang.org/en/]:: version 2.3.1 or higher
+Ruby[http://www.ruby-lang.org/en/]:: version 2.5 or higher
 Bundler[http://gembundler.com/]:: version 1.0 or higher
 ImageMagick[http://www.imagemagick.org/]::
 A database engine:: Either MySQL[http://www.mysql.com/] or PostgreSQL[http://www.postgresql.org/]
@@ -148,4 +148,4 @@ Installation problems? Installation: https://decko.org/installation
 
 If you're looking to go deep into the code, start with http://www.rubydoc.info/gems/card
 
-Thinking about contributing to Decko? here[link:CONTRIBUTING.rdoc]
+Thinking about contributing to Decko? here[link:CONTRIBUTING.md]

data/lib/decko/commands/rspec_command/parser.rb

@@ -5,21 +5,22 @@ module Decko
   module Commands
     class RspecCommand
       class Parser < OptionParser
-        def initialize opts
-          super() do |parser|
-            parser.banner = "Usage: decko rspec [DECKO ARGS] -- [RSPEC ARGS]\n\n" \
-                            "RSPEC ARGS"
-            parser.separator <<-EOT
+        RSPEC_PATH_MESSAGE = <<-EOT
 
             DECKO ARGS
 
-            You don't have to give a full path for FILENAME, the basename is enough
-              If FILENAME does not include '_spec' rspec searches for the
-              corresponding spec file.
-              The line number always referes to example in the (corresponding) spec
-              file.
+            You don't have to give a full path for FILENAME; the basename is enough.
+            If FILENAME does not include '_spec', then rspec searches for the
+            corresponding spec file.
+            The line number always refers to the example in the spec file.
+
+        EOT
 
-            EOT
+        def initialize opts
+          super() do |parser|
+            parser.banner = "Usage: decko rspec [DECKO ARGS] -- [RSPEC ARGS]\n\n" \
+                            "RSPEC ARGS"
+            parser.separator RSPEC_PATH_MESSAGE
 
             parser.on("-d", "--spec FILENAME(:LINE)",
                       "Run spec for a Decko deck file") do |file|
@@ -31,42 +32,53 @@ module Decko
             end
             parser.on("-m", "--mod MODNAME",
                       "Run all specs for a mod or matching a mod") do |file|
-              opts[:files] =
-                if File.exist?("mod/#{file}")
-                  "#{Cardio.gem_root}/mod/#{file}"
-                elsif File.exist?("#{Cardio.gem_root}/mod/#{file}")
-                  "#{Cardio.gem_root}/mod/#{file}"
-                elsif (files = find_spec_file(file, "mod")) && files.present?
-                  files
-                else
-                  find_spec_file(file, "#{Cardio.gem_root}/mod")
-                end
+              opts[:files] = find_mod_file(file, Cardio.gem_root)
             end
             parser.on("-s", "--[no-]simplecov", "Run with simplecov") do |s|
               opts[:simplecov] = s ? "" : "COVERAGE=false"
             end
             parser.on("--rescue", "Run with pry-rescue") do
-              if opts[:executer] == "spring"
-                puts "Disabled pry-rescue. Not compatible with spring."
-              else
-                opts[:rescue] = "rescue "
-              end
+              process_rescue_opts opts
             end
             parser.on("--[no-]spring", "Run with spring") do |spring|
-              if spring
-                opts[:executer] = "spring"
-                if opts[:rescue]
-                  opts[:rescue] = ""
-                  puts "Disabled pry-rescue. Not compatible with spring."
-                end
-              else
-                opts[:executer] = "bundle exec"
-              end
+              process_spring_opts spring, opts
             end
             parser.separator "\n"
           end
         end
 
+        private
+
+        def process_rescue_opts opts
+          if opts[:executer] == "spring"
+            puts "Disabled pry-rescue. Not compatible with spring."
+          else
+            opts[:rescue] = "rescue "
+          end
+        end
+
+        def process_spring_opts spring, opts
+          if spring
+            opts[:executer] = "spring"
+            if opts[:rescue]
+              opts[:rescue] = ""
+              puts "Disabled pry-rescue. Not compatible with spring."
+            end
+          else
+            opts[:executer] = "bundle exec"
+          end
+        end
+
+        def find_mod_file filename, base_dir
+          if File.exist?("mod/#{filename}") || File.exist?("#{base_dir}/mod/#{filename}")
+            "#{base_dir}/mod/#{filename}"
+          elsif (files = find_spec_file(filename, "mod"))&.present?
+            files
+          else
+            find_spec_file(file, "#{base_dir}/mod")
+          end
+        end
+
         def find_spec_file filename, base_dir
           file, line = filename.split(":")
           if file.include?("_spec.rb") && File.exist?(file)

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

@@ -22,8 +22,6 @@ Decko.application.class.configure do
   config.cache_classes = false
   config.reload_classes_only_on_change = true
 
-  config.reload_sets = true
-
   # if defined?(RailsDevTweaks)
   #   config.dev_tweaks.autoload_rules do
   #     skip "/files"

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

@@ -64,4 +64,7 @@ Decko.application.class.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # cache the list of set module objects on card objects
+  config.cache_set_module_list = true
 end

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

@@ -10,7 +10,7 @@ Decko.application.class.configure do
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
 
   config.assets.enabled = true if Object.const_defined?(:JasmineRails)
 

data/lib/decko/engine.rb

@@ -47,12 +47,12 @@ module Decko
       ActiveSupport.on_load(:active_record) do
         ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
       end
-      ActiveSupport.on_load(:after_initialize) do
-        # 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
+      # ActiveSupport.on_load(:after_initialize) do
+      #   # 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
     end
   end
 end

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

@@ -32,8 +32,8 @@ group :test do
   gem 'rspec'
   gem 'rspec-rails', '~>4.0.0.beta2'         # behavior-driven-development suite
   gem 'spork', '>=0.9'
-  gem 'rubocop'
-  gem 'rubocop-decko'
+  gem 'rubocop', '0.88' # 0.89 introduced bugs. may get resolved in rubocop-decko update?
+  # gem 'rubocop-decko'
   gem 'nokogumbo'
 end
 

data/lib/decko/mods_spec_helper.rb

@@ -21,3 +21,5 @@ CardSpecLoader.each_run do
 end
 
 CardSpecLoader.helper
+
+Decko::ModsSpecHelper = :needs_a_value_so_spring_loader_is_happy

data/lib/decko/response.rb

@@ -1,6 +1,10 @@
 module Decko
   # methods for managing decko responses
   module Response
+    def response_format
+      @response_format ||= format_name_from_params
+    end
+
     private
     def respond format, result, status
       if status.in? [302, 303]
@@ -94,7 +98,7 @@ module Decko
 
     def load_format
       request.format = :html if implicit_html?
-      card.format format_name_from_params
+      card.format response_format
     end
 
     def implicit_html?
@@ -139,7 +143,7 @@ module Decko
     end
 
     def home_mark
-      Card.global_setting(:home) || "Home"
+      Card::Rule.global_setting(:home) || "Home"
     end
 
     def view_does_not_require_name?

data/rails/controllers/card_controller.rb

@@ -50,7 +50,6 @@ 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
@@ -87,10 +86,8 @@ class CardController < ApplicationController
   # ----------( HELPER METHODS ) -------------
 
   def handle
-    card.act do
-      Card::Env.success card.name
-      yield ? cud_success : raise(Card::Error::UserError)
-    end
+    Card::Env.success card.name
+    yield ? cud_success : raise(Card::Error::UserError)
   end
 
   # successful create, update, or delete act
@@ -129,6 +126,7 @@ class CardController < ApplicationController
     show error.class.view, error.class.status_code
   end
 
+  # TODO: move to exception object
   def debug_exception? e
     !e.is_a?(Card::Error::UserError) &&
       !e.is_a?(ActiveRecord::RecordInvalid) &&

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Ethan McCutchen
 - Philipp Kühl
 - Lewis Hoffman
 - Gerry Gleason
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-09-11 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.2
+        version: 1.100.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.99.2
+        version: 1.100.0
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -145,7 +145,7 @@ licenses:
 - GPL-2.0
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: structured wiki web platform
 test_files: []