constructor-pages 0.5.5 → 0.5.6

data/app/controllers/constructor_pages/fields_controller.rb

@@ -26,7 +26,7 @@ module ConstructorPages
       @field = Field.find params[:id]
 
         if @field.type_value != params[:field][:type_value]
-          @field.type_model.where(:field_id => @field.id).each do |field|
+          @field.type_class.where(:field_id => @field.id).each do |field|
             new_field = "constructor_pages/types/#{params[:field][:type_value]}_type".classify.constantize.new(
                 :field_id => @field.id,
                 :page_id => field.page_id)

data/app/models/constructor_pages/field.rb

@@ -16,7 +16,7 @@ module ConstructorPages
 
     TYPES.each do |t|
       class_eval %{
-        has_one :#{t}_type, class_name: 'Types::#{t.titleize}Type'
+        has_many :#{t}_types, class_name: 'Types::#{t.titleize}Type'
       }
     end
 
@@ -26,34 +26,37 @@ module ConstructorPages
     default_scope order: :position
 
     # return constant of model by type_value
-    def type_model; "constructor_pages/types/#{type_value}_type".classify.constantize end
+    def type_class; "constructor_pages/types/#{type_value}_type".classify.constantize end
 
-    # remove all type_fields values for specified page
-    def remove_values_for(page); type_model.destroy_all field_id: id, page_id: page.id end
+    # return object of type_value
+    def find_type_object(page); type_class.find_by_field_id_and_page_id(id, page.id) end
 
-    def update_value(page, params)
-      _type_model = type_model.where(field_id: id, page_id: page.id).first_or_create
+    # return created object of type_value
+    def create_type_object(page); type_class.create(field_id: id, page_id: page.id) end
 
-      update_type_model(_type_model, type_value, params) if params
-    end
+    def find_or_create_type_object(page); find_type_object(page) || create_type_object(page) end
 
-    private
+    # 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
 
-    def update_type_model(type_model, type_value, params)
-      type_model.value = 0 if type_value == 'boolean'
+    # set value type_field for specified page
+    def set_value_for(page, value)
+      _type_object = find_type_object(page)
 
-      if params[type_value]
-        if type_value == 'date'
-          value = params[type_value][id.to_s]
-          type_model.value = Date.new(value['date(1i)'].to_i, value['date(2i)'].to_i, value['date(3i)'].to_i).to_s
-        else
-          type_model.value = params[type_value][id.to_s]
-        end
+      if _type_object
+        _type_object.value = value
+        _type_object.save!
       end
-
-      type_model.save
     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
+
     def method_uniqueness
       if Page.first.respond_to?(code_name) \
       or Page.first.respond_to?(code_name.pluralize) \
@@ -69,7 +72,7 @@ module ConstructorPages
     %w{create destroy_all}.each do |m|
       class_eval %{
           def #{m}_page_fields
-            template.pages.each {|page| type_model.#{m} page_id: page.id, field_id: id}
+            template.pages.each {|page| type_class.#{m} page_id: page.id, field_id: id}
           end
       }
     end

data/app/models/constructor_pages/page.rb

@@ -27,36 +27,50 @@ module ConstructorPages
 
     acts_as_nested_set
 
-    def self.find_by_request_or_first(request)
+    # Used for find page by request. It return first page if no request given
+    def self.find_by_request_or_first(request = nil)
       request.nil? ? Page.first : Page.find_by_full_url('/' + request)
     end
 
-    # generate full_url from parent page and url
+    # Generate full_url from parent page and url
     def self.full_url_generate(parent_id, url = '')
       Page.find(parent_id).self_and_ancestors.map {|c| c.url}.append(url).join('/')
     end
 
-    def active?; active end
+    def field(code_name)
+      Field.find_by_code_name_and_template_id code_name, template_id
+    end
+
+    def get_field_value(code_name)
+      field = field(code_name)
+      field.get_value_for(self) if field
+    end
 
-    def field(code_name, meth = 'value')
-      field = Field.find_by_code_name_and_template_id code_name, template_id
+    def find_page_in_branch_template(code_name)
+      _template = Template.find_by_code_name code_name.singularize
 
-      if field
-        _field = field.type_model.find_by_field_id_and_page_id field.id, id
-        _field.send(meth) if _field
+      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
       end
     end
 
+    alias_method :find_pages_in_branch_template, :find_page_in_branch_template
+
+    def set_field_value(code_name, value)
+      field = field(code_name)
+      field.set_value_for(self, value) if field
+    end
+
+    def active?; active end
+
     def as_json(options = {})
-      options =  {
-        :name => self.name,
-        :title => self.title
-      }.merge options
+      options = {name: self.name, title: self.title}.merge options
 
-      fields.each do |field|
-        unless self.send(field.code_name)
-          options = {field.code_name => self.send(field.code_name)}.merge options
-        end
+      template.fields.each do |field|
+        options = {field.code_name.to_sym => field.get_value_for(self)}.merge options
       end
 
       options
@@ -68,27 +82,26 @@ module ConstructorPages
     end
 
     # update all type fields
-    def update_fields_values(params)
-      fields.each {|f| f.update_value(self, params)}
-    end
-
-    def method_missing(name, *args, &block)
-      name = name.to_s
+    def update_fields_values(params, reset_booleans = true)
+      fields.each do |field|
+        value = params[field.code_name.to_sym]
 
-      if field(name).nil?
-        _template = Template.find_by_code_name name.singularize
-        template_id = _template.id if _template
+        _type_object = field.find_or_create_type_object(self)
+        _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
 
-        if template_id
-          result = descendants.where(template_id: template_id) if name == name.pluralize
-          result = ancestors.where(template_id: template_id).first if result.empty?
-          result || []
+        if value
+          _type_object.value = field.type_value == 'date' ? parse_date(value).to_s : value
         end
-      else
-        field(name)
+
+        _type_object.save
       end
     end
 
+    def method_missing(name, *args, &block)
+      name = name.to_s
+      name[-1] == '=' ? set_field_value(name[0..-2], args[0]) : get_field_value(name) || find_pages_in_branch_template(name)
+    end
+
     # check if link specified
     def redirect?; url != link && !link.empty? end
 
@@ -99,6 +112,10 @@ module ConstructorPages
       self.url = ((auto_url || url.empty?) ? translit(name) : url).parameterize
     end
 
+    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
     def translit(str)
@@ -122,7 +139,7 @@ module ConstructorPages
     def descendants_update; descendants.map(&:save) end
 
     def create_fields
-      fields.each {|field| field.type_model.create page_id: id, field_id: field.id}
+      fields.each {|field| field.type_class.create page_id: id, field_id: field.id}
     end
   end
 end

data/app/models/constructor_pages/template.rb

@@ -2,7 +2,7 @@
 
 module ConstructorPages
   class Template < ActiveRecord::Base
-    attr_accessible :name, :code_name, :child_id, :parent_id
+    attr_accessible :name, :code_name, :child_id, :parent_id, :parent
 
     validates_presence_of :name, :code_name
     validates_uniqueness_of :code_name

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

@@ -1 +1 @@
-= check_box_tag "fields[#{field.type_value}][#{field.id}]", nil, page.boolean_types.where(:field_id => field.id).first.value
+= check_box_tag "fields[#{field.code_name}]", nil, page.get_field_value(field.code_name)

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

@@ -1 +1 @@
-= date_select "fields[#{field.type_value}][#{field.id}]", "date", :default => page.date_types.where(:field_id => field.id).first.value
+= date_select "fields[#{field.code_name}]", "date", default: page.get_field_value(field.code_name)

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

@@ -1 +1 @@
-= text_field_tag "fields[#{field.type_value}][#{field.id}]", page.float_types.where(:field_id => field.id).first.value, :class => "span2"
+= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'span2'

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

@@ -1 +1 @@
-= text_area_tag "fields[#{field.type_value}][#{field.id}]", page.html_types.where(:field_id => field.id).first.value, :rows => 10, :class => "span9 ckeditor"
+= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :rows => 10, :class => 'span9 ckeditor'

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

@@ -1,7 +1,7 @@
-- image = page.image_types.where(:field_id => field.id).first
+- image = page.get_field_value(field.code_name)
 
 - if image
-  = image_tag image.value.thumb("200x200").url
+  = image_tag image.value.thumb('200x200').url
 
 %br/
-= file_field_tag "fields[#{field.type_value}][#{field.id}]", :class => "span6"
+= file_field_tag "fields[#{field.code_name}]", :class => 'span6'

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

@@ -1 +1 @@
-= text_field_tag "fields[#{field.type_value}][#{field.id}]", page.integer_types.where(:field_id => field.id).first.value, :class => "span2"
+= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :class => 'span2'

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

@@ -1 +1 @@
-= text_field_tag "fields[#{field.type_value}][#{field.id}]", page.string_types.where(:field_id => field.id).first.value, :class => "span6"
+= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :class => 'span6'

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

@@ -1 +1 @@
-= text_area_tag "fields[#{field.type_value}][#{field.id}]", page.text_types.where(:field_id => field.id).first.value, :rows => 10, :class => "span6"
+= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :rows => 10, :class => 'span6'

data/spec/models/constructor_pages/page_model_spec.rb

@@ -4,36 +4,81 @@ require 'spec_helper'
 
 module ConstructorPages
   describe Page do
-    before :all do
+    before :each do
       Template.delete_all
       Template.create name: 'Page', code_name: 'page'
 
-
+      Page.delete_all
       Field.delete_all
       Types::TextType.delete_all
     end
 
     it 'should be valid' do
-      page = Page.create
-      page.valid?.should be_true
+      Page.create.valid?.should be_true
     end
 
-    describe '.field' do
-      it 'should get value from type_field' do
+    describe '.find_by_request_or_first' do
+      before :each do
+        @page = Page.create name: 'New page', url: 'new-page'
+      end
+
+      it 'should return page by given request path' do
+        Page.find_by_request_or_first('new-page').should == @page
+      end
+
+      it 'should return first page if no given request' do
+        Page.find_by_request_or_first.should == @page
+      end
+    end
+
+    describe '.full_url_generate' do
+      it 'should generate full_url from parent_id and url' do
+      end
+    end
+
+    describe '#set_field' do
+      it 'should set value for type_field' do
         template = Template.create name: 'Page template', code_name: 'page_template'
         page = Page.create name: 'Home page', template: template
         field = Field.create name: 'Content', code_name: 'desc', template: template, type_value: 'text'
-        page.field('desc').should == field.text_type.value
+
+        page.set_field_value('desc', 'my world')
+
+        field.get_value_for(page).should == 'my world'
       end
     end
 
-    describe '.full_url_generate' do
-      it 'should generate full_url from parent_id and url' do
+    describe '#get_field' do
+      it 'should get value from type_field' do
+        template = Template.create name: 'Page template', code_name: 'page_template'
+        page = Page.create name: 'Home page', template: template
+        Field.create name: 'Content', code_name: 'desc', template: template, type_value: 'text'
+
+        page.set_field_value('desc', 'Hello world')
+        page.get_field_value('desc').should == 'Hello world'
+      end
+    end
+
+    describe '#find_page_in_branch_template' do
+      it 'should find page in one branch template by code_name' do
+        brand_template = Template.create name: 'Brand', code_name: 'brand'
+        series_template = Template.create name: 'Series', code_name: 'series', parent: brand_template
+
+        brand_page = Page.create name: 'Zanussi', template: brand_template
+        series_page = Page.create name: 'Fresco', template: series_template, parent: brand_page
+
+        series_page.find_page_in_branch_template('brand').should == brand_page
       end
     end
 
     describe '#as_json' do
-      it 'should return page as json format with fields'
+      it 'should return page as json format with fields' do
+        template = Template.create name: 'JSON', code_name: 'json_template'
+        page = Page.create name: 'Hi json', template: template
+        Field.create name: 'Content', code_name: 'content', template: template, type_value: 'text'
+        page.content = 'Hello world'
+        page.as_json.should == {content: 'Hello world', name: page.name, title: page.title}
+      end
     end
 
     describe '#redirect?' do
@@ -105,6 +150,38 @@ module ConstructorPages
       end
     end
 
+    describe '#update_fields_values' do
+      it 'should update fields values with params' do
+        template = Template.create name: 'New template', code_name: 'brand'
+        Field.create name: 'Price', code_name: 'price', template: template, type_value: 'float'
+        Field.create name: 'Check', code_name: 'check', template: template, type_value: 'boolean'
+
+        page = Page.create name: 'New page', template: template
+
+        page.check = true
+        page.check.should be_true
+
+        page.update_fields_values({price: 1000})
+
+        page.price.should == 1000
+        page.check.should be_false
+      end
+    end
+
+    describe '#remove_fields_values' do
+      it 'should destroy all type_values fields' do
+        template = Template.create name: 'New template', code_name: 'template'
+        field = Field.create name: 'Price', code_name: 'price', template: template, type_value: 'float'
+        page = Page.create name: 'New page', template: template
+
+        page.price = 500
+        field.find_type_object(page).value.should == 500
+
+        page.remove_fields_values
+        field.find_type_object(page).should be_nil
+      end
+    end
+
     describe '#full_url' do
       it 'should be generated from url and ancestors' do
         page = Page.create name: 'Hello'
@@ -169,9 +246,37 @@ module ConstructorPages
     end
 
     describe 'create_fields' do
-      it 'should create type_fields after update page' do
-        page = Page.create name: 'Hello fields'
+      it 'should create type_fields after update page'
+    end
+
+    describe 'method_missing' do
+      it 'should return value of type_value for missing method' do
+        template = Template.create name: 'Page', code_name: 'page_template'
+        page = Page.create name: 'No method', template: template
+        field = Field.create name: 'Content', code_name: 'desc', template: template, type_value: 'text'
+        field.set_value_for(page, 'my world')
+
+        page.desc.should == 'my world'
+      end
+
+      it 'should set value for type_value for missing method' do
+        template = Template.create name: 'Page', code_name: 'page_templ'
+        page = Page.create name: 'No method', template: template
+        field = Field.create name: 'Content', code_name: 'desc', template: template, type_value: 'text'
+
+        page.desc = 'my world 2'
+        field.get_value_for(page).should == 'my world 2'
+      end
+
+      it 'should find page in branch template if no field found' do
+        Template.delete_all
+        brand_template = Template.create name: 'Brand', code_name: 'brand'
+        series_template = Template.create name: 'Series', code_name: 'series', parent: brand_template
+
+        brand_page = Page.create name: 'Zanussi', template: brand_template
+        series_page = Page.create name: 'Fresco', template: series_template, parent: brand_page
 
+        series_page.brand.should == brand_page
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constructor-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -246,3 +246,4 @@ test_files:
 - spec/models/constructor_pages/field_model_spec.rb
 - spec/models/constructor_pages/page_model_spec.rb
 - spec/models/constructor_pages/template_model_spec.rb
+has_rdoc: