sunrise-cms 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eead0862b5bf8d42ba5d82e93028451c6c17dddce56299d59018772620942abe
-  data.tar.gz: eab912f83b38a93e75218863634e6b43ba6a6b070208650998ad65aaac28580d
+  metadata.gz: '098ce642eeaa4b3b99e038cac5afe914c4fec9c8e5a89a74454f2fa3bc0e8505'
+  data.tar.gz: accfeff359f7db91dee2ad3b186f7b1b93130d6c8e0f716c4e689d32963d9760
 SHA512:
-  metadata.gz: 32f253d0e63241684662aa603c9bd070416715c1d67f84cc3856c167c432837f63b9229d5d45f88240489924f59d1f80b3f5184649a90920f79c7ceabae2747f
-  data.tar.gz: 75332274d7a27769bcdae5dcb476321b8820920700a0c1846b1776ad66f4a25d0a66f0597a5af011a8d73d03cfac7cc61ae7f2476bdc927dfda0d77c1ea99f47
+  metadata.gz: d2560918f0f7f7103a48b27b4afc7f753effa7757054f2d1cb8a3f6e3964c987a7183a0f78a43c4950358f9131c0c895160e1b11f0278417ac2cbce622f8711d
+  data.tar.gz: '082d6d8027a20ace581d6a1008fe13981ff25198997dd5689383ba09b4ae319ec08db84ee7ccab75d9400a072812da9328dc94c428617af5e38e053a2d98e8ca'

data/.gitignore

@@ -22,3 +22,4 @@ spec/dummy/log/development.log
 vendor/bundle/
 .DS_Store
 uploads/
+.byebug_history

data/CHANGELOG.rdoc

@@ -1,9 +1,14 @@
+== 1.1.1
+  * Update code to be compatible with rails 5.x
+  * Import for records functional
+  * Remove select2 dependecy
+
 == 1.0.5
   * Update jQuery UI
 
 == 1.0.3
   * Fix parents relations
-  
+
 == 1.0.2
   * Use select2
   * Remove chosen
@@ -63,10 +68,10 @@
   * Replace paperclip with carrierwave
   * New model filter logic
 
-* Scaffold  
+* Scaffold
   * Generate spec tests for controllers
   * Apply new model filter logic
-  
+
 == 0.1.5
 * Core
   * Export users to csv

data/Gemfile

@@ -20,18 +20,22 @@ gem 'galetahub-enum_field', '~> 0.4.0'
 gem 'rails-settings-cached', '~> 0.4.0'
 gem 'rails-uploader', '~> 0.3.4'
 
+gem 'sprockets', '>= 3.0.0', '< 4.0.0'
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
   gem 'coffee-rails'
   gem 'sass-rails'
+  gem 'sass'
 
   gem 'libv8', '~> 3.11.8.4', platforms: :ruby
-  gem 'therubyracer', platforms: :ruby
   gem 'uglifier', '>= 1.0.3'
+  # gem 'therubyracer', platforms: :ruby
 end
 
 group :development, :test do
+  gem 'byebug'
   gem 'fuubar'
   gem 'generator_spec', '~> 0.9.4'
   gem 'launchy'
@@ -43,10 +47,3 @@ group :active_record do
   gem 'awesome_nested_set'
   gem 'pg', '~> 0.15'
 end
-
-# group :mongoid do
-#   gem 'bson_ext'
-#   gem 'carrierwave-mongoid', require: 'carrierwave/mongoid'
-#   gem 'mongoid', '~> 4.0.2'
-#   gem 'mongoid_nested_set', '>= 0.2.1'
-# end

data/README.md

@@ -4,6 +4,12 @@ Open source mini content management system for programmers.
 
 ## Setup
 
+For rails 5.x.x:
+
+```ruby
+  gem 'sunrise-cms', '~> 1.1.0', require: 'sunrise'
+```
+
 For rails 4.x.x:
 
 ```ruby

data/Rakefile

@@ -3,6 +3,7 @@
 require 'rake'
 require 'rake/testtask'
 require 'rdoc/task'
+require 'bundler/gem_tasks'
 
 desc 'Default: run unit tests.'
 task default: :test

data/app/assets/images/sunrise/icons/export.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="i-export" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+  <path d="M28 22 L28 30 4 30 4 22 M16 4 L16 24 M8 12 L16 4 24 12" />
+</svg>

data/app/assets/images/sunrise/icons/import.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32" height="32">
+    <g fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+        <path d="M28 22 L28 30 4 30 4 22 M16 4 L16 24 M8 16 L16 24 24 16" />
+    </g>
+</svg>

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

@@ -5,7 +5,6 @@
 //= require jquery-ui/datepicker
 //= require datepicker/jquery.ui.datepicker-uk
 //= require datepicker/jquery.ui.datepicker-ru
-//= require select2
 
 //= require sunrise/jquery.tmpl.min
 //= require sunrise/jquery.cookie

data/app/assets/javascripts/sunrise/jquery.dialog.js.coffee

@@ -7,130 +7,203 @@ $.fn.extend({
     )
 })
 
+$.fn.extend({
+  import_dialog: (options) ->
+    $(this).each((input_field) ->
+      new ImportDialog(this, options) unless ($ this).hasClass "dialog-init"
+    )
+})
+
 class Dialog
-  constructor: (@form_field, options = {}) ->   
+  constructor: (@form_field, options = {}) ->
     defaults =
       shadow_field: "#dark-shadow"
       dialog_class: "sunrise-dialog"
-    
+
     @options = $.extend defaults, options
-     
+
     this.setup()
     this.register_observers()
-  
+
   setup: ->
     dom_id = this.generate_random_id()
     @element = $ @form_field
-    
+
     @shadow = $ @options.shadow_field
     @container = $ '<div/>', { id: dom_id, class: @options.dialog_class }
-    @container.hide() 
+    @container.hide()
     @shadow.after @container
-    
+
     @element.addClass "dialog-init"
-    
+
   register_observers: ->
     @shadow.bind 'click', (evt) => this.hide()
-    @element.bind 'click', (evt) => 
+    @element.bind 'click', (evt) =>
       this.show()
       false
-  
+
   show: ->
     wnd = $(window)
     body = $('body')
-    
+
     height = if body.innerHeight() > wnd.innerHeight() then body.innerHeight() else wnd.innerHeight()
     @shadow.css 'height', height + 'px'
     @container.css 'left', ($(window).innerWidth() - @container.innerWidth()) / 2 + 'px'
-    
+
     @shadow.show()
     @container.show()
-  
+
   hide: ->
     @shadow.hide()
     @container.hide()
-  
+
   generate_random_id: ->
     string = "dlg_" + this.generate_random_char() + this.generate_random_char() + this.generate_random_char()
     while $("#" + string).length > 0
       string += this.generate_random_char()
     string
-    
+
   generate_random_char: ->
     chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ"
     rand = Math.floor(Math.random() * chars.length)
     newchar = chars.substring rand, rand+1
-    
-    
+
+# SORT
 class SortDialog extends Dialog
-  
+
   setup: ->
     super
-    
+
     @container.addClass 'sort-wrapper'
-    
+
     title = $('<div/>', { class: 'sort-title' })
     title.text(@element.attr 'title')
-    
+
     buttons_holder = $ '<div/>', { class: 'sort-buts-holder' }
     @save_button = $ '<input/>', { type: 'submit', value: @element.data('save_title'), class: 'button', disabled: 'disabled'}
     @cancel_button = $ '<input/>', { type: 'submit', value: @element.data('cancel_title'), class: 'button gray'}
-    
+
     buttons_holder.append(@save_button).append(@cancel_button)
     title_holder = $ '<div/>', { class: 'sort-title-holder' }
     title_holder.append(title).append(buttons_holder)
-    
+
     items_container = $ '<div/>', { class: 'sort-items-holder', id: 'sort_items' }
-    
+
     @container.append(title_holder).append(items_container)
-    
+
   register_observers: ->
     super
-    
+
     @cancel_button.bind 'click', (evt) => this.hide()
     @save_button.bind 'click', (evt) => this.save(evt)
-  
+
   show: ->
     super
-    this.load_data()  
-      
+    this.load_data()
+
   save: ->
     items = {}
     klass = this
-    
+
     $('.sort-item').each (index) ->
       items['ids[' + $(this).data('record-id') + ']'] = index + 1
-      
+
     $.rails.ajax
       url: @element.data 'url'
       type: 'POST'
       data: items
       success: ->
         klass.hide()
-    
+
   load_data: ->
     klass = this
-    
+
     $.ajax
       url: @element.attr 'href'
       success: (data, status, xhr) ->
         $('#sort_items').empty()
         $("#sort-template" ).tmpl(data).appendTo('#sort_items')
         # klass.refresh_counters()
-        
+
         $("#sort_items").sortable
           cursor: 'crosshair'
           opacity: 0.6
-          update: (event, ui) -> 
+          update: (event, ui) ->
             klass.update_sort_item(event, ui)
-            
+
   refresh_counters: ->
     $('.sort-item .numb').each (index) ->
       $(this).text index + 1
-            
+
   update_sort_item: (event, ui) ->
     @save_button.attr 'disabled', false
     this.refresh_counters()
-  
-    
-  
+
+# IMPORT
+class ImportDialog extends Dialog
+  setup: ->
+    super
+
+    @container.addClass 'import-wrapper'
+
+    title = $('<div/>', { class: 'import-title' })
+    title.text(@element.data('title'))
+
+    @upload_input = $('<input />', { type: 'file', class: 'import-fileupload' })
+    @records_list = $('<ul/>')
+
+    @upload_input.fileupload
+      url: @element.data('url')
+      dataType: 'json'
+      autoUpload: true
+      uploadTemplateId: false
+      downloadTemplateId: false
+      done: (e, data) =>
+        $.each data.result.files, (findex, file) =>
+          $.each file.records, (rindex, record) =>
+            line = $('<li>')
+
+            if record?.html?
+              line.append(record.html)
+            else
+              if record.errors?.length > 0
+                rrr = $.extend({}, record)
+                delete(rrr.row)
+                delete(rrr.errors)
+                line.addClass('import-invalid-error')
+                line.append($("<b>ROW: #{record.row}</b>"))
+                line.append($('<br/>')).append(JSON.stringify(rrr)).append($('<br/>'))
+                line.append(record.errors.join('<br/>'))
+              else
+                line.append($("<b>ROW: #{record.row}</b>"))
+                line.append($('<br/>'))
+                line.append JSON.stringify(record)
+
+            @records_list.append(line)
+
+        @container.addClass('disabled')
+        $("#records").load "#{location.pathname} #records", =>
+          @container.removeClass('disabled')
+
+    buttons_holder = $ '<div/>', { class: 'import-buts-holder' }
+    @close_button = $ '<input/>', { type: 'reset', value: 'Close', class: 'button gray'}
+
+    buttons_holder.append(@save_button).append(@close_button)
+    title_holder = $ '<div/>', { class: 'import-title-holder' }
+    title_holder.append(title).append(@upload_input).append(buttons_holder)
+
+    items_container = $ '<div/>', { class: 'import-items-holder', id: 'import_items' }
+    items_container.append(@records_list)
+
+    @container.append(title_holder).append(items_container)
+
+  register_observers: ->
+    super
+
+    @close_button.bind 'click', (evt) =>
+      # this.hide()
+      # location?.reload?()
+      # @records_list.empty()
+      this.hide()
+      @records_list.empty()
+

data/app/assets/javascripts/sunrise/jquery.editable.js.coffee

@@ -9,67 +9,67 @@ class Editable
   constructor: (@fields, options = {}) ->
     this.setup()
     this.register_observers()
-  
+
   setup: ->
     @elements = $ @fields
     @delete_button = @elements.filter('[data-editable=destroy]').first()
     @edit_button = @elements.filter('[data-editable=edit]').first()
-    
-  register_observers: ->  
+
+  register_observers: ->
     @elements.bind 'click', (evt) =>
       element = $(evt.target)
-      
+
       unless element.hasClass('disabled')
         switch element.data('editable')
           when 'destroy' then this.destroy(element)
           when 'edit' then this.edit(element)
       false
-    
+
     $('.check-block input').bind 'change', (evt) =>
       this.check_buttons()
-      
+
     $('.but-holder .check input').bind 'change', (evt) =>
       $('.check-block input').prop("checked", $(evt.target).prop("checked"))
       this.check_buttons()
-      
+
   check_buttons: ->
-    count = $('.check-block input:checked').size()
-    
+    count = $('.check-block input:checked').length
+
     this.toggle_button count > 0, @delete_button
     this.toggle_button count == 1, @edit_button
-    
+
   toggle_button: (condition, button) ->
     if condition then button.removeClass('disabled') else button.addClass('disabled')
-    
+
   destroy: (element) ->
     if this.allowAction(@delete_button)
       this.handleMethod(element, 'delete')
-      
+
   edit: (element) ->
     item = $('.check-block input:checked').first()
     location = element.attr('href').replace('0', item.val())
     window.location = location
-    
+
   allowAction: (element) ->
-    message = element.data('confirm-message')
+    message = element.data('confirm-message') || element.data('confirm')
     answer = false
-    # callback;
-    if !message 
-      return true
+    callback = undefined
+
+    return true unless message
 
-    if $.rails.fire(element, 'confirm') 
+    if $.rails.fire(element, 'confirm')
       answer = $.rails.confirm(message)
       callback = $.rails.fire(element, 'confirm:complete', [answer])
-    
+
     answer && callback
-    
+
   handleMethod: (link, method) ->
     href = link.attr('href')
     csrf_token = $('meta[name=csrf-token]').attr('content')
     csrf_param = $('meta[name=csrf-param]').attr('content')
     form = $('<form method="post" action="' + href + '"></form>')
     metadata_input = '<input name="_method" value="' + method + '" type="hidden" />'
-    
+
     $('.check-block input:checked').each (index, element) ->
       metadata_input += '<input name="ids[]" value="' + $(element).val() + '" type="hidden" />'