comfortable_mexican_sofa 2.0.2 → 2.0.3

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

@@ -7,23 +7,23 @@ module ComfortableMexicanSofa::Seeds::File
     end
 
     def export!
-      prepare_folder!(self.path)
+      prepare_folder!(path)
 
-      self.site.files.each do |file|
-        file_path = File.join(self.path, file.attachment.filename.to_s)
+      site.files.each do |file|
+        file_path = File.join(path, file.attachment.filename.to_s)
 
         # writing attributes
-        open(::File.join(self.path, "_#{file.attachment.filename}.yml"), 'w') do |f|
+        open(::File.join(path, "_#{file.attachment.filename}.yml"), "w") do |f|
           f.write({
             "label"       => file.label,
             "description" => file.description,
-            "categories"  => file.categories.map{|c| c.label}
+            "categories"  => file.categories.map(&:label)
           }.to_yaml)
         end
 
         # writing content
         begin
-          open(::File.join(self.path, ::File.basename(file_path)), 'wb') do |f|
+          open(::File.join(path, ::File.basename(file_path)), "wb") do |f|
             f.write(file.attachment.download)
           end
         rescue Errno::ENOENT, OpenURI::HTTPError
@@ -36,5 +36,6 @@ module ComfortableMexicanSofa::Seeds::File
         ComfortableMexicanSofa.logger.info(message)
       end
     end
+
   end
 end

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

@@ -7,23 +7,22 @@ module ComfortableMexicanSofa::Seeds::File
     end
 
     def import!
-      Dir["#{self.path}[^_]*"].each do |file_path|
-
+      Dir["#{path}[^_]*"].each do |file_path|
         filename = ::File.basename(file_path)
 
-        file = self.site.files.with_attached_attachment
+        file = site.files.with_attached_attachment
           .where("active_storage_blobs.filename" => filename).references(:blob).first ||
-          self.site.files.new
+          site.files.new
 
         # We need to track actual file and its attributes
         fresh_file = false
 
-        if File.exist?(attrs_path = File.join(self.path, "_#{filename}.yml"))
+        if File.exist?(attrs_path = File.join(path, "_#{filename}.yml"))
           if fresh_seed?(file, attrs_path)
             fresh_file = true
 
-            attrs = YAML.load(File.read(attrs_path))
-            category_ids = category_names_to_ids(Comfy::Cms::File, attrs.delete("categories"))
+            attrs = YAML.safe_load(File.read(attrs_path))
+            category_ids = category_names_to_ids(file, attrs.delete("categories"))
             file.attributes = attrs.merge(
               category_ids: category_ids
             )
@@ -51,11 +50,12 @@ module ComfortableMexicanSofa::Seeds::File
           end
         end
 
-        self.seed_ids << file.id
+        seed_ids << file.id
       end
 
       # cleaning up
-      self.site.files.where('id NOT IN (?)', seed_ids).destroy_all
+      site.files.where("id NOT IN (?)", seed_ids).destroy_all
     end
+
   end
 end

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

@@ -7,10 +7,10 @@ module ComfortableMexicanSofa::Seeds::Layout
     end
 
     def export!
-      prepare_folder!(self.path)
+      prepare_folder!(path)
 
-      self.site.layouts.each do |layout|
-        layout_path = File.join(path, layout.ancestors.reverse.collect{|l| l.identifier}, layout.identifier)
+      site.layouts.each do |layout|
+        layout_path = File.join(path, layout.ancestors.reverse.collect(&:identifier), layout.identifier)
         FileUtils.mkdir_p(layout_path)
 
         path = ::File.join(layout_path, "content.html")
@@ -22,10 +22,10 @@ module ComfortableMexicanSofa::Seeds::Layout
           "position"   => layout.position
         }.to_yaml
 
-        data << {header: "attributes",  content: attrs}
-        data << {header: "content",     content: layout.content}
-        data << {header: "js",          content: layout.js}
-        data << {header: "css",         content: layout.css}
+        data << { header: "attributes",  content: attrs }
+        data << { header: "content",     content: layout.content }
+        data << { header: "js",          content: layout.js }
+        data << { header: "css",         content: layout.css }
 
         write_file_content(path, data)
 
@@ -33,5 +33,6 @@ module ComfortableMexicanSofa::Seeds::Layout
         ComfortableMexicanSofa.logger.info(message)
       end
     end
+
   end
 end

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

@@ -7,18 +7,18 @@ module ComfortableMexicanSofa::Seeds::Layout
     end
 
     def import!(path = self.path, parent = nil)
-      Dir["#{path}*/"].each do |path|
-        import_layout(path, nil)
+      Dir["#{path}*/"].each do |layout_path|
+        import_layout(layout_path, parent)
       end
 
       # cleaning up
-      self.site.layouts.where("id NOT IN (?)", self.seed_ids).destroy_all
+      site.layouts.where("id NOT IN (?)", seed_ids).destroy_all
     end
 
   private
 
     def import_layout(path, parent)
-      identifier =  path.split("/").last
+      identifier = path.split("/").last
 
       # reading file content in, resulting in a hash
       content_path = File.join(path, "content.html")
@@ -26,9 +26,9 @@ module ComfortableMexicanSofa::Seeds::Layout
 
       # parsing attributes section
       attributes_yaml = content_hash.delete("attributes")
-      attrs           = YAML.load(attributes_yaml)
+      attrs           = YAML.safe_load(attributes_yaml)
 
-      layout = self.site.layouts.where(identifier: identifier).first_or_initialize
+      layout = site.layouts.where(identifier: identifier).first_or_initialize
       layout.parent = parent
 
       if fresh_seed?(layout, content_path)
@@ -48,12 +48,13 @@ module ComfortableMexicanSofa::Seeds::Layout
         end
       end
 
-      self.seed_ids << layout.id
+      seed_ids << layout.id
 
-      # importing child pages (if there are any)
-      Dir["#{path}*/"].each do |path|
-        import_layout(path, layout)
+      # importing child layouts (if there are any)
+      Dir["#{path}*/"].each do |layout_path|
+        import_layout(layout_path, layout)
       end
     end
+
   end
 end

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

@@ -7,11 +7,11 @@ module ComfortableMexicanSofa::Seeds::Page
     end
 
     def export!
-      prepare_folder!(self.path)
+      prepare_folder!(path)
 
-      self.site.pages.each do |page|
-        page.slug = 'index' if page.slug.blank?
-        page_path = File.join(path, page.ancestors.reverse.map{|p| p.slug.blank?? 'index' : p.slug}, page.slug)
+      site.pages.each do |page|
+        page.slug = "index" if page.slug.blank?
+        page_path = File.join(path, page.ancestors.reverse.map { |p| p.slug.blank? ? "index" : p.slug }, page.slug)
         FileUtils.mkdir_p(page_path)
 
         path = ::File.join(page_path, "content.html")
@@ -21,12 +21,12 @@ module ComfortableMexicanSofa::Seeds::Page
           "label"        => page.label,
           "layout"       => page.layout.try(:identifier),
           "target_page"  => page.target_page.try(:full_path),
-          "categories"   => page.categories.map{|c| c.label},
+          "categories"   => page.categories.map(&:label),
           "is_published" => page.is_published,
           "position"     => page.position
         }.to_yaml
 
-        data << {header: "attributes", content: attrs}
+        data << { header: "attributes", content: attrs }
         data += fragments_data(page, page_path)
 
         write_file_content(path, data)
@@ -51,7 +51,7 @@ module ComfortableMexicanSofa::Seeds::Page
           "is_published" => page.is_published
         }.to_yaml
 
-        data << {header: "attributes", content: attrs}
+        data << { header: "attributes", content: attrs }
         data += fragments_data(translation, page_path)
 
         write_file_content(path, data)
@@ -65,22 +65,24 @@ module ComfortableMexicanSofa::Seeds::Page
     def fragments_data(record, page_path)
       record.fragments.collect do |frag|
         header = "#{frag.tag} #{frag.identifier}"
-        content = case frag.tag
-        when "datetime", "date"
-          frag.datetime
-        when "checkbox"
-          frag.boolean
-        when "file", "files"
-          frag.attachments.map do |attachment|
-            ::File.open(::File.join(page_path, attachment.filename.to_s), "wb") do |f|
-              f.write(attachment.download)
-            end
-            attachment.filename
-          end.join("\n")
-        else
-          frag.content
-        end
-        {header: header, content: content}
+        content =
+          case frag.tag
+          when "datetime", "date"
+            frag.datetime
+          when "checkbox"
+            frag.boolean
+          when "file", "files"
+            frag.attachments.map do |attachment|
+              ::File.open(::File.join(page_path, attachment.filename.to_s), "wb") do |f|
+                f.write(attachment.download)
+              end
+              attachment.filename
+            end.join("\n")
+          else
+            frag.content
+          end
+
+        { header: header, content: content }
       end
     end
 

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

@@ -11,12 +11,12 @@ module ComfortableMexicanSofa::Seeds::Page
     end
 
     def import!
-      import_page(File.join(self.path, "index/"), nil)
+      import_page(File.join(path, "index/"), nil)
 
       link_target_pages
 
       # Remove pages not found in seeds
-      self.site.pages.where('id NOT IN (?)', self.seed_ids).destroy_all
+      site.pages.where("id NOT IN (?)", seed_ids).destroy_all
     end
 
   private
@@ -26,11 +26,14 @@ module ComfortableMexicanSofa::Seeds::Page
       slug = path.split("/").last
 
       # setting page record
-      page = if parent.present?
-        self.site.pages.where(parent: parent, slug: slug).first_or_initialize
-      else
-        self.site.pages.root || self.site.pages.new(slug: slug)
-      end
+      page =
+        if parent.present?
+          child = site.pages.where(slug: slug).first_or_initialize
+          child.parent = parent
+          child
+        else
+          site.pages.root || site.pages.new(slug: slug)
+        end
 
       content_path = File.join(path, "content.html")
 
@@ -42,11 +45,11 @@ module ComfortableMexicanSofa::Seeds::Page
 
         # parsing attributes section
         attributes_yaml = fragments_hash.delete("attributes")
-        attrs           = YAML.load(attributes_yaml)
+        attrs           = YAML.safe_load(attributes_yaml)
 
         # applying attributes
-        layout = self.site.layouts.find_by(identifier: attrs.delete("layout")) || parent.try(:layout)
-        category_ids    = category_names_to_ids(Comfy::Cms::Page, attrs.delete("categories"))
+        layout = site.layouts.find_by(identifier: attrs.delete("layout")) || parent.try(:layout)
+        category_ids    = category_names_to_ids(page, attrs.delete("categories"))
         target_page     = attrs.delete("target_page")
 
         page.attributes = attrs.merge(
@@ -84,11 +87,11 @@ module ComfortableMexicanSofa::Seeds::Page
 
       # Tracking what page from seeds we're working with. So we can remove pages
       # that are no longer in seeds
-      self.seed_ids << page.id
+      seed_ids << page.id
 
       # importing child pages (if there are any)
-      Dir["#{path}*/"].each do |path|
-        import_page(path, page)
+      Dir["#{path}*/"].each do |page_path|
+        import_page(page_path, page)
       end
     end
 
@@ -98,44 +101,44 @@ module ComfortableMexicanSofa::Seeds::Page
       new_translations = []
 
       Dir["#{path}content.*.html"].each do |file_path|
-        locale = File.basename(file_path).match(/content\.(\w+)\.html/)[1]
+        locale = File.basename(file_path).match(%r{content\.(\w+)\.html})[1]
         new_translations << locale
 
         translation = page.translations.where(locale: locale).first_or_initialize
 
-        if fresh_seed?(translation, file_path)
-          # reading file content in, resulting in a hash
-          fragments_hash  = parse_file_content(file_path)
+        next unless fresh_seed?(translation, file_path)
 
-          # parsing attributes section
-          attributes_yaml = fragments_hash.delete("attributes")
-          attrs           = YAML.load(attributes_yaml)
+        # reading file content in, resulting in a hash
+        fragments_hash  = parse_file_content(file_path)
 
-          # applying attributes
-          layout = self.site.layouts.find_by(identifier: attrs.delete("layout")) || page.try(:layout)
-          translation.attributes = attrs.merge(
-            layout: layout
-          )
+        # parsing attributes section
+        attributes_yaml = fragments_hash.delete("attributes")
+        attrs           = YAML.safe_load(attributes_yaml)
 
-          # applying fragments
-          old_frag_identifiers = translation.fragments.pluck(:identifier)
+        # applying attributes
+        layout = site.layouts.find_by(identifier: attrs.delete("layout")) || page.try(:layout)
+        translation.attributes = attrs.merge(
+          layout: layout
+        )
 
-          new_frag_identifiers, fragments_attributes =
-            construct_fragments_attributes(fragments_hash, translation, path)
-          translation.fragments_attributes = fragments_attributes
+        # applying fragments
+        old_frag_identifiers = translation.fragments.pluck(:identifier)
 
-          if translation.save
-            message = "[CMS SEEDS] Imported Translation \t #{locale}"
-            ComfortableMexicanSofa.logger.info(message)
+        new_frag_identifiers, fragments_attributes =
+          construct_fragments_attributes(fragments_hash, translation, path)
+        translation.fragments_attributes = fragments_attributes
 
-            # cleaning up old fragments
-            frags_to_remove = old_frag_identifiers - new_frag_identifiers
-            translation.fragments.where(identifier: frags_to_remove).destroy_all
+        if translation.save
+          message = "[CMS SEEDS] Imported Translation \t #{locale}"
+          ComfortableMexicanSofa.logger.info(message)
 
-          else
-            message = "[CMS SEEDS] Failed to import Translation \n#{locale}"
-            ComfortableMexicanSofa.logger.warn(message)
-          end
+          # cleaning up old fragments
+          frags_to_remove = old_frag_identifiers - new_frag_identifiers
+          translation.fragments.where(identifier: frags_to_remove).destroy_all
+
+        else
+          message = "[CMS SEEDS] Failed to import Translation \n#{locale}"
+          ComfortableMexicanSofa.logger.warn(message)
         end
       end
 
@@ -175,7 +178,7 @@ module ComfortableMexicanSofa::Seeds::Page
         frag_hash
       end
 
-      return [frag_identifiers, frag_attributes]
+      [frag_identifiers, frag_attributes]
     end
 
     # Preparing fragment attachments. Returns hashes with file data for
@@ -193,7 +196,7 @@ module ComfortableMexicanSofa::Seeds::Page
 
       # ensuring that old attachments get removed
       ids_destroy = []
-      if frag = record.fragments.find_by(identifier: identifier)
+      if (frag = record.fragments.find_by(identifier: identifier))
         ids_destroy = frag.attachments.pluck(:id)
       end
 
@@ -204,10 +207,11 @@ module ComfortableMexicanSofa::Seeds::Page
       return unless self.target_pages.present?
 
       self.target_pages.each do |page_id, target|
-        if target = self.site.pages.find_by(full_path: target)
+        if (target = site.pages.find_by(full_path: target))
           @site.pages.find(page_id).update_column(:target_page_id, target.id)
         end
       end
     end
+
   end
 end

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

@@ -7,25 +7,26 @@ module ComfortableMexicanSofa::Seeds::Snippet
     end
 
     def export!
-      prepare_folder!(self.path)
+      prepare_folder!(path)
 
-      self.site.snippets.each do |snippet|
+      site.snippets.each do |snippet|
         attrs = {
           "label"       => snippet.label,
-          "categories"  => snippet.categories.map{|c| c.label},
+          "categories"  => snippet.categories.map(&:label),
           "position"    => snippet.position
         }.to_yaml
 
         data = []
-        data << {header: "attributes", content: attrs}
-        data << {header: "content", content: snippet.content}
+        data << { header: "attributes", content: attrs }
+        data << { header: "content", content: snippet.content }
 
-        snippet_path = File.join(self.path, "#{snippet.identifier}.html")
+        snippet_path = File.join(path, "#{snippet.identifier}.html")
         write_file_content(snippet_path, data)
 
         message = "[CMS SEEDS] Exported Snippet \t #{snippet.identifier}"
         ComfortableMexicanSofa.logger.info(message)
       end
     end
+
   end
 end

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

@@ -7,7 +7,7 @@ module ComfortableMexicanSofa::Seeds::Snippet
     end
 
     def import!
-      Dir.glob("#{self.path}/*.html").each do |path|
+      Dir.glob("#{path}/*.html").each do |path|
         identifier = File.basename(path, ".html")
 
         # reading file content in, resulting in a hash
@@ -15,12 +15,12 @@ module ComfortableMexicanSofa::Seeds::Snippet
 
         # parsing attributes section
         attributes_yaml = content_hash.delete("attributes")
-        attrs           = YAML.load(attributes_yaml)
+        attrs           = YAML.safe_load(attributes_yaml)
 
-        snippet = self.site.snippets.where(identifier: identifier).first_or_initialize
+        snippet = site.snippets.where(identifier: identifier).first_or_initialize
 
         if fresh_seed?(snippet, path)
-          category_ids = category_names_to_ids(Comfy::Cms::Snippet, attrs.delete("categories"))
+          category_ids = category_names_to_ids(snippet, attrs.delete("categories"))
 
           snippet.attributes = attrs.merge(
             category_ids: category_ids,
@@ -38,11 +38,12 @@ module ComfortableMexicanSofa::Seeds::Snippet
 
         # Tracking what page from seeds we're working with. So we can remove pages
         # that are no longer in seeds
-        self.seed_ids << snippet.id
+        seed_ids << snippet.id
       end
 
       # cleaning up
-      self.site.snippets.where("id NOT IN (?)", self.seed_ids).destroy_all
+      site.snippets.where("id NOT IN (?)", seed_ids).destroy_all
     end
+
   end
 end

data/lib/comfortable_mexican_sofa/seeds.rb

@@ -2,9 +2,10 @@ module ComfortableMexicanSofa::Seeds
 
   class Error < StandardError; end
 
-  require 'mimemagic'
+  require "mimemagic"
 
   class Importer
+
     attr_accessor :site,
                   :path,
                   :from,
@@ -24,7 +25,7 @@ module ComfortableMexicanSofa::Seeds
     end
 
     def import!
-      %w(Layout Page Snippet File).each do |klass|
+      %w[Layout Page Snippet File].each do |klass|
         klass = "ComfortableMexicanSofa::Seeds::#{klass}::Importer"
         klass.constantize.new(from, to).import!
       end
@@ -39,7 +40,7 @@ module ComfortableMexicanSofa::Seeds
     #   some more content
     def parse_file_content(file_path)
       text = ::File.read(file_path)
-      tokens = text.split(/^\[(.*?)\]\n/)
+      tokens = text.split(%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]
@@ -50,19 +51,23 @@ module ComfortableMexicanSofa::Seeds
       object.new_record? || ::File.mtime(file_path) > object.updated_at
     end
 
-    def category_names_to_ids(klass, names)
-      [names].flatten.each_with_object({}) do |name, category_ids|
-        category = self.site.categories.find_or_create_by(
+    def category_names_to_ids(record, names)
+      existing_category_ids = record.categories.each_with_object({}) do |id, category_ids|
+        category_ids[id] = 0
+      end
+      [names].flatten.each_with_object(existing_category_ids) do |name, category_ids|
+        category = site.categories.find_or_create_by(
           label:            name,
-          categorized_type: klass.to_s
+          categorized_type: record.class.to_s
         )
         category_ids[category.id] = 1
       end
     end
-  end
 
+  end
 
   class Exporter
+
     attr_accessor :site,
                   :path,
                   :from,
@@ -75,7 +80,7 @@ module ComfortableMexicanSofa::Seeds
     end
 
     def export!
-      %w(Layout Page Snippet File).each do |klass|
+      %w[Layout Page Snippet File].each do |klass|
         klass = "ComfortableMexicanSofa::Seeds::#{klass}::Exporter"
         klass.constantize.new(from, to).export!
       end
@@ -98,5 +103,7 @@ module ComfortableMexicanSofa::Seeds
       FileUtils.rm_rf(path)
       FileUtils.mkdir_p(path)
     end
+
   end
+
 end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,5 @@
 module ComfortableMexicanSofa
-  VERSION = "2.0.2"
-end
+
+  VERSION = "2.0.3".freeze
+
+end

data/lib/comfortable_mexican_sofa/view_hooks.rb

@@ -4,29 +4,30 @@ module ComfortableMexicanSofa::ViewHooks
 
   # Array of declared hooks
   def self.hooks
-    @@hooks ||= { }
+    @hooks ||= {}
   end
 
   # Renders hook content
   def self.render(name, template, options = {})
-    out = ''
-    (self.hooks[name.to_sym] || []).each do |path|
-      out += template.render({:partial => path.first}.merge(options))
+    out = ""
+    (hooks[name.to_sym] || []).each do |path|
+      out += template.render({ partial: path.first }.merge(options))
     end
-    return out.html_safe
+    out.html_safe
   end
 
   # Will declare a partial that will be rendered for this hook
   # Example:
   # ComfortableMexicanSofa::ViewHooks.add(:navigation, 'shared/navigation')
   def self.add(name, partial_path, position = 0)
-    self.hooks[name.to_sym] ||= []
-    self.hooks[name.to_sym] << [partial_path, position]
-    self.hooks[name.to_sym].sort_by! { |hook| hook.last }
+    hooks[name.to_sym] ||= []
+    hooks[name.to_sym] << [partial_path, position]
+    hooks[name.to_sym].sort_by!(&:last)
   end
 
   # Removing previously declared hook
   def self.remove(name)
-    self.hooks.delete(name)
+    hooks.delete(name)
   end
+
 end