decko 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5d97bf5746fea2ca22cbbc1498cc9aa4cc82141
-  data.tar.gz: 1967e966949ff744935fd5791125a1525357595d
+  metadata.gz: 3bfe665a6798cb6d119bb776e202dce24979bf5f
+  data.tar.gz: abb5cb4c0a969cdbbc16c8dd4db5ad56ac0525c2
 SHA512:
-  metadata.gz: 122893f178aa72dc0e5dcd12d3eec005d9aae3087647be70fa9df73d1ccd521045c1b08efc1032d331c3ab37eb3a382176467e6cdb149cbddb847d04c8705ee0
-  data.tar.gz: 0f51e06ae726e1467f60b28bda92ab7e08da3e6edcb99806a8e53f066a015f3acc93096b0ab431c621dde0008a66cb05dfa87d0cda48df446fba7f782437f2cf
+  metadata.gz: ac95d083126c0a2aad3b617f17791b7598fa774ee86ff967c972307a09a7541f2a7729f55a5a1fc70a4845aac613e89d976014445bef24ae0be6980a998a5f7b
+  data.tar.gz: 8c2fa80ddceb0366c36fceebf0b445dc53c92286b6f7bf1c976f2ab078c420d9bb5218439dc16a9845221a217c7c765e0fc499ab1b216638aef38c7505f82ed3

data/lib/decko/application.rb

@@ -21,7 +21,7 @@ module Decko
     end
 
     initializer :load_card, after: :load_config_initializers, group: :all do
-       Card
+      Card if Cardio.load_card?
     end
 
     class << self

data/lib/decko/commands/command.rb

@@ -1,3 +1,5 @@
+# require "English" # needed for CHILD_STATUS, but not sure this is the best place for this.
+
 module Decko
   module Commands
     class Command

data/lib/decko/commands/rake_command.rb

@@ -1,4 +1,5 @@
 require File.expand_path("../command", __FILE__)
+# require "pry"
 
 module Decko
   module Commands
@@ -15,13 +16,18 @@ module Decko
       end
 
       def run
-        command.each do |cmd|
+        commands.each do |cmd|
           puts cmd
-          puts `#{cmd}`
+          # exit_with_child_status cmd
+
+          result = `#{cmd}`
+          process = $?
+          puts result
+          exit process.exitstatus unless process.success?
         end
       end
 
-      def command
+      def commands
         task_cmd = "bundle exec rake #{@task}"
         return [task_cmd] if !@envs || @envs.empty?
         @envs.map do |env|

data/lib/decko/engine.rb

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

data/lib/decko/generators/decko/decko_generator.rb

@@ -88,7 +88,7 @@ class DeckoGenerator < Rails::Generators::AppBase
       template "boot.rb"
       template "databases/#{options[:database]}.yml", "database.yml"
       template "cucumber.yml" if options["core-dev"]
-      template "initializers/cypress_dev.rb" if options["core-dev"]
+      template "initializers/cypress_on_rails.rb" if options["core-dev"]
     end
   end
 

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

@@ -38,7 +38,7 @@ group :test do
 end
 
 group :test, :cypress do
-  gem 'cypress-on-rails', '~> 1.2'
+  gem 'cypress-on-rails', '~> 1.4'
 end
 
 group :test, :development do

data/lib/decko/generators/decko/templates/config/initializers/cypress_on_rails.rb

@@ -0,0 +1,10 @@
+if defined?(CypressOnRails)
+  CypressOnRails.configure do |c|
+    c.cypress_folder = File.join Decko.gem_root, "spec", "cypress"
+    # WARNING!! CypressOnRails can execute arbitrary ruby code
+    # please use with extra caution if enabling on hosted servers or starting your
+    # local server on 0.0.0.0
+    c.use_middleware = Rails.env.cypress? || ENV["CYPRESS_DEV"]
+    c.logger = Rails.logger
+  end
+end

data/lib/decko/response.rb

@@ -3,7 +3,7 @@ module Decko
   module Response
     private
     def respond format, result, status
-      if status == 302
+      if status.in? [302, 303]
         hard_redirect result
       elsif format.is_a?(Card::Format::FileFormat) && status == 200
         send_file(*result)
@@ -16,6 +16,20 @@ module Decko
       render body: body, status: status, content_type: content_type
     end
 
+    def redirect_cud_success success
+      redirect_type = success.redirect || default_cud_success_redirect_type
+      if redirect_type.to_s == "soft"
+        success.target ||= self
+        soft_redirect success
+      else
+        hard_redirect success.to_url, 303
+      end
+    end
+
+    def default_cud_success_redirect_type
+      Card::Env.ajax? ? "soft" : "hard"
+    end
+
     # return a redirect response
     def hard_redirect url, status=302
       url = card_url url # make sure we have absolute url
@@ -32,6 +46,7 @@ module Decko
     # return a standard GET response directly.
     # Used in AJAX situations where PRG pattern is unwieldy
     def soft_redirect success
+      # Card::Cache.renew
       @card = success.target
       require_card_for_soft_redirect!
       self.params = Card::Env[:params] = soft_redirect_params
@@ -87,7 +102,10 @@ module Decko
     end
 
     def format_name_from_params
-      explicit_file_format? ? :file : request.format.to_sym
+      if explicit_file_format?       then :file
+      elsif params[:format].present? then params[:format].to_sym
+      else                                request.format.to_sym
+      end
     end
 
     def explicit_file_format?

data/lib/decko/rest_spec_helper.rb

@@ -3,8 +3,11 @@
 module Decko
   # for use in REST API specs
   module RestSpecMethods
-    def with_token_for usermark
-      yield Card[usermark].account.reset_token
+    def with_api_key_for usermark
+      key_card = Card.fetch [usermark, :account, :api_key], new: {}
+      key_card.content = "asdkfjh1023498203jdfs"
+      Card::Auth.as_bot { key_card.save! }
+      yield key_card.content
     end
   end
 

data/rails/controllers/card_controller.rb

@@ -61,7 +61,7 @@ class CardController < ActionController::Base
   end
 
   def authenticate
-    Card::Auth.set_current params[:token], params[:current]
+    Card::Auth.set_current token: params[:token], api_key: params[:api_key]
   end
 
   def load_mark
@@ -101,11 +101,9 @@ class CardController < ActionController::Base
   def cud_success
     success = Card::Env.success.in_context card.name
     if success.reload?
-      reload
-    elsif Card::Env.ajax? && !success.hard_redirect?
-      soft_redirect success
+      reload # instruct JSON to reload
     else
-      hard_redirect success.to_url, 303
+      redirect_cud_success success
     end
   end
 

data/rails/engine-routes.rb

@@ -20,6 +20,7 @@ Decko::Engine.routes.draw do
 
   # Alternate GET requests
   get "new/:type" => "card#read", view: "new" # common case for card without mark
+  get "type/:type" => "card#read"
   get ":mark/view/:view(.:format)" => "card#read" # simplifies API documentation
   get "card/:view(/:mark(.:format))" => "card#read", view: /new|edit/ # legacy
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Ethan McCutchen
+- Philipp Kühl
 - Lewis Hoffman
 - Gerry Gleason
-- Philipp Kühl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.98.3
+        version: 1.99.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.98.3
+        version: 1.99.0
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -103,6 +103,7 @@ files:
 - lib/decko/generators/decko/templates/config/deck.yml
 - lib/decko/generators/decko/templates/config/environment.rb
 - lib/decko/generators/decko/templates/config/initializers/cypress_dev.rb
+- lib/decko/generators/decko/templates/config/initializers/cypress_on_rails.rb
 - lib/decko/generators/decko/templates/config/puma.rb
 - lib/decko/generators/decko/templates/config/routes.erb
 - lib/decko/generators/decko/templates/gitignore