decko 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4018b7131885e48e51f584ef71b01136360e459aa14f8e68902d93b7d4ca2d9
-  data.tar.gz: 25fe31c5e4d15e9e859f3ba7bd24fcc05e05f36d799f09044cd4393ec56ee2ae
+  metadata.gz: 2a17a0150b6449cc689a0c12a358b7e5fbd826c2bd77cd2afc35e7fb9f7e176a
+  data.tar.gz: ed5a8517dca15772ac1ff9e13c3b55f419ab4f8b6fcbfe4f838240129c33ea05
 SHA512:
-  metadata.gz: bfe7ffdf0f311d98016428ebb9fc6bba09917793eae1551df5661776d808a335d752388619ae8625231da39bbdb8b044498c6059274fed1a0ca0877fe766b2da
-  data.tar.gz: 76a42b154b15c65575b63cab3ea021dab962aad73ff856663156110aed001f826227c9e0249f1ea0c62f16957e715f6366d273d0f15fe24c7b2abc35356491c5
+  metadata.gz: cc0429cd9c292009503a422005a8fdd12e39c1b3464ac3b9be786025e00e18362c234a0da075331fa3feed65c862b1a4f98a70df82a738cd36b84484b85073d2
+  data.tar.gz: 380832ea3ac521b77ffae9ee57b577917676fa9436a8e262768464be3103fffb6954e9e4ada389e8cf95c78acc0905c9e3a4f334bfdd2768955d1ba809786818

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/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

@@ -128,6 +128,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-06-03 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.5
+        version: 1.99.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.99.5
+        version: 1.99.6
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org