kms_models 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7d34f10f2c3f33b4a50bdbac4badec6e3ce73a
-  data.tar.gz: 4dee3caa9f3dd22a3f454e35bfc1185fc38bc257
+  metadata.gz: a9b78c88773588da736e99bea8732e265229d7b4
+  data.tar.gz: 07b6050158b77cbf3d16fcaad3462c8a9e34d834
 SHA512:
-  metadata.gz: 5b1c5100a0d19634d64b03b21cd54c93390eb2b9fce4168e110878e4ef2a4089ee7bbd2f4ccbf38e456503573d59944f88c4a1fe787fdc694528043039a96917
-  data.tar.gz: b2a23bb80c33e1e2d28962288e5db3598cb2d0f849f761f9aa5dc75a9d14e5f6467364baf3930ca0be5d21f6f5822a32343c7b6ff80be1ac3b8008adf20591e7
+  metadata.gz: 5cd7755771682d738fc2c9ec9e4f03295676f86cae31d96c41c549715e74f85c256db3151bb218006012ec3f794b74f6fede7c57a9e0fa89ed43bb07c19725e4
+  data.tar.gz: bd40086173164ddb222e91075ba6e6e9e0ad2b3b7f5329f456799f62409a5c0385ada80bfeb81343d6fa6e2ac3fdbd33e31ee33ddae16a6610dca6a3c6b8c22e

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

@@ -1,4 +1,4 @@
-FieldsController = ($scope, $state, Restangular, $stateParams) ->
+FieldsController = ($scope, $state, Restangular, $stateParams, TransliterationService) ->
   $scope.types = [
     { id: 'Kms::StringField', name: "<%= I18n.t("field_types.string") %>"},
     { id: 'Kms::TextField', name: "<%= I18n.t("field_types.text") %>"},
@@ -8,6 +8,14 @@ FieldsController = ($scope, $state, Restangular, $stateParams) ->
     { id: 'Kms::BelongsToField', name: "<%= I18n.t("field_types.belongs_to") %>"},
   ]
 
+  $scope.fieldsSortableOptions =
+    orderChanged: (event)->
+      for field, index in event.dest.sortableScope.modelValue
+        field_copy =
+          id: field.id
+          position: index
+        Restangular.restangularizeElement($scope.model, field_copy, 'fields').put()
+
   Restangular.all('resources').getList().then (templatable_types)->
     $scope.templatable_types = templatable_types
 
@@ -17,6 +25,10 @@ FieldsController = ($scope, $state, Restangular, $stateParams) ->
 
   $scope.field = {}
 
+  $scope.$watch 'field.name', (newValue, oldValue) ->
+    if newValue? and !$scope.field.id
+      $scope.field.liquor_name = _.snakeCase TransliterationService.translit(newValue, 5).replace(/`/g, '')
+
   $scope.formatType = (field)->
     fieldType = _.find $scope.types, (type) -> type.id == field.type
     if $scope.isAssociationField(field) then "#{fieldType.name} (#{$scope.getDisplayableTemplatableType(field)})" else fieldType.name
@@ -39,4 +51,4 @@ FieldsController = ($scope, $state, Restangular, $stateParams) ->
 
 
 angular.module('KMS')
-    .controller('FieldsController', ['$scope', '$state', 'Restangular', '$stateParams', FieldsController])
+    .controller('FieldsController', ['$scope', '$state', 'Restangular', '$stateParams', 'TransliterationService', FieldsController])

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

@@ -1,4 +1,4 @@
-ModelsController = ($scope, $state, Restangular, $stateParams, Alertify, ErrorsService) ->
+ModelsController = ($scope, $state, Restangular, $stateParams, Alertify, ErrorsService, TransliterationService) ->
   $scope.store = Restangular.all('models')
 
   Restangular.all('users').customGET('kms_user').then (current_user) ->
@@ -18,6 +18,10 @@ ModelsController = ($scope, $state, Restangular, $stateParams, Alertify, ErrorsS
     if newFields and newFields.length > 0 and oldFields and oldFields.length == 0
       $scope.model.label_field =newFields[0].liquor_name
 
+  $scope.$watch 'model.kms_model_name', (newValue, oldValue) ->
+    if newValue? and !$scope.model.id
+      $scope.model.collection_name = _.snakeCase TransliterationService.translit(newValue, 5).replace(/`/g, '')
+
   $scope.create = ->
     $scope.store.post($scope.model).then ->
       # for adding to Menu - better to render resources via js
@@ -39,4 +43,4 @@ ModelsController = ($scope, $state, Restangular, $stateParams, Alertify, ErrorsS
 
 
 angular.module('KMS')
-    .controller('ModelsController', ['$scope', '$state', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', ModelsController])
+    .controller('ModelsController', ['$scope', '$state', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', 'TransliterationService', ModelsController])

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

@@ -1,4 +1,4 @@
-.row
+.row ng-show="entries.length"
   .col-lg-12
     .widget
       .widget-header
@@ -19,3 +19,14 @@
                   .btn-group.pull-right
                     a.btn.btn-sm.btn-danger ng-click="destroy(entry)"
                       i.fa.fa-times
+.row ng-show="!entries.length"
+  .center-block
+    .jumbotron.vertical-center.text-center
+      .container
+        h1
+          span.fa-stack.fa-lg
+            i.fa.fa-circle.fa-stack-2x
+            i.fa.fa-list.fa-stack-1x
+        p = I18n.t(:entries_description)
+        p
+          a.btn.btn-primary.btn-lg ui-sref="models.entries.new({modelId: model.id})" role="button" = I18n.t(:create_first_entry)

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

@@ -1,7 +1,7 @@
 label for="{{ field.liquor_name }}"
   | {{ field.name }}
 ui-select multiple="" ng-model="entry.values[field.liquor_name]" theme="bootstrap" on-select="addObject($item, field)" on-remove='removeObject($item, field)'
-  ui-select-match placeholder=I18n.t(:has_many_field_placeholder)
+  ui-select-match placeholder=I18n.t(:has_many_field_placeholder) class="ui-select-match"
     | {{ $item.values[$item.model.label_field] || $item.id }}
   ui-select-choices repeat="childEntry.id as childEntry in {{ field.liquor_name }}"
     div ng-bind-html="childEntry.values[childEntry.model.label_field] | highlight: $select.search"

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

@@ -3,9 +3,10 @@
     thead
       tr
         th colspan="4" = Kms::Model.human_attribute_name(:fields)
-    tbody
-      tr ng-repeat="field in model.fields_attributes" ng-hide="field._destroy"
+    tbody as-sortable="fieldsSortableOptions" ng-model="model.fields_attributes"
+      tr ng-repeat="field in model.fields_attributes" ng-hide="field._destroy" as-sortable-item=""
         td
+          i.fa.fa-bars as-sortable-item-handle=""  
           | {{ field.name }}
         td
           | {{ field.liquor_name }}

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

@@ -1,8 +1,8 @@
-.row
+.row ng-show="models.length"
   .col-lg-12
     .widget
       .widget-header
-        i.fa.fa-list
+        i.fa.fa-tasks
         = Kms::Model.model_name.human(count: 1.1)
         a.btn.btn-sm.btn-primary.pull-right ui-sref="models.new"
           = I18n.t("add_model")
@@ -18,3 +18,14 @@
                   .btn-group.pull-right
                     a.btn.btn-sm.btn-danger ng-click="destroy(model)" ng-show="currentUser.admin"
                       i.fa.fa-times
+.row ng-show="!models.length"
+  .center-block
+    .jumbotron.vertical-center.text-center
+      .container
+        h1
+          span.fa-stack.fa-lg
+            i.fa.fa-circle.fa-stack-2x
+            i.fa.fa-tasks.fa-stack-1x
+        p = I18n.t(:models_description)
+        p
+          a.btn.btn-primary.btn-lg ui-sref="models.new" role="button" = I18n.t(:create_first_model)

data/app/assets/stylesheets/kms_models/application.css

@@ -13,3 +13,6 @@
  *= require_tree .
  *= require_self
  */
+ .as-sortable-dragging td {
+   padding: 0 10px;
+ }

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

@@ -0,0 +1,23 @@
+module Kms
+  module Models
+    class FieldsController < ApplicationController
+      wrap_parameters :field, include: [:position]
+
+      def update
+        model = Model.find(params[:model_id])
+        @field = model.fields.find(params[:id])
+        if @field.update(field_params)
+          head :no_content
+        else
+          render json: @field.to_json(methods: :errors), status: :unprocessable_entity
+        end
+      end
+
+      protected
+
+      def field_params
+        params.require(:field).permit(:position)
+      end
+    end
+  end
+end

data/app/models/kms/page_decorator.rb

@@ -1,10 +1,12 @@
 Kms::Page.class_eval do
   # fetch item by slug
-  def fetch_item!(slug)
+  def fetch_item(slug)
     return nil unless templatable?
     templatable_type.constantize.find_by_slug!(slug)
   rescue NameError
-    Kms::Entry.find_by_slug!(slug)
+    model = Kms::Model.find(templatable_type.to_i)
+    model.entries.find_by_slug(slug)
+    # Kms::Entry.find_by_slug(slug)
   end
 
   # fetch items for templatable page

data/app/serializers/kms/model_serializer.rb

@@ -5,7 +5,7 @@ module Kms
     has_many :fields_attributes, serializer: Kms::FieldSerializer
 
     def fields_attributes
-      object.fields
+      object.fields.order(:position)
     end
 
   end

data/app/uploaders/entry_file_uploader.rb

@@ -7,8 +7,7 @@ class EntryFileUploader < CarrierWave::Uploader::Base
   # include CarrierWave::MiniMagick
 
   # Choose what kind of storage to use for this uploader:
-  storage :file
-  # storage :fog
+  storage (ENV['KMS_ASSETS_STORAGE'] && ENV['KMS_ASSETS_STORAGE'].to_sym) || :file
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:

data/config/locales/en.yml

@@ -15,6 +15,10 @@ en:
   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..."
+  models_description: "Models are where you organize your content (basically dynamic) like 'News', 'Blog', 'Services' and etc."
+  create_first_model: "Create first model"
+  entries_description: "Here you would create content for corresponding Model"
+  create_first_entry: "Create first entry"
   field_types:
     string: "String"
     text: "Text"

data/config/locales/ru.yml

@@ -15,6 +15,10 @@ ru:
   allow_creation_using_form_field_hint: "На сайте можно будет разместить форму для создания элементов модели"
   has_many_field_placeholder: "Выберите связанные объекты..."
   belongs_to_field_placeholder: "Выберите связанный объект..."
+  models_description: "Модели - это ваш динамический контент. Например, 'Новости', 'Блог', 'Услуги' и тд."
+  create_first_model: "Создать первую модель"
+  entries_description: "Здесь вы можете создавать элементы соответствующей Модели"
+  create_first_entry: "Создать первый элемент"
   field_types:
     string: "Строка"
     text: "Текст"

data/config/routes.rb

@@ -6,6 +6,7 @@ Kms::Models::Engine.routes.draw do
           post '' => 'entries#update'
         end
       end
+      resources :fields, only: :update, format: true
     end
   end
 end

data/db/migrate/20170802063046_change_values_column_to_jsonb.rb

@@ -0,0 +1,5 @@
+class ChangeValuesColumnToJsonb < ActiveRecord::Migration[5.1]
+  def change
+    execute "ALTER TABLE kms_entries ALTER COLUMN values SET DATA TYPE jsonb USING values::jsonb"
+  end
+end

data/db/migrate/20170802085121_add_position_to_kms_fields.rb

@@ -0,0 +1,5 @@
+class AddPositionToKmsFields < ActiveRecord::Migration[5.1]
+  def change
+    add_column :kms_fields, :position, :integer, default: 0, null: false
+  end
+end

data/lib/drops/kms/entry_drop.rb

@@ -1,7 +1,7 @@
 module Kms
   class EntryDrop < Liquor::Drop
 
-    attributes :id, :created_at, :permalink, :model_collection_name
+    attributes :id, :created_at, :slug, :permalink, :model_collection_name
     scopes :order
 
     # overriding methods cause we work with 'json' column
@@ -9,16 +9,16 @@ module Kms
       def find_by(_, fields={})
         fields, = Liquor::Drop.unwrap_scope_arguments([ fields ])
 
-        json_queries = fields.map {|name, value| "values ->> '#{name}' = ?" }
-        result = @source.where(json_queries.join(" AND "), *fields.values.map(&:to_s)).first
+        plain_fields, json_fields = fields_partition(fields)
+        result = @source.where(fields_query(fields), *(json_fields.values + plain_fields.values).map(&:to_s)).first
         Liquor::DropDelegation.wrap_element result if result
       end
 
       def find_all_by(_, fields={})
         fields, = Liquor::Drop.unwrap_scope_arguments([ fields ])
 
-        json_queries = fields.map {|name, value| "values ->> '#{name}' = ?" }
-        result = @source.where(json_queries.join(" AND "), *fields.values.map(&:to_s))
+        plain_fields, json_fields = fields_partition(fields)
+        result = @source.where(fields_query(fields), *(json_fields.values + plain_fields.values).map(&:to_s))
         Liquor::DropDelegation.wrap_scope(result)
       end
 
@@ -26,8 +26,8 @@ module Kms
         args = Liquor::Drop.unwrap_scope_arguments(args)
         parsed_args = args.map do |arg|
           order_clause = arg.split(' ')
-          if order_clause[0].in? ["id", "created_at", "updated_at", "position"]
-            order_clause.join(' ')
+          if order_clause[0].in? Kms::Entry.column_names - ['values']
+            arg
           else
             ["values ->> '#{order_clause[0]}'", order_clause[1].to_s].join(' ')
           end
@@ -35,6 +35,20 @@ module Kms
         # we use reorder because by default we order by position
         Liquor::DropDelegation.wrap_scope @source.reorder(*parsed_args)
       end
+
+      private
+
+      def fields_partition(fields)
+        fields.partition {|name, _| (Kms::Entry.column_names - ['values']).include? name.to_s}.map(&:to_h)
+      end
+
+      def fields_query(fields)
+        plain_fields, json_fields = fields_partition(fields)
+        json_fields_query = json_fields.map {|name, _| "values ->> '#{name}' = ?" }.join(" AND ")
+        plain_fields_query = plain_fields.map {|name, _| "#{name} = ?"}.join(" AND ")
+        [json_fields_query, plain_fields_query].reject(&:empty?).join(' OR ')
+      end
+
     end
 
     def initialize(source)

data/lib/generators/kms_models/install/install_generator.rb

@@ -13,5 +13,9 @@ module KmsModels
       append_file "app/assets/javascripts/application.js", "//= require kms_models/application\n"
     end
 
+    def insert_stylesheet
+      gsub_file "app/assets/stylesheets/application.css", '*/', "*= require kms_models/application\n*/"
+    end
+
   end
 end

data/lib/kms/models/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kms_models
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Igor Petrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - app/assets/javascripts/templates/models/new.html.slim
 - app/assets/stylesheets/kms_models/application.css
 - app/controllers/kms/models/entries_controller.rb
+- app/controllers/kms/models/fields_controller.rb
 - app/controllers/kms/models/models_controller.rb
 - app/controllers/kms/public/entries_controller.rb
 - app/helpers/kms_models/application_helper.rb
@@ -169,6 +170,8 @@ files:
 - db/migrate/20150901115303_add_class_name_to_kms_fields.rb
 - db/migrate/20150910081440_add_position_to_kms_entries.rb
 - db/migrate/20170209125819_add_allow_creation_using_form_to_models.rb
+- db/migrate/20170802063046_change_values_column_to_jsonb.rb
+- db/migrate/20170802085121_add_position_to_kms_fields.rb
 - lib/drops/kms/entry_drop.rb
 - lib/drops/kms/models_wrapper_drop.rb
 - lib/generators/kms_models/install/install_generator.rb
@@ -196,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Extension for KMS