constructor-pages 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f87718df1192d57d620402d6d156cccae11d470
-  data.tar.gz: 87eaad08e35ff3dcb56c9458c1b7a8b3d717c3ec
+  metadata.gz: 8c3ad880702d0787d409bd4990d73fc3016d12c7
+  data.tar.gz: d4a2b4044023da44df7bf14790eb6af7225bbea8
 SHA512:
-  metadata.gz: 442023430fe167aead5546c3dfb2dbb7aca74a532b6851cad6924ebeea8cc546476b2f1cbba4226aca00e506128fedb0b63463cd9a14d1ca392c9d5c7d6df581
-  data.tar.gz: 73b3191051f0569f13cb283accc5818cdeaae6f8aefb9a1e51743e34407387a9075bb27958ff3ec7df86dbc228acd0df86550ead100599f9742a79e07ff1ba87
+  metadata.gz: 548992f46464ebcaca5bd68d21e74efd877a4495b7c1670c3ecacb8008fc9407fdbe9eb5d6f613092765753cccc7c8fcae0734622b1a82d40bf79dfe8d642a00
+  data.tar.gz: cee707598161a23679cacc9faed3c04bfe67ca1b68674f4fe6e9b22326a4f5da473f11f1d81423aef64c70e28291d81a8eda0e3d0d35cae25e0482e43d7a4c3c

data/app/models/constructor_pages/page.rb

@@ -27,7 +27,7 @@ module ConstructorPages
       # Used for find page by request. It return first page if no request given or request is home page
       # @param request for example <tt>'/conditioners/split-systems/zanussi'</tt>
       def find_by_request_or_first(request = nil)
-        request == nil || '/' ? Page.first : Page.find_by(full_url: request)
+        (request.nil? || request == '/') ? Page.first : Page.find_by(full_url: request)
       end
 
       # Generate full_url from parent id and url
@@ -73,14 +73,10 @@ module ConstructorPages
     end
 
     # Get value of field by code_name
-    def get_field_value(code_name)
-      field(code_name).tap {|f| return f.get_value_for(self) if f}
-    end
+    def get_field_value(code_name); field(code_name).try(:get_value_for, self) end
 
     # Set value of field by code_name and value
-    def set_field_value(code_name, value)
-      field(code_name).tap {|f| f.set_value_for(self, value) if f}
-    end
+    def set_field_value(code_name, value); field(code_name).try(:set_value_for, self, value) end
 
     # Update all fields values with given params.
     # @param params should looks like <tt>{price: 500, content: 'Hello'}</tt>

data/app/models/constructor_pages/template.rb

@@ -23,11 +23,7 @@ module ConstructorPages
 
     # Return child corresponding child_id or children first
     def child
-      if child_id
-        self.class.find(child_id)
-      else
-        children.first if !leaf?
-      end
+      child_id ? self.class.find(child_id) : children.first if !leaf?
     end
 
     # Convert name to accusative

data/spec/features/constructor_pages/pages_spec.rb

@@ -89,6 +89,20 @@ module ConstructorPages
       end
     end
 
+    describe 'Show' do
+      it 'should show page with its template' do
+        _page = Page.create name: 'First page', template: @template
+        _template = Template.create name: 'Home page', code_name: 'home_page'
+        _second_page = Page.create name: 'Second page', template: _template
+
+        visit _page.full_url
+        page.should have_content 'Page'
+
+        visit _second_page.full_url
+        page.should have_content 'Home page'
+      end
+    end
+
     describe 'Moving' do
       it 'should move page' do
         _page_first = Page.create name: 'First'

data/spec/models/constructor_pages/page_spec.rb

@@ -29,16 +29,18 @@ module ConstructorPages
 
       describe '.find_by_request_or_first' do
         before :each do
-          @page = Page.create name: 'New page', url: 'new-page'
+          @first_page = Page.create name: 'New page'
+          @second_page = Page.create name: 'Second page'
         end
 
         it 'should return page by given request path' do
-          Page.find_by_request_or_first('/new-page').should == @page
+          Page.find_by_request_or_first('/new-page').should == @first_page
+          Page.find_by_request_or_first('/second-page').should == @second_page
         end
 
         it 'should return first page if no given request or request is home page' do
-          Page.find_by_request_or_first.should == @page
-          Page.find_by_request_or_first('/').should == @page
+          Page.find_by_request_or_first.should == @first_page
+          Page.find_by_request_or_first('/').should == @first_page
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constructor-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.7.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.7.10
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement