kms 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b5e9aa1566a63ddb456f094714505f56b43e370
-  data.tar.gz: 0851c1a489a35a7c54c46e4bad05307f90768fa6
+  metadata.gz: ca7960cd5d2221af0ea109647b3d089679ab57f8
+  data.tar.gz: ecb51e21c23e6f585037024c8918b0497de960b5
 SHA512:
-  metadata.gz: 56b27397a53373a6233345c306f4d172f43ea9fc6046238e3922ddf4517f2e63c21aa8d8a11bd8fe8b8bcdf25b716b73d810e6b006ac8c2418f45b367c9051eb
-  data.tar.gz: 9c8923aa3cd498a8e3c8cb28a937bdd382b4afa73e4fbd6f8bbc8ad6f146a1990008261251984e56c85c3da7119c9a7aee81f08014a3a59b4b19af6dfb921926
+  metadata.gz: 511b185f81e3b56b39fb864142c65ce8425a39d3badf0b3c14e9879b0439154d76bf885bfbfa41c984d8febd4fd21f4e9cddd04147e562c6cae3a5b15ac060ec
+  data.tar.gz: 3099fe7a5562c79f98b02458a613e621c84f455f6b96c5bf6d2f52c5f208d3c9d7f60e0fef356ba87bc0297885a6ae1674d1039bfef7f06d6ee1921551a2fb7b

data/app/assets/javascripts/kms/application/controllers/assets_controller.coffee

@@ -1,21 +1,15 @@
 AssetsController = ($scope, $state, $cookieStore, $cookies, Restangular, $stateParams, Alertify, ErrorsService) ->
-  $scope.javascriptEditorOptions =
-    lineNumbers: true
-    mode: 'javascript'
-    extraKeys:
-      "F11": (cm)->
-        cm.setOption("fullScreen", !cm.getOption("fullScreen"))
-      "Esc": (cm)->
-        if cm.getOption("fullScreen") then cm.setOption("fullScreen", false)
-  $scope.cssEditorOptions =
+
+  $scope.editorOptions = (asset)->
     lineNumbers: true
-    mode: 'css'
+    mode: $scope.getMode(asset)
     extraKeys:
       "F11": (cm)->
         cm.setOption("fullScreen", !cm.getOption("fullScreen"))
       "Esc": (cm)->
         if cm.getOption("fullScreen") then cm.setOption("fullScreen", false)
 
+
   $scope.store = Restangular.all('assets')
   $scope.store.getList().then (assets)->
     $scope.assets = _.groupBy(assets, 'content_type')
@@ -23,12 +17,8 @@ AssetsController = ($scope, $state, $cookieStore, $cookies, Restangular, $stateP
   if $stateParams.id
     $scope.store.get($stateParams.id).then (asset)->
       $scope.asset = asset
-      if /javascript/.test($scope.asset.content_type) or /css/.test($scope.asset.content_type)
+      if /javascript/.test($scope.asset.content_type) or /css/.test($scope.asset.content_type) or /text\//.test($scope.asset.content_type)
         $scope.asset.performing_plain_text = true
-      if /javascript/.test($scope.asset.content_type)
-        $scope.asset.js = true
-      if /css/.test($scope.asset.content_type)
-        $scope.asset.css = true
   else
     {}
 

data/app/assets/javascripts/kms/application/controllers/pages_controller.coffee

@@ -7,6 +7,8 @@ PagesController = ($scope, $state, $cookieStore, Restangular, $stateParams, Aler
     lineNumbers: true
     mode:'htmlmixed'
     autoCloseTags: true
+    matchTags:
+      bothTags: true
     extraKeys:
       "F11": (cm)->
         cm.setOption("fullScreen", !cm.getOption("fullScreen"))

data/app/assets/javascripts/kms/application/controllers/snippets_controller.coffee

@@ -3,6 +3,8 @@ SnippetsController = ($scope, $state, Restangular, $stateParams, Alertify, Error
     lineNumbers: true
     mode:'htmlmixed'
     autoCloseTags: true
+    matchTags:
+      bothTags: true
     extraKeys:
       "F11": (cm)->
         cm.setOption("fullScreen", !cm.getOption("fullScreen"))

data/app/assets/javascripts/kms/application/controllers/templates_controller.coffee

@@ -3,6 +3,8 @@ TemplatesController = ($scope, $state, $cookieStore, Restangular, $stateParams,
     lineNumbers: true
     mode:'htmlmixed'
     autoCloseTags: true
+    matchTags:
+      bothTags: true
     extraKeys:
       "F11": (cm)->
         cm.setOption("fullScreen", !cm.getOption("fullScreen"))

data/app/assets/javascripts/kms/application.js

@@ -17,6 +17,7 @@
 //= require "codemirror/mode/htmlmixed/htmlmixed"
 //= require "codemirror/addon/fold/xml-fold"
 //= require "codemirror/addon/edit/closetag"
+//= require "codemirror/addon/edit/matchtags"
 //= require "codemirror/addon/display/fullscreen"
 //= require "ng-ckeditor/libs/ckeditor/ckeditor"
 //= require "angular/angular.js"

data/app/assets/javascripts/templates/assets/edit.html.slim

@@ -3,8 +3,7 @@
     form role="form"
       .form-group
         small = I18n.t(:toggle_fullscreen_mode_instruction)
-        textarea#text.form-control ng-if="asset.css" ng-model="asset.text" rows="40" ui-codemirror="cssEditorOptions"
-        textarea#text.form-control ng-if="asset.js" ng-model="asset.text" rows="40" ui-codemirror="javascriptEditorOptions"
+        textarea#text.form-control ng-if="asset.performing_plain_text" ng-model="asset.text" rows="40" ui-codemirror="editorOptions(asset)"
       .btn-group
         button.btn.btn-default type="submit" data-redirect="true" ng-click="update($event)" = I18n.t(:update_asset)
         button.btn.btn-default type="submit" ng-click="update($event)" = I18n.t(:update_asset_and_continue)

data/app/controllers/kms/assets_controller.rb

@@ -39,7 +39,7 @@ module Kms
     def show
       @asset = Asset.find(params[:id])
       attrs = {}
-      attrs.merge!(methods: [:text, :performing_plain_text]) if @asset.stylesheet_or_javascript?
+      attrs.merge!(methods: [:text, :performing_plain_text]) if @asset.text_or_javascript?
       render json: @asset.to_json(attrs)
     end
 
@@ -55,4 +55,4 @@ module Kms
       params.require(:asset).permit!
     end
   end
-end
+end

data/app/models/concerns/kms/update_stylesheets_text.rb

@@ -9,7 +9,7 @@ module Kms
     protected
 
     def restore_text
-      unless self.stylesheet_or_javascript?
+      unless stylesheet_or_javascript?
         Asset.where("content_type like '%css%'").each do |asset|
           asset.store_text
           asset.save

data/app/models/kms/asset.rb

@@ -4,7 +4,7 @@ module Kms
 
     mount_uploader :file, AssetUploader
 
-    # заимствовано из Locomotive
+    # inspired by Locomotive
     before_validation :store_text
 
     validate :unique_filename, on: :create
@@ -33,6 +33,10 @@ module Kms
       stylesheet? || javascript?
     end
 
+    def text_or_javascript?
+      text_type? || javascript?
+    end
+
     def stylesheet?
       content_type.include?("css")
     end
@@ -41,12 +45,16 @@ module Kms
       content_type.include?("javascript")
     end
 
+    def text_type?
+      content_type.start_with?("text")
+    end
+
     def store_text
-      return if persisted? && !stylesheet_or_javascript?
+      return if persisted? && !text_or_javascript?
 
       data = performing_plain_text? ? text : (file.present? ? file.read : nil)
 
-      return if !stylesheet_or_javascript? || data.blank?
+      return if !text_or_javascript? || data.blank?
 
       sanitized_source = replace_urls(data)
 
@@ -55,7 +63,7 @@ module Kms
         filename: filename || file.filename
       })
 
-      @text = sanitized_source # no need to reset the plain_text instance variable to have the last version
+      @text = sanitized_source
     end
 
     protected

data/lib/kms/version.rb

@@ -1,3 +1,3 @@
 module Kms
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kms
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Igor Petrov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -518,4 +518,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
 - spec/support/request_helpers.rb
-has_rdoc: