bobkit 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edef2cac373a1bb660b5039319b60000f78390ee4d1b1f247d0a53bd624f77db
-  data.tar.gz: 30c0d9c908ef88fc23153cfeae31d1dbd1bf746a9cfd1bd3d4072511c75ce2e3
+  metadata.gz: 3d302738a52f6b3b3fdfb412d7f2ddf2ba5e70d6fd86e86723b24656c4fd128d
+  data.tar.gz: e17d0e43fc7284018e0b489882a8756d57a482e9c0e873a06b168f9deb6b1680
 SHA512:
-  metadata.gz: 6276ac5b02b23f913988e3fca8d49700d13afd0678354ef27b5142ca5ef4b72608d3ae7d8843523ca4905c5d60f36ebf0073c5e9e1d74c0950c38e8999414c31
-  data.tar.gz: 94765c19081117f7a95f9ce7c7906548c0b318d722f00faba87abfbcec35a976861d8608105de115959dea3b2cfbe81688c2790767c50fc929c8f557672c8620
+  metadata.gz: f7c29a4140a4469b192fdf916907a3193c640b16b7d2db40a09079f0a9550ffa193c5757747cef49d18a78a58bb5eb90a7514682876fae7bc5b518299ef6aef5
+  data.tar.gz: c7d49087068e18324b1afc627bc9d7de92230c424519b35637cb9d13ed6bcebad5157383ca2f694ad45a8309fa61d8014d5455c9be447acbbdc1ff1f627774f9

data/README.md

@@ -2,7 +2,7 @@ Bobkit - Site Generation Toolkit
 ==================================================
 
 [![Gem Version](https://badge.fury.io/rb/bobkit.svg)](https://badge.fury.io/rb/bobkit)
-[![Build Status](https://travis-ci.com/DannyBen/bobkit.svg?branch=master)](https://travis-ci.com/DannyBen/bobkit)
+[![Build Status](https://github.com/DannyBen/bobkit/workflows/Test/badge.svg)](https://github.com/DannyBen/bobkit/actions?query=workflow%3ATest)
 [![Maintainability](https://api.codeclimate.com/v1/badges/64c20ebaaf8ecff0948d/maintainability)](https://codeclimate.com/github/DannyBen/bobkit/maintainability)
 
 ---

data/lib/bobkit.rb

@@ -1,7 +1,6 @@
 require 'i18n'
 require 'fileutils'
-require 'sass'
-require 'sass-globbing'
+require 'sasstool'
 require 'slim'
 require 'coffee_script'
 require 'filewatcher'
@@ -13,7 +12,6 @@ require 'bobkit/file_helpers'
 require 'bobkit/i18n_mixin'
 require 'bobkit/i18n_bridge'
 require 'bobkit/scope_options'
-require 'bobkit/sass_options'
 require 'bobkit/sass_bridge'
 require 'bobkit/slim_options'
 require 'bobkit/slim_bridge'

data/lib/bobkit/sass_bridge.rb

@@ -1,15 +1,20 @@
 module Bobkit
   module SassBridge
     include FileHelpers
-    include SassOptions
-
-    def compile_css(file, options={})
-      @file = "#{styles_folder}/#{file}.scss"
-      extended_options = scss_options.merge({ filename: @file })
-      content = Sass::Engine.new(File.read(@file), extended_options).render
-      output = options[:output]
-      create_file "#{css_output_folder}/#{output}.css", content if output
-      content
+
+    def compile_css(file, output: nil, source_map: true)
+      file = "#{styles_folder}/#{file}.scss"
+      sass = Sasstool::Renderer.new file
+
+      if output
+        create_file "#{css_output_folder}/#{output}.css", sass.render
+
+        if source_map
+          create_file "#{css_output_folder}/#{output}.css.map", sass.source_map
+        end
+      end
+
+      sass.render
     end
   end
 end

data/lib/bobkit/tasks.rb

@@ -8,7 +8,6 @@ module Bobkit
     include I18nBridge
     include MarkdownBridge
     include SlimOptions
-    include SassOptions
     include ScopeOptions
     include Assets
   end

data/lib/bobkit/version.rb

@@ -1,3 +1,3 @@
 module Bobkit
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bobkit
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-26 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -25,33 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sasstool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: sass-globbing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +126,6 @@ files:
 - lib/bobkit/markdown_bridge.rb
 - lib/bobkit/options_base.rb
 - lib/bobkit/sass_bridge.rb
-- lib/bobkit/sass_options.rb
 - lib/bobkit/scope.rb
 - lib/bobkit/scope_options.rb
 - lib/bobkit/slim_bridge.rb
@@ -160,14 +145,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Site Generation Toolkit

data/lib/bobkit/sass_options.rb

@@ -1,13 +0,0 @@
-module Bobkit
-  module SassOptions
-    def scss_options(options=nil)
-      setopt :scss_options, options, scss_defaults
-    end
-    alias_method :sass_options, :scss_options
-
-    def scss_defaults
-      { cache: true, syntax: :scss, style: :nested, 
-        load_paths: [styles_folder] } 
-    end
-  end
-end