maglove 0.8.1 → 1.0.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglove
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,89 +25,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: hamloft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: maglove-widgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: open_uri_redirections
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -151,159 +165,145 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: minitar
+  name: less
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: therubyracer
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: less
+  name: dialers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: image_optim_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: filewatcher
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: image_optim
+  name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: image_optim_pack
+  name: faye
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
+        version: '0.9'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -327,14 +327,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
 - bin/maglove
-- data/maglove/dump.haml
+- data/maglove/export.haml
 - data/maglove/hpub/index.css
 - data/maglove/hpub/index.haml
 - data/maglove/hpub/page.haml
+- data/maglove/index.haml
+- data/maglove/maglove.css
+- data/maglove/maglove.haml
+- data/maglove/maglove.js
 - data/maglove/scaffold/base/base.coffee
 - data/maglove/scaffold/base/base.less
 - data/maglove/scaffold/base/images/base/loading-bars.svg
@@ -395,40 +400,49 @@ files:
 - data/maglove/scaffold/theme/templates/toc.yml
 - data/maglove/scaffold/theme/theme.coffee
 - data/maglove/scaffold/theme/theme.less
-- data/maglove/sdk.haml
 - data/maglove/thumbnail.haml
 - data/maglove/thumbnail.js
-- lib/ext/commander/command.rb
-- lib/ext/commander/methods.rb
+- lib/block_resolver.rb
+- lib/ext/thor/option.rb
+- lib/magloft.rb
+- lib/magloft/api.rb
+- lib/magloft/api_caller.rb
+- lib/magloft/remote_collection.rb
+- lib/magloft/remote_resource.rb
+- lib/magloft/transformable.rb
+- lib/magloft/typeloft_block.rb
+- lib/magloft/typeloft_image.rb
+- lib/magloft/typeloft_template.rb
+- lib/magloft/typeloft_theme.rb
 - lib/maglove.rb
 - lib/maglove/application.rb
-- lib/maglove/asset/base_theme.rb
 - lib/maglove/asset/theme.rb
-- lib/maglove/command/compile.rb
-- lib/maglove/command/compress.rb
-- lib/maglove/command/copy.rb
-- lib/maglove/command/core.rb
-- lib/maglove/command/font.rb
-- lib/maglove/command/server.rb
-- lib/maglove/command/sync.rb
-- lib/maglove/command/theme.rb
-- lib/maglove/command/util.rb
-- lib/maglove/helper/asset_helper.rb
-- lib/maglove/helper/command_helper.rb
+- lib/maglove/commands/assets.rb
+- lib/maglove/commands/base.rb
+- lib/maglove/commands/fonts.rb
+- lib/maglove/commands/main.rb
+- lib/maglove/commands/theme.rb
 - lib/maglove/helper/log_helper.rb
-- lib/maglove/helper/theme_helper.rb
+- lib/maglove/middleware/live_reload.rb
 - lib/maglove/phantom_script.rb
 - lib/maglove/server.rb
-- lib/maglove/server/hpub.rb
-- lib/maglove/template/tumblr.rb
 - lib/maglove/tilt/coffee_template.rb
 - lib/maglove/tilt/haml_template.rb
 - lib/maglove/tilt/js_template.rb
 - lib/maglove/tilt/less_template.rb
 - lib/maglove/tilt/scss_template.rb
-- lib/maglove/tilt/twig_template.rb
 - lib/maglove/tilt/yaml_template.rb
 - lib/maglove/version.rb
+- lib/maglove/workspace.rb
+- lib/powersnap.rb
+- lib/workspace.rb
+- lib/workspace/workspace_dir.rb
+- lib/workspace/workspace_dir/archive.rb
+- lib/workspace/workspace_file.rb
+- lib/workspace/workspace_file/archive.rb
+- lib/workspace/workspace_file/media.rb
+- lib/workspace/workspace_file/net.rb
+- lib/workspace/workspace_file/parse.rb
 - maglove.gemspec
 homepage: https://github.com/MagLoft/maglove
 licenses:

data/data/maglove/dump.haml

@@ -1,58 +0,0 @@
-!!! 5
-%html
-  %head
-    %meta{ charset: "UTF-8" }
-    %title= "#{theme} - #{template}"
-    %meta{ name: "viewport", content: "width=device-width, initial-scale=1.0" }
-    %link{ href: "themes/#{theme}/theme.css", media: "screen", rel: "stylesheet" }
-    %link{ href: "fonts/fonts.css", media: "screen", rel: "stylesheet" }
-    %script{ src: "themes/#{theme}/theme.js", type: "text/javascript" }
-    :css
-      div#__inspector {
-        position: fixed !important;
-        top: 8px !important;
-        right: 8px !important;
-        height: 32px !important;
-        background: #FFF !important;
-        line-height: 32px !important;
-        z-index: 1000000 !important;
-        text-transform: uppercase !important;
-        font-size: 11px !important;
-        font-weight: bold !important;
-        letter-spacing: 1px !important;
-        font-family: "Helvetica Neue" !important;
-        opacity: 0.25 !important;
-        transition: opacity 300ms !important;
-      }
-      
-      div#__inspector:hover {
-        opacity: 1 !important;
-      }
-      
-      div#__inspector a {
-        color: #171717 !important;
-        padding: 0px 12px !important;
-        border-left: 1px solid #F5F5F5 !important;
-        border-right: none !important;
-        border-top: none !important;
-        border-bottom: none !important;
-        display: inline-block !important;
-        float: left !important;
-      }
-      
-      div#__inspector a:hover {
-        color: #FFFFFF !important;
-        background: #000000 !important;
-      }
-      
-      div#__inspector a:first-child {
-        border-left: none !important;
-      }
-  
-  %body
-    = contents
-    - if templates.count > 1
-      #__inspector
-        - templates.each do |template|
-          %a{href: "#{template}.html"}
-            = template

data/data/maglove/sdk.haml

@@ -1,27 +0,0 @@
-!!! 5
-%html
-  %head
-    %meta{ charset: "UTF-8" }
-    %title= "#{theme} - #{template}"
-    %meta{ name: "viewport", content: "width=device-width, initial-scale=1.0" }
-    %meta{ name: "pageid", content: "0" }
-    %link{ href: "/themes/#{theme}/theme.css", media: "screen", rel: "stylesheet" }
-    %link{ href: "/fonts/fonts.css", media: "screen", rel: "stylesheet" }
-    %script{ src: "/themes/#{theme}/theme.js", type: "text/javascript" }
-    :css
-      div#__inspector{position:fixed !important;top:8px !important;right:8px !important;height:32px !important;background:#FFF !important;line-height:32px !important;z-index:1000000 !important;text-transform:uppercase !important;font-size:11px !important;font-weight:bold !important;letter-spacing:1px !important;font-family:"Helvetica Neue" !important;opacity:0.25 !important;transition:opacity 300ms !important;}
-      div#__inspector:hover{opacity:1 !important;}
-      div#__inspector a{color:#171717 !important;padding:0px 12px !important;border-left:1px solid #F5F5F5 !important;border-right:none !important;border-top:none !important;border-bottom:none !important;display:inline-block !important;float:left !important;}
-      div#__inspector a:hover{color:#FFFFFF !important;background:#000000 !important;}
-      div#__inspector a:first-child{border-left:none !important;}
-      div#__bs_notify__{border-radius:0 !important;right:inherit !important;left:8px !important;height:32px !important;top:8px !important;line-height:32px !important;padding:0px 26px !important;color:#171717 !important;z-index:1000000 !important;background:#FFF !important;}
-  %body
-    = contents
-    #__inspector
-      - templates.each do |template|
-        %a{href: "/#{template}"}
-          = template
-    :javascript
-      if(window.ThemeApi) {
-        window.ThemeApi.init({deviceId: 'AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE', appId: 'com.magloft.maglove', apiHost: 'www.magloft.com'});
-      }

data/lib/ext/commander/command.rb

@@ -1,32 +0,0 @@
-module Commander
-  class Command
-    attr_accessor :block
-
-    class Options
-      
-      def __merge(params)
-        new_options = self.__clone
-        new_options.__hash__.merge!(params)
-        new_options
-      end
-      
-      def __clone
-        new_options = Options.new
-        new_options.__hash__.merge!(__hash__)
-        new_options
-      end
-      
-    end
-
-    def invoke(args=[], options=nil)
-      options = options ? options.__clone : Options.new
-      self.block.call(args, options)
-    end
-    
-    def task_action(*args, &block)
-      when_called(*args, &block)
-      self.block = block
-    end
-
-  end
-end

data/lib/ext/commander/methods.rb

@@ -1,8 +0,0 @@
-module Commander
-  module Methods
-    include MagLove::Helper::LogHelper
-    include MagLove::Helper::CommandHelper
-    include MagLove::Helper::ThemeHelper
-    include MagLove::Helper::AssetHelper
-  end
-end

data/lib/maglove/asset/base_theme.rb

@@ -1,17 +0,0 @@
-module MagLove
-  module Asset
-    class BaseTheme < Theme
-      attr_reader :version
-  
-      def initialize(path, theme, version, locals={})
-        @version = version
-        super(path, theme, locals)
-      end
-    
-      def absolute_path
-        File.absolute_path("src/base/#{version}/#{path}")
-      end
-  
-    end
-  end
-end

data/lib/maglove/command/compile.rb

@@ -1,44 +0,0 @@
-module MagLove
-  module Command
-    class Compile
-      include Commander::Methods
-      
-      def run
-        
-        task :coffee, theme: "!" do |args, options|
-          asset = theme_asset("theme.coffee", options.theme)
-          debug("▸ created #{asset.logical_path}") if asset.write!
-        end
-        
-        task :css, theme: "!" do |args, options|
-          if File.exists?(theme_path("theme.scss", options.theme))
-            asset = theme_asset("theme.scss", options.theme)
-          else
-            asset = theme_asset("theme.less", options.theme)
-          end
-          debug("▸ created #{asset.logical_path}") if asset.write!
-        end
-  
-        task :yaml, theme: "!" do |args, options|
-          asset = theme_asset("theme.yml", options.theme)
-          debug("▸ created #{asset.logical_path}") if asset.write!
-        end
-  
-        task :templates, theme: "!", bucket: "localhost:3002" do |args, options|
-          Hamloft::Options.defaults[:asset_uri] = "http://#{options.bucket}"
-          theme_glob("templates/*.{html,haml,twig}", options.theme).each do |file|
-            # check if yaml file exists
-            locals = {}
-            locals_contents = theme_contents(file.sub(/\.[^.]+\z/, ".yml"), options.theme)
-            if locals_contents
-              locals = YAML.load(locals_contents).with_indifferent_access
-            end
-            asset = theme_asset(file, options.theme, locals)
-            debug("▸ created #{asset.logical_path}") if asset.write!
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/maglove/command/compress.rb

@@ -1,28 +0,0 @@
-module MagLove
-  module Command
-    class Compress
-      include Commander::Methods
-      
-      def run
-        
-        task :theme, theme: "!" do |args, options|
-          # archive_path("dist/themes/#{options.theme}", "**/*", "#{options.theme}.tar.gz")
-          target = "themes/#{options.theme}/#{options.theme}.tar.gz"
-          Dir.chdir("dist") do
-            tgz = Zlib::GzipWriter.new(File.open(target, "wb"))
-            Archive::Tar::Minitar::Output.open(tgz) do |tar|
-              Dir["themes/#{options.theme}/**/*"].reject{|file| file == target}.each do |file|
-                if !(/^themes\/#{options.theme}\/(images|thumbs|templates)/.match(file))
-                  Archive::Tar::Minitar::pack_file(file, tar)
-                end
-              end
-            end
-          end
-          
-          debug("▸ created #{options.theme}.tar.gz")
-        end
-        
-      end
-    end
-  end
-end

data/lib/maglove/command/copy.rb

@@ -1,35 +0,0 @@
-module MagLove
-  module Command
-    class Copy
-      include Commander::Methods
-      
-      def run
-
-        task :base_images, theme: "!", pattern: "images/**/*.{jpg,png,gif,svg}" do |args, options|
-          pattern = options.pattern.gsub(theme_base_path("", options.theme), "")
-          theme_base_glob(pattern, options.theme).each do |file|
-            asset = base_theme_asset(file, options.theme)
-            debug("▸ created #{asset.logical_path}") if asset.write!
-          end
-        end
-
-        task :images, theme: "!", pattern: "images/**/*.{jpg,png,gif,svg}" do |args, options|
-          pattern = options.pattern.gsub(theme_path("", options.theme), "")
-          theme_glob(pattern, options.theme).each do |file|
-            asset = theme_asset(file, options.theme)
-            debug("▸ created #{asset.logical_path}") if asset.write!
-          end
-        end  
-  
-        task :thumbs, theme: "!", pattern: "thumbs/**/*.{jpg,png,gif,svg}" do |args, options|
-          pattern = options.pattern.gsub(theme_path("", options.theme), "")
-          theme_glob(pattern, options.theme).each do |file|
-            asset = theme_asset(file, options.theme)
-            debug("▸ created #{asset.logical_path}") if asset.write!
-          end
-        end
-
-      end
-    end
-  end
-end