constructor-cms 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa0d5ab38b7e184f86ec0c1760f866179626899
-  data.tar.gz: db509a39b252d05c871a4e783d07e2b21a2e7ac5
+  metadata.gz: 6500e3498ffe43b926ab0eb43bf2d66f9dab464b
+  data.tar.gz: e3ea540cecc0fe31124b53a1cccd2bdef1af0090
 SHA512:
-  metadata.gz: d138a447d15b3f907ded261135d28dec1c8729457dcd4ecc0d8b25ac2af3972ce3c9f6bc4674dcf05714a81a4ade534f8694bf3f3290cb2326b232fa8365263e
-  data.tar.gz: 07c1553d7cd639a461396dbbe68684c302bf6f2132182a54fe0fc4bc2969cb17d757cd652aa451533af2ec08966173c07ab7007c78f1b569d03e96c00f5adae2
+  metadata.gz: efcb9ee149e95df47d25badfb8f09768d2a4e28e58afd1da1b080f5bd1fa56985721e280575f38253c87d781ee8328396f907da31325ea80241ab3bae7f09068
+  data.tar.gz: 7a781dd453a6ed3e76f04886f3c320835699f92f05dd2d09ce94a379b6810c5d8a76d00d34f372d94b32ee232af72b4e471b5afa4b8cd7b6cfba6f89e8e864ae

data/.gitignore

@@ -11,3 +11,4 @@ spec/dummy/tmp
 doc/
 .yardoc/
 tmp/
+pkg/

data/Guardfile

@@ -5,7 +5,7 @@ guard 'rspec', :spec_paths => extensions.map{|e| "#{e}/spec"}, :cli => (['~/.rsp
     watch(%r{^#{extension}/spec/.+_spec\.rb$})
     watch(%r{^#{extension}/app/(.+)\.rb$})                           { |m| "#{extension}/spec/#{m[1]}_spec.rb" }
     watch(%r{^#{extension}/lib/(.+)\.rb$})                           { |m| "#{extension}/spec/lib/#{m[1]}_spec.rb" }
-    watch(%r{^#{extension}/app/controllers/(.+)_(controller)\.rb$})  { |m| ["#{extension}/spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "#{extension}/spec/features/#{m[1]}_spec.rb"] }
+    watch(%r{^#{extension}/app/controllers/constructor_#{extension}/(.+)_(controller)\.rb$})  { |m| "#{extension}/spec/features/constructor_#{extension}/#{m[1]}_spec.rb" }
     watch(%r{^#{extension}/spec/support/(.+)\.rb$})                  { "#{extension}/spec" }
     watch("#{extension}/spec/spec_helper.rb")                        { "#{extension}/spec" }
     # Capybara request specs

data/README.md

@@ -12,7 +12,7 @@ Constructor – an open source Ruby on Rails content management system for Rails
 
 ### Add to Gemfile
 
-    gem 'constructor-cms', '~> 0.6.4'
+    gem 'constructor-cms', '~> 0.7.2'
 
 ### Install
 

data/Rakefile

@@ -10,6 +10,8 @@ APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 require 'rspec/core/rake_task'
 
+Dir[File.expand_path('../tasks/**/*', __FILE__)].each {|task| load task}
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = './**/*_spec.rb'
 end

data/core/lib/constructor_core/version.rb

@@ -1,3 +1,3 @@
 module ConstructorCore
-  VERSION = '0.7.0'
+  VERSION = '0.7.2'
 end

data/pages/app/controllers/constructor_pages/fields_controller.rb

@@ -23,22 +23,17 @@ module ConstructorPages
     def update
       @field = Field.find params[:id]
 
-        if @field.type_value != params[:field][:type_value]
-          @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)
-
-            if @field.type_value != 'image' \
-            and params[:field][:type_value] != 'image' \
-            and not (@field.type_value == 'string' and field.value.strip == '')
-                new_field.value = field.value
-            end
-
-            new_field.save
-
-            field.destroy
-          end
+      unless @field.type_value == params[:field][:type_value]
+        @field.type_class.where(field_id: @field.id).each do |field|
+          "constructor_pages/types/#{params[:field][:type_value]}_type".classify.constantize.new(
+              field_id: @field.id, page_id: field.page_id).tap {|f|
+            f.value = field.value unless [@field.type_value, params[:field][:type_value]].include?('image') and
+                                  (@field.type_value == 'string' and field.value.strip == '')
+            f.save; field.destroy
+          }
         end
+      end
+
       if @field.update field_params
         redirect_to edit_template_url(@field.template.id), notice: t(:field_success_updated, name: @field.name)
       else

data/pages/app/helpers/constructor_pages/code_name_uniq.rb

@@ -1,9 +1,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, :code_name_already_in_use)
-      end
+      errors.add(:base, :code_name_already_in_use) unless Page.check_code_name(code_name) and check_code_name(code_name)
     end
   end
 end

data/pages/app/models/constructor_pages/field.rb

@@ -2,14 +2,14 @@
 
 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
     # Adding code_name_uniqueness method
     include CodeNameUniq
 
     # Array of available field types
-    TYPES = %w{string integer float boolean text date html image}
+    TYPES = %w{string integer float boolean text date html image}.tap {|_t|
+    _t.each {|t| class_eval %{has_many :#{t}_types, dependent: :destroy, class_name: 'Types::#{t.titleize}Type'}}}
 
     validates_presence_of :name
     validates_uniqueness_of :code_name, scope: :template_id
@@ -18,25 +18,17 @@ module ConstructorPages
     after_create :create_page_fields
     after_destroy :destroy_all_page_fields
 
-    belongs_to :template
-
-    # Adding has_many for all field types
-    TYPES.each do |t|
-      class_eval %{
-        has_many :#{t}_types, dependent: :destroy, class_name: 'Types::#{t.titleize}Type'
-      }
-    end
-
     has_many :pages, through: :template
+    belongs_to :template
 
-    acts_as_list  scope: :template_id
+    acts_as_list scope: :template_id
     default_scope -> { order :position }
 
     # Return constant of model type_value
     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.where(field_id: id, page_id: page.id).first end
+    def find_type_object(page); type_class.find_by(field_id: id, page_id: page.id) end
 
     # Create object of type_value by page
     def create_type_object(page); type_class.create(field_id: id, page_id: page.id) end
@@ -45,43 +37,23 @@ module ConstructorPages
     def remove_type_object(page); find_type_object(page).destroy end
 
     # 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 get_value_for(page); find_type_object(page).tap {|t| return t && t.value} end
 
     # Set value type_field for specified page
-    def set_value_for(page, value)
-      _type_object = find_type_object(page)
-
-      if _type_object
-        _type_object.value = value
-        _type_object.save!
-      end
-    end
+    def set_value_for(page, value); find_type_object(page).tap {|t| t || return; t.update value: value} 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|
-        %w{self_and_ancestors descendants}.each do |m|
-          if template.send(m).map{|t| t.code_name}.include?(name)
-            return false
-          end
-        end
-      end
-
+      [code_name.pluralize, code_name.singularize].each {|name|
+        %w{self_and_ancestors descendants}.each {|m|
+          return false if template.send(m).map(&:code_name).include?(name)}}
       true
     end
 
     # Create and destroy page fields
-    %w{create destroy_all}.each do |m|
-      class_eval %{
-          def #{m}_page_fields
-            template.pages.each {|page| type_class.#{m} page_id: page.id, field_id: id}
-          end
-      }
-    end
+    %w{create destroy_all}.each {|m| class_eval %{
+      def #{m}_page_fields; template.pages.each {|page| type_class.#{m} page_id: page.id, field_id: id} end }}
   end
 end

data/pages/app/models/constructor_pages/page.rb

@@ -5,11 +5,10 @@ module ConstructorPages
   class Page < ActiveRecord::Base
     # 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'}
+      class_eval %{has_many :#{t}_types,  dependent: :destroy, class_name: 'Types::#{t.titleize}Type'}
     end
 
     has_many :fields, through: :template
-
     belongs_to :template
 
     default_scope -> { order :lft }
@@ -48,31 +47,12 @@ module ConstructorPages
       end
 
       def search(what_search = nil)
-        if @where_search
-          if @where_search.is_a?(String)
-            _page = Page.find_by full_url: @where_search
-          elsif @where_search.is_a?(Page)
-            _page = @where_search
-          end
-
-          @result = _page ? _page.descendants : []
-        else
-          @result = Page.all
-        end
-
-        if what_search
-          _template = Template.find_by code_name: what_search.to_s.singularize.downcase
-          @result = _template ? @result.where(template: _template) : []
-        end
-
-        if @params_search
-          @params_search.each_pair do |k, v|
-            @result = @result.select { |p| p.send(k) == v }
-          end
-        end
-
+        (@where_search.is_a?(String) ? Page.find_by(full_url: @where_search) : @where_search)
+        .tap {|p| @result = @where_search ? p ? p.descendants : [] : Page.all }
+        what_search && Template.find_by(code_name: what_search.to_s.singularize.downcase)
+        .tap {|t| @result = t ? @result.where(template: t) : [] }
+        @params_search && @params_search.each_pair {|k,v| @result = @result.select {|p| p.send(k) == v}}
         @where_search = @params_search = nil
-
         @result
       end
 
@@ -84,6 +64,7 @@ module ConstructorPages
     end
 
     def search(what_search = nil); Page.in(self).search(what_search) end
+    def by(params_search = nil); Page.by(params_search); self end
     def search_by(params_search = nil); Page.by(params_search).in(self).search end
 
     # Get field by code_name
@@ -105,28 +86,19 @@ module ConstructorPages
     # @param params should looks like <tt>{price: 500, content: 'Hello'}</tt>
     # @param reset_booleans reset all boolean fields to false before assign params
     def update_fields_values(params, reset_booleans = true)
-      return if params.nil?
-
-      fields.each do |field|
-        value = params[field.code_name.to_sym]
-
-        _type_object = field.find_type_object(self)
+      params || return
 
-        if _type_object
-          _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
-          _type_object.value = value if value
-          _type_object.save
-        end
-      end
+      fields.each {|f| f.find_type_object(self).tap {|t| t || break
+        t.value = 0 if f.type_value == 'boolean' && reset_booleans
+        params[f.code_name.to_sym].tap {|v| v && t.value = v}
+        t.save }}
     end
 
     # Create fields values
-    def create_fields_values; fields.each {|f| f.create_type_object(self) } end
+    def create_fields_values; fields.each {|f| f.create_type_object self} end
 
     # Remove all fields values
-    def remove_fields_values
-      fields.each {|f| f.remove_type_object self}
-    end
+    def remove_fields_values; fields.each {|f| f.remove_type_object self} end
 
     # Search page by template code_name in same branch of pages and templates.
     # It allows to call page.category.brand.series.model etc.
@@ -135,16 +107,11 @@ module ConstructorPages
     # and return array of pages if founded in descendants
     #
     # 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
-
-      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
+    # @param cname template code name
+    def find_page_in_branch(cname)
+      Template.find_by(code_name: cname.singularize).tap {|t| t || return
+        (descendants.where(template_id: t.id) if cname == cname.pluralize).tap {|r| r ||= []
+          return r.empty? ? ancestors.find_by(template_id: t.id) : r}}
     end
 
     alias_method :find_pages_in_branch, :find_page_in_branch
@@ -159,9 +126,7 @@ module ConstructorPages
     # @param options default merge name and title page attributes
     def as_json(options = {})
       {name: self.name, title: self.title}.merge(options).tap do |options|
-        fields.each do |f|
-          options.merge!({f.code_name.to_sym => f.get_value_for(self)})
-        end
+        fields.each {|f| options.merge!({f.code_name.to_sym => f.get_value_for(self)})}
       end
     end
 
@@ -175,12 +140,9 @@ module ConstructorPages
     #   puts page.price
     #   page.brand.models.each do...
     def method_missing(name, *args, &block)
-      if new_record?
-        super
-      else
-        name = name.to_s
-        name[-1] == '=' ? set_field_value(name[0..-2], args[0]) : get_field_value(name) || find_pages_in_branch(name)
-      end
+      super && return if new_record?
+      name = name.to_s
+      name[-1] == '=' ? set_field_value(name[0..-2], args[0]) : get_field_value(name) || find_pages_in_branch(name)
     end
 
     private
@@ -192,19 +154,13 @@ module ConstructorPages
 
     # TODO: add more languages
     # translit to english
-    def translit(str)
-      Russian.translit(str)
-    end
+    def translit(str); Russian.translit(str) end
 
     # Page is not valid if there is no template
-    def template_check
-      errors.add_on_empty(:template_id) if Template.count == 0
-    end
+    def template_check; errors.add_on_empty(:template_id) if Template.count == 0 end
 
     # If template_id is nil then get first template
-    def template_assign
-      self.template_id = Template.first.id unless template_id
-    end
+    def template_assign; self.template_id = Template.first.id unless template_id end
 
     # Update full_url
     def full_url_update

data/pages/app/models/constructor_pages/template.rb

@@ -23,23 +23,15 @@ module ConstructorPages
 
     # Return child corresponding child_id or children first
     def child
-      if child_id.nil? and !leaf?
-        children.first
-      else
-        Template.find child_id
-      end
+      !child_id && !leaf? ? children.first : self.class.find(child_id)
     end
 
     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)
-          return false
-        end
-      end
-
+    def check_code_name(cname)
+      [cname.pluralize, cname.singularize].each {|name|
+        return false if root.descendants.map{|t| t.code_name unless t.code_name == cname}.include?(name)}
       true
     end
   end

data/pages/config/routes.rb

@@ -15,12 +15,11 @@ ConstructorPages::Engine.routes.draw do
       get ':id/:template_id/edit/' => 'fields#edit', as: :edit_field
     end
 
-    scope '/pages' do
-      get ':page/new' => 'pages#new', as: :new_child_page
-    end
+    get '/pages/:page/new' => 'pages#new', as: :new_child_page
   end
 
   root :to => 'pages#show'
+
   get '*all/search/:what_search' => 'pages#search', format: false
   get '*all.:format' => 'pages#show'
   get '*all' => 'pages#show'

data/pages/spec/models/constructor_pages/{page_model_spec.rb → page_spec.rb}

@@ -138,7 +138,6 @@ module ConstructorPages
         end
       end
 
-
       context 'search in certain page' do
         it 'should search with what search' do
           @page.search.should == [@first_brand_page, @second_brand_page]
@@ -150,7 +149,9 @@ module ConstructorPages
         it 'it should search with by params' do
           @page.search_by(area: 25).should == [@first_brand_page]
           @page.search_by(price: 30000).should == [@second_brand_page]
+          @page.by(price: 30000).search.should == [@second_brand_page]
           @page.search_by(area: 10).should == []
+          @page.by(area: 10).search.should == []
         end
       end
     end

data/tasks/constructor-cms_tasks.rake

@@ -0,0 +1,15 @@
+namespace :all do
+  desc 'Build gems into the pkg directory'
+  task :build do
+    sh 'rake build'
+
+    %w{core pages}.each do |engine|
+      sh "gem build #{engine}/constructor-#{engine}.gemspec && mv constructor-#{engine}-#{ConstructorCore::VERSION}.gem pkg/"
+    end
+  end
+
+  desc 'Push all gems to Rubygems'
+  task :push do
+     sh "for i in pkg/*#{ConstructorCore::VERSION}.gem; do gem push $i; done"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constructor-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: constructor-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -394,20 +394,20 @@ files:
 - pages/lib/constructor-pages.rb
 - pages/lib/constructor_pages/engine.rb
 - pages/public/hello.txt
-- pages/spec/features/constructor_pages/fields_controller_spec.rb
-- pages/spec/features/constructor_pages/pages_controller_spec.rb
-- pages/spec/features/constructor_pages/templates_controller_spec.rb
+- pages/spec/features/constructor_pages/fields_spec.rb
+- pages/spec/features/constructor_pages/pages_spec.rb
+- pages/spec/features/constructor_pages/templates_spec.rb
 - pages/spec/helpers/constructor_pages/.keep
-- pages/spec/models/constructor_pages/field_model_spec.rb
-- pages/spec/models/constructor_pages/page_model_spec.rb
-- pages/spec/models/constructor_pages/template_model_spec.rb
-- pages/spec/models/constructor_pages/types/boolean_type_model_spec.rb
-- pages/spec/models/constructor_pages/types/date_type_model_spec.rb
-- pages/spec/models/constructor_pages/types/float_type_model_spec.rb
-- pages/spec/models/constructor_pages/types/html_type_model_spec.rb
-- pages/spec/models/constructor_pages/types/integer_type_model_spec.rb
-- pages/spec/models/constructor_pages/types/string_type_model_spec.rb
-- pages/spec/models/constructor_pages/types/text_type_model_spec.rb
+- pages/spec/models/constructor_pages/field_spec.rb
+- pages/spec/models/constructor_pages/page_spec.rb
+- pages/spec/models/constructor_pages/template_spec.rb
+- pages/spec/models/constructor_pages/types/boolean_type_spec.rb
+- pages/spec/models/constructor_pages/types/date_type_spec.rb
+- pages/spec/models/constructor_pages/types/float_type_spec.rb
+- pages/spec/models/constructor_pages/types/html_type_spec.rb
+- pages/spec/models/constructor_pages/types/integer_type_spec.rb
+- pages/spec/models/constructor_pages/types/string_type_spec.rb
+- pages/spec/models/constructor_pages/types/text_type_spec.rb
 - pages/spec/routing/constructor_pages/.keep
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -450,6 +450,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
 - spec/spec_helper.rb
+- tasks/constructor-cms_tasks.rake
 homepage: http://ivanzotov.github.com/constructor
 licenses: []
 metadata: {}
@@ -515,4 +516,3 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
 - spec/spec_helper.rb
-has_rdoc: