conjoin 0.0.6 → 0.0.7
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/conjoin/version.rb +1 -1
- data/lib/conjoin/widgets.rb +2 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ac1323a2c159994b3c2e7a58f0f8b85e42e392df
|
|
4
|
+
data.tar.gz: 726ed880c4471213259ddfa3c6f3bf8126a5e6e9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 623b8011f05b0e4582542f387d2787c07949e85aa97108bccd853edaa7326ad9ec032f9c6b58c127b8516320aec4a3cbf471e8c58ca981e242ada3463de98391
|
|
7
|
+
data.tar.gz: 33c5837e860eb51212f2049f0b3db5b1a68a062f7a7f330e0cee5c58a3823a60c66a820cccd8662df5623bcc6df20d3ec1a1f63a60ed1b5123f8449d31e42f3d
|
data/lib/conjoin/version.rb
CHANGED
data/lib/conjoin/widgets.rb
CHANGED
|
@@ -8,7 +8,7 @@ module Conjoin
|
|
|
8
8
|
|
|
9
9
|
def self.setup app
|
|
10
10
|
self.app = app
|
|
11
|
-
app.settings[:widgets_root]
|
|
11
|
+
app.settings[:widgets_root] ||= "#{app.root}/app/widgets"
|
|
12
12
|
app.settings[:widgets] ||= {}
|
|
13
13
|
|
|
14
14
|
Dir["#{app.root}/app/widgets/**/*.rb"].each { |rb| require rb }
|
|
@@ -314,6 +314,7 @@ module Conjoin
|
|
|
314
314
|
class Routes < Struct.new(:settings)
|
|
315
315
|
def app
|
|
316
316
|
App.settings = settings
|
|
317
|
+
App.root = settings[:root]
|
|
317
318
|
App.plugin Conjoin::Cuba::Render
|
|
318
319
|
App.plugin Conjoin::Auth
|
|
319
320
|
App.plugin Conjoin::Assets
|