rails_admin_comments 0.2.3.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9def7a1d3c49125431c8c0cb21860624da66c16b
-  data.tar.gz: f7a9e8e91c2c7e80015b47208a937299c8c4efd3
+  metadata.gz: ba7a121ac7788f5ec9886d9421168858fbf8099a
+  data.tar.gz: ba44064cfc1379ada742b146c683dbadc71c9a40
 SHA512:
-  metadata.gz: 12635a30d8fd2b73570326ef420b4c9378c690a118c15b525091bca522e58124d12805a23402babd8b66507d9bd3ff43e6a3637307b989aeb68f0a68e7c5b443
-  data.tar.gz: 3b85956299714a26b7c9c9ce2efdb605af1264a3b69e088d4072cb9137e9e8d52bb152f03c078e9cab32b9bd1827b624199d1ce987aaeca2e5b662c190fe1321
+  metadata.gz: 51f68aca9bfc4430f4cc8d5658d5e7cd5d4b8b5554c09e291aaecdd7f4e56407123a6203b7989909dbe5186f8c39e533e62ca347219abb0b5cbbd287718bbb02
+  data.tar.gz: 39e13a90b30789a9fe723dea12f7080e20e77078e28937c7787bbe2ed141e333fc4b26c7692e57186a55e7b9663144cc48345f0f68ce0478300c242887ac5c19

data/.ruby-gemset

@@ -1 +1 @@
-rails_admin_comments
+rails_admin_comments_rails5

data/README.md

@@ -1,5 +1,7 @@
 # RailsAdminComments DEVELOPMENT VERSION
 
+### Rails 5 support
+
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/rails_admin_comments`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 TODO: Delete this and the text above, and describe your gem

data/lib/rails_admin_comments.rb

@@ -5,9 +5,6 @@ require 'mongoid_userstamp'
 
 require "rails_admin_comments/engine"
 
-require 'rails_admin/config/actions'
-require 'rails_admin/config/model'
-
 require 'rails_admin_comments/configuration'
 
 require 'rails_admin/config/actions'

data/lib/rails_admin_comments/action.rb

@@ -34,9 +34,9 @@ module RailsAdmin
                 begin
                   if params['rails_admin_comments_comment'].present?
                     if params['rails_admin_comments_comment']['id'].present?
-                      @comment = @object.rails_admin_comments.where(id: params['rails_admin_comments_comment']['id']).first
+                      @comment = @object.rails_admin_comments.find(params['rails_admin_comments_comment']['id'])
                     end
-                    @comment ||= @object.rails_admin_comments.new
+                    @comment = @object.rails_admin_comments.new if @comment.nil?
 
                     @comment.content = params['rails_admin_comments_comment']['content']
                     @comment.visible_for_user_ids = params['rails_admin_comments_comment']['visible_for_user_ids']
@@ -61,24 +61,8 @@ module RailsAdmin
                   @message = "<strong class='error'>#{I18n.t('admin.actions.comments.error')}</strong>: #{e}".freeze
                 end
 
-                @comments = @object.rails_admin_comments.by_date.enabled.for_user(current_user) || []
-                render action: @action.template_name
-
-              elsif request.delete?
-                if params['rails_admin_comments_comment']['id'].present?
-                  @comment = @object.rails_admin_comments.where(id: params['rails_admin_comments_comment']['id']).first
-                end
-                if @comment and @comment.destroy
-                  @comment = nil
-                  @message = "<strong class='success'>Удалено</strong>".freeze
-                else
-                  @message = "<strong class='error'>Удаление не удалось</strong>".freeze
-                end
-
-                @comments = @object.rails_admin_comments.by_date.enabled.for_user(current_user) || []
                 render action: @action.template_name
               end
-
             end
           end
         end
@@ -127,7 +111,7 @@ module RailsAdmin
               begin
                 if params['rails_admin_comments_model_comment'].present?
                   if params['rails_admin_comments_model_comment']['id'].present?
-                    @comment = @model.rails_admin_model_comments.where(id: params['rails_admin_comments_model_comment']['id']).first
+                    @comment = @model.rails_admin_model_comments.find(params['rails_admin_comments_model_comment']['id'])
                   end
                   @comment ||= @model.rails_admin_model_comments.new
 
@@ -154,21 +138,18 @@ module RailsAdmin
                 @message = "<strong class='error'>#{I18n.t('admin.actions.comments.error')}</strong>: #{e}".freeze
               end
 
-              @comments = @model.rails_admin_model_comments.by_date.enabled.for_user(current_user) || []
               render action: @action.template_name
 
             elsif request.delete?
               if params['rails_admin_comments_model_comment']['id'].present?
-                @comment = @model.rails_admin_model_comments.where(id: params['rails_admin_comments_model_comment']['id']).first
+                @comment = @model.rails_admin_model_comments.find(params['rails_admin_comments_model_comment']['id'])
               end
               if @comment and @comment.destroy
                 @comment = nil
-                @message = "<strong class='success'>Удалено</strong>".freeze
+                @message = "Удалено".freeze
               else
-                @message = "<strong class='error'>Удаление не удалось</strong>".freeze
+                @message = "Удаление не удалось".freeze
               end
-
-              @comments = @model.rails_admin_model_comments.by_date.enabled.for_user(current_user) || []
               render action: @action.template_name
             end
           end

data/lib/rails_admin_comments/models/mongoid/comments.rb

@@ -7,7 +7,7 @@ module RailsAdminComments
         include ::Mongoid::Timestamps::Short
         include ::Mongoid::Userstamp
 
-        belongs_to :rails_admin_commentable, polymorphic: true
+        belongs_to :rails_admin_commentable, polymorphic: true, optional: true
 
         store_in collection: "rails_admin_comments".freeze
 
@@ -21,7 +21,7 @@ module RailsAdminComments
 
         has_and_belongs_to_many :visible_for_users, class_name: "User", inverse_of: nil
         scope :for_user, ->(user) {
-          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil}, {visible_for_user_ids: []})
+          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil})
         }
       end
     end

data/lib/rails_admin_comments/models/mongoid/model_comments.rb

@@ -9,7 +9,7 @@ module RailsAdminComments
 
         field :model_name, type: String
 
-        store_in collection: "rails_admin_model_comments"
+        store_in collection: "rails_admin_model_comments".freeze
 
         field :enabled, type: ::Mongoid::VERSION.to_i < 4 ? Boolean : ::Mongoid::Boolean, default: true
         scope :enabled, -> { where(enabled: true) }
@@ -21,7 +21,7 @@ module RailsAdminComments
 
         has_and_belongs_to_many :visible_for_users, class_name: "User", inverse_of: nil
         scope :for_user, ->(user) {
-          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil}, {visible_for_user_ids: []})
+          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil})
         }
       end
     end

data/lib/rails_admin_comments/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminComments
-  VERSION = "0.2.3.3".freeze
+  VERSION = "0.3.0".freeze
 end

data/rails_admin_comments.gemspec

@@ -30,7 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "rails_admin", [">= 0.8.1", "< 1.1"]
-  spec.add_dependency "mongoid", [">= 5.0", "< 6.1"]
-  spec.add_dependency "glebtv_mongoid_userstamp", '~> 0.6'
+  spec.add_dependency "rails", '>= 5.0.0'
+
+  spec.add_dependency "rails_admin", '>= 1.0.0.rc'
+  spec.add_dependency "mongoid", [">= 5.0", "< 7.0"]
+  spec.add_dependency "glebtv_mongoid_userstamp", '~> 0.6.1'
 end

data/release.sh

@@ -2,5 +2,5 @@
 bundle update
 git add --all .
 git commit -am "${*:1}"
-git push -u origin master
+git push -u origin rails5
 rake release

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_comments
 version: !ruby/object:Gem::Version
-  version: 0.2.3.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,25 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rails_admin
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: rails_admin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.0.0.rc
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +75,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,21 +85,21 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: glebtv_mongoid_userstamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.1
 description: Comments for rails_admin
 email:
 - i43ack@gmail.com