simpleadmin 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeab1715d2a9bbfe21f922fe8ce15db20d961ab0
-  data.tar.gz: fd24bff7a22e9b1aa6be78a32cc63bc3493cf388
+  metadata.gz: cd0a8de5f131f2c6ba6a68ee6dd96da378dd5a9f
+  data.tar.gz: 239ee609fab25425bf0a15e2b6e0f7b6bed756f7
 SHA512:
-  metadata.gz: 981308a4b93cf2013bcc3d13e4e752431f245c443dec115e447df3c94e09362d2a7e6a785b39fd13bc3f3cd680415d5f0e9bccc6f063c3cd8efa2c8f0abc0498
-  data.tar.gz: cf482b0571390bcb45b118610dd525a12b4a7364d538a63d4597ba51339425e60b57f30623070b46ff4cfda0b347859357cac97f5e9913f9865a89556b24fe81
+  metadata.gz: 8ccc48824e98412dbb4e8b29bd201ae64a4f09d73036c4185e3fbdfaf4f50e0765980e41e396f1a80c5eb6e2326f383e74d854cfd88aeb1f8e75b0e6a2381ba6
+  data.tar.gz: 977774d4f0790a2188e86add7aacda4a3cb804c0caa60bd21cd02ca8d9257b42a802615f9f1bd9580aeca418020f68da7433141a734583bc1aeff922b4d9c735

data/.rubocop.yml

@@ -0,0 +1,58 @@
+AllCops:
+  Exclude:
+    - 'bin/*'
+  TargetRubyVersion: 2.4.1
+  DisplayCopNames: true
+
+Style/Encoding:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Exclude:
+    - "**/*_spec.rb"
+
+Metrics/BlockLength:
+  Exclude:
+    - "**/*_spec.rb"
+
+Metrics/LineLength:
+  Max: 160
+
+Metrics/MethodLength:
+  Max: 30
+
+Metrics/AbcSize:
+  Max: 80
+
+Metrics/BlockLength:
+  Max: 100
+
+Metrics/PerceivedComplexity:
+  Max: 20
+
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Layout/IndentationWidth:
+  Enabled: false
+
+Layout/IndentationConsistency:
+  Enabled: false
+
+Style/AccessModifierDeclarations:
+  Enabled: false

data/Gemfile

@@ -4,5 +4,5 @@ gemspec
 
 ruby '2.4.1'
 
-gem 'rails', '~> 5.0.6'
 gem 'pg', '~> 0.18'
+gem 'rails', '~> 5.0.6'

data/Gemfile.lock

@@ -0,0 +1,142 @@
+PATH
+  remote: .
+  specs:
+    simpleadmin (1.2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.0.7.1)
+      actionpack (= 5.0.7.1)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.7.1)
+      actionpack (= 5.0.7.1)
+      actionview (= 5.0.7.1)
+      activejob (= 5.0.7.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.7.1)
+      actionview (= 5.0.7.1)
+      activesupport (= 5.0.7.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.7.1)
+      activesupport (= 5.0.7.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.7.1)
+      activesupport (= 5.0.7.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.7.1)
+      activesupport (= 5.0.7.1)
+    activerecord (5.0.7.1)
+      activemodel (= 5.0.7.1)
+      activesupport (= 5.0.7.1)
+      arel (~> 7.0)
+    activesupport (5.0.7.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.4)
+    builder (3.2.3)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubis (2.7.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.3.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
+    pg (0.21.0)
+    rack (2.0.6)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.7.1)
+      actioncable (= 5.0.7.1)
+      actionmailer (= 5.0.7.1)
+      actionpack (= 5.0.7.1)
+      actionview (= 5.0.7.1)
+      activejob (= 5.0.7.1)
+      activemodel (= 5.0.7.1)
+      activerecord (= 5.0.7.1)
+      activesupport (= 5.0.7.1)
+      bundler (>= 1.3.0)
+      railties (= 5.0.7.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.0.7.1)
+      actionpack (= 5.0.7.1)
+      activesupport (= 5.0.7.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack
+  actionview
+  activerecord
+  bundler (~> 1.15)
+  pg (~> 0.18)
+  rails (~> 5.0.6)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  simpleadmin!
+
+RUBY VERSION
+   ruby 2.4.1p111
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -1,6 +1,4 @@
 [![Gem Version](https://badge.fury.io/rb/simpleadmin.svg)](https://rubygems.org/gems/simpleadmin)
-[![Gitter](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/simpleadmin-rails/Lobby)
-
 
 # SimpleAdmin
 
@@ -17,7 +15,7 @@ This is small API library to connect your application with SimpleAdmin service.
 
 ## Installation
 
-![simple_admin](https://image.ibb.co/mTjOpe/simpleadmin_preview.png)
+![simple_admin](https://getsimpleadmin.com/assets/browser-60e23472a81b90d1de2caf52e02b982cba4d1db4215626352476670deed9dd25.png)
 
 Add SimpleAdmin to your application's Gemfile:
 

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/app/controllers/simple_admin/entities_controller.rb

@@ -7,7 +7,7 @@ module SimpleAdmin
 
       ApplicationRecord.descendants.each do |model|
         models << {
-          name:    model.name,
+          name: model.name,
           columns: model.columns.map { |column| { name: column.name, type: column.sql_type.parameterize.underscore } }
         }
       end

data/app/controllers/simple_admin/resources_controller.rb

@@ -1,50 +1,16 @@
 module SimpleAdmin
   class ResourcesController < BaseController
     def index
-      model_klass  = params[:model_klass_name].constantize
-      model_fields = params[:model_fields].map { |field_attributes| field_attributes[:field_name] }
-
-      per_page = params[:per_page].to_i
-      page     = params[:page].to_i if params[:page].present?
-      total    = model_klass.count
-
-      resources = model_klass.limit(per_page)
-
-      if params[:query].present?
-        search_result = search(params[:query], model_klass, params[:model_attributes])
-
-        resources = search_result[:resources]
-        total     = search_result[:total]
-      end
-
-      resources = resources.offset((per_page * page) - per_page) if page.present?
-
-      if params[:sort].present?
-        resources = resources.order(params[:sort][:column_name] => params[:sort][:order])
-      else
-        resources = resources.order(id: :asc)
-      end
-
-      resources = resources.map do |resource|
-        _resource = {}
-
-        resource.attributes.each do |attribute_name, attribute_value|
-          next unless model_fields.include?(attribute_name)
-
-          _resource[attribute_name] = attribute_value
-        end
-
-        _resource
-      end
+      resource_service = ResourcesService.new(params[:model_klass_name], params[:model_fields])
+                                         .index_action(params[:per_page], params[:page], params[:sort], params[:query], params[:model_attributes])
 
       render json: {
-        resources: resources,
-        total:     total
+        resources: resource_service.resources,
+        total: resource_service.total
       }
     end
 
     def show
-      model_klass = params[:model_klass_name].constantize
       model_fields = params[:model_fields].map { |model_field| model_field['field_name'] }
 
       resource = model_klass.find(params[:id]).attributes.slice(*model_fields)
@@ -53,8 +19,6 @@ module SimpleAdmin
     end
 
     def create
-      model_klass = params[:model_klass_name].constantize
-
       resource = model_klass.new(resource_params)
 
       if resource.save
@@ -65,7 +29,6 @@ module SimpleAdmin
     end
 
     def update
-      model_klass = params[:model_klass_name].constantize
       resource = model_klass.find(params[:id])
 
       if resource.update(resource_params)
@@ -76,7 +39,6 @@ module SimpleAdmin
     end
 
     def destroy
-      model_klass = params[:model_klass_name].constantize
       resource = model_klass.find(params[:id])
 
       resource.destroy
@@ -84,16 +46,8 @@ module SimpleAdmin
 
     private
 
-      def search(search_query, model_klass, model_attributes)
-        return [] if model_attributes.empty?
-
-        query = model_attributes.map { |model_attribute| "#{model_attribute} LIKE ?" }.join(' OR ')
-        query_arguments = model_attributes.map { "%#{search_query}%" }
-
-        {
-          resources: model_klass.where(query, *query_arguments),
-          total:     model_klass.where(query, *query_arguments).count
-        }
+      def model_klass
+        params[:model_klass_name].constantize
       end
 
       def resource_params

data/app/services/resources_service.rb

@@ -0,0 +1,63 @@
+class ResourcesService
+  attr_reader :model_klass, :model_fields
+
+  def initialize(model_klass_name, model_fields)
+    @model_klass  = model_klass_name.constantize
+    @model_fields = model_fields.map { |field_attributes| field_attributes[:field_name] }
+  end
+
+  def index_action(per_page, page, sort, query, model_attributes)
+    per_page = per_page.to_i
+    page     = page.to_i if page.present?
+
+    total = model_klass.count
+
+    resources = model_klass.limit(per_page)
+
+    if query.present?
+      search_result = search(query, model_klass, model_attributes)
+
+      resources = search_result[:resources]
+      total     = search_result[:total]
+    end
+
+    resources = resources.offset((per_page * page) - per_page) if page.present?
+
+    resources = if sort.present?
+      resources.order(sort[:column_name] => sort[:order])
+                else
+      resources.order(id: :asc)
+                end
+
+    resources = resources.map do |resource|
+      _resource = {}
+
+      resource.attributes.each do |attribute_name, attribute_value|
+        next unless model_fields.include?(attribute_name)
+
+        _resource[attribute_name] = attribute_value
+      end
+
+      _resource
+    end
+
+    OpenStruct.new(
+      resources: resources,
+      total: total
+    )
+  end
+
+  private
+
+    def search(search_query, model_klass, model_attributes)
+      return [] if model_attributes.empty?
+
+      query = model_attributes.map { |model_attribute| "#{model_attribute} LIKE ?" }.join(' OR ')
+      query_arguments = model_attributes.map { "%#{search_query}%" }
+
+      {
+        resources: model_klass.where(query, *query_arguments),
+        total: model_klass.where(query, *query_arguments).count
+      }
+    end
+end

data/lib/simpleadmin/routes.rb

@@ -14,7 +14,7 @@ module ActionDispatch::Routing
 
     def mount_simpleadmin
       namespace :simple_admin do
-        resources :entities,  only: [:index, :show]
+        resources :entities,  only: %i[index show]
         resources :entity_field_type_actions, only: :create
 
         resources :resources

data/lib/simpleadmin/version.rb

@@ -1,3 +1,3 @@
 module Simpleadmin
-  VERSION = "1.2.1"
+  VERSION = '1.2.2'.freeze
 end

data/simpleadmin.gemspec

@@ -1,13 +1,12 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "simpleadmin/version"
+require 'simpleadmin/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "simpleadmin"
+  spec.name          = 'simpleadmin'
   spec.version       = Simpleadmin::VERSION
-  spec.authors       = ["Dmitriy Strukov"]
-  spec.email         = ["dmitiry_strukov2011@mail.ru"]
+  spec.authors       = ['Dmitriy Strukov']
+  spec.email         = ['dmitiry_strukov2011@mail.ru']
 
   spec.summary       = 'simple-admin'
   spec.description   = 'simple-admin'
@@ -17,10 +16,9 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
 
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
+  spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simpleadmin
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Dmitriy Strukov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,9 +103,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - app/controllers/simple_admin/base_controller.rb
@@ -114,6 +116,7 @@ files:
 - app/controllers/simple_admin/resources_controller.rb
 - app/controllers/simple_admin/versions_controller.rb
 - app/services/entity_field_types/status_field.rb
+- app/services/resources_service.rb
 - bin/console
 - bin/setup
 - lib/simpleadmin.rb