constructor-pages 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b2d5a5066524d6c27449d84de87965553916c7
-  data.tar.gz: 88bdd55c263eaf36a80cf7e4638a840a98cc245a
+  metadata.gz: c3259f9691d8cbc03a1a0125470d5755657a0bf3
+  data.tar.gz: 3dbcf5cf69714b79c4070c4a2386ffca74587811
 SHA512:
-  metadata.gz: 06d3f0dace870f2325d88361ec28bea1c7829475db50e105b6d086bb91a91f555bbb8ae9b4599a8e2ac4f29bc4e213969324866603e3344ef36e6131e0ec25dd
-  data.tar.gz: 8ef00cb3d76539fc7923cacf066367b686d91aa11269325c9b0351a3430e859d6fcc5052cda0afe8d25f40fca51efc6977923aef9e92ef4aedf257be92101841
+  metadata.gz: 5e6088570f1810b6b26b0bf6b02405c4b758785913f0f8d9aeb35f01f6e5784398d32335c0e4b33f6b34150b8099f94a91086adf99d283393d5f61f03fde2cc1
+  data.tar.gz: f3bbd308a22d42ae3e958e61dc3a40384fe2f1d91736c52dd351d6839b37e20b098ecfa42529892e64e592d6fa56861c1dfdd73910886145c669ddd676d5bde0

data/app/controllers/constructor_pages/fields_controller.rb

@@ -13,7 +13,7 @@ module ConstructorPages
     end
 
     def create
-      @field = Field.new params[:field]
+      @field = Field.new field_params
 
       if @field.save
         redirect_to edit_template_path(@field.template_id), notice: t(:field_success_added, name: @field.name)
@@ -42,7 +42,7 @@ module ConstructorPages
             field.destroy
           end
         end
-      if @field.update_attributes params[:field]
+      if @field.update field_params
         redirect_to edit_template_url(@field.template.id), notice: t(:field_success_updated, name: @field.name)
       else
         render :action => "edit"
@@ -61,6 +61,15 @@ module ConstructorPages
 
     private
 
+    def field_params
+      params.require(:field).permit(
+          :name,
+          :code_name,
+          :template_id,
+          :type_value
+      )
+    end
+
     def move_to(to)
       @field = Field.find(params[:id])
       to == :up ? @field.move_higher : @field.move_lower

data/app/controllers/constructor_pages/pages_controller.rb

@@ -3,10 +3,8 @@
 module ConstructorPages
   class PagesController < ConstructorCore::ApplicationController
     include MoveHelper
-    caches_page :show
 
     before_filter {@roots = Page.roots}
-    before_filter :cache, only: [:create, :update, :destroy, :move_up, :move_down]
 
     def new
       @page, @template_id, @multipart = Page.new, Template.first.id, false
@@ -92,7 +90,7 @@ module ConstructorPages
     end
 
     def create
-      @page = Page.new params[:page]
+      @page = Page.new page_params
 
       if @page.save
         redirect_to pages.pages_url, notice: t(:page_success_added, name: @page.name)
@@ -108,7 +106,7 @@ module ConstructorPages
         @page.remove_fields_values
       end
 
-      if @page.update_attributes params[:page]
+      if @page.update page_params
         @page.create_fields_values
         @page.update_fields_values params[:fields]
 
@@ -129,16 +127,26 @@ module ConstructorPages
 
     private
 
-    def error_404
-      render file: "#{Rails.root}/public/404", layout: false, status: 404
+    def page_params
+      params.require(:page).permit(
+          :active,
+          :name,
+          :url,
+          :title,
+          :keywords,
+          :description,
+          :auto_url,
+          :parent_id,
+          :template_id,
+          :in_nav,
+          :in_map,
+          :in_menu,
+          :link
+      )
     end
 
-    def cache
-      expire_page :action => :show
-      cache_dir = ActionController::Base.page_cache_directory
-      unless cache_dir == Rails.root.to_s+"/public"
-        FileUtils.rm_r(Dir.glob(cache_dir+"/*")) rescue Errno::ENOENT
-      end
+    def error_404
+      render file: "#{Rails.root}/public/404", layout: false, status: 404
     end
   end
 end

data/app/controllers/constructor_pages/templates_controller.rb

@@ -8,11 +8,6 @@ module ConstructorPages
 
     def new
       @template = Template.new
-
-      if params[:template]
-        @parent = Template.find(params[:template])
-        @template.parent_id = @parent.id
-      end
     end
 
     def edit
@@ -20,7 +15,7 @@ module ConstructorPages
     end
 
     def create
-      @template = Template.new params[:template]
+      @template = Template.new template_params
 
       if @template.save
         redirect_to templates_url, notice: t(:template_success_added, name: @template.name)
@@ -32,7 +27,7 @@ module ConstructorPages
     def update
       @template = Template.find params[:id]
 
-      if @template.update_attributes params[:template]
+      if @template.update template_params
         redirect_to templates_url, notice: t(:template_success_updated, name: @template.name)
       else
         render action: :edit
@@ -47,5 +42,16 @@ module ConstructorPages
     end
 
     %w{up down}.each {|m| define_method "move_#{m}" do move_to :template, m.to_sym end}
+
+    private
+
+    def template_params
+      params.require(:template).permit(
+          :name,
+          :code_name,
+          :parent_id,
+          :child_id
+      )
+    end
   end
 end

data/app/models/constructor_pages/field.rb

@@ -5,8 +5,6 @@ module ConstructorPages
   #
   # Each field has type of value such as float, integer, string...
   class Field < ActiveRecord::Base
-    attr_accessible :name, :code_name, :type_value, :template_id, :template
-
     # Adding code_name_uniqueness method
     include CodeNameUniq
 
@@ -38,7 +36,7 @@ module ConstructorPages
     def type_class; "constructor_pages/types/#{type_value}_type".classify.constantize end
 
     # Return object of type_value by page
-    def find_type_object(page); type_class.find_by_field_id_and_page_id(id, page.id) end
+    def find_type_object(page); type_class.where(field_id: id, page_id: page.id).first end
 
     # Create object of type_value by page
     def create_type_object(page); type_class.create(field_id: id, page_id: page.id) end

data/app/models/constructor_pages/page.rb

@@ -3,11 +3,6 @@
 module ConstructorPages
   # Page model. Pages are core for company websites, blogs etc.
   class Page < ActiveRecord::Base
-    attr_accessible :name, :title, :keywords, :description,
-                    :url, :full_url, :active, :auto_url,
-                    :parent, :parent_id, :link, :in_menu, :in_map,
-                    :in_nav, :template_id, :template
-
     # Adding has_many for all field types
     Field::TYPES.each do |t|
       class_eval %{
@@ -19,7 +14,7 @@ module ConstructorPages
 
     belongs_to :template
 
-    default_scope order :lft
+    default_scope -> { order(:lft)}
 
     validate :template_check
 
@@ -32,7 +27,7 @@ module ConstructorPages
     # Used for find page by request. It return first page if no request given
     # @param request for example <tt>'/conditioners/split-systems/zanussi'</tt>
     def self.find_by_request_or_first(request = nil)
-      request.nil? ? Page.first : Page.find_by_full_url(request)
+      request.nil? ? Page.first : Page.where(full_url: request).first
     end
 
     # Generate full_url from parent id and url
@@ -47,6 +42,7 @@ module ConstructorPages
     # field and template code_name should be uniqueness for page methods
     def self.check_code_name(code_name)
       [code_name, code_name.pluralize, code_name.singularize].each do |name|
+        # TODO: replace Page.first
         if Page.first.respond_to?(name)
           return false
         end
@@ -57,7 +53,7 @@ module ConstructorPages
 
     # Get field by code_name
     def field(code_name)
-      Field.find_by_code_name_and_template_id code_name, template_id
+      Field.find_by code_name: code_name, template_id: template_id
     end
 
     # Get value of field by code_name
@@ -80,13 +76,16 @@ module ConstructorPages
         value = params[field.code_name.to_sym]
 
         _type_object = field.find_type_object(self)
-        _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
 
-        if value
-          _type_object.value = field.type_value == 'date' ? parse_date(value).to_s : value
-        end
+        if _type_object
+          _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
+
+          if value
+            _type_object.value = value
+          end
 
-        _type_object.save
+          _type_object.save
+        end
       end
     end
 
@@ -107,12 +106,12 @@ module ConstructorPages
     # It determines if code_name is singular or nor
     # @param code_name template code name
     def find_page_in_branch(code_name)
-      _template = Template.find_by_code_name code_name.singularize
+      _template = Template.where(code_name: code_name.singularize).first
 
       if _template
         result = []
         result = descendants.where(template_id: _template.id) if code_name == code_name.pluralize
-        result = ancestors.find_by_template_id(_template.id) if result.empty?
+        result = ancestors.where(template_id: _template.id).first if result.empty?
         result
       end
     end
@@ -158,13 +157,8 @@ module ConstructorPages
       self.url = ((auto_url || url.empty?) ? translit(name) : url).parameterize
     end
 
-    # TODO: move out
-    def parse_date(value)
-      Date.new(value['date(1i)'].to_i, value['date(2i)'].to_i, value['date(3i)'].to_i)
-    end
-
     # TODO: add more languages
-    # Translit to english
+    # translit to english
     def translit(str)
       Russian.translit(str)
     end

data/app/models/constructor_pages/template.rb

@@ -7,12 +7,9 @@ module ConstructorPages
   # For example:
   #   template "Product" should has fields like "price", "description", "size" etc.
   class Template < ActiveRecord::Base
-
     # Adding code_name_uniqueness method
     include CodeNameUniq
 
-    attr_accessible :name, :code_name, :child_id, :parent_id, :parent
-
     validates_presence_of :name, :code_name
     validates_uniqueness_of :code_name
     validate :code_name_uniqueness

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

@@ -2,9 +2,8 @@
 
 module ConstructorPages
   module Types
+    # Boolean type. Render as checkbox.
     class BooleanType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
     end

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

@@ -2,15 +2,10 @@
 
 module ConstructorPages
   module Types
+    # Date time. Render as three select lists (day, month, year).
     class DateType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
-
-      def russian
-        Russian::strftime(self.value, "%d %B %Y").gsub(/0(\d\D)/, '\1')
-      end
     end
   end
 end

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

@@ -2,9 +2,8 @@
 
 module ConstructorPages
   module Types
+    # Float type. Render small text field.
     class FloatType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
     end

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

@@ -2,9 +2,8 @@
 
 module ConstructorPages
   module Types
+    # HTML type. Render ckeditor wysiwyg.
     class HtmlType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
     end

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

@@ -2,16 +2,17 @@
 
 module ConstructorPages
   module Types
+    # Image type. Render select file field.
     class ImageType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
 
       image_accessor :value
 
       validates :value, :presence  => true
+      # Max size is 5 MB
       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
     end
   end

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

@@ -2,9 +2,8 @@
 
 module ConstructorPages
   module Types
+    # Integer type. Render small text field.
     class IntegerType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
     end

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

@@ -2,9 +2,8 @@
 
 module ConstructorPages
   module Types
+    # String type. Render large text field.
     class StringType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
     end

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

@@ -2,9 +2,8 @@
 
 module ConstructorPages
   module Types
+    # Text type. Render textarea.
     class TextType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
     end

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

@@ -1 +1 @@
-= date_select "fields[#{field.code_name}]", "date", default: page.get_field_value(field.code_name)
+= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), type: :date

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

@@ -93,5 +93,5 @@
       .span12
         .form-actions
           = f.submit :class => "btn btn-primary"
-          = link_to t(:cancel), pages_url, :class => "btn"
-          = link_to t(:delete_page), @page, :confirm => t(:are_you_sure?), :method => :delete, :class => "btn btn-danger pull-right" unless @page.new_record?
+          = link_to t(:cancel), pages_url, class: 'btn'
+          = link_to t(:delete_page), @page, method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @page.new_record?

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

@@ -21,8 +21,8 @@
           </li>
 
         <li>
-        - if page.active == true
-          = link_to page.name, page.full_url, :class => "btn btn-link"
+        - if page.published?
+          = link_to page.name, page.full_url, class: 'btn btn-link'
         - else
           %button.btn.disabled= page.name
 
@@ -42,9 +42,9 @@
             - else
               = link_to "<i class='icon-chevron-down'></i> #{t :add} #{ConstructorPages::Template.find(page.template.child_id).name.downcase}".html_safe, new_child_page_path(page), :class => "btn btn-success btn-mini"
 
-          = link_to "<i class='icon-remove'></i> #{t :delete}".html_safe, page_path(page), confirm: t(:are_you_sure?), method: :delete, class: 'btn btn-danger btn-mini pull-right'
+          = link_to "<i class='icon-remove'></i> #{t :delete}".html_safe, page_path(page), method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)}
+
 
-        
 
         - level = page.level
         - last_page = page

data/app/views/constructor_pages/templates/_form.haml

@@ -37,11 +37,11 @@
           = link_to "<i class='icon-arrow-up'></i>".html_safe, field_move_up_path(field), :class => "btn btn-mini #{"disabled" if field.first?}"
 
           = link_to "<i class='icon-pencil icon-white'></i>".html_safe, edit_field_path(field, field.template), :class => "btn btn-mini btn-primary"
-          = link_to "<i class='icon-remove icon-white'></i>".html_safe, field_path(field), :method => :delete, :confirm => t(:are_you_sure?), :class => "btn btn-mini btn-danger"
+          = link_to "<i class='icon-remove icon-white'></i>".html_safe, field_path(field), method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-mini btn-danger'
 
     .row-fluid
       .span12
         .form-actions
           = f.submit :class => "btn btn-primary"
           = link_to t(:cancel), templates_url, :class => "btn"
-          = link_to t(:delete_template), @template, :confirm => t(:are_you_sure?), :method => :delete, :class => "btn btn-danger pull-right" unless @template.new_record?
+          = link_to t(:delete_template), @template, method: :delete, data: {confirm: t(:are_you_sure?)},  class: 'btn btn-danger pull-right' unless @template.new_record?

data/config/locales/ru.yml

@@ -8,7 +8,6 @@ ru:
   are_you_sure?: 'Вы уверены?'
   display_in: 'Отображать в'
 
-
   menu: 'Меню'
   breadcrumbs: 'Хлебные крошки'
 

data/constructor-pages.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'dragonfly'
   s.add_dependency 'rack-cache'
-  s.add_dependency 'awesome_nested_set', '~> 2.0'
+  s.add_dependency 'awesome_nested_set'
   s.add_dependency 'haml-rails'
   s.add_dependency 'acts_as_list'
+  s.add_dependency 'russian'
 
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'capybara'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 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.5.8
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: russian
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement