kms_models 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dc36ed60108e1abb7b3210d652bac2afffe538e
-  data.tar.gz: 74981584dff01d19b74893f47a5fa572324a2cf1
+  metadata.gz: bf7d34f10f2c3f33b4a50bdbac4badec6e3ce73a
+  data.tar.gz: 4dee3caa9f3dd22a3f454e35bfc1185fc38bc257
 SHA512:
-  metadata.gz: ae80e9ae8c89722e0f81ce79be9d66c6983e8f2a98c9a6893829187a62e88ca3b378c259de50216d52bac7212b7f536b0d22b1723a6e6255f20e6c863e63bbae
-  data.tar.gz: c80cfee5be37fd4b9843d3af7e1a4770e0d82be15592beec2cd759930b7ef2711a098e4481035e44321c02b82a593d30261e9b21a19eb9c79cf3ae474254a041
+  metadata.gz: 5b1c5100a0d19634d64b03b21cd54c93390eb2b9fce4168e110878e4ef2a4089ee7bbd2f4ccbf38e456503573d59944f88c4a1fe787fdc694528043039a96917
+  data.tar.gz: b2a23bb80c33e1e2d28962288e5db3598cb2d0f849f761f9aa5dc75a9d14e5f6467364baf3930ca0be5d21f6f5822a32343c7b6ff80be1ac3b8008adf20591e7

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/internal/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 

data/app/assets/javascripts/kms_models/application/controllers/{entries_controller.coffee → entries_controller.coffee.erb}

@@ -27,8 +27,9 @@ EntriesController = ($scope, $state, Restangular, $stateParams, Alertify, Errors
 
   $scope.initAssociationField = (field)->
     if field.type == 'Kms::HasManyField'
-      $scope.entry.values[field.liquor_name] = _.filter $scope[field.liquor_name], (element)->
-        _.contains $scope.entry.values[field.liquor_name], element.id.toString()
+      fieldEntries = _.map $scope.entry.values[field.liquor_name], (entryId)->
+        _.find $scope[field.liquor_name], { 'id': parseInt(entryId) }
+      $scope.entry.values[field.liquor_name] = _.compact fieldEntries
     else
       $scope.entry.values[field.liquor_name] = _.find $scope[field.liquor_name], (element)->
         $scope.entry.values[field.liquor_name] == element.id.toString()
@@ -43,7 +44,7 @@ EntriesController = ($scope, $state, Restangular, $stateParams, Alertify, Errors
     $scope.entry = {values: {}}
 
   $scope.getAssociationFields = (model)->
-    _.filter model.fields, (field) -> field.type == 'Kms::HasManyField' or field.type == 'Kms::BelongsToField'
+    _.filter model.fields_attributes, (field) -> field.type == 'Kms::HasManyField' or field.type == 'Kms::BelongsToField'
 
   $scope.getFieldTemplateName = (field)->
     typeSplitted = field.type.split '::'
@@ -65,8 +66,8 @@ EntriesController = ($scope, $state, Restangular, $stateParams, Alertify, Errors
     if $scope.entry.slug
       fd.append("entry[slug]", $scope.entry.slug)
     for key, value of $scope.entry.values
-      continue if value == undefined
-      if value
+      # continue if value == undefined
+      unless _.isEmpty(value)
         if value.constructor.name == 'Array'
           for element in value
             id = if element.constructor.name == 'Object' then element.id else element
@@ -74,14 +75,14 @@ EntriesController = ($scope, $state, Restangular, $stateParams, Alertify, Errors
         else if value.constructor.name != 'Object'
           fd.append("entry[values][#{key}]", value || '')
       else
-        fd.append("entry[values][#{key}]", value || '')
+        fd.append("entry[values][#{key}]", if value? then value else '')
     $scope.entry.withHttpConfig({ transformRequest: angular.identity }).post('', fd, '', {"Content-Type": undefined}).then ->
       $state.go('models.entries', modelId: $scope.model.id)
     ,(response)->
       Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
   $scope.destroy = (entry)->
-    if(confirm('Вы уверены?'))
+    if(confirm('<%= I18n.t(:are_you_sure) %>'))
       entry.remove().then ->
         $scope.entries = _.without($scope.entries, entry)
 

data/app/assets/javascripts/kms_models/application/controllers/fields_controller.coffee.erb

@@ -30,7 +30,7 @@ FieldsController = ($scope, $state, Restangular, $stateParams) ->
 
   $scope.addField = ->
     if $scope.field.name and $scope.field.type
-      $scope.model.fields.push($scope.field)
+      $scope.model.fields_attributes.push($scope.field)
       $scope.field = {}
 
   $scope.removeField = (field)->

data/app/assets/javascripts/kms_models/application/controllers/{models_controller.coffee → models_controller.coffee.erb}

@@ -1,4 +1,4 @@
-ModelsController = ($scope, $state, Restangular, $stateParams) ->
+ModelsController = ($scope, $state, Restangular, $stateParams, Alertify, ErrorsService) ->
   $scope.store = Restangular.all('models')
 
   Restangular.all('users').customGET('kms_user').then (current_user) ->
@@ -12,9 +12,9 @@ ModelsController = ($scope, $state, Restangular, $stateParams) ->
     $scope.store.get($stateParams.id).then (model)->
       $scope.model = model
   else
-    $scope.model = {fields: []}
+    $scope.model = {fields_attributes: []}
 
-  $scope.$watchCollection 'model.fields', (newFields, oldFields) ->
+  $scope.$watchCollection 'model.fields_attributes', (newFields, oldFields) ->
     if newFields and newFields.length > 0 and oldFields and oldFields.length == 0
       $scope.model.label_field =newFields[0].liquor_name
 
@@ -23,20 +23,20 @@ ModelsController = ($scope, $state, Restangular, $stateParams) ->
       # for adding to Menu - better to render resources via js
       window.location.reload()
       #$state.go('models')
-    ,->
-      console.log('bug')
+    ,(response)->
+      Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
   $scope.update = ->
     $scope.model.put().then ->
       $state.go('models')
-    ,->
-      console.log('bug')
+    ,(response)->
+      Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
   $scope.destroy = (model)->
-    if confirm('Вы уверены?')
+    if confirm('<%= I18n.t(:are_you_sure) %>')
       model.remove().then ->
         window.location.reload()
 
 
 angular.module('KMS')
-    .controller('ModelsController', ['$scope', '$state', 'Restangular', '$stateParams', ModelsController])
+    .controller('ModelsController', ['$scope', '$state', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', ModelsController])

data/app/assets/javascripts/templates/entries/form.html.slim

@@ -1,3 +1,3 @@
-.form-group ng-repeat="field in model.fields"
+.form-group ng-repeat="field in model.fields_attributes"
   ng-include src="'fields/' + getFieldTemplateName(field) + '.html'"
   /input.form-control type="text" ng-model="entry.values[field.liquor_name]" ng-attr-id="{{field.liquor_name}}"

data/app/assets/javascripts/templates/help/models_endpoints.html.slim

@@ -0,0 +1,26 @@
+h4 = I18n.t("liquor_help.endpoints_title")
+p
+  ul
+    li
+      var POST /entries/:collection_name
+      p
+        span = I18n.t('liquor_help.endpoints.entries.post.main_description')
+      p
+        code ng-non-bindable=''
+          | <form action="/entries/:collection_name" method="post">
+          br
+          |   <input type="hidden" name='authenticity_token' value='{{ request.form_authenticity_token }}'>
+          br
+          |   <input type="text" name="entry[name]">
+          br
+          |   <input type="submit" value="Send">
+          br
+          | </form>
+      p
+        table.table
+          tr
+            th #{ I18n.t('liquor_help.parameter') } /entries/:collection_name
+            th = I18n.t('liquor_help.description')
+          tr
+            td entry[:field_liquor_name]
+            td = I18n.t('liquor_help.endpoints.entries.post.parameters.entry')

data/app/assets/javascripts/templates/models/fields.html.slim

@@ -4,7 +4,7 @@
       tr
         th colspan="4" = Kms::Model.human_attribute_name(:fields)
     tbody
-      tr ng-repeat="field in model.fields" ng-hide="field._destroy"
+      tr ng-repeat="field in model.fields_attributes" ng-hide="field._destroy"
         td
           | {{ field.name }}
         td
@@ -17,7 +17,7 @@
           .btn-group.pull-right
             a.btn.btn-sm.btn-danger ng-click="removeField(field)"
               i.fa.fa-times
-      tr ng-hide="model.fields.length > 0"
+      tr ng-hide="model.fields_attributes.length > 0"
         td
           i = I18n.t(:no_fields_yet)
   .row

data/app/assets/javascripts/templates/models/form.html.slim

@@ -7,4 +7,9 @@
   small.help-block = I18n.t(:collection_name_field_hint)
 .form-group
   label for="label_field" = Kms::Model.human_attribute_name(:label_field)
-  select#label_field.form-control ng-model="model.label_field" ng-options="field.liquor_name as field.name for field in model.fields"
+  select#label_field.form-control ng-model="model.label_field" ng-options="field.liquor_name as field.name for field in model.fields_attributes"
+.form-group
+  label for="allow_creation_using_form" style="margin-right:10px;"
+    = Kms::Model.human_attribute_name(:allow_creation_using_form)
+  toggle-switch ng-model="model.allow_creation_using_form" on-label=I18n.t(:yes_word) off-label=I18n.t(:no_word)
+  small.help-block = I18n.t(:allow_creation_using_form_field_hint)

data/app/controllers/kms/models/models_controller.rb

@@ -1,35 +1,31 @@
 module Kms
   module Models
     class ModelsController < ApplicationController
+      wrap_parameters :model, include: [:kms_model_name, :collection_name, :label_field, :fields_attributes, :allow_creation_using_form]
 
       def index
-        render json: Model.all.to_json
+        render json: Model.all, root: false
       end
 
       def show
         @model = Model.find(params[:id])
-        render json: @model.to_json(include: {:fields => {methods: :type}})
+        render json: @model, root: false
       end
 
       def create
-        params[:model].merge!(fields_attributes: params[:fields])
         @model = Model.new(model_params)
         if @model.save
           Kms::ResourceService.register(:models, @model, "fa-tasks")
           Kms::ModelsWrapperDrop.register_model @model.collection_name
-          render json: @model.to_json
         else
-          render json: @model.to_json(methods: :errors), status: :unprocessable_entity
+          render json: {errors: @model.errors}.to_json, status: :unprocessable_entity
         end
       end
 
       def update
-        params[:model].merge!(fields_attributes: params[:fields])
         @model = Model.find(params[:id])
-        if @model.update_attributes(model_params)
-          render json: @model.to_json
-        else
-          render json: @model.to_json(methods: :errors), status: :unprocessable_entity
+        unless @model.update_attributes(model_params)
+          render json: {errors: @model.errors}.to_json, status: :unprocessable_entity
         end
       end
 
@@ -37,13 +33,12 @@ module Kms
         @model = Model.find(params[:id])
         @model.destroy
         Kms::ResourceService.unregister(:models, @model)
-        render json: @model.to_json
       end
 
       protected
 
       def model_params
-        params.require(:model).permit!
+        params.require(:model).permit(:kms_model_name, :collection_name, :label_field, :allow_creation_using_form, fields_attributes: [:id, :name, :liquor_name, :type, :class_name, :_destroy])
       end
 
     end

data/app/controllers/kms/public/entries_controller.rb

@@ -0,0 +1,25 @@
+module Kms
+  module Public
+    class EntriesController < ActionController::Base
+      protect_from_forgery with: :exception
+      before_action :find_model
+
+      def create
+        entry = @model.entries.new(values: entry_params)
+        unless @model.allow_creation_using_form? && entry.save
+          render json: {errors: entry.errors}.to_json, status: :unprocessable_entity
+        end
+      end
+
+      protected
+
+      def find_model
+        @model = Model.find_by!(collection_name: params[:collection_name])
+      end
+
+      def entry_params
+        params.require(:entry).permit(@model.fields.pluck(:liquor_name))
+      end
+    end
+  end
+end

data/app/models/kms/file_field.rb

@@ -4,7 +4,7 @@ module Kms
         value = entry.values[liquor_name]
         uploader = EntryFileUploader.new(OpenStruct.new(model: entry, field_name: liquor_name))
         uploader.retrieve_from_store! value
-        uploader.url
+        uploader.file.exists? ? uploader.url : nil
       end
     end
 end

data/app/models/kms/has_many_field.rb

@@ -3,6 +3,13 @@ module Kms
     def get_value(entry)
       entry_ids = entry.values[liquor_name]
       association_records = Kms::Entry.where(id: entry_ids)
+      if entry_ids.present?
+        # this one allows ORDER BY the IN value list like this example:
+        # SELECT * FROM "comments" WHERE ("comments"."id" IN (1,3,2,4))
+        # ORDER BY  id=1 DESC, id=3 DESC, id=2 DESC, id=4 DESC
+        order_sql = entry_ids.map {|entry_id| "id=#{entry_id} DESC"}
+        association_records = association_records.order(order_sql.join(','))
+      end
       Liquor::DropDelegation.wrap_scope(association_records)
     end
   end

data/app/models/kms/model.rb

@@ -4,6 +4,8 @@ module Kms
     has_many :entries, class_name: 'Kms::Entry', dependent: :destroy
     accepts_nested_attributes_for :fields, allow_destroy: true
 
+    validates :kms_model_name, :collection_name, presence: true
+
     def name
       id.to_s
     end

data/app/serializers/kms/entry_serializer.rb

@@ -11,7 +11,7 @@ module Kms
       object.model.fields.file_fields.each do |file_field|
         uploader = EntryFileUploader.new(OpenStruct.new(model: object, field_name: file_field.liquor_name))
         uploader.retrieve_from_store! values_with_urls[file_field.liquor_name]
-        values_with_urls[file_field.liquor_name] = { url: uploader.url }
+        values_with_urls[file_field.liquor_name] = { url: uploader.file.exists? ? uploader.url : nil }
       end
       # prepare checkbox fields - cause PostgreSQL json stored as strings
       object.model.fields.checkbox_fields.each do |checkbox_field|

data/app/serializers/kms/field_serializer.rb

@@ -0,0 +1,6 @@
+module Kms
+  class FieldSerializer < ActiveModel::Serializer
+    attributes :id, :name, :liquor_name, :type, :class_name
+  end
+
+end

data/app/serializers/kms/model_serializer.rb

@@ -0,0 +1,12 @@
+module Kms
+  class ModelSerializer < ActiveModel::Serializer
+    attributes :id, :kms_model_name, :collection_name, :label_field, :allow_creation_using_form, :fields_attributes
+
+    has_many :fields_attributes, serializer: Kms::FieldSerializer
+
+    def fields_attributes
+      object.fields
+    end
+
+  end
+end

data/config/initializers/help.rb

@@ -1 +1 @@
-Kms::HelpService.register_templates Kms::Models::Engine, 'help/models_variables.html'
+Kms::HelpService.register_templates Kms::Models::Engine, 'help/models_variables.html', 'help/models_endpoints.html'

data/config/locales/en.yml

@@ -12,6 +12,7 @@ en:
   select_field_type: "Select field type"
   select_model: "Select Model"
   collection_name_field_hint: "You can access model collection like this: models.your_collection_name (ex., models.services)"
+  allow_creation_using_form_field_hint: "On website you can place a form allowing to create model entries"
   has_many_field_placeholder: "Select related objects..."
   belongs_to_field_placeholder: "Select related object..."
   field_types:
@@ -25,6 +26,13 @@ en:
     variables:
       models:
         main_description: 'Variable "models" gives access to models collections of entries. You can access collection using model collection name - "Collection name (for Liquor)" field. For example, if you created some Model with "services" collection name, then you could iterate its collection using "for" tag like this:'
+    endpoints:
+      entries:
+        post:
+          main_description: This endpoint allows you to setup form submitting Model's elements. For example, if you have a model with collection name "posts" (and field with "title" Liquor name), you could create a form with action="/entries/posts" and an input with name="entry[title]"
+          parameters:
+            entry: Value of each parameter will be saved to corresponding Model's entry field
+
   activerecord:
     models:
       kms/model:
@@ -43,6 +51,7 @@ en:
         collection_name: "Collection name (for Liquor)"
         fields: "Fields"
         label_field: "Label field (used for URL/slug generating)"
+        allow_creation_using_form: "Allow creation using form"
       kms/field:
         name: "Name"
         liquor_name: "Name for Liquor"

data/config/locales/ru.yml

@@ -12,6 +12,7 @@ ru:
   select_field_type: "Выберите тип свойства"
   select_model: "Выберите модель"
   collection_name_field_hint: "К коллекции можно будет обратиться так: models.your_collection_name (напр., models.services)"
+  allow_creation_using_form_field_hint: "На сайте можно будет разместить форму для создания элементов модели"
   has_many_field_placeholder: "Выберите связанные объекты..."
   belongs_to_field_placeholder: "Выберите связанный объект..."
   field_types:
@@ -25,6 +26,12 @@ ru:
     variables:
       models:
         main_description: 'Переменная models предоставляет доступ к коллекциям моделей, определённых пользователем на вкладке "Модели". Доступ осуществляется через название коллекции модели - поле "Название коллекции (для Liquor)" при создании модели. Например, если создана модель с названием коллекции services, то можно использовать for для итерации по элементам коллекции следующим образом:'
+    endpoints:
+      entries:
+        post:
+          main_description: Этот запрос позволяет создавать формы для отправки элементов модели. Например, если есть модель с названием коллекции "posts" (и поле с названием для Liquor - "title"), то можно создать форму с action="/entries/posts" и input с name="entry[title]"
+          parameters:
+            entry: Значение каждого параметра такого вида будет сохранено в соответствующее поле элемента модели
   activerecord:
     models:
       kms/model:
@@ -43,6 +50,7 @@ ru:
         collection_name: "Название коллекции (для Liquor)"
         fields: "Свойства"
         label_field: "Поле, используемое для генерации ссылок на объекты"
+        allow_creation_using_form: "Разрешить создание элементов с помощью форм"
       kms/field:
         name: "Название"
         liquor_name: "Название для Liquor"

data/config/routes.rb

@@ -9,3 +9,6 @@ Kms::Models::Engine.routes.draw do
     end
   end
 end
+Rails.application.routes.draw do
+  post '/entries/:collection_name' => 'kms/public/entries#create'
+end

data/db/migrate/20150409124420_create_kms_models.rb

@@ -1,4 +1,4 @@
-class CreateKmsModels < ActiveRecord::Migration
+class CreateKmsModels < ActiveRecord::Migration[4.2]
   def change
     create_table :kms_models do |t|
       t.string :model_name

data/db/migrate/20150409125056_create_kms_fields.rb

@@ -1,4 +1,4 @@
-class CreateKmsFields < ActiveRecord::Migration
+class CreateKmsFields < ActiveRecord::Migration[4.2]
   def change
     create_table :kms_fields do |t|
       t.string :name

data/db/migrate/20150413143711_create_kms_entries.rb

@@ -1,4 +1,4 @@
-class CreateKmsEntries < ActiveRecord::Migration
+class CreateKmsEntries < ActiveRecord::Migration[4.2]
   def change
     create_table :kms_entries do |t|
       t.belongs_to :model, index: true

data/db/migrate/20150820080436_add_label_field_to_kms_models.rb

@@ -1,4 +1,4 @@
-class AddLabelFieldToKmsModels < ActiveRecord::Migration
+class AddLabelFieldToKmsModels < ActiveRecord::Migration[4.2]
   def change
     add_column :kms_models, :label_field, :string
   end

data/db/migrate/20150820132142_add_slug_to_kms_entries.rb

@@ -1,4 +1,4 @@
-class AddSlugToKmsEntries < ActiveRecord::Migration
+class AddSlugToKmsEntries < ActiveRecord::Migration[4.2]
   def change
     add_column :kms_entries, :slug, :string
     add_index :kms_entries, :slug, unique: true

data/db/migrate/20150821201250_fix_models_column_name.rb

@@ -1,4 +1,4 @@
-class FixModelsColumnName < ActiveRecord::Migration
+class FixModelsColumnName < ActiveRecord::Migration[4.2]
   def change
     rename_column :kms_models, :model_name, :kms_model_name
   end

data/db/migrate/20150901115303_add_class_name_to_kms_fields.rb

@@ -1,4 +1,4 @@
-class AddClassNameToKmsFields < ActiveRecord::Migration
+class AddClassNameToKmsFields < ActiveRecord::Migration[4.2]
   def change
     add_column :kms_fields, :class_name, :string
   end

data/db/migrate/20150910081440_add_position_to_kms_entries.rb

@@ -1,4 +1,4 @@
-class AddPositionToKmsEntries < ActiveRecord::Migration
+class AddPositionToKmsEntries < ActiveRecord::Migration[4.2]
   def change
     add_column :kms_entries, :position, :integer, default: 0, null: false
   end

data/db/migrate/20170209125819_add_allow_creation_using_form_to_models.rb

@@ -0,0 +1,5 @@
+class AddAllowCreationUsingFormToModels < ActiveRecord::Migration[5.0]
+  def change
+    add_column :kms_models, :allow_creation_using_form, :boolean, default: false
+  end
+end

data/lib/kms/models/engine.rb

@@ -1,5 +1,4 @@
 require "friendly_id"
-require 'kms/drops/models_wrapper_drop'
 module Kms
   module Models
     class Engine < ::Rails::Engine

data/lib/kms/models/version.rb

@@ -1,5 +1,5 @@
 module Kms
   module Models
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end