maglove 2.0.4 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e479f768c7700d2bbc986b901fbdc3818a6b08
-  data.tar.gz: 85dc7407efcc70f10ad67b73b2c147328360e60a
+  metadata.gz: 7f7896a05f75ab83d370e8ee2e04751f7a534079
+  data.tar.gz: bd7fab9800b1a8da0e8e31bddc167d3bfe447b5f
 SHA512:
-  metadata.gz: 503990999cd27820790637bc3885729708e57975e011bb050ad050e0c1e419fb0b4e6b1d46aa5e8ceb59310aeb91f87b9978d1887ddb1eda576f410f8627f683
-  data.tar.gz: 253eee85575e1667789e1d950ce4ffc2d32c65b5943d054eb23c7fa0cc269789f093f9990d17a4d41b56a9bd2d359e8e82cf86131bc1313594861536579fb920
+  metadata.gz: 8813bda699c274fb6bcdd43752f4f2633ebced987cc6070f051aeeba190ecb09b19d11702364dc699ebfdefa61217d89d8ec6c5ce88e1463d10719d3b5825c22
+  data.tar.gz: 11e012d299e08125c3f4c3144463cd3fb5a41b02fafeb42527f5a71aad3cfd47901a6ef8b1b3757440f6b0070b6f5b70271a3c7fb5165a3119c8bbfe1bb4f246

data/{data/maglove → assets}/maglove.js

@@ -37,7 +37,7 @@ class MagLove {
   init(message) {
     console.log("MagLove Initialized")
     this.templates = message.templates
-    this.send("watch")
+    this.send("watch", { template: this.template })
     if(window.ThemeApi) {
       window.ThemeApi.init({deviceId: 'AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE', appId: 'com.magloft.maglove', apiHost: 'www.magloft.com'})
     }

data/{data/maglove → assets}/scaffold/theme/templates/article-01.haml

@@ -2,7 +2,7 @@
 - drop_container
 
 -# ROOT CONTAINER
-- container_widget animate: "scale-background", min_height: "calc(100vh - 92px)", parallax_effect: "fixed", image_source: variable(:background_url, asset("images/sample/skyscraper.jpg")), image_size: "cover", background_color: "overlay", image_position: "center center" do
+- container_widget animate: "scale-background", min_height: "calc(100vh - 92px)", parallax_effect: "fixed", image_source: var(:background_url, asset("images/sample/skyscraper.jpg")), image_size: "cover", background_color: "overlay", image_position: "center center" do
   
   -# TOP PAGE CONTAINER
   - container_widget min_height: "calc(100vh - 92px)" do
@@ -13,7 +13,7 @@
       -# MAIN HEADING
       - heading_widget align: "left", style: "feature" do
         - style :bold, color: "#FFFFFF" do
-          = variable(:title, "Article Title")
+          = var(:title, "Article Title")
     
       - horizontal_rule_widget style: "flourish-01", color: "light"    
     
@@ -30,7 +30,7 @@
     - container_widget parallax_effect: "up", image_source: asset("images/base/bg/stripes.jpg"), margin_left: "20px", margin_right: "20px", margin_top: "20px", padding_top: "2em", padding_bottom: "2em", padding_left: "2em", padding_right: "2em" do
       - heading_widget type: "h2", align: "center", style: "feature" do
         - style :bold, color: "#FFFFFF" do
-          = variable(:title, "WHY I DESIGN?")
+          = var(:title, "WHY I DESIGN?")
           
     -# BODY CONTAINER
     - container_widget padding_top: "2em", padding_left: "0em", padding_right: "0em" do

data/{data/maglove → assets}/scaffold/theme/templates/toc.haml

@@ -2,7 +2,7 @@
 - drop_container
 
 -# ROOT CONTAINER
-- container_widget min_height: "100vh", parallax_effect: "fixed", image_source: variable(:background_url, asset("images/bg/toc.jpg")), image_size: "cover", image_position: "top center", padding_left: "20px", padding_right: "20px" do
+- container_widget min_height: "100vh", parallax_effect: "fixed", image_source: var(:background_url, asset("images/bg/toc.jpg")), image_size: "cover", image_position: "top center", padding_left: "20px", padding_right: "20px" do
   
   -# FIXED CONTAINER
   - container_widget animate: "fade-in-up scroll-animate", padding_top: "2em", padding_left: "20px", padding_right: "20px" do

data/bin/maglove

@@ -4,14 +4,8 @@ require "thor"
 require "ext/thor/option"
 require 'coffee_script'
 require "active_support/all"
-require "hamloft"
-require "workspace"
 require "typhoeus"
 require "maglove"
-require "action_dispatch/http/mime_type"
-
-# require local widgets
-Dir["widgets/*.rb"].each { |path| require File.join(Dir.pwd, path) }
 
 # allow colons
 ARGV.unshift(*ARGV.shift.split(":")) if ARGV.count > 0 and ARGV[0].include?(":")

data/lib/magloft/api_caller.rb

@@ -43,33 +43,33 @@ module MagLoft
     end
 
     short_circuits.add(
-      if: -> (response) { Dialers::Status.new(response.status).server_error? },
-      do: -> (response) { fail Dialers::ServerError, response }
+      if: ->(response) { Dialers::Status.new(response.status).server_error? },
+      do: ->(response) { fail Dialers::ServerError, response }
     )
 
     short_circuits.add(
-      if: -> (response) { Dialers::Status.new(response.status).is?(404) },
-      do: -> (response) { fail Dialers::NotFoundError, response }
+      if: ->(response) { Dialers::Status.new(response.status).is?(404) },
+      do: ->(response) { fail Dialers::NotFoundError, response }
     )
 
     short_circuits.add(
-      if: -> (response) { Dialers::Status.new(response.status).is?(409) },
-      do: -> (response) { fail ConflictError, response }
+      if: ->(response) { Dialers::Status.new(response.status).is?(409) },
+      do: ->(response) { fail ConflictError, response }
     )
 
     short_circuits.add(
-      if: -> (response) { Dialers::Status.new(response.status).is?(400) },
-      do: -> (response) { fail ValidationError, response }
+      if: ->(response) { Dialers::Status.new(response.status).is?(400) },
+      do: ->(response) { fail ValidationError, response }
     )
 
     short_circuits.add(
-      if: -> (response) { Dialers::Status.new(response.status).is?(422) },
-      do: -> (response) { fail ValidationError, response }
+      if: ->(response) { Dialers::Status.new(response.status).is?(422) },
+      do: ->(response) { fail ValidationError, response }
     )
 
     short_circuits.add(
-      if: -> (response) { Dialers::Status.new(response.status).is?(401) },
-      do: -> (response) { fail UnauthorizedError, response }
+      if: ->(response) { Dialers::Status.new(response.status).is?(401) },
+      do: ->(response) { fail UnauthorizedError, response }
     )
 
     class ConflictError < Dialers::ErrorWithResponse

data/lib/magloft/remote_resource.rb

@@ -1,6 +1,6 @@
 module MagLoft
   class RemoteResource
-    attr_accessor :changed_data, :id
+    attr_accessor :id
     attr_reader :destroyed
 
     def initialize(attributes = {})
@@ -9,33 +9,33 @@ module MagLoft
     end
 
     def changed?
-      self.changed_data.keys.count > 0
+      changed_data.keys.count > 0
     end
 
     def destroyed?
-      self.destroyed == true
+      destroyed == true
     end
 
     def save
       return false if destroyed? or !changed?
-      if self.changed_data.keys.count > 0
-        if self.id.nil?
-          transformable = Api.client.api_caller.post(self.class.endpoint, self.changed_data)
+      if changed_data.keys.count > 0
+        if id.nil?
+          transformable = Api.client.api_caller.post(self.class.endpoint, changed_data)
         else
-          transformable = Api.client.api_caller.put("#{self.class.endpoint}/#{self.id}", self.changed_data.except(:id))
+          transformable = Api.client.api_caller.put("#{self.class.endpoint}/#{id}", changed_data.except(:id))
         end
         transformable.transform_to_existing(self)
-        self.clear_changed_data!
+        clear_changed_data!
       end
       self
     end
 
     def destroy
-      return false if self.id.nil? or self.destroyed?
-      transformable = Api.client.api_caller.delete("#{self.class.endpoint}/#{self.id}")
+      return false if id.nil? or destroyed?
+      transformable = Api.client.api_caller.delete("#{self.class.endpoint}/#{id}")
       transformable.transform_to_existing(self)
       @destroyed = true
-      self.clear_changed_data!
+      clear_changed_data!
       self
     end
 
@@ -44,12 +44,12 @@ module MagLoft
     end
 
     def clear_changed_data!
-      self.changed_data = {}
+      @changed_data = {}
       self
     end
 
     def update_data(key, value)
-      if self.send(key) != value
+      if send(key) != value
         instance_variable_set("@#{key}", value)
         changed_data[key] = value
       end
@@ -63,8 +63,8 @@ module MagLoft
       def remote_attribute(*args)
         args.each do |arg|
           remote_attributes.push(arg)
-          self.class_eval("attr_accessor :#{arg}")
-          self.class_eval("def #{arg}=(val);update_data(:#{arg}, val);end")
+          class_eval("attr_accessor :#{arg}", __FILE__, __LINE__)
+          class_eval("def #{arg}=(val);update_data(:#{arg}, val);end", __FILE__, __LINE__)
         end
       end
 
@@ -93,7 +93,7 @@ module MagLoft
       end
 
       def create(attributes = {})
-        entity = self.new(attributes)
+        entity = new(attributes)
         entity.save
         entity
       end
@@ -104,7 +104,7 @@ module MagLoft
           if remote_attributes.include?(attribute)
             params = {}
             params[attribute] = args.first
-            return self.find_one(params)
+            return find_one(params)
           end
         end
         super

data/lib/maglove.rb

@@ -1,35 +1,35 @@
 require 'magloft'
-require "maglove/workspace"
-require "maglove/widgets"
+require "workspace"
+require "workspace-parse"
+require "maglove/theme"
+require "maglove/engine"
 require "maglove/commands/base"
 require "maglove/commands/fonts"
 require "maglove/commands/theme"
 require "maglove/commands/assets"
 require "maglove/commands/main"
-require "block_resolver"
 
 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]
+  def self.theme
+    Theme.instance
+  end
+
+  def self.assets_dir
+    @assets_dir ||= begin
+      spec = Gem::Specification.find_by_name("maglove")
+      Workspace::Dir.new(spec.gem_dir).dir("assets")
     end
   end
 
   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.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

data/lib/maglove/asset/theme.rb

@@ -11,7 +11,6 @@ require "maglove/tilt/yaml_template"
 module MagLove
   module Asset
     class Theme
-      include Workspace
       include MagLove::Helper::LogHelper
       attr_reader :mtime, :path, :valid, :contents, :options
 
@@ -20,22 +19,24 @@ module MagLove
         "less" => "css",
         "scss" => "css",
         "coffee" => "js",
+        "js" => "js",
         "yml" => "json"
       }
 
       def initialize(path, options = {})
         @path = path
         @options = options
+        @options[:theme] = Maglove.theme.identifier
         @mtime = File.mtime(absolute_path)
         begin
           if ::Tilt[input_type]
             template = ::Tilt.new(absolute_path)
-            @contents = template.render(Object.new, @options.merge(base_path: theme_base_dir.to_s))
+            @contents = template.render(Object.new, @options.merge(base_path: "src/base/#{Maglove.theme.base_version}/"))
           else
             @contents = File.read(absolute_path)
           end
-        rescue StandardError => e
-          error("▸ #{e.message}")
+        rescue Maglove::Engine::RenderError => e
+          error("▸ HAML error: #{e.message}")
         end
       end
 
@@ -68,9 +69,9 @@ module MagLove
 
       def absolute_path
         if @options[:base]
-          File.absolute_path("src/base/#{theme_config(:base_version)}/#{path}")
+          Maglove.theme.base_dir.file(path).absolute_path
         else
-          File.absolute_path("src/themes/#{@options[:theme]}/#{path}")
+          Maglove.theme.src_dir.file(path).absolute_path
         end
       end