serbea 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2014debe9382e252988c8d41ebec4102153508a856dca4dd7b72d2e347fb4023
-  data.tar.gz: aa729c3b2212ff33e5399544bc798593864248d6aacaeb0764c92fa43dc0cf8e
+  metadata.gz: d1afdeb44daa8b1b9cd20c73ec82ebd02defc8d7322247cdc65870279b380450
+  data.tar.gz: 9e7371768fd0cab610e26c9b15020d6320d3d8f78a9f805e56c08d3dcec26ddd
 SHA512:
-  metadata.gz: c7d3037ee50671772fad0ab5e8cbce90a9ae402769d5ffd49163df182a8c011da83d66809602d01d3186b2cc513d30116922fab461f03d3d0746b2d3f17a977e
-  data.tar.gz: 63f25bbbc2edd056c6c5cb461c356b52301f4590cc8733ca2be621f430b39d20df30f8ee881344e3c4088e19fb34d5630f4b9ac045db2fb5a3908830ae6bef18
+  metadata.gz: 352d91c0845ee77c0fc4cbea9953f3d9f63fcc230ad2f6f9fc52cbba64bd6da409482a6e2c5e032c39f853acd1c0f62042869a13f9a34a88c74387825b433fc1
+  data.tar.gz: fde8baf367844161f6f6afcd10c29450673d56871e67949cb831f0d7c86b2a163b644a80e171ffa4d0a104ef549cfa7201dacf7ea6d6522305bfc6aa82ca8ffc

data/.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: ci
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby_version: [2.7.2, 3.0.0]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    # Has to be top level to cache properly
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_PATH: "vendor/bundle"
+    steps:
+      - uses: actions/checkout@master
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
+      - name: Test with Rake
+        run: bundle exec rake

data/.gitignore

@@ -15,7 +15,6 @@ mkmf.log
 *.gem
 Gemfile.lock
 .bundle
-.ruby-version
 
 # Mac files
 .DS_Store

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+
+## 2.0.0
+
+- Add plain ol' Ruby pipeline functionality
+- Raise errors using gem-based classes
+- Upgrade docs site to Bridgetown 1.3.1 and esbuild
+
+## 1.0.1
+
+- Widespread release.

data/lib/rouge/lexers/serbea.rb

@@ -9,6 +9,7 @@ module Rouge
       desc "Embedded Ruby Serbea template files"
 
       tag 'serb'
+      aliases 'serbea'
 
       filenames '*.serb'
 

data/lib/serbea/helpers.rb

@@ -30,7 +30,7 @@ module Serbea
     def import(*args, **kwargs, &block)
       helper_names = %i(partial render)
       available_helper = helper_names.find { |meth| respond_to?(meth) }
-      raise "Serbea Error: no `render' or `partial' helper available in #{self.class}" unless available_helper
+      raise Serbea::Error, "Serbea Error: no `render' or `partial' helper available in #{self.class}" unless available_helper
       available_helper == :partial ? partial(*args, **kwargs, &block) : render(*args, **kwargs, &block)
       nil
     end

data/lib/serbea/pipeline.rb

@@ -4,6 +4,17 @@ require "active_support/core_ext/object/blank"
 
 module Serbea
   class Pipeline
+    # If you include this in any regular Ruby template environment (say ERB),
+    # you can then use Serbea-style pipeline code within the block, e.g.
+    #
+    # `pipe "Hello world" do upcase | split(" ") | join(", ") end`
+    # => `HELLO, WORLD`
+    module Helper
+      def pipe(input = nil, &blk)
+        Pipeline.new(binding, input).tap { _1.instance_exec(&blk) }.value
+      end
+    end
+
     # Exec the pipes!
     # @param template [String]
     # @param locals [Hash]
@@ -85,13 +96,13 @@ module Serbea
         if var.respond_to?(:call)
           @value = var.call(@value, *args, **kwargs)
         else
-          "Serbea warning: Filter #{name} does not respond to call".tap do |warning|
-            self.class.raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)
+          "Serbea warning: Filter '#{name}' does not respond to call".tap do |warning|
+            self.class.raise_on_missing_filters ? raise(Serbea::FilterMissing, warning) : STDERR.puts(warning)
           end
         end
       else
-        "Serbea warning: Filter not found: #{name}".tap do |warning|
-          self.class.raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)
+        "Serbea warning: Filter `#{name}' not found".tap do |warning|
+          self.class.raise_on_missing_filters ? raise(Serbea::FilterMissing, warning) : STDERR.puts(warning)
         end
       end
 
@@ -101,5 +112,24 @@ module Serbea
     def to_s
       self.class.output_processor.call(@value.is_a?(String) ? @value : @value.to_s)
     end
+  
+    def |(*)
+      self
+    end
+
+    def method_missing(...)
+      filter(...)
+    end
+
+    def value(callback = nil)
+      return @value unless callback
+
+      @value = if callback.is_a?(Proc)
+                 callback.(@value)
+               else
+                 callback
+               end
+      self
+    end
   end
 end

data/lib/serbea/template_engine.rb

@@ -188,7 +188,7 @@ module Serbea
                 buff << "{% %}\n" # preserve original directive line length
               end
             else
-              raise "Handler for Serbea template directive `#{$1}' not found"
+              raise Serbea::Error, "Handler for Serbea template directive `#{$1}' not found"
             end
           else
             buff << "{% end %}"

data/lib/serbea.rb

@@ -1,6 +1,12 @@
 require "tilt"
 require "tilt/erubi"
 
+module Serbea
+  class Error < StandardError; end
+
+  class FilterMissing < Error; end
+end
+
 require "serbea/helpers"
 require "serbea/pipeline"
 require "serbea/template_engine"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/serbea.gemspec

@@ -13,12 +13,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.7"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|script|spec|features)/!) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|script|spec|features|docs|serbea-rails)/!) }
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency("activesupport", ">= 6.0")
   spec.add_runtime_dependency("erubi", ">= 1.10")
-  spec.add_runtime_dependency("hash_with_dot_access", "~> 1.1")
   spec.add_runtime_dependency("tilt", "~> 2.0")
 
   spec.add_development_dependency("rake", "~> 13.0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: hash_with_dot_access
-  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'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -86,37 +72,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- docs/.gitignore
-- docs/Gemfile
-- docs/bridgetown.config.yml
-- docs/frontend/javascript/index.js
-- docs/frontend/styles/index.scss
-- docs/package.json
-- docs/plugins/builders/.keep
-- docs/plugins/site_builder.rb
-- docs/src/404.html
-- docs/src/_components/footer.liquid
-- docs/src/_components/head.liquid
-- docs/src/_components/navbar.liquid
-- docs/src/_data/site_metadata.yml
-- docs/src/_layouts/default.liquid
-- docs/src/_layouts/home.liquid
-- docs/src/_layouts/page.liquid
-- docs/src/_layouts/post.liquid
-- docs/src/favicon.ico
-- docs/src/images/.keep
-- docs/src/images/serbea-logomark.svg
-- docs/src/images/serbea-logotype.svg
-- docs/src/index.md
-- docs/start.js
-- docs/sync.js
-- docs/webpack.config.js
-- docs/yarn.lock
 - lib/rouge/lexers/serbea.rb
 - lib/serbea.rb
 - lib/serbea/helpers.rb

data/docs/.gitignore

@@ -1,37 +0,0 @@
-# Bridgetown
-output
-.bridgetown-cache
-.bridgetown-metadata
-.bridgetown-webpack
-
-# Dependency folders
-node_modules
-bower_components
-vendor
-
-# Caches
-.sass-cache
-.npm
-.node_repl_history
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore Byebug command history file.
-.byebug_history
-
-# dotenv environment variables file
-.env
-
-# Mac files
-.DS_Store
-
-# Yarn
-yarn-error.log
-yarn-debug.log*
-.pnp/
-.pnp.js
-# Yarn Integrity file
-.yarn-integrity
-
-.ruby-version

data/docs/Gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-gem "bridgetown", "~> 0.19"
-gem "serbea", "~> 0.10", :group => :bridgetown_plugins

data/docs/bridgetown.config.yml

@@ -1,6 +0,0 @@
-url: "https://www.serbea.dev"
-permalink: pretty
-
-timezone: America/Los_Angeles
-
-template_engine: serbea

data/docs/frontend/javascript/index.js

@@ -1,3 +0,0 @@
-import "../styles/index.scss"
-
-console.info("Bridgetown is loaded!")

data/docs/frontend/styles/index.scss

@@ -1,169 +0,0 @@
-$body-background: #f2f2f2;
-$body-color: #5a5a5a;
-$heading-color: #222222;
-
-html {
-  box-sizing: border-box;
-}
-*, *:before, *:after {
-  box-sizing: inherit;
-}
-
-body {
-  background: $body-background;
-  color: $body-color;
-  font-family: BlinkMacSystemFont,-apple-system,"Segoe UI","Roboto","Oxygen","Ubuntu","Cantarell","Fira Sans","Droid Sans","Helvetica Neue","Helvetica","Arial",sans-serif;
-  margin: 0 8px;
-  font-size: 19px;
-  line-height: 1.5;
-}
-
-a {
-  color: #204a87;
-  text-decoration: underline;
-  text-decoration-color: #90add3;
-}
-
-h1 {
-  font-weight: 900;
-  font-size: 2.5rem;
-  color: $heading-color;
-  text-align: center;
-}
-
-footer {
-  text-align: center;
-  margin-bottom: 4rem;
-  font-size: 1em;
-}
-
-main {
-  margin: 2rem auto 4rem;
-  max-width: 68rem;
-  padding: 25px 35px 50px;
-  background: white;
-  box-shadow: 2px 3px 3px #ddd;
-  border-radius: 3px;
-  
-  @media (max-width: 500px) {
-    padding: 16px 16px 50px;
-  }
-}
-
-h2 {
-  font-weight: 700;
-  color: $heading-color;
-  text-align: center;
-}
-
-h3 {
-  margin-top: 3rem;
-  margin-bottom: 2rem;
-  font-weight: 700;
-  color: $heading-color;
-  font-size: 1.75rem;
-  text-align: center;
-}
-
-p, ul li, ol li {
-  margin-top: 0;
-  margin-bottom: 1.5rem;
-}
-
-div.highlighter-rouge {
-  margin: 1.5rem 0;
-  width: 100%;
-  overflow: auto;
-}
-
-$grey: #888;
-$base-code-text-color: #222;
-
-code {
-  font-size: 1.1rem;
-  font-family: ui-monospace, monospace;
-  color: #8f5902;
-}
-
-pre code {
-  color: $base-code-text-color;
-}
-
-.highlight .hll { background-color: #ffffcc }
-.highlight .c { color: $grey } /* Comment */
-.highlight .err { color: #a40000 } /* Error */
-.highlight .g { color: $base-code-text-color } /* Generic */
-.highlight .k { color: #204a87; font-weight: 500 } /* Keyword */
-.highlight .l { color: $base-code-text-color } /* Literal */
-.highlight .n { color: $base-code-text-color } /* Name */
-.highlight .o { color: #ce5c00; font-weight: 500 } /* Operator */
-.highlight .x { color: $base-code-text-color } /* Other */
-.highlight .p { color: $base-code-text-color; font-weight: 500 } /* Punctuation */
-.highlight .cm { color: #8f5902 } /* Comment.Multiline */
-.highlight .cp { color: #8f5902 } /* Comment.Preproc */
-.highlight .c1 { color: #8f5902 } /* Comment.Single */
-.highlight .cs { color: #8f5902 } /* Comment.Special */
-.highlight .gd { color: #a40000 } /* Generic.Deleted */
-.highlight .ge { color: $base-code-text-color } /* Generic.Emph */
-.highlight .gr { color: #ef2929 } /* Generic.Error */
-.highlight .gh { color: #000080; font-weight: 500 } /* Generic.Heading */
-.highlight .gi { color: #00A000 } /* Generic.Inserted */
-.highlight .go { color: $base-code-text-color } /* Generic.Output */
-.highlight .gp { color: #8f5902 } /* Generic.Prompt */
-.highlight .gs { color: $base-code-text-color; font-weight: 500 } /* Generic.Strong */
-.highlight .gu { color: #800080; font-weight: 500 } /* Generic.Subheading */
-.highlight .gt { color: #a40000; font-weight: 500 } /* Generic.Traceback */
-.highlight .kc { color: #204a87; font-weight: 500 } /* Keyword.Constant */
-.highlight .kd { color: #204a87; font-weight: 500 } /* Keyword.Declaration */
-.highlight .kn { color: #204a87; font-weight: 500 } /* Keyword.Namespace */
-.highlight .kp { color: #204a87; font-weight: 500 } /* Keyword.Pseudo */
-.highlight .kr { color: #204a87; font-weight: 500 } /* Keyword.Reserved */
-.highlight .kt { color: #204a87; font-weight: 500 } /* Keyword.Type */
-.highlight .ld { color: $base-code-text-color } /* Literal.Date */
-.highlight .m { color: #0000cf; font-weight: 500 } /* Literal.Number */
-.highlight .s { color: #4e9a06 } /* Literal.String */
-.highlight .na { color: #8d8400 } /* Name.Attribute */
-.highlight .nb { color: #204a87 } /* Name.Builtin */
-.highlight .nc { color: $base-code-text-color } /* Name.Class */
-.highlight .no { color: $base-code-text-color } /* Name.Constant */
-.highlight .nd { color: #5c35cc; font-weight: 500 } /* Name.Decorator */
-.highlight .ni { color: #ce5c00 } /* Name.Entity */
-.highlight .ne { color: #cc0000; font-weight: 500 } /* Name.Exception */
-.highlight .nf { color: $base-code-text-color } /* Name.Function */
-.highlight .nl { color: #f57900 } /* Name.Label */
-.highlight .nn { color: $base-code-text-color } /* Name.Namespace */
-.highlight .nx { color: $base-code-text-color } /* Name.Other */
-.highlight .py { color: $base-code-text-color } /* Name.Property */
-.highlight .nt { color: #204a87; font-weight: 500 } /* Name.Tag */
-.highlight .nv { color: $base-code-text-color } /* Name.Variable */
-.highlight .ow { color: #204a87; font-weight: 500 } /* Operator.Word */
-.highlight .w { color: #f8f8f8; text-decoration: underline } /* Text.Whitespace */
-.highlight .mf { color: #0000cf; font-weight: 500 } /* Literal.Number.Float */
-.highlight .mh { color: #0000cf; font-weight: 500 } /* Literal.Number.Hex */
-.highlight .mi { color: #0000cf; font-weight: 500 } /* Literal.Number.Integer */
-.highlight .mo { color: #0000cf; font-weight: 500 } /* Literal.Number.Oct */
-.highlight .sb { color: #4e9a06 } /* Literal.String.Backtick */
-.highlight .sc { color: #4e9a06 } /* Literal.String.Char */
-.highlight .sd { color: #8f5902 } /* Literal.String.Doc */
-.highlight .s2 { color: #4e9a06 } /* Literal.String.Double */
-.highlight .se { color: #4e9a06 } /* Literal.String.Escape */
-.highlight .sh { color: #4e9a06 } /* Literal.String.Heredoc */
-.highlight .si { color: #4e9a06 } /* Literal.String.Interpol */
-.highlight .sx { color: #4e9a06 } /* Literal.String.Other */
-.highlight .sr { color: #4e9a06 } /* Literal.String.Regex */
-.highlight .s1 { color: #4e9a06 } /* Literal.String.Single */
-.highlight .ss { color: #4e9a06 } /* Literal.String.Symbol */
-.highlight .bp { color: #3465a4 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: $base-code-text-color } /* Name.Variable.Class */
-.highlight .vg { color: $base-code-text-color } /* Name.Variable.Global */
-.highlight .vi { color: $base-code-text-color } /* Name.Variable.Instance */
-.highlight .il { color: #0000cf; font-weight: 500 } /* Literal.Number.Integer.Long */
-
-.language-liquid {
-  .highlight .p {
-    color: #8d8400;
-  }
-  .highlight .nv {
-    color: #204a87;
-  }
-}

data/docs/package.json

@@ -1,34 +0,0 @@
-{
-  "name": "bridgetown-primer-demo",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "build": "bundle exec bridgetown build",
-    "serve": "bundle exec bridgetown serve",
-    "clean": "bundle exec bridgetown clean",
-    "webpack-build": "webpack --mode production",
-    "webpack-dev": "webpack --mode development -w",
-    "deploy": "yarn clean && yarn webpack-build && yarn build",
-    "sync": "node sync.js",
-    "start": "node start.js"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.9.0",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-decorators": "^7.10.1",
-    "@babel/plugin-transform-runtime": "^7.9.0",
-    "@babel/preset-env": "^7.9.0",
-    "babel-loader": "^8.1.0",
-    "browser-sync": "^2.26.7",
-    "concurrently": "^5.2.0",
-    "css-loader": "^3.4.2",
-    "file-loader": "^6.0.0",
-    "mini-css-extract-plugin": "^0.9.0",
-    "node-sass": "^4.13.1",
-    "sass-loader": "^8.0.2",
-    "style-loader": "^1.1.3",
-    "webpack": "^4.42.1",
-    "webpack-cli": "^3.3.11",
-    "webpack-manifest-plugin": "^2.2.0"
-  }
-}

data/docs/plugins/site_builder.rb

@@ -1,3 +0,0 @@
-class SiteBuilder < Bridgetown::Builder
-  # write builders which subclass SiteBuilder in plugins/builder
-end

data/docs/src/404.html

@@ -1,9 +0,0 @@
----
-permalink: /404.html
-layout: default
----
-
-<h1>404</h1>
-
-<p><strong>Page not found :(</strong></p>
-<p>The requested page could not be found.</p>

data/docs/src/_components/footer.liquid

@@ -1,3 +0,0 @@
-<footer>
-  <strong><a href="https://github.com/bridgetownrb/serbea">Visit the GitHub Repo ▸</a></strong>
-</footer>

data/docs/src/_components/head.liquid

@@ -1,9 +0,0 @@
-<meta charset="utf-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-{% capture page_title %}{{ title | strip_html | strip_newlines }}{% endcapture %}
-<title>{% if page_title != "" %}{{ page_title | escape }} | {{ metadata.title | escape }}{% else %}{{ metadata.title | escape }}: {{ metadata.tagline | escape }}{% endif %}</title>
-
-<meta name="description" content="{{ metadata.description }}" />
-
-<link rel="stylesheet" href="{% webpack_path css %}" />
-<script src="{% webpack_path js %}" defer></script>

data/docs/src/_components/navbar.liquid

@@ -1,5 +0,0 @@
-<nav>
-  <a href="/">Home</a>
-  <a href="/about">About</a>
-  <a href="/posts">Posts</a>
-</nav>

data/docs/src/_data/site_metadata.yml

@@ -1,11 +0,0 @@
-# Site settings
-# These are used to personalize your new site. If you look in the HTML files,
-# you will see them accessed via {{ site.metadata.title }}, {{ site.metadata.email }}, and so on.
-# You can create any custom variable you would like, and they will be accessible
-# in the templates via {{ site.metadata.myvariable }}.
-
-title: Serbea
-tagline: Similar to ERB, Except Awesomer
-email: your-email@example.com
-description: >- # this means to ignore newlines until "baseurl:"
-  The Ruby template engine you didn't realize you needed. Until now.

data/docs/src/_layouts/default.liquid

@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    {% render "head", metadata: site.metadata, title: page.title %}
-  </head>
-  <body class="{{ page.layout }} {{ page.page_class }}">
-    <main>
-      {{ content }}
-    </main>
-
-    {% render "footer", metadata: site.metadata %}
-  </body>
-</html>

data/docs/src/_layouts/home.liquid

@@ -1,13 +0,0 @@
----
-layout: default
----
-
-<h1 style="margin-bottom: 1.5rem">
-  <img src="/images/serbea-logomark.svg" alt="" style="height: 120px; vertical-align: middle;margin-bottom:20px" />
-  <img src="/images/serbea-logotype.svg" alt="Serbea" style="height: 60px; vertical-align: middle;margin-top:0px;margin-left:20px;margin-right:20px" />
-</h1>
-
-<p style="font-size: 1.5rem;text-align: center">Similar to ERB, Except Awesomer. 😉<p>
-
-
-{{ content }}

data/docs/src/_layouts/page.liquid

@@ -1,7 +0,0 @@
----
-layout: default
----
-
-<h1>{{ page.title }}</h1>
-
-{{ content }}

data/docs/src/_layouts/post.liquid

@@ -1,7 +0,0 @@
----
-layout: default
----
-
-<h1>{{ page.title }}</h1>
-
-{{ content }}

data/docs/src/images/.keep

@@ -1 +0,0 @@
-