comfortable_mexican_sofa 2.0.12 → 2.0.13

data/lib/comfortable_mexican_sofa/content/tags/partial.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Tag for injecting partials. Example tag:
 #   {{cms:partial path/to/partial, foo: bar, zip: zoop}}
 # This expands into a familiar:
@@ -19,7 +21,7 @@ class ComfortableMexicanSofa::Content::Tag::Partial < ComfortableMexicanSofa::Co
   end
 
   # we output erb into rest of the content
-  def allow_erb
+  def allow_erb?
     true
   end
 

data/lib/comfortable_mexican_sofa/content/tags/snippet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Tag for reusable snippets within context's site scope. Looks like this:
 #   {{cms:snippet identifier}}
 # Snippets may have more tags in them like fragments, so they may be expanded too.

data/lib/comfortable_mexican_sofa/content/tags/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Tag for injecting template rendering. Example tag:
 #   {{cms:template template/path}}
 # This expands into something like this:
@@ -18,7 +20,7 @@ class ComfortableMexicanSofa::Content::Tag::Template < ComfortableMexicanSofa::C
   end
 
   # we output erb into rest of the content
-  def allow_erb
+  def allow_erb?
     true
   end
 

data/lib/comfortable_mexican_sofa/content/tags/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Tag for text content that is going to be rendered using text input
 #   {{ cms:text identifier }}
 #
@@ -5,7 +7,7 @@ class ComfortableMexicanSofa::Content::Tag::Text < ComfortableMexicanSofa::Conte
 
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = { id: nil, class: "form-control" }
+    options = { id: form_field_id, class: "form-control" }
     input   = view.send(:text_field_tag, name, content, options)
 
     yield input

data/lib/comfortable_mexican_sofa/content/tags/textarea.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Tag for text content that is going to be rendered using textarea
 #   {{ cms:textarea identifier }}
 #
@@ -5,7 +7,7 @@ class ComfortableMexicanSofa::Content::Tag::TextArea < ComfortableMexicanSofa::C
 
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = { id: nil, data: { "cms-cm-mode" => "text/html" } }
+    options = { id: form_field_id, data: { "cms-cm-mode" => "text/html" } }
     input   = view.send(:text_area_tag, name, content, options)
 
     yield input

data/lib/comfortable_mexican_sofa/content/tags/wysiwyg.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Tag for text content that is going to be rendered using Redactor (default) in
 # the admin area
 #   {{ cms:wysiwyg identifier }}
@@ -7,7 +9,7 @@ class ComfortableMexicanSofa::Content::Tag::Wysiwyg < ComfortableMexicanSofa::Co
 
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = { id: nil, data: { "cms-rich-text" => true } }
+    options = { id: form_field_id, data: { "cms-rich-text" => true } }
     input   = view.send(:text_area_tag, name, content, options)
     yield input
   end

data/lib/comfortable_mexican_sofa/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "comfortable_mexican_sofa"
 require "rails"
 require "rails-i18n"
@@ -7,7 +9,6 @@ require "kramdown"
 require "jquery-rails"
 require "haml-rails"
 require "sass-rails"
-require "coffee-rails"
 
 module ComfortableMexicanSofa
   class Engine < ::Rails::Engine

data/lib/comfortable_mexican_sofa/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa
 
   class Error < StandardError

data/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::ActsAsTree
 
   def self.included(base)

data/lib/comfortable_mexican_sofa/extensions/has_revisions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::HasRevisions
 
   def self.included(base)

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -1,8 +1,13 @@
-class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
+# frozen_string_literal: true
 
-  def field(record, tag, index)
-    object_name = record.class.to_s.demodulize.underscore
+class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
 
+  # Renders form input for a fragment
+  #
+  # @param [Comfy::Cms::Page] record
+  # @param [ComfortableMexicanSofa::Content::Tag] tag
+  # @param [Integer] index
+  def fragment_field(tag, index)
     tag.form_field(object_name, @template, index) do |tag_input|
       name = "#{object_name}[fragments_attributes][#{index}][identifier]"
       identifer_input = @template.hidden_field_tag(name, tag.identifier, id: nil)
@@ -14,7 +19,7 @@ class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
       label = I18n.t("comfy.cms.content.tag.#{tag.identifier}", default: tag.identifier.titleize)
       renderable = tag.respond_to?(:renderable) ? tag.renderable : true
 
-      form_group bootstrap: { label: { text: label, class: "renderable-#{renderable}" } } do
+      form_group bootstrap: { label: { text: label, for: tag.form_field_id, class: "renderable-#{renderable}" } } do
         concat identifer_input
         concat tag_name_input
         concat tag_input
@@ -22,19 +27,21 @@ class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
     end
   end
 
-  # Wrapper for form action that is sticking to the bottom of the viewport
-  def form_actions(&block)
-    <<-HTML.strip_heredoc.html_safe
-      <div class="form-actions row bg-light">
-        <div class="col-lg-8 offset-lg-2">
-          <div class="form-group row mb-0">
-            <div class="col-sm-10 offset-sm-2">
-              #{capture(&block)}
-            </div>
-          </div>
-        </div>
-      </div>
-    HTML
+  # Wrapper for form action that is sticking to the bottom of the viewport.
+  # Example:
+  #   = form.form_actions do
+  #     = form.submit
+  #
+  def form_actions
+    content_tag(:div, class: "form-actions row bg-light") do
+      content_tag(:div, class: "col-lg-8 offset-lg-2") do
+        content_tag(:div, class: "form-group row mb-0") do
+          content_tag(:div, class: "col-sm-10 offset-sm-2") do
+            yield
+          end
+        end
+      end
+    end
   end
 
 end

data/lib/comfortable_mexican_sofa/render_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::RenderMethods
 
   def self.included(base)

data/lib/comfortable_mexican_sofa/routes/cms.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActionDispatch::Routing::Mapper
 
   def comfy_route_cms(options = {})

data/lib/comfortable_mexican_sofa/routes/cms_admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActionDispatch::Routing::Mapper
 
   def comfy_route_cms_admin(path: "admin")

data/lib/comfortable_mexican_sofa/routing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "routes/cms_admin"
 require_relative "routes/cms"
 

data/lib/comfortable_mexican_sofa/seeds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::Seeds
 
   class Error < StandardError; end
@@ -40,7 +42,7 @@ module ComfortableMexicanSofa::Seeds
     #   some more content
     def parse_file_content(file_path)
       text = ::File.read(file_path)
-      tokens = text.split(%r{^\[(.*?)\]\n})
+      tokens = text.split(%r{^\[(.*?)\]\r?\n})
       tokens.shift # first item should be blank
       tokens.in_groups_of(2).each_with_object({}) do |pair, h|
         h[pair[0]] = pair[1]

data/lib/comfortable_mexican_sofa/seeds/file/exporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::Seeds::File
   class Exporter < ComfortableMexicanSofa::Seeds::Exporter
 

data/lib/comfortable_mexican_sofa/seeds/file/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::Seeds::File
   class Importer < ComfortableMexicanSofa::Seeds::Importer
 

data/lib/comfortable_mexican_sofa/seeds/layout/exporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::Seeds::Layout
   class Exporter < ComfortableMexicanSofa::Seeds::Exporter
 

data/lib/comfortable_mexican_sofa/seeds/layout/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::Seeds::Layout
   class Importer < ComfortableMexicanSofa::Seeds::Importer
 

data/lib/comfortable_mexican_sofa/seeds/page/exporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::Seeds::Page
   class Exporter < ComfortableMexicanSofa::Seeds::Exporter
 

data/lib/comfortable_mexican_sofa/seeds/page/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::Seeds::Page
   class Importer < ComfortableMexicanSofa::Seeds::Importer
 

data/lib/comfortable_mexican_sofa/seeds/snippet/exporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::Seeds::Snippet
   class Exporter < ComfortableMexicanSofa::Seeds::Exporter
 

data/lib/comfortable_mexican_sofa/seeds/snippet/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa::Seeds::Snippet
   class Importer < ComfortableMexicanSofa::Seeds::Importer
 

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ComfortableMexicanSofa
 
-  VERSION = "2.0.12".freeze
+  VERSION = "2.0.13"
 
 end

data/lib/comfortable_mexican_sofa/view_hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This mechanism is used by 3rd party plugins.
 # Normally you'd use partials from your own app
 module ComfortableMexicanSofa::ViewHooks

data/lib/generators/comfy/cms/assets_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy
   module Generators
     module Cms

data/lib/generators/comfy/cms/cms_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/active_record"
 
 module Comfy
@@ -27,7 +29,7 @@ module Comfy
       end
 
       def generate_railties_order
-        application <<-RUBY.strip_heredoc
+        application <<~RUBY
           # Ensuring that ActiveStorage routes are loaded before Comfy's globbing
           # route. Without this file serving routes are inaccessible.
           config.railties_order = [ActiveStorage::Engine, :main_app, :all]
@@ -35,7 +37,7 @@ module Comfy
       end
 
       def generate_routing
-        route_string = <<-RUBY.strip_heredoc
+        route_string = <<~RUBY
           comfy_route :cms_admin, path: "/admin"
           # Ensure that this route is defined last
           comfy_route :cms, path: "/"
@@ -48,8 +50,8 @@ module Comfy
       end
 
       def generate_assets
-        copy_file "app/assets/javascripts/comfy/admin/cms/custom.js.coffee",
-          "app/assets/javascripts/comfy/admin/cms/custom.js.coffee"
+        copy_file "app/assets/javascripts/comfy/admin/cms/custom.js",
+          "app/assets/javascripts/comfy/admin/cms/custom.js"
         copy_file "app/assets/stylesheets/comfy/admin/cms/custom.sass",
           "app/assets/stylesheets/comfy/admin/cms/custom.sass"
       end

data/lib/generators/comfy/cms/controllers_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy
   module Generators
     module Cms

data/lib/generators/comfy/cms/models_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy
   module Generators
     module Cms

data/lib/generators/comfy/cms/views_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy
   module Generators
     module Cms

data/lib/generators/comfy/scaffold/scaffold_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/generated_attribute"
 require "rails/generators/active_record"
 
@@ -49,7 +51,7 @@ module Comfy
       end
 
       def generate_route
-        route_string = <<-TEXT.strip_heredoc
+        route_string = <<~TEXT
           namespace :admin do
             resources :#{file_name.pluralize}
           end
@@ -60,11 +62,13 @@ module Comfy
 
       def generate_navigation_link
         partial_path = "app/views/comfy/admin/cms/partials/_navigation_inner.html.haml"
+
         unless File.exist?(File.join(destination_root, partial_path))
           create_file partial_path
         end
+
         append_file partial_path do
-          <<-HAML.strip_heredoc
+          <<~HAML
             %li.nav-item
               = active_link_to '#{class_name.pluralize}', admin_#{file_name.pluralize}_path, class: 'nav-link'
           HAML

data/lib/tasks/cms_seeds.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :comfy do
   namespace :cms_seeds do
     desc "Import CMS Seed data into database (from: folder name, to: site identifier)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: comfy_bootstrap_form
   requirement: !ruby/object:Gem::Requirement
@@ -184,11 +170,20 @@ files:
 - README.md
 - Rakefile
 - app/assets/fonts/comfy/admin/cms/lib/redactor-font.eot
-- app/assets/javascripts/comfy/admin/cms/application.js.coffee
-- app/assets/javascripts/comfy/admin/cms/base.js.coffee
-- app/assets/javascripts/comfy/admin/cms/custom.js.coffee
-- app/assets/javascripts/comfy/admin/cms/files.js.coffee
-- app/assets/javascripts/comfy/admin/cms/uploader.js.coffee
+- app/assets/javascripts/comfy/admin/cms/application.js
+- app/assets/javascripts/comfy/admin/cms/base.js
+- app/assets/javascripts/comfy/admin/cms/categories.js
+- app/assets/javascripts/comfy/admin/cms/codemirror.js
+- app/assets/javascripts/comfy/admin/cms/custom.js
+- app/assets/javascripts/comfy/admin/cms/diff.js
+- app/assets/javascripts/comfy/admin/cms/file_link.js
+- app/assets/javascripts/comfy/admin/cms/file_upload.js
+- app/assets/javascripts/comfy/admin/cms/files_modal.js
+- app/assets/javascripts/comfy/admin/cms/page_fragments.js
+- app/assets/javascripts/comfy/admin/cms/slugify.js
+- app/assets/javascripts/comfy/admin/cms/sortable_list.js
+- app/assets/javascripts/comfy/admin/cms/timepicker.js
+- app/assets/javascripts/comfy/admin/cms/wysiwyg.js
 - app/assets/javascripts/comfy/vendor/Moxie.swf
 - app/assets/javascripts/comfy/vendor/Moxie.xap
 - app/assets/javascripts/comfy/vendor/bootstrap.min.js
@@ -451,8 +446,7 @@ files:
 - app/views/comfy/admin/cms/files/_file.html.haml
 - app/views/comfy/admin/cms/files/_form.html.haml
 - app/views/comfy/admin/cms/files/_modal.html.haml
-- app/views/comfy/admin/cms/files/create.js.erb
-- app/views/comfy/admin/cms/files/destroy.js.coffee
+- app/views/comfy/admin/cms/files/destroy.js.erb
 - app/views/comfy/admin/cms/files/edit.html.haml
 - app/views/comfy/admin/cms/files/index.html.haml
 - app/views/comfy/admin/cms/files/new.html.haml
@@ -466,7 +460,6 @@ files:
 - app/views/comfy/admin/cms/pages/_form.html.haml
 - app/views/comfy/admin/cms/pages/_index_branch.html.haml
 - app/views/comfy/admin/cms/pages/edit.html.haml
-- app/views/comfy/admin/cms/pages/form_fragments.js.erb
 - app/views/comfy/admin/cms/pages/index.html.haml
 - app/views/comfy/admin/cms/pages/new.html.haml
 - app/views/comfy/admin/cms/pages/toggle_branch.js.erb
@@ -483,7 +476,6 @@ files:
 - app/views/comfy/admin/cms/translations/_form.html.haml
 - app/views/comfy/admin/cms/translations/_sidebar.html.haml
 - app/views/comfy/admin/cms/translations/edit.html.haml
-- app/views/comfy/admin/cms/translations/form_fragments.js.erb
 - app/views/comfy/admin/cms/translations/new.html.haml
 - app/views/kaminari/comfy/_first_page.html.haml
 - app/views/kaminari/comfy/_gap.html.haml
@@ -572,7 +564,9 @@ files:
 - lib/comfortable_mexican_sofa/content/tags/fragment.rb
 - lib/comfortable_mexican_sofa/content/tags/helper.rb
 - lib/comfortable_mexican_sofa/content/tags/markdown.rb
+- lib/comfortable_mexican_sofa/content/tags/mixins/file_content.rb
 - lib/comfortable_mexican_sofa/content/tags/number.rb
+- lib/comfortable_mexican_sofa/content/tags/page_file_link.rb
 - lib/comfortable_mexican_sofa/content/tags/partial.rb
 - lib/comfortable_mexican_sofa/content/tags/snippet.rb
 - lib/comfortable_mexican_sofa/content/tags/template.rb
@@ -631,7 +625,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="