redde_seo 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aab502b4441399a9a16afb66cd4702e9e7a8547
-  data.tar.gz: e2b0ba29a2b38eec17fd6f77581148f001ec664d
+  metadata.gz: 7bc51bdeafb5c59c2002a266a50954333479ac7a
+  data.tar.gz: 2a0f94f206f07d133c0a939cc7557e4597ac41ce
 SHA512:
-  metadata.gz: ccfa6b0fbc6a8e9068a0951c15e67604259d20e4052929ef487f964ce088eb9ed8eb9a727b2a60f03d0ea2f7d9bafbde4c2f17f1eee747e1c370f8fd77098d2d
-  data.tar.gz: 313a971c1ffd79f13e2d3dc0fcd30b33cab86a5045b0dfd6abd9116f72a8c5e209388b80b7aad6c8b236b164e93d8c019d044d36c271b4b3277de5a5687e6bfa
+  metadata.gz: 411fa7bf5f7b05860c9e1ebc57cf45c6df452815ff7728d529b7782e1ff8580004f6a8385f9cf8521e565db43fc4f5915284a2466115a4a5651876d83280773f
+  data.tar.gz: bb31a361cea476eb6faa06019a6e08534eb211aa308326d6e753137338a8cee3e929584a7c03703bf344275bf9e69caf456719513bdc11d79d8076d21e7a675a

data/app/controllers/admin/seos_controller.rb

@@ -1,7 +1,8 @@
 # coding: utf-8
 class Admin::SeosController < Admin::BaseController
+  before_action :set_categories
   def index
-    @seos = Redde::Seo.empty
+    @seos = Redde::Seo.for_empty(params[:empty]).for_type(params[:seoable_type]).page(params[:page])
   end
 
   def all
@@ -50,6 +51,10 @@ class Admin::SeosController < Admin::BaseController
     end
   end
 
+  def set_categories
+    @categories = Redde::Seo.categories
+  end
+
   def notice_for(obj)
     "#{obj.class.model_name.human} сохранен."
   end

data/app/helpers/redde/seo/seos_helper.rb

@@ -1,4 +1,16 @@
+# coding: utf-8
+
 module Redde::Seo::SeosHelper
+  def seo_empty_link(name, key)
+    content_tag :p do
+      link_to name, params.merge(empty: key), class: ['phead-side__link', ('_active' if params[:empty] == key.to_s)]
+    end
+  end
+
+  def seo_type_link(name, key)
+    link_to name, url_for(params.merge(seoable_type: key)), class: ['phead-tabs__link', ('_active' if params[:seoable_type] == key)]
+  end
+
   def seo_link_for_url(seo)
     link_to seo_url_for(seo), [:edit, :admin, seo], alt: seo.url, title: seo.url
   end

data/app/models/redde/seo.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 class Redde::Seo < ActiveRecord::Base
+  paginates_per 50
   attr_accessor :skip_basic_validation
 
   belongs_to :seoable, polymorphic: true
@@ -8,6 +9,8 @@ class Redde::Seo < ActiveRecord::Base
   scope :for_url, ->(u) { where(url: u) }
   scope :for_object, ->(o) { where(seoable_type: o.class.name, seoable_id: o.id) }
   scope :empty, -> { where("title is null or title = '' or keywords is null or keywords = '' or description is null or description = ''") }
+  scope :full, -> { where("char_length(title) > 0 AND char_length(keywords) > 0 AND char_length(description) > 0") }
+  scope :for_type, ->(u) { where(seoable_type: u) }
 
   validates :title, :keywords, :description, length: { minimum: 5 }, allow_blank: true, unless: :skip_basic_validation
 
@@ -22,4 +25,22 @@ class Redde::Seo < ActiveRecord::Base
   def self.model_name
     ActiveModel::Name.new(self, nil, 'Seo')
   end
+
+  def self.categories
+    self.select('seos.seoable_type, COUNT(*) AS type_count').group('seos.seoable_type')
+      .inject({}) do |res, t|
+        if t.seoable_type
+          name = "#{t.seoable_type.constantize.model_name.human} (#{t.type_count})"
+        else
+          name = "Без привязки (#{t.type_count})"
+        end
+        res.merge(name => t.seoable_type)
+    end
+  end
+
+  def self.for_empty(empty = nil)
+    return self.all if empty.nil?
+    return self.empty if empty == 'true'
+    self.full
+  end
 end

data/app/views/admin/seos/index.html.haml

@@ -1,8 +1,11 @@
 - content_for(:page_header) do
   %h1 SEO
-  %p= link_to 'Все', [:all, :admin, :seos] if action_name != 'all'
-  %p= link_to 'Пустые', [:admin, :seos] if action_name != 'index'
-
+  = seo_empty_link('Все', nil)
+  = seo_empty_link('Пустые', true)
+  = seo_empty_link('Полные', false)
+  %nav.phead-tabs
+    - @categories.each do |name, key|
+      = seo_type_link(name, key)
 - unless @seos.empty?
   %table.list
     %colgroup
@@ -25,4 +28,5 @@
         %td= seo_title_for(seo)
         %td= seo_empty_for(seo)
         %td= link_to 'Удалить', [:admin, seo], method: :delete, data: { confirm: 'Удалить?' }, class: :del
+  = paginate @seos
 

data/lib/redde_seo/version.rb

@@ -1,3 +1,3 @@
 module ReddeSeo
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redde_seo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Oleg Bovykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: quiet_assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement