maglove 2.0.4 → 2.0.7

data/lib/maglove/commands/assets.rb

@@ -18,49 +18,49 @@ module MagLove
       desc "clean", "Clean theme dist directory"
       def clean
         info("▸ Cleaning up Theme Directory")
-        theme_dir(root: "dist").reset!
+        theme.dist_dir.clean
       end
 
       desc "images", "Copy images"
       def images
         info("▸ Copying Images")
-        workspace_dir("src/base/#{theme_config(:base_version)}").files("images/**/*.{jpg,png,gif,svg}").each do |file|
+        theme.base_dir.children("images/**/*.{jpg,png,gif,svg}").each do |file|
           debug("~> Copying #{file}")
-          file.asset(theme: options.theme, base: true).write!
+          MagLove::Asset::Theme.new(file.path, { base: true }).write!
         end
-        theme_dir.files("images/**/*.{jpg,png,gif,svg}").each do |file|
+        theme.src_dir.children("images/**/*.{jpg,png,gif,svg}").each do |file|
           debug("~> Copying #{file}")
-          file.asset.write!
+          MagLove::Asset::Theme.new(file.path, { base: false }).write!
         end
       end
-      
+
       desc "videos", "Copy videos"
       def videos
         info("▸ Copying Videos")
-        theme_dir.files("videos/**/*.{mp4,webm,ogg}").each do |file|
+        theme.src_dir.children("videos/**/*.{mp4,webm,ogg}").each do |file|
           debug("~> Copying #{file}")
-          file.asset(theme: options.theme).write!
+          MagLove::Asset::Theme.new(file.path, { base: false }).write!
         end
       end
-      
-      desc "imageoptim", "Optimize images"
+
+      desc "optimizeimages", "Optimize images"
       option :percent, type: :numeric, required: true, default: 25
-      def imageoptim
-        require "image_optim"
-        optimizer = ImageOptim.new(nice: 20, pngout: true, optipng: {level: 5}, jpegoptim: {allow_lossy: true, max_quality: 80})
+      def optimizeimages
         info("▸ Optimizing Images")
-        theme_dir.files("images/**/*.{jpg,png,gif}").each do |file|
-          if optimizer.optimizable?(file.to_s)
-            new_path = optimizer.optimize_image(file.to_s)
-            if !new_path.nil?
-              new_file = WorkspaceFile.new("/", new_path.to_s)
-              improvement = (file.size.to_f / new_file.size - 1) * 100
-              if improvement >= options.percent
-                info("~> #{file} optimized #{improvement.to_i}% (#{file.size/1000}kb to #{new_file.size/1000}kb)")
-                new_file.move(file)
-              else
-                debug("~> #{file} (#{improvement.to_i}% < #{options.percent}%)")
-              end
+        require "workspace-media"
+        Workspace.tmpdir do |tmpdir|
+          theme.src_dir.children("images/**/*.{jpg,png,gif}").each do |file|
+            tmp_file = tmpdir.file(file.name)
+            file.copy(tmp_file)
+            old_size = tmp_file.size
+            tmp_file.optimize!(image_max_width: 1536, quality: 75, convert_jpg: false, optimize: true)
+            new_size = tmp_file.size
+            compression = new_size.to_f / old_size.to_f
+            if compression < 0.99
+              info("~> #{file.relative_path} optimized #{((1 - compression) * 100).to_i}% (#{old_size / 1000}kb to #{new_size / 1000}kb)")
+              tmp_file.move(file)
+            else
+              debug("~> #{file.relative_path} skipped #{((1 - compression) * 100).to_i}% (#{old_size / 1000}kb to #{new_size / 1000}kb)")
             end
           end
         end
@@ -69,56 +69,73 @@ module MagLove
       desc "javascript", "Compile JavaScript"
       def javascript
         info("▸ Compiling JavaScript")
-        theme_dir.file("theme.coffee").asset.write!
+        MagLove::Asset::Theme.new("theme.coffee", { base: false }).write!
       end
 
       desc "stylesheet", "Compile Stylesheet"
       def stylesheet
         info("▸ Compiling Stylesheet")
-        theme_dir.files("theme.{scss,less}").first.asset(asset_uri: ".").write!
+        Maglove::Engine.configure do |config|
+          config.asset_uri = "."
+        end
+        file = theme.src_dir.children("theme.{scss,less}").first
+        MagLove::Asset::Theme.new(file.path, { base: false }).write!
       end
 
       desc "yaml", "Compile YAML Manifest"
       def yaml
         info("▸ Compiling YAML Manifest")
-        theme_dir.file("theme.yml").asset.write!
+        MagLove::Asset::Theme.new("theme.yml", { base: false }).write!
       end
-      
+
       desc "compress", "Compress Assets for Distribution"
       def compress
         invoke(:javascript)
         invoke(:stylesheet)
-        
+        require 'cssminify'
+        require 'closure-compiler'
+
         info("▸ Compressing JavaScript")
-        theme_dir(root: "dist").file("theme.js").minify!
+        js_file = theme.dist_dir.file("theme.js")
+        js_file.write(Closure::Compiler.new.compile(js_file.read))
+
         info("▸ Compressing Stylesheet")
-        theme_dir(root: "dist").file("theme.css").minify!
+        css_file = theme.dist_dir.file("theme.css")
+        runtime = ExecJS.compile(Maglove.assets_dir.file("autoprefixer.js").read)
+        results = runtime.call("(function(css) { return autoprefixer.process(css).css; })", [css_file.read])
+        css_file.write(CSSminify.compress(results))
       end
 
       desc "templates", "Compile HAML Templates"
       def templates
         info("▸ Compiling HAML Templates")
-        asset_uri = "file://#{workspace_dir('dist').absolute_path}"
-        theme_config(:templates).each do |template|
+        Maglove::Engine.configure do |config|
+          config.asset_uri = "file://#{Workspace::Dir.new(Dir.pwd, 'dist').absolute_path}"
+          config.block_path = theme.src_dir.dir("blocks").to_s
+        end
+        theme.templates.each do |template|
           debug "~> processing template #{template}"
-          template_file = theme_dir.file("templates/#{template}.haml")
+          template_file = theme.src_dir.file("templates/#{template}.haml")
           error!("~> Template '#{template}' does not exist!") if template_file.nil?
-          contents = template_file.asset(asset_uri: asset_uri).contents
-          html_contents = gem_dir.file("export.haml").read_hamloft(theme: options.theme, contents: contents, asset_uri: asset_uri)
-          theme_dir(root: "dist").file("templates/#{template}.html").write(html_contents)
+          contents = MagLove::Asset::Theme.new(template_file.path, { base: false }).contents
+          html_contents = Maglove::Engine.render(Maglove.assets_dir.file("export.haml").read, theme: theme.identifier, contents: contents)
+          theme.dist_dir.file("templates/#{template}.html").write(html_contents)
         end
       end
 
       desc "blocks", "Compile HAML Blocks"
       def blocks
         info("▸ Compiling HAML Blocks")
-        if theme_dir.dir("blocks").exists?
-          asset_uri = "file://#{workspace_dir('dist').absolute_path}"
-          theme_dir.dir("blocks").files("**/*.haml").each do |block_file|
+        if theme.src_dir.dir("blocks").exists?
+          Maglove::Engine.configure do |config|
+            config.asset_uri = "file://#{Workspace::Dir.new(Dir.pwd, 'dist').absolute_path}"
+            config.block_path = theme.src_dir.dir("blocks").to_s
+          end
+          theme.src_dir.dir("blocks").children("**/*.haml").each do |block_file|
             debug "~> processing block #{block_file.basename}"
-            contents = block_file.asset(asset_uri: asset_uri).contents
-            html_contents = gem_dir.file("export.haml").read_hamloft(theme: options.theme, contents: contents, asset_uri: asset_uri)
-            theme_dir(root: "dist").file("blocks/#{block_file.basename}.html").write(html_contents)
+            contents = MagLove::Asset::Theme.new(block_file.path, { base: false }).contents
+            html_contents = Maglove::Engine.render(Maglove.assets_dir.file("export.haml").read, theme: theme.identifier, contents: contents)
+            theme.dist_dir.file("blocks/#{block_file.basename}.html").write(html_contents)
           end
         else
           debug "~> no blocks available"

data/lib/maglove/commands/base.rb

@@ -4,17 +4,21 @@ module MagLove
   module Commands
     class Base < Thor
       include MagLove::Helper::LogHelper
-      include Workspace
 
       def initialize(args, opts, config)
         namespace = self.class.name.split("::").last.underscore
         command = config[:current_command].name
         Logging.mdc["full_command"] = "#{namespace}:#{command}"
         super
+        theme.load(options.theme) if options.theme? and options.theme != theme.identifier
       end
 
       private
 
+      def theme
+        Maglove.theme
+      end
+
       def magloft_api
         @magloft_api ||= MagLoft::Api.client(options[:token])
       end

data/lib/maglove/commands/fonts.rb

@@ -19,7 +19,7 @@ module MagLove
         end
 
         # 2: Generate stylesheets
-        debug("▸ compiling fonts:")
+        info("▸ compiling fonts:")
         FileUtils.touch("dist/fonts/fonts.css")
         open("dist/fonts/fonts.css", 'wb') do |master_file|
           font_map.each do |font_id, variants|
@@ -40,11 +40,14 @@ module MagLove
             end
           end
         end
-        debug("▸ all font styles created")
-        if options.sync
-          # @TODO: Submit to cloud server
-          debug("▸ all fonts synchronized")
-        end
+      end
+
+      desc "push", "Publish fonts to google cloud storage"
+      option :bucket, type: :string, default: "cdn.magloft.com"
+      def push
+        invoke(Fonts, :compile, [], {})
+        info("▸ pushing fonts to gcs")
+        `gsutil -m rsync -r dist/fonts/ gs://#{options.bucket}/fonts/`
       end
 
       private

data/lib/maglove/commands/main.rb

@@ -1,6 +1,8 @@
 module MagLove
   module Commands
     class Main < Base
+      Maglove::Engine.register_widgets
+
       desc "fonts SUBCOMMAND ...ARGS", "manage fonts"
       subcommand "fonts", Commands::Fonts
 
@@ -12,7 +14,7 @@ module MagLove
 
       desc "compile", "Compile all themes"
       def compile
-        workspace_dir("src/themes").each_dir do |dir|
+        Workspace::Dir.new(Dir.pwd, "src/themes").children("*").each do |dir|
           theme = dir.name
           info("COMPILING THEME #{theme}")
           invoke(Assets, :compile, [], theme: theme)

data/lib/maglove/commands/theme.rb

@@ -5,11 +5,11 @@ module MagLove
       option :port, type: :string, default: "4000"
       option :theme, type: :string, required: true, validator: OptionValidator
       def server
-        invoke(Assets, :compile, [], { theme: options.theme })
+        invoke(Assets, :compile, [], { theme: theme.identifier })
         invoke(Fonts, :compile, [], {})
-        info("▸ starting server for theme '#{options.theme}' on '127.0.0.1:#{options.port}'")
+        info("▸ starting server for theme '#{theme.identifier}' on '127.0.0.1:#{options.port}'")
         require 'maglove/server'
-        MagLove::Server.start(options.port, options.theme, theme_config(:templates))
+        MagLove::Server.start(options.port, theme.identifier, theme.templates)
       end
 
       desc "thumbnails", "Create page thumbnails"
@@ -17,17 +17,20 @@ module MagLove
       def thumbnails
         require "powersnap"
         invoke(Fonts, :compile, [], {})
-        invoke(Assets, :compile, [], theme: options.theme)
+        invoke(Assets, :compile, [], theme: theme.identifier)
 
         info("▸ Generating Template Thumbnails")
-        output_dir = theme_dir(root: "dist").chdir("templates")
-        powersnap = Powersnap.new(output_dir.files("*.html").map(&:url))
-        powersnap.generate(dir: output_dir.to_s, width: 768, height: 1024, pattern: "{basename}.png", zoom: 1.0, page: false)
+        output_dir = theme.dist_dir.dir("templates")
+        urls = output_dir.children("*.html").map { |file| "file://#{file.absolute_path}" }
+        powersnap = Powersnap.new(urls)
+        response = powersnap.generate(dir: output_dir.to_s, width: 768, height: 1024, pattern: "{basename}.png", zoom: 1.0, page: false)
+        error!("Error generating thumbnails. Make sure npm module 'powersnap' is installed globally") if response["status"] != "success"
 
         info("▸ Generating Block Thumbnails")
-        output_dir = theme_dir(root: "dist").chdir("blocks")
+        output_dir = theme.dist_dir.dir("blocks")
         if output_dir.exists?
-          powersnap = Powersnap.new(output_dir.files("*.html").map(&:url))
+          urls = output_dir.children("*.html").map { |file| "file://#{file.absolute_path}" }
+          powersnap = Powersnap.new(urls)
           powersnap.generate(dir: output_dir.to_s, width: 512, height: 200, pattern: "{basename}.png", zoom: 1.0, page: true)
         end
       end
@@ -37,73 +40,75 @@ module MagLove
       option :theme, type: :string, required: true, validator: OptionValidator
       option :thumbnails, type: :boolean, default: false
       def push
-        info("▸ Pushing theme '#{options.theme}' to MagLoft")
+        info("▸ Pushing theme '#{theme.identifier}' to MagLoft")
 
         # validate theme
-        theme_identifier = theme_config(:identifier)
-        error!("Theme '#{theme_identifier}' not found") unless theme_identifier
+        error!("Theme '#{theme.identifier}' not found") unless theme.identifier
         begin
-          theme = magloft_api.typeloft_themes.find_by_identifier(theme_identifier)
+          typeloft_theme = magloft_api.typeloft_themes.find_by_identifier(theme.identifier)
         rescue MagLoft::ApiCaller::UnauthorizedError
           error!("▸ You are not allowed to access the MagLoft API.")
         end
-        if theme.nil?
-          info("▸ To create a new theme, run: maglove theme:create --theme '#{theme_identifier}'")
-          error!("Theme '#{theme_identifier}' was not yet created.")
+        if typeloft_theme.nil?
+          info("▸ To create a new theme, run: maglove theme:create --theme '#{theme.identifier}'")
+          error!("Theme '#{theme.identifier}' was not yet created.")
         end
 
         # invoke asset compilation
         invoke(Fonts, :compile, [], {})
-        invoke(Assets, :compile, [], { theme: options.theme })
-        invoke(Assets, :compress, [], { theme: options.theme })
+        invoke(Assets, :compile, [], { theme: theme.identifier })
+        invoke(Assets, :compress, [], { theme: theme.identifier })
 
         # update theme
         info("▸ Synchronizing Metadata")
-        theme.base_version = theme_config(:base_version)
-        theme.name = theme_config(:name)
-        theme.description = theme_config(:description)
-        theme.widgets = theme_config(:widgets)
-        theme.fonts = theme_config(:fonts)
-        theme.save
+        typeloft_theme.base_version = theme.base_version
+        typeloft_theme.name = theme.name
+        typeloft_theme.description = theme.description
+        typeloft_theme.widgets = theme.widgets
+        typeloft_theme.fonts = theme.fonts
+        typeloft_theme.save
 
         # upload blocks
-        theme_blocks = theme.typeloft_blocks.all
+        info("▸ Synchronizing Blocks")
+        theme_blocks = typeloft_theme.typeloft_blocks.all
         theme_blocks_map = Hash[theme_blocks.map { |block| [block.identifier, block] }]
-        if theme_dir.chdir("blocks").exists?
-          block_files = theme_dir.chdir("blocks").files("**/*.haml")
+        if theme.src_dir.dir("blocks").exists?
+          block_files = theme.src_dir.dir("blocks").children("**/*.haml")
           block_files.each do |block_file|
-            block_identifier = block_file.slug
+            block_identifier = block_file.basename
             if (block = theme_blocks_map[block_identifier])
               block.name = block_file.basename.titlecase
               block.contents = block_file.read
+              block.contents.length
               if block.changed?
                 info "▸ Updating Block '#{block_identifier}'"
                 block.save
               end
             else
               info "▸ Creating Block '#{block_identifier}'"
-              theme.typeloft_blocks.create(identifier: block_identifier, name: block_file.basename.titlecase, contents: block_file.read)
+              typeloft_theme.typeloft_blocks.create(identifier: block_identifier, name: block_file.basename.titlecase, contents: block_file.read)
             end
           end
         end
 
         # upload images
         info("▸ Synchronizing Images")
-        theme_images = theme.typeloft_images.all
+        theme_images = typeloft_theme.typeloft_images.all
         theme_images_map = Hash[theme_images.map { |image| [image.remote_file, image] }]
         hydra = Typhoeus::Hydra.new
-        theme_dir(root: "dist").files("images/**/*.{jpg,png,gif,svg}").each do |image_file|
-          remote_file = "themes/#{options.theme}/#{image_file.relative_path}"
+        theme.dist_dir.children("images/**/*.{jpg,png,gif,svg}").each do |image_file|
+          remote_file = "themes/#{theme.identifier}/#{image_file.relative_path}"
           if (existing_image = theme_images_map[remote_file])
-            if image_file.md5 != existing_image.md5
+            image_file_md5 = Digest::MD5.hexdigest(image_file.read)
+            if image_file_md5 != existing_image.md5
               info("▸ Updating Image '#{remote_file}'")
-              existing_image.md5 = image_file.md5
+              existing_image.md5 = image_file_md5
               hydra.queue(existing_image.queue_upload(image_file.to_s) { debug("▸ Finished updating Image '#{remote_file}'") })
               existing_image.save
             end
           else
             info("▸ Creating Image '#{remote_file}'")
-            new_image = theme.typeloft_images.create(remote_file: remote_file, title: image_file.basename.titlecase, md5: image_file.md5)
+            new_image = typeloft_theme.typeloft_images.create(remote_file: remote_file, title: image_file.basename.titlecase, md5: image_file_md5)
             hydra.queue(new_image.queue_upload(image_file.to_s) { info("▸ Finished creating Image '#{remote_file}'") })
           end
         end
@@ -111,17 +116,17 @@ module MagLove
 
         # upload css/js
         info("▸ Synchronizing JavaScript")
-        theme.upload_javascript(theme_dir(root: "dist").file("theme.js").to_s)
+        typeloft_theme.upload_javascript(theme.dist_dir.file("theme.js").to_s)
         info("▸ Synchronizing Stylesheet")
-        theme.upload_stylesheet(theme_dir(root: "dist").file("theme.css").to_s)
+        typeloft_theme.upload_stylesheet(theme.dist_dir.file("theme.css").to_s)
 
         # upload templates
         info("▸ Synchronizing Templates")
-        theme_templates = theme.typeloft_templates.all
+        theme_templates = typeloft_theme.typeloft_templates.all
         theme_templates_map = Hash[theme_templates.map { |template| [template.identifier, template] }]
-        templates = theme_config(:templates)
+        templates = theme.templates
         templates.each_with_index do |template_identifier, position|
-          template_file = theme_dir.file("templates/#{template_identifier}.haml")
+          template_file = theme.src_dir.file("templates/#{template_identifier}.haml")
           next unless !template_file.nil? and template_file.exists?
           if (template = theme_templates_map[template_identifier])
             template.title = template_identifier.titlecase
@@ -133,18 +138,18 @@ module MagLove
             end
           else
             info "▸ Creating Template '#{template_identifier}'"
-            theme.typeloft_templates.create(identifier: template_identifier, title: template_identifier.titlecase, contents: template_file.read, position: position)
+            typeloft_theme.typeloft_templates.create(identifier: template_identifier, title: template_identifier.titlecase, contents: template_file.read, position: position)
           end
         end
 
         # update thumbnails
         if options.thumbnails
-          invoke(:thumbnails, [], { theme: options.theme })
+          invoke(:thumbnails, [], { theme: theme.identifier })
           hydra = Typhoeus::Hydra.new
 
           info("▸ Synchronizing Template Thumbnails")
-          theme.typeloft_templates.all.each do |template|
-            thumbnail_file = theme_dir(root: "dist").dir("templates").file("#{template.identifier}.png")
+          typeloft_theme.typeloft_templates.all.each do |template|
+            thumbnail_file = theme.dist_dir.dir("templates").file("#{template.identifier}.png")
             if thumbnail_file.exists?
               info("~> Uploading Thumbnail for '#{template.identifier}'")
               hydra.queue(template.queue_upload_thumbnail(thumbnail_file.to_s) { info("▸ Finished uploading Thumbnail for '#{template.identifier}'") })
@@ -152,8 +157,8 @@ module MagLove
           end
 
           info("▸ Synchronizing Block Thumbnails")
-          theme.typeloft_blocks.all.each do |block|
-            thumbnail_file = theme_dir(root: "dist").dir("blocks").file("#{block.identifier}.png")
+          typeloft_theme.typeloft_blocks.all.each do |block|
+            thumbnail_file = theme.dist_dir.dir("blocks").file("#{block.identifier}.png")
             if thumbnail_file.exists?
               info("~> Uploading Thumbnail for '#{block.identifier}'")
               hydra.queue(block.queue_upload_thumbnail(thumbnail_file.to_s) { info("▸ Finished uploading Thumbnail for '#{block.identifier}'") })
@@ -169,13 +174,13 @@ module MagLove
       option :token, type: :string, required: true
       option :theme, type: :string, required: true, validator: OptionValidator
       def create
-        info("▸ Creating new theme '#{options.theme}'")
+        info("▸ Creating new theme '#{theme.identifier}'")
 
-        error!("Missing yaml config 'name'") unless theme_config(:name)
-        error!("Missing yaml config 'base_version'") unless theme_config(:base_version)
-        theme = magloft_api.typeloft_themes.find_by_identifier(options.theme)
-        error!("This theme already exists") unless theme.nil?
-        magloft_api.typeloft_themes.create(identifier: options.theme, name: theme_config(:name), description: theme_config(:description), base_version: theme_config(:base_version))
+        error!("Missing yaml config 'name'") unless theme.name
+        error!("Missing yaml config 'base_version'") unless theme.base_version
+        typeloft_theme = magloft_api.typeloft_themes.find_by_identifier(theme.identifier)
+        error!("This theme already exists") unless typeloft_theme.nil?
+        magloft_api.typeloft_themes.create(identifier: theme.identifier, name: theme.name, description: theme.description, base_version: theme.base_version)
         info("▸ Theme successfully created!")
       end
 
@@ -183,10 +188,10 @@ module MagLove
       option :token, type: :string, required: true
       option :theme, type: :string, required: true
       def delete
-        info("▸ Deleting theme '#{options.theme}'")
-        theme = magloft_api.typeloft_themes.find_by_identifier(options.theme)
-        error!("Could not find a theme with identifier '#{options.theme}'") if theme.nil?
-        theme.destroy
+        info("▸ Deleting theme '#{theme.identifier}'")
+        typeloft_theme = magloft_api.typeloft_themes.find_by_identifier(theme.identifier)
+        error!("Could not find a theme with identifier '#{theme.identifier}'") if typeloft_theme.nil?
+        typeloft_theme.destroy
         info("▸ Theme successfully deleted!")
       end
 
@@ -194,8 +199,8 @@ module MagLove
       option :token, type: :string, required: true
       def list
         info("▸ Listing themes")
-        magloft_api.typeloft_themes.all.each do |theme|
-          info("~> #{theme.identifier} (NAME: #{theme.name}, ACTIVE: #{theme.active ? 'YES' : 'NO'})")
+        magloft_api.typeloft_themes.all.each do |typeloft_theme|
+          info("~> #{typeloft_theme.identifier} (NAME: #{typeloft_theme.name}, ACTIVE: #{typeloft_theme.active ? 'YES' : 'NO'})")
         end
       end
     end