weaver 0.8.10 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7375a43b9eb52d29c8fb980d39bc44f79366f224b401bdf47891aa736e8f2ac6
-  data.tar.gz: a9167aa2ea966bad99549e129b8662b96d71f19c841a12b817221a3116fc16d9
+  metadata.gz: 7a0c140d29a69d405a040f1daa47f216800a6d71c7fe60f5d66d1334c15b187f
+  data.tar.gz: 92c853bc946894c83ab381188ee921ca0893c44fa5c8ee0d6a1189549d61ad5c
 SHA512:
-  metadata.gz: fe06fd189428d80c8d42ff8d83cf096533eac616755462a995487b71da37488edf608f2ce8aa84f0b302e73916cd04c85c7df58a3329c4b8fa5425cdf1868733
-  data.tar.gz: 1234cac0b9e1450a0ef535d4dec82050ffd3223391d9b235d6819273725697e9a72f8aae53097651a50165245985d7684464e1b46327a410b92b643afb7d95c5
+  metadata.gz: 9f60ed4d8ba97f27cef892f147a4151fa14bb83d9a675d5b965a652e8d2a6f855af94d721a2e2465a7e436f6e6737c8c6cb35801e587c890628da3271e6ccb6a
+  data.tar.gz: e74417a0256eabb9ab41d351418df8bae7d1522e949ad4462d21ef52897806d17550e7ba79357afbc404c010a9626eb4ebd327944c81585380137654bee4b097

data/exe/weaver

@@ -7,7 +7,7 @@ require 'sinatra/base'
 
 class Website < Sinatra::Base
   set :static, true # set up static file routing
-  set :public_folder, File.join(Gem.loaded_specs['weaver'].full_gem_path, 'data', 'weaver')	# set up the static dir (with images/js/css inside)
+  set :public_folder, File.join(Gem.loaded_specs['weaver'].full_gem_path, 'data', 'weaver') # set up the static dir (with images/js/css inside)
   set :bind, '0.0.0.0'
   set :port, ENV['PORT'] || 4567
 
@@ -63,6 +63,7 @@ class Website < Sinatra::Base
       if site.pages.key?(path)
 
         level = viewname.split(%r{/}, 0).length
+        content_type 'text/css' if path.end_with?('.css')
         site.pages[path].generate(level)
 
       else
@@ -95,19 +96,19 @@ def build!(_args)
 
   buildDir = "#{Dir.pwd}/build"
 
-  cp_r_options = { preserve: true }
+  preserve = true
 
   FileUtils.rm_rf buildDir
-  FileUtils.cp_r(File.join(Gem.loaded_specs['weaver'].full_gem_path, 'data', 'weaver'), buildDir, cp_r_options)
-  FileUtils.cp_r('images', buildDir, cp_r_options) if Dir.exist? 'images'
+  FileUtils.cp_r(File.join(Gem.loaded_specs['weaver'].full_gem_path, 'data', 'weaver'), buildDir, preserve: preserve)
+  FileUtils.cp_r('images', buildDir, preserve: preserve) if Dir.exist? 'images'
   if Dir.exist? 'js'
     Dir['js/*.*'].each do |x|
-      FileUtils.cp_r(x, File.join(buildDir, 'js'), cp_r_options)
+      FileUtils.cp_r(x, File.join(buildDir, 'js'), preserve: preserve)
     end
   end
   if Dir.exist? 'css'
     Dir['css/*.*'].each do |x|
-      FileUtils.cp_r(x, File.join(buildDir, 'css'), cp_r_options)
+      FileUtils.cp_r(x, File.join(buildDir, 'css'), preserve: preserve)
     end
   end
 

data/lib/weaver/element_types/code.rb

@@ -2,11 +2,11 @@
 
 module Weaver
   class Code
-    def initialize(page, anchors, lang)
+    def initialize(page, anchors, lang, options={})
       @page = page
       @anchors = anchors
       @content = ''
-      @options = {}
+      @options = options
 
       codeArray = @anchors['code']
 

data/lib/weaver/element_types/dynamic_table.rb

@@ -281,7 +281,7 @@ module Weaver
         DATATABLE_SCRIPT
 
         @page.onload_scripts << <<-SCRIPT
-        				SCRIPT
+        SCRIPT
       end
 
       method_missing(:table, table_options, &block)

data/lib/weaver/element_types/form_elements.rb

@@ -64,14 +64,18 @@ module Weaver
          end
 
         div "class": div_class do
-          span (options[:front_text]).to_s, class: 'input-group-addon' if options[:front_text]
+          if options[:front_text]
+            span (options[:front_text]).to_s, class: 'input-group-addon'
+          end
           if input_options[:rows] && (input_options[:rows] > 1)
             textarea input_options do
             end
           else
             input input_options
           end
-          span (options[:back_text]).to_s, class: 'input-group-addon' if options[:back_text]
+          if options[:back_text]
+            span (options[:back_text]).to_s, class: 'input-group-addon'
+          end
         end
       end
 

data/lib/weaver/element_types/panel.rb

@@ -23,7 +23,7 @@ module Weaver
           panel: { outer: 'panel panel-default', header: 'panel-heading', body: 'panel-body', footer: 'panel-footer' },
           primary: { outer: 'panel panel-primary', header: 'panel-heading', body: 'panel-body', footer: 'panel-footer' },
           success: { outer: 'panel panel-success', header: 'panel-heading', body: 'panel-body', footer: 'panel-footer' },
-          info: { outer: 'panel panel-info',	header: 'panel-heading', body: 'panel-body', footer: 'panel-footer' },
+          info: { outer: 'panel panel-info', header: 'panel-heading', body: 'panel-body', footer: 'panel-footer' },
           warning: { outer: 'panel panel-warning', header: 'panel-heading', body: 'panel-body', footer: 'panel-footer' },
           danger: { outer: 'panel panel-danger', header: 'panel-heading', body: 'panel-body', footer: 'panel-footer' },
           blank: { outer: 'panel blank-panel', header: 'panel-heading', body: 'panel-body', footer: 'panel-footer' }

data/lib/weaver/elements.rb

@@ -20,7 +20,6 @@ module Weaver
       end
 
       if !inner
-
         options = args[0] || []
         opts = options.map { |key, value| "#{key}=\"#{value}\"" }.join ' '
 
@@ -116,8 +115,8 @@ module Weaver
       @inner_content << tabs.generate
     end
 
-    def syntax(lang = :javascript, &block)
-      code = Code.new(@page, @anchors, lang)
+    def syntax(lang = :javascript, options = {}, &block)
+      code = Code.new(@page, @anchors, lang, options)
       code.instance_eval(&block)
 
       @inner_content << code.generate
@@ -132,7 +131,9 @@ module Weaver
       elsif options[:rounded_corners] == :top
         style += ' border-radius: 8px 8px 0px 0px'
       else
-        style += " border-radius: #{options[:rounded_corners]}px" if options[:rounded_corners]
+        if options[:rounded_corners]
+          style += " border-radius: #{options[:rounded_corners]}px"
+        end
 
       end
 
@@ -309,7 +310,9 @@ module Weaver
 
         action = Action.new(@page, @anchors, &block)
         buttonOptions[:onclick] = "#{action.name}(this)"
-        buttonOptions[:onclick] = "#{action.name}(this, #{options[:data]})#{closer}" if options[:data]
+        if options[:data]
+          buttonOptions[:onclick] = "#{action.name}(this, #{options[:data]})#{closer}"
+        end
         @page.scripts << action.generate
       end
 

data/lib/weaver/page_types/page.rb

@@ -99,7 +99,9 @@ module Weaver
       body_tag = "<body class='#{@body_class}'>" if @body_class
 
       loading_bar = ''
-      loading_bar = "<script src='#{mod}js/plugins/pace/pace.min.js'></script>" if @loading_bar_visible
+      if @loading_bar_visible
+        loading_bar = "<script src='#{mod}js/plugins/pace/pace.min.js'></script>"
+      end
 
       extra_scripts = @requested_scripts.map do |key, _value|
         <<-SCRIPT_DECL

data/lib/weaver/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Weaver
-  VERSION = '0.8.10'
+  VERSION = '0.8.12'
 end

data/weaver.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'optimist'
-  spec.add_dependency 'sinatra', '~> 2.0.3'
+  spec.add_dependency 'rackup'
+  spec.add_dependency 'sinatra', '~> 4'
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weaver
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.12
 platform: ruby
 authors:
 - David Siaw
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rackup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
+        version: '4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -31339,71 +31339,6 @@ files:
 - data/weaver/js/plugins/rickshaw/rickshaw.min.js
 - data/weaver/js/plugins/rickshaw/vendor/d3.v3.js
 - data/weaver/js/plugins/select2/select2.full.min.js
-- data/weaver/js/plugins/skeuocard/Gruntfile.coffee
-- data/weaver/js/plugins/skeuocard/LICENSE
-- data/weaver/js/plugins/skeuocard/README.md
-- data/weaver/js/plugins/skeuocard/bower.json
-- data/weaver/js/plugins/skeuocard/fonts/ocra-webfont.eot
-- data/weaver/js/plugins/skeuocard/fonts/ocra-webfont.svg
-- data/weaver/js/plugins/skeuocard/fonts/ocra-webfont.ttf
-- data/weaver/js/plugins/skeuocard/fonts/ocra-webfont.woff
-- data/weaver/js/plugins/skeuocard/images/card-flip-arrow.png
-- data/weaver/js/plugins/skeuocard/images/card-front-background.png
-- data/weaver/js/plugins/skeuocard/images/card-invalid-indicator.png
-- data/weaver/js/plugins/skeuocard/images/card-valid-anim.gif
-- data/weaver/js/plugins/skeuocard/images/card-valid-indicator.png
-- data/weaver/js/plugins/skeuocard/images/error-pointer.png
-- data/weaver/js/plugins/skeuocard/images/issuers/visa-chase-sapphire.png
-- data/weaver/js/plugins/skeuocard/images/issuers/visa-simple-front.png
-- data/weaver/js/plugins/skeuocard/images/products/amex-front.png
-- data/weaver/js/plugins/skeuocard/images/products/dinersclubintl-front.png
-- data/weaver/js/plugins/skeuocard/images/products/discover-front.png
-- data/weaver/js/plugins/skeuocard/images/products/generic-back.png
-- data/weaver/js/plugins/skeuocard/images/products/generic-front.png
-- data/weaver/js/plugins/skeuocard/images/products/jcb-front.png
-- data/weaver/js/plugins/skeuocard/images/products/maestro-front.png
-- data/weaver/js/plugins/skeuocard/images/products/mastercard-front.png
-- data/weaver/js/plugins/skeuocard/images/products/unionpay-front.png
-- data/weaver/js/plugins/skeuocard/images/products/visa-back.png
-- data/weaver/js/plugins/skeuocard/images/products/visa-front.png
-- data/weaver/js/plugins/skeuocard/images/src/card-front-background.fw.png
-- data/weaver/js/plugins/skeuocard/images/src/error-pointer.png
-- data/weaver/js/plugins/skeuocard/images/src/product-amex-front.fw.png
-- data/weaver/js/plugins/skeuocard/images/src/product-dinersclub-front.fw.png
-- data/weaver/js/plugins/skeuocard/images/src/product-discover-front.fw.png
-- data/weaver/js/plugins/skeuocard/images/src/product-generic-front.fw.png
-- data/weaver/js/plugins/skeuocard/images/src/product-jcb-front.fw.png
-- data/weaver/js/plugins/skeuocard/images/src/product-maestro-front.fw.png
-- data/weaver/js/plugins/skeuocard/images/src/product-mastercard-front.fw.png
-- data/weaver/js/plugins/skeuocard/images/src/product-unionpay-front.fw.png
-- data/weaver/js/plugins/skeuocard/images/src/product-visa-front.fw.png
-- data/weaver/js/plugins/skeuocard/index.html
-- data/weaver/js/plugins/skeuocard/javascripts/skeuocard.js
-- data/weaver/js/plugins/skeuocard/javascripts/skeuocard.min.js
-- data/weaver/js/plugins/skeuocard/javascripts/src/CardProduct.coffee
-- data/weaver/js/plugins/skeuocard/javascripts/src/ExpirationInputView.coffee
-- data/weaver/js/plugins/skeuocard/javascripts/src/FlipTabView.coffee
-- data/weaver/js/plugins/skeuocard/javascripts/src/SegmentedCardNumberInputView.coffee
-- data/weaver/js/plugins/skeuocard/javascripts/src/Skeuocard.coffee
-- data/weaver/js/plugins/skeuocard/javascripts/src/TextInputView.coffee
-- data/weaver/js/plugins/skeuocard/javascripts/vendor/cssua.min.js
-- data/weaver/js/plugins/skeuocard/javascripts/vendor/demo.fix.js
-- data/weaver/js/plugins/skeuocard/javascripts/vendor/jquery-2.0.3.min.js
-- data/weaver/js/plugins/skeuocard/package-lock.json
-- data/weaver/js/plugins/skeuocard/package.json
-- data/weaver/js/plugins/skeuocard/screenshot.png
-- data/weaver/js/plugins/skeuocard/styles/demo.css
-- data/weaver/js/plugins/skeuocard/styles/demo.css.map
-- data/weaver/js/plugins/skeuocard/styles/skeuocard.css
-- data/weaver/js/plugins/skeuocard/styles/skeuocard.css.map
-- data/weaver/js/plugins/skeuocard/styles/skeuocard.reset.css
-- data/weaver/js/plugins/skeuocard/styles/skeuocard.reset.css.map
-- data/weaver/js/plugins/skeuocard/styles/src/_browser_hacks.scss
-- data/weaver/js/plugins/skeuocard/styles/src/_cards.scss
-- data/weaver/js/plugins/skeuocard/styles/src/_util.scss
-- data/weaver/js/plugins/skeuocard/styles/src/demo.scss
-- data/weaver/js/plugins/skeuocard/styles/src/skeuocard.reset.scss
-- data/weaver/js/plugins/skeuocard/styles/src/skeuocard.scss
 - data/weaver/js/plugins/slick/slick.min.js
 - data/weaver/js/plugins/slimscroll/jquery.slimscroll.js
 - data/weaver/js/plugins/slimscroll/jquery.slimscroll.min.js
@@ -31460,7 +31395,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -31475,11 +31410,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Website generator
 test_files:
-- spec/weaver_spec.rb
 - spec/spec_helper.rb
+- spec/weaver_spec.rb

data/data/weaver/js/plugins/skeuocard/Gruntfile.coffee

@@ -1,74 +0,0 @@
-# Thanks to Jackson Gariety (https://github.com/jacksongariety/) for
-# contributing the initial version of this Gruntfile.
-
-module.exports = (grunt) ->
-  path = require('path')
-  # Configure plugins
-  grunt.initConfig
-
-    express:
-      all:
-        options:
-          port: 8000
-          hostname: "0.0.0.0"
-          bases: [path.resolve(__dirname, '.')]
-
-    open:
-      all:
-        path: 'http://localhost:<%= express.all.options.port%>'
-
-    coffee:
-      all:
-        options:
-          join: true
-        files:
-          "./javascripts/skeuocard.js": [
-            "./javascripts/src/Skeuocard.coffee",
-            "./javascripts/src/FlipTabView.coffee",
-            "./javascripts/src/SegmentedCardNumberInputView.coffee",
-            "./javascripts/src/ExpirationInputView.coffee",
-            "./javascripts/src/TextInputView.coffee",
-            "./javascripts/src/CardProduct.coffee"
-          ]
-
-    sass:
-      all:
-        options:
-          style: 'compressed'
-        files:
-          "./styles/skeuocard.reset.css": "./styles/src/skeuocard.reset.scss"
-          "./styles/skeuocard.css": "./styles/src/skeuocard.scss"
-          "./styles/demo.css": "./styles/src/demo.scss"
-
-    uglify:
-      all:
-        options:
-          mangle: false # don't change function names
-        files:
-          "./javascripts/skeuocard.min.js": "./javascripts/skeuocard.js"
-
-    watch:
-      all:
-        files: [
-          "./javascripts/src/*.coffee"
-          "./styles/src/*.scss"
-        ]
-        tasks: ["coffee", "sass", "uglify"]
-        options:
-          livereload: true
-
-
-  # Load plugins
-  grunt.loadNpmTasks "grunt-contrib-watch"
-  grunt.loadNpmTasks "grunt-contrib-coffee"
-  grunt.loadNpmTasks "grunt-contrib-sass"
-  grunt.loadNpmTasks "grunt-contrib-uglify"
-  grunt.loadNpmTasks "grunt-open"
-  grunt.loadNpmTasks "grunt-express"
-
-  # Default task
-  grunt.registerTask "default", [
-    "express",
-    "open",
-    "watch"
-  ]

data/data/weaver/js/plugins/skeuocard/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Ken Keiter <ken@kenkeiter.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.