constructor-pages 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0457fa097a8f3640bda13ce1f9699d1de07fe13
-  data.tar.gz: 2dbd8ce3ee79fd7a4faa636823dc87ee6710b532
+  metadata.gz: c078ab91ea33dd0cdfc25092efd3969d3978861f
+  data.tar.gz: b943b4a056a152bdac0d0d858ade1fca1b61c79f
 SHA512:
-  metadata.gz: 41e7f40d889a96c0210994feb7362c743912c700c373e49091a7d4b7ac51bb40a2896fa2899016d30bea7659420cbf88d54399aee5346051418c2c071f087732
-  data.tar.gz: 1384f5b705a64fda65ae8d1ef04c62c29071d487bdd038ee9322179b2c046b5aa3f68100e51ae4b9810c9b291dd7d073ae11a7c43699078702939fc1d75aee8a
+  metadata.gz: f674c9622f7be5947ddc8a6b63e00a3251edccfa56ac4096039d09b60e883f95feac19e52f9e70207588024ab6aa50172f3b0e31ab8988eb4f2bf17438cab930
+  data.tar.gz: 39fdf84915c22c79bb1e11e92541f78fbb7a5a220483558df018935e908163d29a72c092c6200ecaaab070c20de23f0b26f73b736dfbf3e9c5f26e9fd9cbe0d6

data/app/controllers/constructor_pages/pages_controller.rb

@@ -10,7 +10,7 @@ module ConstructorPages
 
     def index
       @pages = Page.includes(:template).load
-      @pages_cache = Digest::MD5.hexdigest(@pages.map{|p| [p.name, p.lft, p.template_id]}.join)
+      @pages_cache = Digest::MD5.hexdigest(@pages.map{|p| [p.name, p.url, p.lft, p.template_id]}.join)
       @template_exists = Template.count != 0
       flash[:notice] = 'Create at least one template' unless @template_exists
     end
@@ -56,6 +56,7 @@ module ConstructorPages
       @page = Page.new page_params
 
       if @page.save
+        @page.touch_branch
         redirect_to pages_path, notice: t(:page_success_added, name: @page.name)
       else
         render :new
@@ -72,6 +73,7 @@ module ConstructorPages
       if @page.update page_params
         @page.create_fields_values if _template_changed
         @page.update_fields_values params[:fields]
+        @page.touch_branch
 
         redirect_to pages_path, notice: t(:page_success_updated, name: @page.name)
       else
@@ -80,7 +82,9 @@ module ConstructorPages
     end
 
     def destroy
-      @page = Page.find(params[:id]).destroy
+      @page = Page.find(params[:id])
+      @page.touch_branch
+      @page.destroy
       redirect_to pages_path, notice: t(:page_success_removed, name: @page.name)
     end
 

data/app/models/constructor_pages/page.rb

@@ -133,6 +133,11 @@ module ConstructorPages
     # Check if link specified
     def redirect?; url != link && !link.empty? end
 
+    # Touch all pages in same branch
+    def touch_branch
+      [ancestors, descendants].each {|p| p.map(&:touch)}
+    end
+
     # When method missing it get/set field value or get page in branch
     #
     # Examples:
@@ -165,7 +170,7 @@ module ConstructorPages
 
     # Reload all descendants
     def descendants_update
-      descendants.map(&:save) if self.url_changed?
+      descendants.map(&:save) if self.full_url_changed?
     end
   end
 end

data/app/models/constructor_pages/types/boolean_type.rb

@@ -5,7 +5,7 @@ module ConstructorPages
     # Boolean type. Render as checkbox.
     class BooleanType < ActiveRecord::Base
       belongs_to :field
-      belongs_to :page
+      belongs_to :page, touch: true
     end
   end
 end

data/app/models/constructor_pages/types/date_type.rb

@@ -5,7 +5,7 @@ module ConstructorPages
     # Date time. Render as three select lists (day, month, year).
     class DateType < ActiveRecord::Base
       belongs_to :field
-      belongs_to :page
+      belongs_to :page, touch: true
     end
   end
 end

data/app/models/constructor_pages/types/float_type.rb

@@ -5,7 +5,7 @@ module ConstructorPages
     # Float type. Render small text field.
     class FloatType < ActiveRecord::Base
       belongs_to :field
-      belongs_to :page
+      belongs_to :page, touch: true
     end
   end
 end

data/app/models/constructor_pages/types/html_type.rb

@@ -5,7 +5,7 @@ module ConstructorPages
     # HTML type. Render ckeditor wysiwyg.
     class HtmlType < ActiveRecord::Base
       belongs_to :field
-      belongs_to :page
+      belongs_to :page, touch: true
     end
   end
 end

data/app/models/constructor_pages/types/image_type.rb

@@ -5,15 +5,15 @@ module ConstructorPages
     # Image type. Render select file field.
     class ImageType < ActiveRecord::Base
       belongs_to :field
-      belongs_to :page
+      belongs_to :page, touch: true
 
       image_accessor :value
 
-      validates :value, :presence  => true
+      validates :value, presence: true
       # Max size is 5 MB
-      validates_size_of :value, :maximum => 5.megabytes, :message => :incorrect_size
+      validates_size_of :value, maximum: 5.megabytes, message: :incorrect_size
       # Accept only jpeg, png, gif
-      validates_property :mime_type, :of => :value, :in => %w(image/jpeg image/png image/gif), :message => :incorrect_format
+      validates_property :mime_type, of: :value, in: %w(image/jpeg image/png image/gif), message: :incorrect_format
     end
   end
 end

data/app/models/constructor_pages/types/integer_type.rb

@@ -5,7 +5,7 @@ module ConstructorPages
     # Integer type. Render small text field.
     class IntegerType < ActiveRecord::Base
       belongs_to :field
-      belongs_to :page
+      belongs_to :page, touch: true
     end
   end
 end

data/app/models/constructor_pages/types/string_type.rb

@@ -5,7 +5,7 @@ module ConstructorPages
     # String type. Render large text field.
     class StringType < ActiveRecord::Base
       belongs_to :field
-      belongs_to :page
+      belongs_to :page, touch: true
     end
   end
 end

data/app/models/constructor_pages/types/text_type.rb

@@ -5,7 +5,7 @@ module ConstructorPages
     # Text type. Render textarea.
     class TextType < ActiveRecord::Base
       belongs_to :field
-      belongs_to :page
+      belongs_to :page, touch: true
     end
   end
 end

data/app/views/constructor_pages/fields/types/_float.haml

@@ -1 +1 @@
-= number_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'span2'
+= number_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'span2', step: 'any'

data/spec/models/constructor_pages/page_spec.rb

@@ -291,6 +291,19 @@ module ConstructorPages
           page.redirect?.should be_true
         end
       end
+
+      describe '#touch_branch' do
+        it 'should touch all pages in same branch' do
+          page = Page.create name: 'Hello world'
+          second_page = Page.create name: 'Again', parent: page
+          page.reload
+
+          updated = second_page.updated_at
+          page.touch_branch
+          second_page.reload
+          second_page.updated_at.should_not == updated
+        end
+      end
     end
 
     context 'ATTRIBUTES' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-28 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.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,6 @@ files:
 - app/views/constructor_pages/fields/types/_integer.haml
 - app/views/constructor_pages/fields/types/_string.haml
 - app/views/constructor_pages/fields/types/_text.haml
-- app/views/constructor_pages/pages/_breadcrumbs.haml
 - app/views/constructor_pages/pages/_field.haml
 - app/views/constructor_pages/pages/_form.haml
 - app/views/constructor_pages/pages/edit.haml

data/app/views/constructor_pages/pages/_breadcrumbs.haml

@@ -1,7 +0,0 @@
-- unless page.ancestors.empty?
-  %ul.breadcrumb
-    - page.ancestors.each do |i|
-      - if i.in_nav
-        %li
-          = link_to i.name, i.full_url, title: i.name, class: 'b-page-json'
-          %span{class: 'divider'} /