decko 0.3.5 → 0.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/decko/generators/decko/templates/Gemfile +1 -1
- data/rails/controllers/card_controller.rb +16 -7
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 344e35c0a6a330ad1d408fa42fb1bb1e61f0f10a
|
|
4
|
+
data.tar.gz: cf4004b834deedf11c0f85a1e515d7d66554db5a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c51bbf5d92869fa34bb78135f1671dee009d76d6d6044332c2e04b6de1dcfdee21ad28551dd433f265669c4b7a464396edfcc51c8e282a74a38055c1813d2a2c
|
|
7
|
+
data.tar.gz: c6a03a0156dc39c544cfc69f448c9c4925aaad7a0a05db5475d0a89553021bff9de2f7a7bf6ea58ba8040c590a7e5ed004ca656f840f03886f0497c2386800a7
|
|
@@ -91,7 +91,7 @@ group :test do
|
|
|
91
91
|
# CUKES see features dir
|
|
92
92
|
gem 'cucumber-rails', '~> 1.5', :require=>false # feature-driven-development suite
|
|
93
93
|
gem 'capybara', '~> 2.14'
|
|
94
|
-
gem 'selenium-webdriver', '
|
|
94
|
+
gem 'selenium-webdriver', '3.6.0'
|
|
95
95
|
gem 'chromedriver-helper', '~> 1.1.0'
|
|
96
96
|
# gem 'capybara-webkit'
|
|
97
97
|
gem 'launchy' # lets cucumber launch browser windows
|
|
@@ -73,11 +73,19 @@ class CardController < ActionController::Base
|
|
|
73
73
|
def load_card
|
|
74
74
|
@card = Card.controller_fetch params
|
|
75
75
|
raise Card::Error::NotFound unless @card
|
|
76
|
-
|
|
77
|
-
|
|
76
|
+
load_action
|
|
77
|
+
record_as_main
|
|
78
78
|
card.errors.any? ? render_errors : true
|
|
79
79
|
end
|
|
80
80
|
|
|
81
|
+
def load_action
|
|
82
|
+
@card.select_action_by_params params
|
|
83
|
+
end
|
|
84
|
+
|
|
85
|
+
def record_as_main
|
|
86
|
+
Card::Env[:main_name] = params[:main] || card&.name || ""
|
|
87
|
+
end
|
|
88
|
+
|
|
81
89
|
def refresh_card
|
|
82
90
|
@card = card.refresh
|
|
83
91
|
end
|
|
@@ -108,15 +116,16 @@ class CardController < ActionController::Base
|
|
|
108
116
|
card.content = card.last_draft_content if use_draft?
|
|
109
117
|
|
|
110
118
|
format = format_from_params card
|
|
119
|
+
result = render_page format, view
|
|
120
|
+
status = format.error_status || status
|
|
121
|
+
deliver format, result, status
|
|
122
|
+
end
|
|
111
123
|
|
|
124
|
+
def render_page format, view
|
|
112
125
|
view ||= params[:view]
|
|
113
|
-
|
|
126
|
+
card.act do
|
|
114
127
|
format.page self, view, Card::Env.slot_opts
|
|
115
128
|
end
|
|
116
|
-
|
|
117
|
-
status = format.error_status || status
|
|
118
|
-
# puts "RESULT: #{format.class}/#{status}"
|
|
119
|
-
deliver format, result, status
|
|
120
129
|
end
|
|
121
130
|
|
|
122
131
|
def render_errors
|
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.3.
|
|
4
|
+
version: 0.3.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ethan McCutchen
|
|
@@ -33,14 +33,14 @@ dependencies:
|
|
|
33
33
|
requirements:
|
|
34
34
|
- - '='
|
|
35
35
|
- !ruby/object:Gem::Version
|
|
36
|
-
version: 1.93.
|
|
36
|
+
version: 1.93.6
|
|
37
37
|
type: :runtime
|
|
38
38
|
prerelease: false
|
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
|
40
40
|
requirements:
|
|
41
41
|
- - '='
|
|
42
42
|
- !ruby/object:Gem::Version
|
|
43
|
-
version: 1.93.
|
|
43
|
+
version: 1.93.6
|
|
44
44
|
description: a wiki approach to stuctured data, dynamic interaction, and web design
|
|
45
45
|
email:
|
|
46
46
|
- info@decko.org
|