c80_news_tz 0.1.1.1 → 0.1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef72d5df75824859b292c4c6025830a3ca83c23
-  data.tar.gz: 1b18b039552919886bf9b29b59130afaf3ac21eb
+  metadata.gz: 2c20f9594fbbe051876b9634c02ffea4b09d41aa
+  data.tar.gz: bdfd17888df61ac487a59f9d7a38d3ff4f493cc7
 SHA512:
-  metadata.gz: 2417f95b5b9251d82ccb11d96b309158df2972f3a6dce00b4d959187f1de849a4382761fb56878b6fb39565b18cacb3b8280495f2c6df94b4f6f9d0b05c9f526
-  data.tar.gz: e4953d28831aa7f597a7b4b16af8b0f3308bf34360b103a3c4be8517a867635a197ccaabe5f5b26fe01d93ef1f44a94388a5cb1332d7cb308c7913d5d8f86f9d
+  metadata.gz: 74897617e0613cc2b5ca6dc5c0fa87170e3bc18947fe54c9193f584c0383b85a5db322a683e552bad687292dea2d2139199e099126b448479e48e85700514d69
+  data.tar.gz: bd5f68976b44438e69c1b9c6aa70dabdcd7cf0c81485883ab353cfcff45752e9d6b793c40f42a162da7e234ea231a86974cfcb4151f7e6c59656341da7cc6471

data/README.md

@@ -7,9 +7,7 @@ News HABTM Rubrics. News HABTM Issues. News HABTM Companies. Companies has_many
 
 Add this line to your application's Gemfile:
 
-```ruby
-gem 'c80_news_tz'
-```
+    gem 'c80_news_tz'
 
 And then execute:
 
@@ -19,52 +17,87 @@ Or install it yourself as:
 
     $ gem install c80_news_tz
 
-## Usage
+Perform migrations:
 
-1) `rake db:migrate`
+    $ rake db:migrate
 
-2) Скопировать example файлы из `db\seeds\`, убрать расширение example.
+Copy example seed files from `<GEM_FOLDER>\db\seeds\` to `<HOST_PROJECT_FOLDER>\db\seeds\`,
+remove `.example` extensions.
 
-3) `cp seeds.sh.example seeds.sh; sudo chmod +x seeds.sh; ./seeds.sh`.
+Copy seeds.sh.example file:
 
-4) Add the line to application's routes file:
+    cp <GEM_FOLDER>\seeds.sh.example <HOST_PROJECT_FOLDER>\seeds.sh; sudo chmod +x seeds.sh; ./seeds.sh
+    
+Add the line to application's routes file:
 
-```
-mount C80NewsTz::Engine => '/'
-```
+    mount C80NewsTz::Engine => '/'
 
-5) Add this line to `application.js.coffee`:
+Add this line to `application.js.coffee`:
 
-```
-#= require c80_news_tz
-```
+    #= require c80_news_tz
 
-6) Add this line to `application.scss`:
+Add this line to `application.scss`:
 
-```
-@import "c80_news_tz/application";
-```
+    @import "c80_news_tz/application";
 
-7) Add this line to `application_controller.rb`:
+Add this line to `application_controller.rb`:
 
-```
-helper C80NewsTz::Engine.helpers
-```
+    helper C80NewsTz::Engine.helpers
 
-This gem uses: ActiveAdmin, Fontawesome.
+This gem uses: ActiveAdmin, Fontawesome. Add this to your `active_admin_custom.scss` file:
 
-Add this to your `active_admin_custom.scss` file:
+    @import "font-awesome";
 
-```scss
-@import "font-awesome";
-```
+Add these lines to `routes.rb` (optional):
+
+    get '/companies/:company_slug' => 'site#company'
+    get '/news/:fact_slug' => 'site#fact'
+    get '/issues/:issue_slug' => 'site#issue'
+    get '/notices/:notice_slug' => 'site#notice'
+    get '/rubrics/:rubric_slug' => 'site#rubric'
+
+Implement these methods in `site_controller.rb` (optional):
+    
+    def company
+    end
+    
+    # просмотр новости на отдельной странице
+    def fact
+      @fact = C80NewsTz::Fact.where(:slug => params[:fact_slug]).first
+      @vparams[:page_content] = @fact.full if @fact.full.present?
+      @vparams[:body_id] = 'fact'
+      add_title @fact.title
+      # add_breadcrumb @page.title
+      @vparams[:description] = @fact.short_meta_description if @fact.short_meta_description.present?
+      override_with_seo
+      # найти и подсветить родительский пункт меню
+      @vparams[:active_menus] << MenuItem.where(:title => 'Новости').first.id
+    end
+  
+    def issue
+      # ...
+    end
+    
+    def notice
+      # ...
+    end
+  
+    # просмотр рубрики на отдельной странице
+    def rubric
+      @rubric = C80NewsTz::Rubric.where(:slug => params[:rubric_slug]).first
+      add_title(@rubric.title)
+      override_with_seo
+    end
+
+Implement corresponding views (optional). For example `views/site/fact.html.erb`:
+    
+    <h1><%= @fact.title %></h1>
+    <%= check_page_art(@vparams[:page_content], @fact.fphotos, @fact.title).html_safe %>
 
 ## Available helper methods
 
-```
-render_news_block
-render_one_fact
-```
+    render_news_block
+    render_one_fact
 
 ## Development
 

data/app/admin/c80_news_tz/compaines.rb

@@ -7,6 +7,7 @@ ActiveAdmin.register C80NewsTz::Company, :as => 'Company' do
   permit_params :title,
                 :activity_type,
                 :desc,
+                :logo,
                 :fact_ids => [],
                 :adress_attributes => [:id, :locality, :street, :telephone_1, :telephone_2, :telephone_3, :latitude, :longitude, :email_1, :email_2, :site_1, :site_2],
                 :cphotos_attributes => [:id, :image, :_destroy],
@@ -64,7 +65,7 @@ ActiveAdmin.register C80NewsTz::Company, :as => 'Company' do
 
       f.input :title
       f.input :activity_type
-
+      f.input :logo, :hint => "#{image_tag("#{f.object.logo.url}")}".html_safe
     end
 
     f.inputs "Адрес", :class => 'collapsed', for: [:adress, f.object.adress || C80NewsTz::Adress.new] do |s|
@@ -100,7 +101,7 @@ ActiveAdmin.register C80NewsTz::Company, :as => 'Company' do
         ff.input :file, :as => :file, :hint => ff.template.asset_url(ff.object.file)
       end
 =end
-    f.inputs 'Новости\публикации, связанные с компанией', :class => 'collapsed' do
+    f.inputs 'Публикации, связанные с компанией', :class => 'collapsed' do
       f.input :facts,
               :as => :check_boxes,
               :member_label => Proc.new { |p|

data/app/admin/c80_news_tz/facts.rb

@@ -2,7 +2,7 @@ ActiveAdmin.register C80NewsTz::Fact, :as => 'Fact' do
 
   before_filter :skip_sidebar!, :only => :index
 
-  menu :label => 'Новости', :parent => 'Содержимое сайта'
+  menu :label => 'Публикации', :parent => 'Содержимое сайта'
 
   permit_params :short,
                 :title,
@@ -29,7 +29,7 @@ ActiveAdmin.register C80NewsTz::Fact, :as => 'Fact' do
 
     column '' do |fact|
       if fact.fphotos.count > 0
-        image_tag(fact.fphotos.first.image.thumb_preview)
+        image_tag(fact.fphotos.first.image.thumb_preview_medium)
       end
     end
 
@@ -74,15 +74,15 @@ ActiveAdmin.register C80NewsTz::Fact, :as => 'Fact' do
       f.input :short, :input_html => {:rows => 3, :class => 'code_area'}
       f.input :leader_abz, :input_html => {:rows => 3, :class => 'code_area'}
 
-      f.inputs 'Картинки, вставляемые в текст новости (первая картинка идёт в предпросмотр новости)', :class => 'collapsed' do
+      f.inputs 'Картинки, вставляемые в текст публикации (первая картинка идёт в предпросмотр публикации)', :class => 'collapsed' do
         f.has_many :fphotos, :allow_destroy => true do |fphotos|
           fphotos.input :image,
                        :as => :file,
-                       :hint => image_tag(fphotos.object.image.thumb_preview)
+                       :hint => image_tag(fphotos.object.image.thumb_preview_medium)
         end
       end
 
-      f.inputs 'Текст новости' do
+      f.inputs 'Текст публикации' do
         f.input :full, :as => :ckeditor
       end
 

data/app/admin/c80_news_tz/locations.rb

@@ -0,0 +1,43 @@
+ActiveAdmin.register C80NewsTz::Location, :as => 'Location' do
+
+  menu :label => "Места на главной", :parent => 'Содержимое сайта'
+
+  before_filter :skip_sidebar!, :only => :index
+
+  permit_params :fact_ids => []
+
+  config.sort_order = 'id_asc'
+
+  index do
+    id_column
+    column :title
+
+    column :facts do |loc|
+      # нарисуем список
+      list_items = ((loc.facts.map { |p|
+        "<li>• #{ p.title } <a href='/news/#{p.slug}' target='_blank'>[view]</a> <a href='/admin/facts/#{p.slug}/edit'>[edit]</a> </li>"
+      }).join("")).html_safe
+
+      "<ul>#{list_items}</ul>".html_safe
+    end
+
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+    f.inputs "Свойства" do
+      f.input :title
+
+      f.input :facts,
+              :as => :select,
+              :input_html => {:multiple => false},
+              :include_blank => true,
+              :member_label => Proc.new { |p|
+                p.title
+              }
+
+    end
+    f.actions
+  end
+
+end

data/app/helpers/c80_news_tz/application_helper.rb

@@ -2,39 +2,24 @@
 module C80NewsTz
   module ApplicationHelper
 
-    include LocalTimeHelper
-
-    def render_news_block(is_news_page=false,page=1)
-
-
-      if is_news_page
-        per_page = C80NewsTz::Prop.first.per_page
-        news = Fact.paginate(:page => page,:per_page => per_page)
-      else
-        per_widget = C80NewsTz::Prop.first.per_widget
-        news = Fact.limit(per_widget)
-      end
-
-      render :partial => "shared/news_block",
-             :locals => {
-                 :news_list => news,
-                 :is_news_page => is_news_page
-             }
-    end
-
-    def render_one_fact(fact)
-      render :partial => "shared/fact",
-             :locals => {
-                 fact: fact
-             }
-    end
-
     def url_for_fact(fact)
       "news/#{fact.slug}"
     end
 
     def apph_url_for_rubric(rubric_slug)
-      "rubrics/#{rubric_slug}"
+      "#{root_url}rubrics/#{rubric_slug}"
+    end
+
+    def apph_url_for_company(company_slug)
+      "companies/#{company_slug}"
+    end
+    
+    def apph_url_for_notice(notice_slug)
+      "notices/#{notice_slug}"
+    end
+    
+    def apph_url_for_issue(issue_id)
+      "issues/#{issue_id}"
     end
 
   end

data/app/helpers/c80_news_tz/subj_helper.rb

@@ -0,0 +1,32 @@
+module C80NewsTz
+  module SubjHelper
+
+    include LocalTimeHelper
+
+    def render_news_block(is_news_page=false,page=1)
+
+      if is_news_page
+        per_page = C80NewsTz::Prop.first.per_page
+        news = Fact.paginate(:page => page,:per_page => per_page)
+      else
+        per_widget = C80NewsTz::Prop.first.per_widget
+        news = Fact.limit(per_widget)
+      end
+
+      render :partial => "shared/news_block",
+             :locals => {
+                 :news_list => news,
+                 :is_news_page => is_news_page
+             }
+    end
+
+    def render_one_fact(fact)
+      render :partial => "shared/fact",
+             :locals => {
+                 fact: fact
+             }
+    end
+
+
+  end
+end

data/app/models/c80_news_tz/company.rb

@@ -1,4 +1,6 @@
+include ActionView::Helpers::SanitizeHelper
 require "babosa"
+
 module C80NewsTz
   class Company < ActiveRecord::Base
     has_many :galleries, :dependent => :destroy
@@ -22,6 +24,8 @@ module C80NewsTz
     has_and_belongs_to_many :facts, :join_table => 'c80_news_tz_companies_facts'
     has_and_belongs_to_many :notices, :join_table => 'c80_news_tz_companies_notices'
 
+    mount_uploader :logo, ClogoUploader
+
     extend FriendlyId
     friendly_id :title, use: :slugged
 
@@ -38,5 +42,19 @@ module C80NewsTz
       # name_changed? || super
     end
 
+    def desc_short
+      result = ''
+
+      if desc.present?
+        d = desc.gsub!(/\[\[\d\]\]/, '')
+        if d.nil?
+          d = desc
+        end
+        result = strip_tags(d)[0..100]
+      end
+
+      result
+    end
+
   end
 end

data/app/models/c80_news_tz/cphoto.rb

@@ -28,11 +28,5 @@ module C80NewsTz
       end
     end
 
-    # выдать размеры картинки thumb_preview
-    def thumb_preview_size
-      img = MiniMagick::Image.open(image.thumb_preview.path)
-      [img["width"],img["height"]]
-    end
-
   end
 end

data/app/models/c80_news_tz/fact.rb

@@ -13,6 +13,7 @@ module C80NewsTz
 
     has_and_belongs_to_many :rubrics, :join_table => 'c80_news_tz_facts_rubrics'
     has_and_belongs_to_many :companies, :join_table => 'c80_news_tz_companies_facts'
+    has_and_belongs_to_many :locations, :join_table => 'c80_news_tz_facts_locations'
 
     validates_with FactValidator
     default_scope {order(:created_at => :desc)}
@@ -40,5 +41,58 @@ module C80NewsTz
 
     end
 
+    # выдать картинку, которая пойдёт в блок преьвю
+    def photo_preview
+      result = nil
+      if fphotos.count > 0
+        result = fphotos.first.image
+      else
+      end
+      result
+    end
+
+    # выдать строку: title первой попавшейся рубрики
+    # если таковой нету - выдаётся пустая строка
+    def rubric_title
+      result = ""
+      if rubrics.count > 0
+        result = rubrics.first.title
+      end
+      result
+    end
+
+    # выдать логотип первой попавшейся компании
+    # если чего-то нету - выдаётся nil
+    def company_logo
+      result = nil
+      if companies.count > 0
+        if companies.first.logo.present?
+          result = companies.first.logo
+        end
+      end
+      result
+    end
+
+    # выдать массив хэшей: список фактов, находящихся в указанных позициях, отсортированный по location_id
+    def self.where_locations(arr_locs_ids)
+      # f = C80NewsTz::Fact.joins(:locations).where(:c80_news_tz_locations => {:id => [1,2]})
+
+      s = "
+        SELECT
+          `c80_news_tz_facts`.*,
+          `c80_news_tz_locations`.`id` AS `location_id`
+        FROM `c80_news_tz_facts`
+          INNER JOIN `c80_news_tz_facts_locations` ON `c80_news_tz_facts_locations`.`fact_id` = `c80_news_tz_facts`.`id`
+          INNER JOIN `c80_news_tz_locations` ON `c80_news_tz_locations`.`id` = `c80_news_tz_facts_locations`.`location_id`
+        WHERE `c80_news_tz_locations`.`id` IN (#{arr_locs_ids.join(",")})
+        ORDER BY `location_id`;
+      "
+
+      # result = self.connection.select_all(s)
+      result = self.find_by_sql(s)
+
+      result
+    end
+
   end
 end

data/app/models/c80_news_tz/fact_validator.rb

@@ -3,15 +3,15 @@ module C80NewsTz
     def validate(record)
 
       unless record.title.present?
-        record.errors[:title] = 'Название новости не может быть пустым'
+        record.errors[:title] = 'Название публикации не может быть пустым'
       end
 
-      unless record.short.present?
-        record.errors[:short] = 'Заполните краткое описание новости'
-      end
+      # unless record.short.present?
+      #   record.errors[:short] = 'Заполните краткое описание публикации'
+      # end
 
       unless record.full.present?
-        record.errors[:full] = 'Текст новости не может быть пустым'
+        record.errors[:full] = 'Текст публикации не может быть пустым'
       end
 
     end

data/app/models/c80_news_tz/fphoto.rb

@@ -35,10 +35,10 @@ module C80NewsTz
     end
 
     # выдать размеры картинки thumb_preview
-    def thumb_preview_size
-      img = MiniMagick::Image.open(image.thumb_preview.path)
-      [img["width"],img["height"]]
-    end
+    # def thumb_preview_size
+    #   img = MiniMagick::Image.open(image.thumb_preview.path)
+    #   [img["width"],img["height"]]
+    # end
 
   end
 end

data/app/models/c80_news_tz/location.rb

@@ -0,0 +1,5 @@
+module C80NewsTz
+  class Location < ActiveRecord::Base
+    has_and_belongs_to_many :facts, :join_table => 'c80_news_tz_facts_locations'
+  end
+end

data/app/models/c80_news_tz/nphoto.rb

@@ -28,11 +28,5 @@ module C80NewsTz
       end
     end
 
-    # выдать размеры картинки thumb_preview
-    def thumb_preview_size
-      img = MiniMagick::Image.open(image.thumb_preview.path)
-      [img["width"],img["height"]]
-    end
-
   end
 end

data/app/uploaders/c80_news_tz/clogo_uploader.rb

@@ -0,0 +1,55 @@
+# грузит лого компании
+module C80NewsTz
+  class ClogoUploader < CarrierWave::Uploader::Base
+
+    include CarrierWave::MiniMagick
+
+    storage :file
+
+    process :resize_to_limit => [500,500]
+
+    version :thumb_fit do
+      process :resize_to_fit => [124,124]
+    end
+
+    version :thumb_fill do
+      process :resize_to_fill => [124,74]
+    end
+
+    version :thumb_preview_small do
+      process :resize_to_fit => [80, 44]
+    end
+
+    version :thumb_preview_medium do
+      process :resize_to_fit => [80, 44]
+    end
+
+    # идёт в блок "главная публикация", что на главной
+    version :thumb_preview_big do
+      process :resize_to_fit => [124, 124]
+    end
+
+    def store_dir
+      "uploads/companies/_logos/#{format("%02d", model.id)}"
+    end
+
+    def extension_white_list
+      %w(jpg jpeg gif png)
+    end
+
+    def filename
+      if original_filename
+        "logo_#{secure_token(4)}.#{file.extension}"
+      end
+    end
+
+    protected
+    def secure_token(length=16)
+      var = :"@#{mounted_as}_secure_token"
+      model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
+    end
+
+
+  end
+
+end

data/app/uploaders/c80_news_tz/fphoto_uploader.rb

@@ -22,8 +22,17 @@ module C80NewsTz
       process :resize_to_limit_small
     end
 
-    version :thumb_preview do
-      process :resize_to_fill => [229, 152]
+    version :thumb_preview_small do
+      process :resize_to_fill => [126, 84]
+    end
+
+    version :thumb_preview_medium do
+      process :resize_to_fill => [223, 149]
+    end
+
+    # идёт в блок "главная публикация", что на главной
+    version :thumb_preview_big do
+      process :resize_to_fill => [500, 321]
     end
 
     def store_dir

data/config/locales/ru.yml

@@ -14,14 +14,17 @@ ru:
         one: "компанию"
         other: "Компании"
       fact:
-        one: 'новость'
-        other: 'Новости'
+        one: 'публикацию'
+        other: 'Публикации'
       issue:
          one: 'номер журнала'
          other: 'Номера журнала'
       rubric:
          one: 'рубрику'
          other: 'Рубрики'
+      location:
+         one: 'место'
+         other: 'Места на главной под публикации'
     attributes:
       c80_news_tz/notice:
         title: "Название"
@@ -47,7 +50,7 @@ ru:
         title: 'Название'
         activity_type: 'Род деятельности'
         desc: 'Описание'
-        facts: 'Новости'
+        facts: 'Публикации'
       c80_news_tz/gallery:
         title: 'Название галереи'
       c80_news_tz/fact:
@@ -64,7 +67,10 @@ ru:
         number: 'Номер'
         pdf: 'PDF'
         pdfs: 'PDF'
-        facts: 'Новости'
+        facts: 'Публикации'
       c80_news_tz/rubric:
         title: 'Название'
-        facts: 'Новости'
+        facts: 'Публикации'
+      c80_news_tz/location:
+        title: 'Название'
+        facts: 'Публикация'

data/config/routes.rb

@@ -1,4 +1,3 @@
 C80NewsTz::Engine.routes.draw do
   match 'news_guru', :to => 'application#guru', :via => :post
-  get '/rubrics/:rubric_slug' => 'site#rubric'
 end

data/db/migrate/20160226142022_create_companies.rb

@@ -5,6 +5,7 @@ class CreateCompanies < ActiveRecord::Migration
       t.string :activity_type
       t.text :desc
       t.string :slug
+      t.string :logo
 
       t.timestamps
     end

data/db/migrate/20160304145554_create_locations.rb

@@ -0,0 +1,10 @@
+class CreateLocations < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_locations, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :title
+      t.string :tag
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20160304145555_create_join_table_facts_locations.rb

@@ -0,0 +1,12 @@
+class CreateJoinTableFactsLocations < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_facts_locations, :id => false do |t|
+      t.integer :fact_id, :null => false
+      t.integer :location_id, :null => false
+    end
+
+    # Add table index
+    add_index :c80_news_tz_facts_locations, [:fact_id, :location_id], :unique => true
+
+  end
+end

data/lib/c80_news_tz/version.rb

@@ -1,3 +1,3 @@
 module C80NewsTz
-  VERSION = "0.1.1.1"
+  VERSION = "0.1.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_news_tz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1
+  version: 0.1.1.15
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - app/admin/c80_news_tz/compaines.rb
 - app/admin/c80_news_tz/facts.rb
 - app/admin/c80_news_tz/issues.rb
+- app/admin/c80_news_tz/locations.rb
 - app/admin/c80_news_tz/notices.rb
 - app/admin/c80_news_tz/rubrics.rb
 - app/assets/images/c80_news_tz/.keep
@@ -113,6 +114,7 @@ files:
 - app/assets/stylesheets/c80_news_tz/facts_wookmark.scss
 - app/controllers/c80_news_tz/application_controller.rb
 - app/helpers/c80_news_tz/application_helper.rb
+- app/helpers/c80_news_tz/subj_helper.rb
 - app/models/c80_news_tz/adress.rb
 - app/models/c80_news_tz/company.rb
 - app/models/c80_news_tz/cphoto.rb
@@ -122,12 +124,14 @@ files:
 - app/models/c80_news_tz/gallery.rb
 - app/models/c80_news_tz/gphoto.rb
 - app/models/c80_news_tz/issue.rb
+- app/models/c80_news_tz/location.rb
 - app/models/c80_news_tz/notice.rb
 - app/models/c80_news_tz/nphoto.rb
 - app/models/c80_news_tz/pdf.rb
 - app/models/c80_news_tz/prop.rb
 - app/models/c80_news_tz/rubric.rb
 - app/models/c80_news_tz/rubric_validator.rb
+- app/uploaders/c80_news_tz/clogo_uploader.rb
 - app/uploaders/c80_news_tz/cphoto_uploader.rb
 - app/uploaders/c80_news_tz/fphoto_uploader.rb
 - app/uploaders/c80_news_tz/gphoto_uploader.rb
@@ -160,6 +164,8 @@ files:
 - db/migrate/20160227121414_create_galleries.rb
 - db/migrate/20160227121415_create_gphotos.rb
 - db/migrate/20160227121416_create_nphotos.rb
+- db/migrate/20160304145554_create_locations.rb
+- db/migrate/20160304145555_create_join_table_facts_locations.rb
 - db/seeds/19_fill_news_props.rb.example
 - db/seeds/20_fill_rubrics.rb.example
 - db/seeds/21_fill_facts.rb.example