constructor-pages 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2baa47a4688a68e29dcf737f3b12bb3f1eb7b758
-  data.tar.gz: 0e041e904853abf666db195b27a49b97c80ab332
+  metadata.gz: e9b2d5a5066524d6c27449d84de87965553916c7
+  data.tar.gz: 88bdd55c263eaf36a80cf7e4638a840a98cc245a
 SHA512:
-  metadata.gz: 18a6b01b23863c4b7f98db5613de1afab43cb9b71184bb3f789c8b9f5384da01deb50ad3dd6b07d06c87eb66e9c06856d9788ce5b34818eb336b43f4a54a9744
-  data.tar.gz: 550592c690084f29051ff33e4e2b07fe61f47b80dbd4feccb5db53c235805fafdfcebf3ae7e103537a6f608ab9ca4ce2d25e5bb605a715db61306d13829e8bc6
+  metadata.gz: 06d3f0dace870f2325d88361ec28bea1c7829475db50e105b6d086bb91a91f555bbb8ae9b4599a8e2ac4f29bc4e213969324866603e3344ef36e6131e0ec25dd
+  data.tar.gz: 8ef00cb3d76539fc7923cacf066367b686d91aa11269325c9b0351a3430e859d6fcc5052cda0afe8d25f40fca51efc6977923aef9e92ef4aedf257be92101841

data/app/controllers/constructor_pages/pages_controller.rb

@@ -109,6 +109,7 @@ module ConstructorPages
       end
 
       if @page.update_attributes params[:page]
+        @page.create_fields_values
         @page.update_fields_values params[:fields]
 
         redirect_to pages_url, notice: t(:page_success_updated, name: @page.name)

data/app/helpers/constructor_pages/code_name_uniq.rb

@@ -2,7 +2,7 @@ module ConstructorPages
   module CodeNameUniq
     def code_name_uniqueness
       unless Page.check_code_name(code_name) and check_code_name(code_name)
-        errors.add(:base, t(:code_name_already_in_use))
+        errors.add(:base, :code_name_already_in_use)
       end
     end
   end

data/app/models/constructor_pages/field.rb

@@ -1,12 +1,18 @@
 # encoding: utf-8
 
 module ConstructorPages
+  # Field model. Fields allows to add custom fields for template.
+  #
+  # 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
 
+    # Array of available field types
     TYPES = %w{string integer float boolean text date html image}
 
-    attr_accessible :name, :code_name, :type_value, :template_id, :template
     validates_presence_of :name
     validates_uniqueness_of :code_name, :scope => :template_id
     validate :code_name_uniqueness
@@ -16,6 +22,7 @@ module ConstructorPages
 
     belongs_to :template
 
+    # Adding has_many for all field types
     TYPES.each do |t|
       class_eval %{
         has_many :#{t}_types, class_name: 'Types::#{t.titleize}Type'
@@ -27,24 +34,25 @@ module ConstructorPages
     acts_as_list  scope: :template_id
     default_scope order: :position
 
-    # return constant of model by type_value
+    # Return constant of model type_value
     def type_class; "constructor_pages/types/#{type_value}_type".classify.constantize end
 
-    # return object of type_value
+    # 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
 
-    # return created object of type_value
+    # Create object of type_value by page
     def create_type_object(page); type_class.create(field_id: id, page_id: page.id) end
 
-    def find_or_create_type_object(page); find_type_object(page) || create_type_object(page) end
+    # Remove all type_fields values for specified page
+    def remove_type_object(page); find_type_object(page).destroy end
 
-    # get value from type_field for specified page
+    # Get value from type_field for specified page
     def get_value_for(page)
       _type_object = find_type_object(page)
       _type_object ? _type_object.value : nil
     end
 
-    # set value type_field for specified page
+    # Set value type_field for specified page
     def set_value_for(page, value)
       _type_object = find_type_object(page)
 
@@ -54,18 +62,22 @@ module ConstructorPages
       end
     end
 
-    # remove all type_fields values for specified page
-    def remove_values_for(page); type_class.destroy_all field_id: id, page_id: page.id end
-
     private
 
+    # Check if there is code_name in template branch
     def check_code_name(code_name)
       [code_name.pluralize, code_name.singularize].each do |name|
-        template.self_and_ancestors.map{|t| t.code_name unless t.code_name == code_name}.include?(name)
-        template.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(name)
+        %w{self_and_ancestors descendants}.each do |m|
+          if template.send(m).map{|t| t.code_name}.include?(name)
+            return false
+          end
+        end
       end
+
+      true
     end
 
+    # Create and destroy page fields
     %w{create destroy_all}.each do |m|
       class_eval %{
           def #{m}_page_fields

data/app/models/constructor_pages/page.rb

@@ -1,12 +1,14 @@
 # encoding: utf-8
 
 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 %{
         has_many :#{t}_types,  dependent: :destroy, class_name: 'Types::#{t.titleize}Type'
@@ -23,7 +25,7 @@ module ConstructorPages
 
     before_save :friendly_url, :template_assign, :full_url_update
     after_update :descendants_update
-    after_create :create_fields
+    after_create :create_fields_values
 
     acts_as_nested_set
 
@@ -77,7 +79,7 @@ module ConstructorPages
       fields.each do |field|
         value = params[field.code_name.to_sym]
 
-        _type_object = field.find_or_create_type_object(self)
+        _type_object = field.find_type_object(self)
         _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
 
         if value
@@ -88,9 +90,12 @@ module ConstructorPages
       end
     end
 
+    # Create fields values
+    def create_fields_values; fields.each {|field| field.create_type_object(self) } end
+
     # Remove all fields values
     def remove_fields_values
-      fields.each {|f| f.remove_values_for self}
+      fields.each {|f| f.remove_type_object self}
     end
 
     # Search page by template code_name in same branch of pages and templates.
@@ -181,8 +186,5 @@ module ConstructorPages
 
     # Reload all descendants
     def descendants_update; descendants.map(&:save) end
-
-    # Create fields values
-    def create_fields; fields.each {|field| field.create_type_object(self) } end
   end
 end

data/app/models/constructor_pages/template.rb

@@ -1,7 +1,14 @@
 # encoding: utf-8
 
 module ConstructorPages
+  # Template model. Template allows assing different design for pages.
+  #
+  # Templates has many fields.
+  # 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
@@ -17,7 +24,7 @@ module ConstructorPages
 
     acts_as_nested_set
 
-    # return child corresponding child_id or children first
+    # Return child corresponding child_id or children first
     def child
       if child_id.nil? and !leaf?
         children.first
@@ -28,6 +35,7 @@ module ConstructorPages
 
     private
 
+    # Check if there is code_name in same branch
     def check_code_name(code_name)
       [code_name.pluralize, code_name.singularize].each do |name|
         if root.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(name)

data/constructor-pages.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'haml-rails'
   s.add_dependency 'acts_as_list'
 
-
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'capybara'
 end

data/spec/models/constructor_pages/field_model_spec.rb

@@ -9,19 +9,129 @@ module ConstructorPages
       @template = Template.create name: 'Page', code_name: 'page'
 
       Field.delete_all
+      Field::TYPES.each do |t|
+        "constructor_pages/types/#{t}_type".classify.constantize.delete_all
+      end
     end
 
     describe '.create' do
       it 'should be valid' do
         _field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
-        _field.valid?.should be_true
+        _field.should be_valid
       end
 
-      it 'should validate uniqueness' do
-        Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+      it 'should create page fields' do
+        _page = Page.create name: 'Page', template: @template
+        _field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+
+        _page.content.should == ''
+      end
+    end
+
+    describe '#destroy' do
+      it 'should destroy page fields' do
         _field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        _page = Page.create name: 'Page', template: @template
+
+        _page.content.should == ''
+        _field.destroy
+        _page.content.should be_nil
+      end
+    end
+
+    describe '#type_class' do
+      it 'should return constant of type_value' do
+        field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'html'
+        field.type_class.should == Types::HtmlType
+
+        field.type_value = 'text'
+        field.type_class.should == Types::TextType
+      end
+    end
+
+    describe '#find_type_object' do
+      it 'should find one object of type_value by page' do
+        field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        page = Page.create name: 'Page', template: @template
+
+        text_type = Types::TextType.find_by_field_id_and_page_id field.id, page.id
+
+        field.find_type_object(page).should == text_type
+      end
+    end
+
+    describe '#create_type_object' do
+      it 'should create object of type_value by page' do
+        field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        page = Page.create name: 'Page', template: @template
+
+        text_type = field.create_type_object(page)
+        text_type.should be_an_instance_of(Types::TextType)
+        text_type.page_id.should == page.id
+        text_type.field_id.should == field.id
+      end
+    end
+
+    describe '#remove_type_object' do
+      it 'should remote object of type_value by page' do
+        field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        page = Page.create name: 'Page', template: @template
+
+        field.find_type_object(page).should be_an_instance_of(Types::TextType)
+
+        field.remove_type_object(page)
+        field.find_type_object(page).should be_nil
+      end
+    end
+
+    describe '#get_value_for' do
+      it 'should get value of type field by page' do
+        field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        page = Page.create name: 'Page', template: @template
+        page.content = 'Hello world'
+
+        field.get_value_for(page).should == 'Hello world'
+      end
+    end
+
+    describe '#set_value_for' do
+      it 'should set value for type field by page' do
+        field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        page = Page.create name: 'Page', template: @template
+
+        field.set_value_for(page, 'Hello')
+        page.content.should == 'Hello'
+      end
+    end
+
+    describe '#code_name' do
+      it 'should be uniqueness in scope fields' do
+        Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        _field = Field.create name: 'Content 2', code_name: 'content', template: @template, type_value: 'html'
+
+        _field.should_not be_valid
+      end
+
+      it 'should be uniqueness in scope Page' do
+        Page.create name: 'Page', template: @template
+        _field = Field.create name: 'Content', code_name: 'get_field_value', template: @template, type_value: 'text'
+        _field.should_not be_valid
+      end
+
+      it 'should be uniqueness in scope Template branch' do
+        Page.create name: 'Page', template: @template
+
+        _template = Template.create name: 'Brand', code_name: 'brand', parent: @template
+        @template.reload
+
+        _field = Field.create name: 'Content', code_name: 'brand', template: @template, type_value: 'text'
+        _field.should_not be_valid
+
+        _field.code_name = 'brands'
+        _field.should_not be_valid
 
-        _field.valid?.should_not be_true
+        _field.code_name = 'price'
+        _field.should be_valid
       end
     end
   end

data/spec/models/constructor_pages/page_model_spec.rb

@@ -83,15 +83,17 @@ module ConstructorPages
 
         describe '#update_fields_values' do
           it 'should update fields values with params' do
-            Field.create name: 'Count', code_name: 'count', template: @template, type_value: 'integer'
+            @template.reload
+            Field.create name: 'Count', code_name: 'amount', template: @template, type_value: 'integer'
+
             @page.reload
 
-            @page.count = 10
+            @page.amount = 10
 
-            @page.update_fields_values({price: 1000, count: 20})
+            @page.update_fields_values({price: 1000, amount: 20})
 
             @page.price.should == 1000
-            @page.count.should == 20
+            @page.amount.should == 20
           end
 
           it 'should reset boolean fields' do

data/spec/models/constructor_pages/template_model_spec.rb

@@ -4,9 +4,26 @@ require 'spec_helper'
 
 module ConstructorPages
   describe Template do
+    before :each do
+      Template.delete_all
+    end
+
     it 'should be valid' do
-      template = Template.create name: 'Page template', code_name: 'page_template'
-      template.valid?.should be_true
+      _template = Template.create name: 'Page template', code_name: 'page_template'
+      _template.valid?.should be_true
+    end
+
+    describe '#child' do
+      it 'should return child corresponding child_id or children first' do
+        _brand = Template.create name: 'Brand', code_name: 'brand'
+        _series = Template.create name: 'Series', code_name: 'series', parent: _brand
+        _brand.reload
+
+        _brand.child.should == _series
+        _brand.child_id = 1
+
+        _brand.child.should == _brand
+      end
     end
   end
 end

data/spec/requests/constructor_pages/pages_controller_spec.rb

@@ -1,13 +1,12 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require 'capybara/rspec'
 
 module ConstructorPages
   describe 'Page Controller', type: :feature do
-    it 'should be valid' do
-      Page.create name: 'Hello'
-      visit '/hello'
-    end
+#    it 'should be valid' do
+#      Page.create name: 'Hello'
+#      visit '/hello'
+#    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Ivan Zotov
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,6 @@ files:
 - lib/constructor-pages.rb
 - lib/constructor_pages/engine.rb
 - public/hello.txt
-- spec/features/constructor_pages/pages_controller_spec.rb
 - spec/models/constructor_pages/field_model_spec.rb
 - spec/models/constructor_pages/page_model_spec.rb
 - spec/models/constructor_pages/template_model_spec.rb
@@ -226,8 +225,8 @@ signing_key:
 specification_version: 4
 summary: Pages for Constructor CMS
 test_files:
-- spec/features/constructor_pages/pages_controller_spec.rb
 - spec/models/constructor_pages/field_model_spec.rb
 - spec/models/constructor_pages/page_model_spec.rb
 - spec/models/constructor_pages/template_model_spec.rb
 - spec/requests/constructor_pages/pages_controller_spec.rb
+has_rdoc: 

data/spec/features/constructor_pages/pages_controller_spec.rb

@@ -1,13 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-require 'capybara/rspec'
-
-module ConstructorPages
-  describe 'Page Controller', type: :feature do
-    it 'should be valid' do
-      Page.create name: 'Hello'
-      visit '/hello'
-    end
-  end
-end