constructor-pages 0.7.9 → 0.7.10
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:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8c3ad880702d0787d409bd4990d73fc3016d12c7
|
4
|
+
data.tar.gz: d4a2b4044023da44df7bf14790eb6af7225bbea8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 548992f46464ebcaca5bd68d21e74efd877a4495b7c1670c3ecacb8008fc9407fdbe9eb5d6f613092765753cccc7c8fcae0734622b1a82d40bf79dfe8d642a00
|
7
|
+
data.tar.gz: cee707598161a23679cacc9faed3c04bfe67ca1b68674f4fe6e9b22326a4f5da473f11f1d81423aef64c70e28291d81a8eda0e3d0d35cae25e0482e43d7a4c3c
|
@@ -27,7 +27,7 @@ module ConstructorPages
|
|
27
27
|
# Used for find page by request. It return first page if no request given or request is home page
|
28
28
|
# @param request for example <tt>'/conditioners/split-systems/zanussi'</tt>
|
29
29
|
def find_by_request_or_first(request = nil)
|
30
|
-
request
|
30
|
+
(request.nil? || request == '/') ? Page.first : Page.find_by(full_url: request)
|
31
31
|
end
|
32
32
|
|
33
33
|
# Generate full_url from parent id and url
|
@@ -73,14 +73,10 @@ module ConstructorPages
|
|
73
73
|
end
|
74
74
|
|
75
75
|
# Get value of field by code_name
|
76
|
-
def get_field_value(code_name)
|
77
|
-
field(code_name).tap {|f| return f.get_value_for(self) if f}
|
78
|
-
end
|
76
|
+
def get_field_value(code_name); field(code_name).try(:get_value_for, self) end
|
79
77
|
|
80
78
|
# Set value of field by code_name and value
|
81
|
-
def set_field_value(code_name, value)
|
82
|
-
field(code_name).tap {|f| f.set_value_for(self, value) if f}
|
83
|
-
end
|
79
|
+
def set_field_value(code_name, value); field(code_name).try(:set_value_for, self, value) end
|
84
80
|
|
85
81
|
# Update all fields values with given params.
|
86
82
|
# @param params should looks like <tt>{price: 500, content: 'Hello'}</tt>
|
@@ -23,11 +23,7 @@ module ConstructorPages
|
|
23
23
|
|
24
24
|
# Return child corresponding child_id or children first
|
25
25
|
def child
|
26
|
-
if
|
27
|
-
self.class.find(child_id)
|
28
|
-
else
|
29
|
-
children.first if !leaf?
|
30
|
-
end
|
26
|
+
child_id ? self.class.find(child_id) : children.first if !leaf?
|
31
27
|
end
|
32
28
|
|
33
29
|
# Convert name to accusative
|
@@ -89,6 +89,20 @@ module ConstructorPages
|
|
89
89
|
end
|
90
90
|
end
|
91
91
|
|
92
|
+
describe 'Show' do
|
93
|
+
it 'should show page with its template' do
|
94
|
+
_page = Page.create name: 'First page', template: @template
|
95
|
+
_template = Template.create name: 'Home page', code_name: 'home_page'
|
96
|
+
_second_page = Page.create name: 'Second page', template: _template
|
97
|
+
|
98
|
+
visit _page.full_url
|
99
|
+
page.should have_content 'Page'
|
100
|
+
|
101
|
+
visit _second_page.full_url
|
102
|
+
page.should have_content 'Home page'
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
92
106
|
describe 'Moving' do
|
93
107
|
it 'should move page' do
|
94
108
|
_page_first = Page.create name: 'First'
|
@@ -29,16 +29,18 @@ module ConstructorPages
|
|
29
29
|
|
30
30
|
describe '.find_by_request_or_first' do
|
31
31
|
before :each do
|
32
|
-
@
|
32
|
+
@first_page = Page.create name: 'New page'
|
33
|
+
@second_page = Page.create name: 'Second page'
|
33
34
|
end
|
34
35
|
|
35
36
|
it 'should return page by given request path' do
|
36
|
-
Page.find_by_request_or_first('/new-page').should == @
|
37
|
+
Page.find_by_request_or_first('/new-page').should == @first_page
|
38
|
+
Page.find_by_request_or_first('/second-page').should == @second_page
|
37
39
|
end
|
38
40
|
|
39
41
|
it 'should return first page if no given request or request is home page' do
|
40
|
-
Page.find_by_request_or_first.should == @
|
41
|
-
Page.find_by_request_or_first('/').should == @
|
42
|
+
Page.find_by_request_or_first.should == @first_page
|
43
|
+
Page.find_by_request_or_first('/').should == @first_page
|
42
44
|
end
|
43
45
|
end
|
44
46
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: constructor-pages
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ivan Zotov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-06-
|
11
|
+
date: 2013-06-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: constructor-core
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.7.
|
19
|
+
version: 0.7.10
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.7.
|
26
|
+
version: 0.7.10
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: dragonfly
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|