redde 0.3.39 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2724ca09fd2d3fcc17a41ca62671f9bad0fe62a5
-  data.tar.gz: f0c5c9294422dcf37a3a0636c19fb58555665ba2
+SHA256:
+  metadata.gz: b5e0be1b746e4912e3b8956e5b8425449cc99cd59a7898cd344298c2981f6534
+  data.tar.gz: c7fc72bd1781b24ad1d20e09eb6fa99fa70927154d4814d704f17de7f9fe7185
 SHA512:
-  metadata.gz: 61a720788a04988fc12ac3eeabdccabdc299981016a2a207f4d7b07023909e32a23f89806091330bf35fc8a617eeed1a68933e73030c0a8cc2fec2c568c4b82a
-  data.tar.gz: eec37588201fa4ceb88bbfd99d58ad6a4d541efde14283101434a87956219ab964e0d657d81e091ab7a775689202f747c2d1121b4264db5e2d2d98922c60e4b5
+  metadata.gz: cfc5dc125bacb07fb1eec37085685e253d8ed2637f764aa5bc6417597c29f1adb29c95fc40c665284154a5178bd3760aa495627a310279c369bc6ad621ee7230
+  data.tar.gz: 1a1b284210da57a843253d91537fd1d229cade37b37d082122888957f96dfbeeeab8166335b809f956ca65917da2428f6a079c8c2036b085e5428b477b992c2f

data/.travis.yml

@@ -1,9 +1,12 @@
 script: bundle exec rspec
 language: ruby
+services:
+  - redis-server
 notifications:
   email: false
 rvm:
-  - 2.2
+  - 2.3
+  - 2.4
 before_install:
   - gem install bundler
 before_script:

data/README.md

@@ -1,6 +1,6 @@
 # Redde
-[![Build Status](https://secure.travis-ci.org/redde/redde.png)](http://travis-ci.org/redde/redde)
-[![Code Climate](https://codeclimate.com/github/redde/redde.png)](https://codeclimate.com/github/redde/redde)
+[![Build Status](https://travis-ci.org/redde/redde.svg?branch=master)](https://travis-ci.org/redde/redde)
+[![Code Climate](https://codeclimate.com/github/redde/redde/badges/gpa.svg)](https://codeclimate.com/github/redde/redde)
 
 Admin generator for redde projects
 

data/app/assets/javascripts/redde/index.js.coffee

@@ -1,13 +1,14 @@
-#= require jquery
-#= require jquery_ujs
-
-# Пока подключаем все подряд, потом сделать кастомизацию
-#= require ./sortable
-#= require ./sortTree
-#= require ./fileapi
-#= require ./redactor
-#= require ./file
-
-$ ->
-  $(document).on 'click', '[data-href]', (e)->
-    location.href = $(e.currentTarget).data('href')
+#= require jquery
+#= require jquery_ujs
+
+# Пока подключаем все подряд, потом сделать кастомизацию
+#= require ./sortable
+#= require ./sortTree
+#= require ./fileapi
+#= require ./redactor
+#= require ./file
+#= require message-bus
+
+$ ->
+  $(document).on 'click', '[data-href]', (e)->
+    location.href = $(e.currentTarget).data('href')

data/app/assets/javascripts/redde/sortTree/index.js.coffee

@@ -1,4 +1,4 @@
-#= require jquery-ui/sortable
+#= require jquery-ui/widgets/sortable
 #= require ./jquery.mjs.nestedSortable.js
 
 $ ->

data/app/assets/javascripts/redde/sortable.coffee

@@ -1,4 +1,4 @@
-#= require jquery-ui/sortable
+#= require jquery-ui/widgets/sortable
 
 ###
 variants:

data/app/controllers/admin/base_controller.rb

@@ -1,6 +1,7 @@
 class Admin::BaseController < ActionController::Base
   layout 'redde'
   before_action :authenticate_manager!
+  after_action :track_viewer, only: [:edit, :update]
   protect_from_forgery with: :exception
   include Redde::AdminHelper
   include Redde::IndexHelper
@@ -71,6 +72,23 @@ class Admin::BaseController < ActionController::Base
     'сохранена'
   end
 
+  def use_presence?
+    defined?(Redis)
+  end
+
+  def item
+    instance_variable_get("@#{record}")
+  end
+
+  def track_viewer
+    Redde::Presence::View.new(item, current_manager.id).view if item.present?
+  end
+
+  def viewers
+    @viewers ||= Manager.where(Redde::Presence::View.viewers_of(item)) if item
+  end
+  helper_method :viewers
+
   def url_for_obj(obj, custom_url = nil)
     return custom_url if custom_url.present?
     return [:edit, :admin, obj] if params[:commit] == 'Применить'

data/app/helpers/redde/index_helper.rb

@@ -11,108 +11,6 @@ module Redde::IndexHelper
     model_name.columns.select { |i| i.type == :string }.first
   end
 
-  class IndexBuilder
-    include ActionView::Helpers::TagHelper
-    include ActionView::Context
-
-    attr_accessor :list, :params
-
-    def initialize(list, params)
-      @list = list
-      @params = params
-    end
-
-    def empty( options = {} )
-      content_tag(:th, "", class: ['list__head', options[:class]])
-    end
-
-    def thead insert
-      content_tag :thead do
-        content_tag(:tr, empty + visible + insert + empty(class: 'list__head_del') + empty)
-      end
-    end
-
-    def visible
-      empty(class: '_eye') if list.column_names.include?('visible')
-    end
-
-    class IndexHeadCellBuilder
-      include ActionView::Helpers::TagHelper
-      include ActionView::Context
-
-      attr_accessor :list
-
-      def initialize(list)
-        @list = list
-      end
-
-      def cell field = nil, options = {}, &block
-        if field.is_a?(Symbol) || field.is_a?(String)
-          content_tag :th, list.human_attribute_name(field), class: ['list__head', options[:class]]
-        elsif field.is_a?(Hash)
-          content_tag :th, "", class: ['list__head', field[:class]]
-        elsif field.nil?
-          content_tag :th, "", class: 'list__head'
-        end
-      end
-    end
-
-    class IndexCellBuilder
-      include ActionView::Helpers
-      include ActionView::Context
-      include ActionView::Helpers::UrlHelper
-      include Rails.application.routes.url_helpers
-      include Haml::Helpers
-
-      attr_accessor :item, :builder
-
-      def initialize(item, builder)
-        @item = item
-        @builder = builder
-        init_haml_helpers
-      end
-
-      def self.content value
-        case value.class.name
-        when 'Time' then I18n.l(value, format: '%d %b %Y, %H:%M')
-        when 'Date' then I18n.l(value, format: '%d %b %Y')
-        else
-          value
-        end
-      end
-
-      def cell(field, options = {}, &block)
-        # через content_tag ... do не работает
-        if field.is_a?(Hash)
-          content_tag :td, capture(&block), class: ['list__cell', field[:class]]
-        else
-          content_tag :td, if block_given? then capture(&block) else IndexCellBuilder.content(item.send(field)) end, class: ['list__cell', options[:class]]
-        end
-      end
-
-      def empty(options = {})
-        content_tag(:td, "", class: ['list__cell', options[:class]])
-      end
-
-      def handle
-        return content_tag(:td, "", class: ['list__cell', '_handle'], 'data-sortable-handle' => "") if item.class.column_names.include?('position')
-        empty
-      end
-
-      def visible
-        content_tag :td, class: 'list__cell _eye' do
-          link_to('', url_for(id: item, controller: builder.params[:controller], action: :update, item.class.model_name.param_key => { visible: !item.visible} ), class: ['list__eye', ('_disactive' if !item.visible)], data: { method: 'put' })
-        end if item.class.column_names.include?('visible')
-      end
-
-      def del
-        content_tag :td, class: 'list__cell list__cell_del' do
-          link_to('', url_for(id: item, action: :destroy, controller: builder.params[:controller]), method: :delete, data: { confirm: 'Точно удалить?' }, class: 'list__del')
-        end
-      end
-    end
-  end
-
   def list_table(list, options = {}, &block)
     raise ArgumentError, "Missing block" unless block_given?
     builder = IndexBuilder.new(list, params)
@@ -233,7 +131,111 @@ module Redde::IndexHelper
   end
 
   def index_value_for(item, column)
-    return model_name::INDEX_COLUMNS[column.to_sym].call(item) if defined?(model_name::INDEX_COLUMNS) && model_name::INDEX_COLUMNS.is_a?(Hash) && model_name::INDEX_COLUMNS[column.to_sym].present?
+    "#{item.model_name}::INDEX_COLUMNS".constantize[column.to_sym].call(item)
+  rescue
     item.send(column)
   end
+
+  class IndexBuilder
+    include ActionView::Helpers::TagHelper
+    include ActionView::Context
+
+    attr_accessor :list, :params
+
+    def initialize(list, params)
+      @list = list
+      @params = params
+    end
+
+    def empty( options = {} )
+      content_tag(:th, "", class: ['list__head', options[:class]])
+    end
+
+    def thead insert
+      content_tag :thead do
+        content_tag(:tr, empty + visible + insert + empty(class: 'list__head_del') + empty)
+      end
+    end
+
+    def visible
+      empty(class: '_eye') if list.column_names.include?('visible')
+    end
+
+    class IndexHeadCellBuilder
+      include ActionView::Helpers::TagHelper
+      include ActionView::Context
+
+      attr_accessor :list
+
+      def initialize(list)
+        @list = list
+      end
+
+      def cell field = nil, options = {}, &block
+        if field.is_a?(Symbol) || field.is_a?(String)
+          content_tag :th, list.human_attribute_name(field), class: ['list__head', options[:class]]
+        elsif field.is_a?(Hash)
+          content_tag :th, "", class: ['list__head', field[:class]]
+        elsif field.nil?
+          content_tag :th, "", class: 'list__head'
+        end
+      end
+    end
+
+    class IndexCellBuilder
+      include ActionView::Helpers
+      include ActionView::Context
+      include ActionView::Helpers::UrlHelper
+      include Redde::IndexHelper
+      include Rails.application.routes.url_helpers
+      include Haml::Helpers
+
+      attr_accessor :item, :builder
+
+      def initialize(item, builder)
+        @item = item
+        @builder = builder
+        init_haml_helpers
+      end
+
+      def self.content(value)
+        case value.class.name
+        when 'Time' then I18n.l(value, format: '%d %b %Y, %H:%M')
+        when 'Date' then I18n.l(value, format: '%d %b %Y')
+        else
+          value
+        end
+      end
+
+      def cell(field, options = {}, &block)
+        # через content_tag ... do не работает
+        if field.is_a?(Hash)
+          content_tag :td, capture(&block), class: ['list__cell', field[:class]]
+        else
+          content_tag :td, if block_given? then capture(&block) else raw(IndexCellBuilder.content(index_value_for(item, field))) end, class: ['list__cell', options[:class]]
+        end
+      end
+
+      def empty(options = {})
+        content_tag(:td, "", class: ['list__cell', options[:class]])
+      end
+
+      def handle
+        return content_tag(:td, "", class: ['list__cell', '_handle'], 'data-sortable-handle' => "") if item.class.column_names.include?('position')
+        empty
+      end
+
+      def visible
+        content_tag :td, class: 'list__cell _eye' do
+          link_to('', url_for(id: item, controller: builder.params[:controller], action: :update, item.class.model_name.param_key => { visible: !item.visible} ), class: ['list__eye', ('_disactive' if !item.visible)], data: { method: 'put' })
+        end if item.class.column_names.include?('visible')
+      end
+
+      def del
+        content_tag :td, class: 'list__cell list__cell_del' do
+          link_to('', url_for(id: item, action: :destroy, controller: builder.params[:controller]), method: :delete, data: { confirm: 'Точно удалить?' }, class: 'list__del')
+        end
+      end
+    end
+  end
 end

data/app/models/redde/photo.rb

@@ -2,7 +2,7 @@ class Redde::Photo < ActiveRecord::Base
   mount_uploader :src, PhotoUploader
   self.table_name = 'redde_photos'
 
-  belongs_to :imageable, polymorphic: true
+  belongs_to :imageable, polymorphic: true, optional: true
   default_scope { order(:position) }
   before_save :set_token, unless: :persisted_link?
 

data/app/models/redde/presence/view.rb

@@ -0,0 +1,28 @@
+module Redde
+  module Presence
+    class View
+      attr_reader :obj, :user_id
+      TTL = 15
+
+      def initialize(obj, user_id)
+        @obj = obj
+        @user_id = user_id
+      end
+
+      def self.viewers_of(obj)
+        Redis.current.keys("#{obj.class.name}:#{obj.id}:*").map do |key|
+          key.split(':').last.to_i
+        end
+      end
+
+      def view
+        Redis.current.set(key, 1)
+        Redis.current.expire(key, TTL)
+      end
+
+      def key
+        "#{obj.class.name}:#{obj.id}:#{user_id}"
+      end
+    end
+  end
+end

data/app/models/redde/presence.rb

@@ -0,0 +1,5 @@
+module Redde
+  module Presence
+    require_relative 'presence/view' if defined?(Redis)
+  end
+end

data/app/views/admin/base/edit.html.haml

@@ -9,4 +9,4 @@
 
   -# проверить и написать правильное условие
   -# f.object.class.reflect_on_association(:seo)
-  =# render 'admin/seos/block', { f: f } if f.object.methods.include?(:seo)
+  -# = render 'admin/seos/block', { f: f } if f.object.methods.include?(:seo)

data/app/views/admin/redde_photos/_photo.haml

@@ -1,6 +1,6 @@
 %li.photos__item{ :id => "photo_#{photo.id}" }
   = link_to photo.src_url, class: 'photos__link' do
-    = image_tag photo.src.admin, class: 'photos__img'
+    = image_tag photo.src_url(:admin), class: 'photos__img'
     %span.photos__title= photo.src.file.filename
   = link_to("",
     url_for([:admin, photo]),

data/db/migrate/20160121152706_create_redde_photos.rb

@@ -1,4 +1,4 @@
-class CreateReddePhotos < ActiveRecord::Migration
+class CreateReddePhotos < ActiveRecord::Migration[4.2]
   def change
     create_table :redde_photos do |t|
       t.integer :imageable_id

data/lib/redde/engine.rb

@@ -2,7 +2,7 @@ module Redde
   class Engine < ::Rails::Engine
     config.generators do |g|
       g.test_framework      :rspec,        fixture: false
-      g.fixture_replacement :factory_girl, dir: 'spec/factories'
+      g.fixture_replacement :factory_bot, dir: 'spec/factories'
       g.assets false
       g.helper false
     end
@@ -11,5 +11,8 @@ module Redde
         redde/favicon.png
       )
     end
+    initializer 'ReddeEngine.add_message_bus' do |app|
+      app.middleware.use MessageBus::Rack::Middleware
+    end
   end
 end

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.3.39'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/redde.rb

@@ -16,6 +16,7 @@ require 'jquery-ui-rails'
 require 'coffee-rails'
 require 'devise'
 require 'rails'
+require 'message_bus'
 
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8

data/redde.gemspec

@@ -29,22 +29,24 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mini_magick'
   spec.add_runtime_dependency 'kaminari'
   spec.add_runtime_dependency 'ancestry'
+  spec.add_runtime_dependency 'message_bus'
+  spec.add_runtime_dependency 'redis'
   spec.add_dependency 'rails', '>= 3.1'
   spec.add_dependency 'sass-rails'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec-rails', '>= 2.7'
-  spec.add_development_dependency 'factory_girl_rails', '>= 2.7'
+  spec.add_development_dependency 'factory_bot_rails', '>= 2.7'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'generator_spec'
   spec.add_development_dependency 'devise'
   spec.add_development_dependency 'coffee-rails'
   spec.add_development_dependency 'sprockets-rails'
-  spec.add_development_dependency 'quiet_assets'
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'ffaker'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'launchy'
+  spec.add_development_dependency 'puma'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.39
+  version: 0.4.0
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -151,6 +151,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: message_bus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +250,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -320,7 +348,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: quiet_assets
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -334,7 +362,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -348,7 +376,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -362,7 +390,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -376,7 +404,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -518,6 +546,8 @@ files:
 - app/models/concerns/redde/tree_sortable.rb
 - app/models/concerns/redde/with_photo.rb
 - app/models/redde/photo.rb
+- app/models/redde/presence.rb
+- app/models/redde/presence/view.rb
 - app/models/redde/system_command.rb
 - app/models/redde/url_generator.rb
 - app/uploaders/photo_uploader.rb
@@ -585,8 +615,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Admin scaffold generator for redde projects