constructor-pages 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c078ab91ea33dd0cdfc25092efd3969d3978861f
-  data.tar.gz: b943b4a056a152bdac0d0d858ade1fca1b61c79f
+  metadata.gz: f7c99ad910ed090f671a97bb20daac6d2c794705
+  data.tar.gz: 738a7f27c0dfaa1c1cb5bdb8684b42cc640599ad
 SHA512:
-  metadata.gz: f674c9622f7be5947ddc8a6b63e00a3251edccfa56ac4096039d09b60e883f95feac19e52f9e70207588024ab6aa50172f3b0e31ab8988eb4f2bf17438cab930
-  data.tar.gz: 39fdf84915c22c79bb1e11e92541f78fbb7a5a220483558df018935e908163d29a72c092c6200ecaaab070c20de23f0b26f73b736dfbf3e9c5f26e9fd9cbe0d6
+  metadata.gz: 21cd621106d968f6458280fbf8046f1e51dc92352311a986ddfef188d91a718beb2ea0d157ca7069cca17a3977c7a2e89d50ce2d73a24151211f423a250f097e
+  data.tar.gz: 072ac7bd7b8a4975c62181809f41faf45477d4b5af133d3d5ff24fc0af3502d759dcd36d10ee7ceaca96371e9e5612af7bdffdadcb937897cdebb6a04d4e9793

data/app/controllers/constructor_pages/pages_controller.rb

@@ -33,20 +33,6 @@ module ConstructorPages
       render template: "templates/#{_code_name}"
     end
 
-    def search
-      @page = Page.find_by_request_or_first("/#{params[:all]}")
-
-      _params = request.query_parameters
-      _params.each_pair {|k,v| v || (_params.delete(k); next)
-        _params[k] = v.numeric? ? v.to_f : (v.to_boolean if v.boolean?)}
-
-      @pages = Page.in(@page).by(_params).search(params[:what_search])
-
-      @page.template.code_name.tap {|c| [c.pluralize, c.singularize].each {|name|
-        instance_variable_set('@'+name, @pages)}
-        render template: "templates/#{c}_search"}
-    end
-
     def edit
       @page = Page.find(params[:id])
       @parent_id, @template_id = @page.parent.try(:id), @page.template.id

data/app/models/constructor_pages/page.rb

@@ -47,13 +47,19 @@ module ConstructorPages
       end
 
       def search(what_search = nil)
-        (@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}}
+        hash_search, array_search = {}, []
+
+        @where_search = Page.find_by(full_url: @where_search) if @where_search.is_a?(String)
+        array_search = ['lft > ? and rgt < ?', @where_search.lft, @where_search.rgt] if @where_search
+
+        what_search && what_search = what_search.to_s.singularize.downcase
+        hash_search[:template_id] = ConstructorPages::Template.find_by(code_name: what_search).try(:id) if what_search
+
+        hash_search[:id] = ids_by_params(@params_search) if @params_search
+
         @where_search = @params_search = nil
-        @result
+
+        hash_search.empty? && array_search.empty? ? [] : Page.where(hash_search).where(array_search).to_a
       end
 
       def in(where_search  = nil); tap {@where_search  = where_search}  end
@@ -61,6 +67,45 @@ module ConstructorPages
 
       def search_in(where_search  = nil); self.in(where_search).search  end
       def search_by(params_search = nil); self.by(params_search).search end
+
+
+      def ids_by_params(params)
+        _hash = {}
+
+        params.each_pair do |key, value|
+          next if key == 'utf8'
+
+          key = key.to_s
+          _key, _value = key.gsub(/>|</, ''), value
+
+          if _value.is_a?(String)
+            next if _value.strip.empty?
+            _value = _value.gsub(/>|</, '')
+            _value = _value.numeric? ? _value.to_f : (_value.to_boolean if _value.boolean?)
+          end
+
+          sign = '='
+
+          if key =~ />$/ || value =~ /^>/
+            sign = '>'
+          elsif key =~ /<$/ || value =~ /^</
+            sign = '<'
+          end
+
+          _fields = ConstructorPages::Field.where(code_name: _key)
+
+          _ids = []
+
+          _fields.each do |_field|
+            _hash[:field_id] = _field.id
+            _ids << _field.type_class.where("value #{sign} #{_value}").where(_hash).map(&:page_id)
+          end
+
+          _hash[:page_id] = _ids.flatten.uniq
+        end
+
+        return _hash[:page_id] || []
+      end
     end
 
     def search(what_search = nil); Page.in(self).search(what_search) end

data/config/routes.rb

@@ -17,7 +17,6 @@ ConstructorPages::Engine.routes.draw do
 
   root :to => 'pages#show'
 
-  get '*all/search/:what_search' => 'pages#search', format: false
   get '*all.:format' => 'pages#show'
   get '*all' => 'pages#show'
 end

data/spec/models/constructor_pages/page_spec.rb

@@ -70,7 +70,7 @@ module ConstructorPages
         @content_field = Field.create name: 'Content', code_name: 'content', template: @brand_template, type_value: 'text'
         @check_field = Field.create name: 'Check', code_name: 'check', template: @brand_template, type_value: 'boolean'
         @brand_price_field = Field.create name: 'Price', code_name: 'price', template: @brand_template, type_value: 'float'
-        @brand_area_field = Field.create name: 'Area', code_name: 'area', template: @brand_template, type_value: 'integer'
+        @brand_area_field = Field.create name: 'Area', code_name: 'brand_area', template: @brand_template, type_value: 'integer'
 
         @page = Page.create name: 'Fresco', template: @template
         @page.price = 15000
@@ -82,21 +82,23 @@ module ConstructorPages
 
         @first_brand_page = Page.create name: 'Midea', template: @brand_template, parent: @page
         @first_brand_page.price = 20000
-        @first_brand_page.area = 25
+        @first_brand_page.brand_area = 25
         @first_brand_page.content = 'This is first brand page'
         @first_brand_page.check = true
 
         @second_brand_page = Page.create name: 'Dantex', template: @brand_template, parent: @page
         @second_brand_page.price = 30000
-        @second_brand_page.area = 55
+        @second_brand_page.brand_area = 55
         @second_brand_page.content = 'This is second brand page'
         @second_brand_page.check = false
+        @second_brand_page.reload
 
         @third_brand_page = Page.create name: 'LG', template: @brand_template, parent: @second_page
         @third_brand_page.price = 10000
-        @third_brand_page.area = 38
+        @third_brand_page.brand_area = 38
         @third_brand_page.content = 'This is third brand page'
         @third_brand_page.check = true
+        @third_brand_page.reload
 
         @page.reload
         @second_page.reload
@@ -104,7 +106,6 @@ module ConstructorPages
 
       context 'search in all pages' do
         it 'should search with what search' do
-          Page.search.should == [@page, @first_brand_page, @second_brand_page, @second_page, @third_brand_page]
           Page.search(:hello).should == []
           Page.search(:brand).should == [@first_brand_page, @second_brand_page, @third_brand_page]
           Page.search(:brands).should == [@first_brand_page, @second_brand_page, @third_brand_page]
@@ -121,22 +122,23 @@ module ConstructorPages
           Page.in(@second_page).search('brand').should == [@third_brand_page]
         end
 
-        it 'it should search with by params' do
-          Page.in(@page).search_by(area: 25).should == [@first_brand_page]
+        it 'should search with by params' do
+          @page.reload
+          Page.in(@page).search_by(brand_area: 25).should == [@first_brand_page]
           Page.search_by(area: 10).should == [@second_page]
           Page.search_by(price: 15000).should == [@page]
-          Page.in(@page).by(area: 25).search(:brand).should == [@first_brand_page]
-          Page.in(@second_page).by(area: 38).search(:brand).should == [@third_brand_page]
-          Page.in(@second_page).by(area: 40).search(:brand).should == []
-          Page.in('/world').search_by(area: 10).should == []
+          Page.in(@page).by(brand_area: 25).search(:brand).should == [@first_brand_page]
+          Page.in(@second_page).by(brand_area: 38).search(:brand).should == [@third_brand_page]
+          Page.in(@second_page).by(brand_area: 40).search(:brand).should == []
+          Page.in('/world').search_by(brand_area: 10).should == []
         end
 
         it 'should search with less' do
-          pending#Page.search(price: ['<', 20000]).should == [@page]
+          Page.search_by('price<' => '20000').should == [@page, @second_page, @third_brand_page]
         end
 
         it 'should search with more' do
-          pending#Page.search(price: ['<', 20000], price: ['>', 5000]).should == [@page, @second_page]
+          Page.search_by('price>' => 20000).should == [@second_brand_page]
         end
       end
 
@@ -149,7 +151,7 @@ module ConstructorPages
         end
 
         it 'it should search with by params' do
-          @page.search_by(area: 25).should == [@first_brand_page]
+          @page.search_by(brand_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 == []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-06-29 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.1
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement