bobkit 0.1.9 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edef2cac373a1bb660b5039319b60000f78390ee4d1b1f247d0a53bd624f77db
-  data.tar.gz: 30c0d9c908ef88fc23153cfeae31d1dbd1bf746a9cfd1bd3d4072511c75ce2e3
+  metadata.gz: 99f29c755fc05009338bf2170974c691a2873a7eceb01f1e5ac4b2a9f3278ed1
+  data.tar.gz: f7704fe340fdf20923e6402ee654ccaa2a2f319454be2de5e33c167fc9c7b51e
 SHA512:
-  metadata.gz: 6276ac5b02b23f913988e3fca8d49700d13afd0678354ef27b5142ca5ef4b72608d3ae7d8843523ca4905c5d60f36ebf0073c5e9e1d74c0950c38e8999414c31
-  data.tar.gz: 94765c19081117f7a95f9ce7c7906548c0b318d722f00faba87abfbcec35a976861d8608105de115959dea3b2cfbe81688c2790767c50fc929c8f557672c8620
+  metadata.gz: ae4612bec44c476c9694959c824c77718ec184b7666c37d18bec2b013077407a70c64c9491895b66b9bdc192d77eef00cfeb4616a10a4944041c68fa410c2b7b
+  data.tar.gz: 6736053dec44b7555edf2f8b91eb8f5697b5eaefb4ea8b1d552b0469b2d3e37a90ac7ef21a90b36cec578da7a8ad8410d243812486fe1cdb1ca5def7ca7c4d30

data/README.md

@@ -1,8 +1,7 @@
-Bobkit - Site Generation Toolkit
-==================================================
+# 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)
 
 ---
@@ -29,8 +28,7 @@ The design intentions were to:
 
 
 
-Install
---------------------------------------------------
+## Install
 
 `gem install bobkit`
 
@@ -40,8 +38,7 @@ Or with Bundler:
 
 
 
-Usage
---------------------------------------------------
+## Usage
 
 The basic usage pattern is this:
 
@@ -92,8 +89,7 @@ bob.render ...
 bob.compile_css ...
 ```
 
-Reference
---------------------------------------------------
+## Reference
 
 ### Setting folder locations and options
 
@@ -265,9 +261,11 @@ use it.
 ```ruby
 include Bobkit::Watcher
 
-watch do |filename, event|
-  puts "#{event}: #{filename}"
-  generate
+watch do |changes|
+  changes do |filename, event|
+    puts "#{event}: #{filename}"
+    generate
+  end
 end
 
 def generate
@@ -280,11 +278,5 @@ The watch command is just like
 with the exception that the array of paths to watch is optional. If none
 provided, we will watch all the input folders.
 
-Todo
---------------------------------------------------
-
-- [ ] YAML loader (data_folder?)
-- [ ] CSV Loader (data_folder?)
-
 
 [1]: https://github.com/DannyBen/bobkit/tree/master/examples

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.2"
 end

data/lib/bobkit.rb

@@ -1,27 +1,27 @@
-require 'i18n'
-require 'fileutils'
-require 'sass'
-require 'sass-globbing'
-require 'slim'
-require 'coffee_script'
-require 'filewatcher'
-require 'rdiscount'
-
-require 'bobkit/options_base'
-require 'bobkit/location_options'
-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'
-require 'bobkit/coffee_bridge'
-require 'bobkit/markdown_bridge'
-require 'bobkit/assets'
-require 'bobkit/watcher'
-
-require 'bobkit/scope'
-require 'bobkit/tasks'
-require 'bobkit/bob'
+require 'singleton'
+
+require 'i18n'
+require 'fileutils'
+require 'sasstool'
+require 'slim'
+require 'coffee_script'
+require 'filewatcher'
+require 'rdiscount'
+
+require 'bobkit/options_base'
+require 'bobkit/location_options'
+require 'bobkit/file_helpers'
+require 'bobkit/i18n_mixin'
+require 'bobkit/i18n_bridge'
+require 'bobkit/scope_options'
+require 'bobkit/sass_bridge'
+require 'bobkit/slim_options'
+require 'bobkit/slim_bridge'
+require 'bobkit/coffee_bridge'
+require 'bobkit/markdown_bridge'
+require 'bobkit/assets'
+require 'bobkit/watcher'
+
+require 'bobkit/scope'
+require 'bobkit/tasks'
+require 'bobkit/bob'

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bobkit
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-26 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: sasstool
   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: sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: sass-globbing
+  name: slim
   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: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   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.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.14
 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