maglove 0.8.1 → 1.0.2

data/lib/maglove/tilt/js_template.rb

@@ -4,24 +4,22 @@ module MagLove
       self.default_mime_type = 'application/javascript'
 
       def prepare
-        
       end
 
       def evaluate(scope, locals, &block)
-
         # handle includes
-        @data = @data.gsub(/^\/\/=\srequire\s(.+)$/) do |match|
+        @data = @data.gsub(%r{^//=\srequire\s(.+)$}) do |match|
           path = Regexp.last_match[1]
           include_path = File.absolute_path(path, File.dirname(file))
-          
+
           # check if base path exists
-          if not File.exists?(include_path)
+          unless File.exist?(include_path)
             include_path = File.absolute_path(path, locals[:base_path])
           end
-          
-          if File.exists?(include_path)
+
+          if File.exist?(include_path)
             include_template = ::Tilt.new(include_path)
-            include_contents = include_template.render(Object.new, locals)
+            include_template.render(Object.new, locals)
           else
             raise "Path not found: #{include_path}"
           end
@@ -36,3 +34,5 @@ module MagLove
     end
   end
 end
+
+Tilt.mappings["js"] = [MagLove::Tilt::JsTemplate]

data/lib/maglove/tilt/less_template.rb

@@ -4,15 +4,16 @@ module MagLove
       self.default_mime_type = 'theme/html'
 
       def prepare
-        @parser  = ::Less::Parser.new(options.merge :filename => eval_file, :line => line, :relativeUrls => false)
+        @parser = ::Less::Parser.new(options.merge(filename: eval_file, line: line, relativeUrls: false))
       end
-    
+
       def evaluate(scope, locals, &block)
-        prepared_data = "@base: \"#{locals[:base_path].sub("src/", "../../")}\";\n#{data}"
+        prepared_data = "@base: \"#{locals[:base_path].sub('src/', '../../')}\";\n#{data}"
         @engine = @parser.parse(prepared_data)
         @output ||= @engine.to_css(options)
       end
-    
     end
   end
 end
+
+Tilt.mappings["less"] = [MagLove::Tilt::LessTemplate]

data/lib/maglove/tilt/scss_template.rb

@@ -1,10 +1,13 @@
-module Sass::Script::Functions  
+module Sass::Script::Functions
   def asset(url)
     assert_type url, :String
-    Sass::Script::Value::String.new("url(\"#{::Hamloft::Options.defaults[:asset_uri]}/#{url.value}\")")
+    Sass::Script::Value::String.new("url(\"#{asset_uri}/#{url.value}\")")
   end
-  # declare(:asset, [:url])
-  
+
+  def asset_uri
+    options[:locals][:asset_uri] || Hamloft.asset_uri
+  end
+
   def asset_data(url)
     assert_type url, :String
     theme = options[:locals][:theme]
@@ -23,20 +26,23 @@ module MagLove
   module Tilt
     class ScssTemplate < ::Tilt::SassTemplate
       self.default_mime_type = 'text/css'
-    
+
       def prepare
       end
 
       def evaluate(scope, locals, &block)
-        prepared_data = "@base: \"#{locals[:base_path].sub("src/", "../../")}\";\n#{data}"
-        engine = Sass::Engine.new(prepared_data, sass_options.merge({locals: locals}))
+        prepared_data = "@base: \"#{locals[:base_path].sub('src/', '../../')}\";\n#{data}"
+        engine = Sass::Engine.new(prepared_data, sass_options.merge({ locals: locals }))
         @output ||= engine.render
       end
-      
+
       private
-        def sass_options
-          options.merge(:filename => eval_file, :line => line, :syntax => :scss)
-        end
+
+      def sass_options
+        options.merge(filename: eval_file, line: line, syntax: :scss)
+      end
     end
   end
 end
+
+Tilt.mappings["scss"] = [MagLove::Tilt::ScssTemplate]

data/lib/maglove/tilt/yaml_template.rb

@@ -2,9 +2,8 @@ module MagLove
   module Tilt
     class YamlTemplate < ::Tilt::Template
       self.default_mime_type = 'application/json'
-    
+
       def prepare
-      
       end
 
       def evaluate(scope, locals, &block)
@@ -17,3 +16,5 @@ module MagLove
     end
   end
 end
+
+Tilt.mappings["yml"] = [MagLove::Tilt::YamlTemplate]

data/lib/maglove/version.rb

@@ -1,3 +1,3 @@
 module MagLove
-  VERSION = "0.8.1"
+  VERSION = "1.0.2"
 end

data/lib/maglove/workspace.rb

@@ -0,0 +1,41 @@
+module Workspace
+  def theme_dir(root: "src", theme: options[:theme])
+    workspace_dir("#{root}/themes/#{theme}")
+  end
+
+  def theme_file(path, root: "src", theme: options[:theme])
+    workspace_file("#{root}/themes/#{theme}", path)
+  end
+
+  def theme_base_file(path, theme: options[:theme])
+    theme_base_dir(theme: theme).file(path)
+  end
+
+  def theme_base_dir(theme: options[:theme])
+    base_version = theme_config(:base_version, theme: theme)
+    workspace_dir("src/base/#{base_version}")
+  end
+
+  def gem_dir
+    workspace_dir(Gem.datadir("maglove"))
+  end
+
+  def theme_config(key = nil, theme: options[:theme])
+    Maglove.theme_config(key, theme)
+  end
+
+  class WorkspaceFile
+    def asset(theme: workspace_theme, base: false, asset_uri: ".")
+      MagLove::Asset::Theme.new(path, { theme: theme, base: base, asset_uri: asset_uri })
+    end
+
+    def workspace_theme
+      match = self.workspace.match(%r{/themes/([^/]+)})
+      match ? match[1] : nil
+    end
+
+    def read_hamloft(options = {})
+      Hamloft.render(read, options)
+    end
+  end
+end

data/lib/maglove.rb

@@ -1,51 +1,40 @@
-require "tilt"
-require "hamloft"
+require 'magloft'
+require "maglove/workspace"
+require "maglove/widgets"
+require "maglove/commands/base"
+require "maglove/commands/fonts"
+require "maglove/commands/theme"
+require "maglove/commands/assets"
+require "maglove/commands/main"
+require "block_resolver"
 
-require "rubygems"
-require "bundler"
-require "active_support/all"
-require "dotenv"
-require "webrick"
-require "filewatcher"
-require "logging"
-require "coffee_script"
-require "therubyracer"
-require "less"
-require "sass"
-require "action_dispatch/http/mime_type"
-require "commander"
-require "image_optim"
-require "zlib"
-require 'zip'
-require "archive/tar/minitar"
+module Maglove
+  def self.theme_config(key = nil, theme)
+    @theme_config ||= {}
+    unless @theme_config[theme]
+      config_file = Workspace::WorkspaceFile.new("src/themes/#{theme}", "theme.yml")
+      @theme_config[theme] = config_file.read_yaml
+    end
+    if key.nil?
+      @theme_config[theme]
+    else
+      @theme_config[theme][key.to_s]
+    end
+  end
 
-require "maglove/version"
-require "maglove/tilt/twig_template"
-require "maglove/tilt/haml_template"
-require "maglove/tilt/less_template"
-require "maglove/tilt/scss_template"
-require "maglove/tilt/coffee_template"
-require "maglove/tilt/js_template"
-require "maglove/tilt/yaml_template"
-require "maglove/helper/log_helper"
-require "maglove/helper/theme_helper"
-require "maglove/helper/asset_helper"
-require "maglove/helper/command_helper"
-require "ext/commander/command"
-require "ext/commander/methods"
-require "maglove/command/theme"
-require "maglove/command/core"
-require "maglove/command/compile"
-require "maglove/command/compress"
-require "maglove/command/copy"
-require "maglove/command/util"
-require "maglove/command/font"
-require "maglove/command/sync"
-require "maglove/command/server"
-require "maglove/phantom_script"
-require "maglove/application"
-require "maglove/asset/theme"
-require "maglove/asset/base_theme"
-require "maglove/server/hpub"
-require "maglove/server"
-require "maglove/template/tumblr"
+  def self.logger
+    if @logger.nil?
+      Logging.color_scheme("bright",
+                           levels: { debug: :blue, info: :green, warn: :yellow, error: :red, fatal: [:white, :on_red] },
+                           date: :blue,
+                           mdc: :cyan,
+                           logger: :cyan,
+                           message: :black)
+      Logging.appenders.stdout("stdout", layout: Logging.layouts.pattern(pattern: '[%d] %-5l %-18X{full_command} %x %m\n', color_scheme: 'bright'))
+      @logger = Logging::Logger.new(self.class.name)
+      @logger.level = :debug
+      @logger.add_appenders('stdout')
+    end
+    @logger
+  end
+end

data/lib/powersnap.rb

@@ -0,0 +1,24 @@
+class Powersnap
+  attr_accessor :urls, :prefix
+
+  def initialize(urls, prefix: nil)
+    @urls = urls.map { |url| URI.encode(url) }
+    @prefix = prefix
+  end
+
+  def generate(dir: ".", width: 768, height: 1024, pattern: "image-{index}.png", zoom: 1.0, page: false, quality: 100, css: nil)
+    extension = File.extname(pattern)
+    if extension == ".jpg"
+      format = "jpeg"
+    elsif extension == ".png"
+      format = "png"
+    else
+      raise "Invalid file extension: #{extension}"
+    end
+    cmd = "#{@prefix} powersnap -j -d \"#{dir}\" -t \"#{format}\" -q #{quality} -z #{zoom} #{page ? '--page' : ''} -w #{width.to_i} -h #{height.to_i} #{(css and "-c #{css}")} -f \"#{pattern}\" #{@urls.join(' ')}"
+    json_response = `#{cmd}`
+
+    response = JSON.parse(json_response)
+    return response["stats"] == "success"
+  end
+end

data/lib/workspace/workspace_dir/archive.rb

@@ -0,0 +1,18 @@
+module Workspace
+  class WorkspaceDir
+    module Archive
+      extend ActiveSupport::Concern
+
+      def compress_zip(target_file)
+        target_file.delete!
+        require "zip"
+        Zip::File.open(target_file.to_s, 'w') do |zipfile|
+          Dir["#{self}/**/**"].each do |file|
+            zipfile.add(file.sub("#{self}/", ''), file)
+          end
+        end
+        self
+      end
+    end
+  end
+end

data/lib/workspace/workspace_dir.rb

@@ -0,0 +1,98 @@
+require 'workspace/workspace_dir/archive'
+module Workspace
+  class WorkspaceDir
+    include Workspace::WorkspaceDir::Archive
+
+    attr_accessor :workspace, :path
+
+    def initialize(workspace, path = "")
+      @workspace = workspace
+      @path = path
+    end
+
+    def to_s
+      File.join(@workspace, @path)
+    end
+
+    def name
+      File.basename(to_s)
+    end
+
+    def create
+      FileUtils.mkdir_p(to_s)
+      self
+    end
+
+    def exists?
+      File.directory?(to_s)
+    end
+
+    def copy(target_dir)
+      target_dir.parent_dir.create unless target_dir.parent_dir.exists?
+      FileUtils.cp_r(to_s, target_dir.to_s)
+    end
+
+    def delete!
+      FileUtils.rm_rf(to_s)
+    end
+
+    def reset!
+      delete!
+      create
+    end
+
+    def file(file_path)
+      WorkspaceFile.new(@workspace, File.join(@path, file_path))
+    end
+
+    def dir(dir_path)
+      self.class.new(@workspace, File.join(@path, dir_path))
+    end
+
+    def root_dir
+      self.class.new(@workspace, "")
+    end
+
+    def chdir(target_dir = nil)
+      if target_dir.nil?
+        self.class.new(to_s, "")
+      else
+        self.class.new(dir(target_dir).to_s, "")
+      end
+    end
+
+    def parent_dir
+      root_dir.dir(File.expand_path("..", @path))
+    end
+
+    def children
+      entries = []
+      Dir.chdir(to_s) do
+        Dir["*"].each do |path|
+          entries.push(dir(path))
+        end
+      end
+      entries
+    end
+
+    def files(glob = "*")
+      entries = []
+      Dir.chdir(to_s) do
+        Dir[glob].each do |path|
+          entries.push(file(path))
+        end
+      end
+      entries
+    end
+
+    def each_dir(&block)
+      children.each do |subdir|
+        yield(subdir)
+      end
+    end
+
+    def absolute_path
+      File.absolute_path(to_s)
+    end
+  end
+end

data/lib/workspace/workspace_file/archive.rb

@@ -0,0 +1,45 @@
+module Workspace
+  class WorkspaceFile
+    module Archive
+      extend ActiveSupport::Concern
+
+      def extract(target_dir)
+        target_dir.create
+        if extension == "zip"
+          extract_zip(target_dir)
+        elsif extension == "gz"
+          extract_gz(target_dir)
+        end
+        self
+      end
+
+      private
+
+      def extract_zip(target_dir)
+        require "zip"
+        Zip::File.open(to_s) do |archive|
+          archive.each do |entry|
+            entry.extract(File.join(target_dir.to_s, entry.name))
+          end
+        end
+      end
+
+      def extract_gz(target_dir)
+        require 'rubygems/package'
+        workspace_dir = target_dir.root_dir
+        archive = Gem::Package::TarReader.new(Zlib::GzipReader.open(to_s))
+        archive.rewind
+        archive.each do |entry|
+          if entry.directory?
+            archive_dir = workspace_dir.dir(entry.full_name)
+            archive_dir.create
+          elsif entry.file?
+            archive_file = workspace_dir.file(entry.full_name)
+            archive_file.write(entry.read)
+          end
+        end
+        archive.close
+      end
+    end
+  end
+end

data/lib/workspace/workspace_file/media.rb

@@ -0,0 +1,19 @@
+module Workspace
+  class WorkspaceFile
+    module Media
+      extend ActiveSupport::Concern
+
+      def image?
+        ["jpg", "jpeg", "gif", "png"].include?(extension)
+      end
+
+      def video?
+        ["mp4"].include?(extension)
+      end
+
+      def audio?
+        ["mp3"].include?(extension)
+      end
+    end
+  end
+end

data/lib/workspace/workspace_file/net.rb

@@ -0,0 +1,18 @@
+require "open-uri"
+require "open_uri_redirections"
+
+module Workspace
+  class WorkspaceFile
+    module Net
+      extend ActiveSupport::Concern
+
+      def download(url)
+        url = "http:#{url}" if url[0..1] == "//"
+        contents = open(url, { ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE, allow_redirections: :safe }).read
+        dir.create unless dir.exists?
+        write(contents)
+        self
+      end
+    end
+  end
+end

data/lib/workspace/workspace_file/parse.rb

@@ -0,0 +1,21 @@
+module Workspace
+  class WorkspaceFile
+    module Parse
+      extend ActiveSupport::Concern
+
+      def read_json
+        JSON.parse(read)
+      end
+
+      def read_yaml
+        Psych.load_file(to_s)
+      end
+
+      def read_haml(options)
+        require "haml"
+        engine = Haml::Engine.new(read)
+        engine.render(Object.new, options)
+      end
+    end
+  end
+end

data/lib/workspace/workspace_file.rb

@@ -0,0 +1,99 @@
+require 'workspace/workspace_file/archive'
+require 'workspace/workspace_file/media'
+require 'workspace/workspace_file/net'
+require 'workspace/workspace_file/parse'
+
+module Workspace
+  class WorkspaceFile
+    include Workspace::WorkspaceFile::Archive
+    include Workspace::WorkspaceFile::Media
+    include Workspace::WorkspaceFile::Net
+    include Workspace::WorkspaceFile::Parse
+
+    attr_accessor :workspace, :path
+
+    def initialize(workspace, path)
+      @workspace = workspace
+      @path = path
+    end
+
+    def set(data)
+      @contents = data
+      self
+    end
+
+    def contents
+      @contents ||= read
+    end
+
+    def replace(key, value)
+      contents.gsub!(key, value)
+      self
+    end
+
+    def write(data = nil)
+      data ||= @contents
+      dir.create unless dir.exists?
+      File.open(to_s, "wb") { |file| file << data }
+      self
+    end
+
+    def copy(target_file)
+      target_file.dir.create unless target_file.dir.exists?
+      FileUtils.cp(to_s, target_file.to_s)
+    end
+
+    def to_s
+      File.join(@workspace, @path)
+    end
+
+    def relative_path
+      @path.sub(%r{^/}, "")
+    end
+
+    def exists?
+      File.exist?(to_s) and !File.directory?(to_s)
+    end
+
+    def read
+      File.open(to_s).read
+    end
+
+    def dir
+      Workspace::WorkspaceDir.new(@workspace, File.dirname(@path))
+    end
+
+    def md5
+      Digest::MD5.hexdigest(read)
+    end
+
+    def url
+      "file://#{absolute_path}"
+    end
+
+    def delete!
+      FileUtils.rm_f(to_s)
+    end
+
+    def basename
+      File.basename(path, ".*")
+    end
+
+    def slug
+      relative_path.chomp(File.extname(self.relative_path))
+    end
+
+    def extension
+      File.extname(to_s).gsub(/^\./, "")
+    end
+
+    def rename!(filename)
+      FileUtils.mv(to_s, dir.file(filename).to_s) if exists?
+      @path = dir.file(filename).path
+    end
+
+    def absolute_path
+      File.absolute_path(to_s)
+    end
+  end
+end

data/lib/workspace.rb

@@ -0,0 +1,11 @@
+require "workspace/workspace_dir"
+require "workspace/workspace_file"
+module Workspace
+  def workspace_dir(workspace, path = "")
+    Workspace::WorkspaceDir.new(workspace, path)
+  end
+
+  def workspace_file(workspace, path = "")
+    Workspace::WorkspaceFile.new(workspace, path)
+  end
+end

data/maglove.gemspec

@@ -14,26 +14,26 @@ Gem::Specification.new do |s|
   s.description = "This gem contains development and built tools for creating MagLoft themes."
   s.required_rubygems_version = '>= 2.4.7'
   s.add_runtime_dependency "bundler", "~> 1.10"
-  s.add_runtime_dependency "dotenv", "~> 2.0"
   s.add_runtime_dependency 'haml', "~> 4.0"
-  s.add_runtime_dependency 'hamloft', "~> 0.2.1"
-  s.add_runtime_dependency "rubyzip", "~> 1.1"
-  s.add_runtime_dependency "activesupport", "~> 5.0"
-  s.add_runtime_dependency "actionpack", "~> 5.0"
+  s.add_runtime_dependency "thor", "~> 0.19"
+  s.add_runtime_dependency 'hamloft', "~> 0.2.4"
+  s.add_runtime_dependency "activesupport", ">= 4.0"
+  s.add_runtime_dependency "actionpack", ">= 4.0"
+  s.add_runtime_dependency "maglove-widgets", "~> 1.0"
+  s.add_runtime_dependency "open_uri_redirections", "~> 0.2"
   s.add_runtime_dependency "logging", "~> 2.0"
   s.add_runtime_dependency "tilt", "~> 1.4"
   s.add_runtime_dependency "coffee-script", "~> 2.4"
-  s.add_runtime_dependency "minitar", "~> 0.5"
-  s.add_runtime_dependency "therubyracer", "~> 0.12"
   s.add_runtime_dependency "less", "~> 2.6"
   s.add_runtime_dependency "sass", "~> 3.4"
-  s.add_runtime_dependency "webrick", "~> 1.3"
-  s.add_runtime_dependency "commander", "~> 4.3"
-  s.add_runtime_dependency "filewatcher", "~> 0.5"
+  s.add_runtime_dependency "dialers", "~> 0.2"
+  s.add_runtime_dependency "rubyzip", "~> 1.1"
   s.add_runtime_dependency "image_optim", "~> 0.21"
   s.add_runtime_dependency "image_optim_pack", "~> 0.2"
-  s.add_development_dependency "rspec", "~> 3.3"
-  s.add_development_dependency "pry", "~> 0.10"
+  s.add_runtime_dependency "puma", "~> 3.6"
+  s.add_runtime_dependency "filewatcher", "~> 0.5"
+  s.add_runtime_dependency "faye", "~> 1.2"
+  s.add_runtime_dependency "faraday", "~> 0.9"
   s.add_development_dependency "rubocop", "~> 0.32"
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }