decko 0.5.3 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0d26843fd82a71c814ef7ed7d5ff8b7245ca8491
4
- data.tar.gz: 760ecf11d36c8d9285b811f72d16ad16d289b236
3
+ metadata.gz: c2c0b62be6973d42ca0313378dbbc42161349f30
4
+ data.tar.gz: 065f3de25caebaa321a6170cdae58a7471456cb5
5
5
  SHA512:
6
- metadata.gz: e3e6c20d118701148730a519426eb73656420ff22132ead49563d3989d07aad6c82ebe18b6af05b729acf4f733c45de29da2d371f0ec289e56e4e6a71eb30a8b
7
- data.tar.gz: 2e0f2e25cbb5fd3132964d181a3944032efc41e457bd1cd3b4ac03af7d808f24e4b7a664b417aeb3ec184958c2bdd2540bb1aac80d88c3e78be15357046473bc
6
+ metadata.gz: 75874b945a5c272db5bbbce646ecd8f866a80bb9dad9933caaaefcc6204b177288929e7166eca04339fae2a7b3c37f20cb47411f322607ba8cc4950039c3ed8f
7
+ data.tar.gz: 20fd9ae8f95b4583d10f57fc3c6621d7d955daa4ea09ef977076e10e4feef9560db96bf20a9ed2e89db1a8c0893095855de96ab9364b50d89a9f1ef002dace22
@@ -53,7 +53,8 @@ module Decko
53
53
 
54
54
  def format_name_from_params
55
55
  return :file if params[:explicit_file]
56
- format = request.parameters[:format]
56
+ format = request.format
57
+ # format = request.parameters[:format]
57
58
  # unknown format
58
59
  return :file unless Card::Format.registered.member?(format)
59
60
  format.to_sym
@@ -99,6 +99,7 @@ decko_namespace = namespace :decko do
99
99
  prepped_asset_path do |assets_path|
100
100
  Card::Mod.dirs.each_assets_path do |mod, target|
101
101
  link = File.join assets_path, mod
102
+ FileUtils.rm_rf link
102
103
  FileUtils.ln_s target, link, force: true
103
104
  end
104
105
  end
@@ -54,10 +54,10 @@ class CardController < ActionController::Base
54
54
  before_action :refresh_card, only: [:create, :update, :delete]
55
55
 
56
56
  def setup
57
- request.format = :html unless params[:format] # is this used??
58
57
  Card::Machine.refresh_script_and_style unless params[:explicit_file]
59
58
  Card::Cache.renew
60
59
  Card::Env.reset controller: self
60
+ request.format = :html if Card::Env.ajax? && !params[:format]
61
61
  end
62
62
 
63
63
  def authenticate
@@ -24,10 +24,12 @@ Decko::Engine.routes.draw do
24
24
  match ":id(.:format)" => "card#update", via: :put
25
25
  match ":id(.:format)" => "card#delete", via: :delete
26
26
 
27
+ get ":id/view/:view(.:format)" => "card#read"
28
+
27
29
  # ~~~~~~~~~~~~~~~~~~~~~~~~~~
28
30
  # legacy
29
31
  get "new/:type" => "card#read", view: "new"
30
- get "card/:view(/:id(.:format))" => "card#read", view: /new|options|edit/
32
+ get "card/:view(/:id(.:format))" => "card#read", view: /new|edit/
31
33
 
32
34
  get "account/signin" => "card#read", id: ":signin"
33
35
  get "account/signout" => "card#delete", id: ":signin"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decko
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.3
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2018-06-21 00:00:00.000000000 Z
14
+ date: 2018-07-23 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: card
@@ -19,14 +19,14 @@ dependencies:
19
19
  requirements:
20
20
  - - '='
21
21
  - !ruby/object:Gem::Version
22
- version: 1.95.3
22
+ version: 1.96.0
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 1.95.3
29
+ version: 1.96.0
30
30
  description: a wiki approach to stuctured data, dynamic interaction, and web design
31
31
  email:
32
32
  - info@decko.org