meetup-generator 0.0.20210128 → 1.2.84

data/lib/build_helpers.rb

@@ -0,0 +1,9 @@
+require_relative 'version'
+
+def gem_version
+  format('%s.%s', BASE_VERSION, build_number)
+end
+
+def build_number
+  ENV['TRAVIS_BUILD_NUMBER'] || 0
+end

data/lib/meetup-generator.rb

@@ -0,0 +1,63 @@
+require 'json'
+require 'yaml'
+
+# Everything needed for a meetup generator
+#
+class MeetupGenerator
+  attr_reader :words, :lib, :unused_templates
+
+  def initialize
+    grep, dict = find_unix_stuff
+    @words = `#{grep} "^[a-z]*$" #{dict}`.split("\n")
+    @lib = YAML.load_file(ROOT + 'lib' + 'all_the_things.yaml')
+  end
+
+  def find_unix_stuff
+    case RUBY_PLATFORM
+    when /solaris/
+      %w[/bin/grep /usr/share/lib/dict/words]
+    when /linux/
+      %w[/bin/grep /usr/share/dict/words]
+    when /darwin/
+      %w[/usr/bin/grep /usr/share/dict/words]
+    else
+      abort "unsupported platform: #{RUBY_PLATFORM}"
+    end
+  end
+
+  def title
+    @unused_templates ||= lib[:template].dup
+    t = unused_templates.sample
+    unused_templates.delete(t)
+    t.scan(/%\w+%/).each { |k| t = t.sub(k, lib[k[1..-2].to_sym].sample) }
+    t.scan(/RAND\d+/).each do |i|
+      t = t.sub(i, rand(2..(i.sub(/RAND/, '').to_i)).to_s)
+    end
+    t
+  end
+
+  def talks(count = 5)
+    @unused_templates = lib[:template].dup
+    count.times.with_object([]) { |_i, a| a.<< title }
+  end
+
+  def talker
+    lib[:first_name].sample + ' ' + lib[:last_name].sample
+  end
+
+  def role
+    lib[:job_role].sample + ' ' + lib[:job_title].sample
+  end
+
+  def company
+    words.sample.sub(/([^aeiou])er$/, '\\1r').downcase + '.io'
+  end
+
+  def refreshment
+    lib[:food_style].sample + ' ' + lib[:food].sample
+  end
+
+  def talk
+    { talk: talks(1)[0], talker: talker, role: role, company: company }
+  end
+end

data/lib/version.rb

@@ -0,0 +1,4 @@
+# We define the major and minor here. The patch version comes from
+# the Travis build number
+#
+BASE_VERSION = '1.2'.freeze

data/meetup-generator.gemspec

@@ -1,13 +1,11 @@
-# frozen_string_literal: true
-
+require 'pathname'
 require 'date'
-
-# Github actions sets the RELEASE_VERSION environment variable
+require 'English'
+require_relative 'lib/build_helpers'
 
 Gem::Specification.new do |gem|
   gem.name          = 'meetup-generator'
-  gem.version       = ENV['RELEASE_VERSION'] ||
-                      "0.0.#{Time.now.strftime('%Y%m%d')}"
+  gem.version       = gem_version
   gem.date          = Date.today.to_s
 
   gem.summary       = 'Stupid fatuous random string generatpr'
@@ -15,29 +13,23 @@ Gem::Specification.new do |gem|
                       'DevOps meetup, using all the latest buzzwords, ' \
                       'new-shiny, and clichés'
   gem.authors       = ['Robert Fisher']
-  gem.email         = 'rob@sysdef.xyz'
+  gem.email         = 'slackboy@gmail.com'
   gem.homepage      = 'https://github.com/snltd/meetup-generator'
   gem.license       = 'BSD-2-Clause'
 
-  gem.bindir        = 'bin'
-  gem.executables   = ['meetup-generator.rb', 'locate_meetup-generator']
-  gem.files         = IO.readlines('package/runtime_files', chomp: true)
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.test_files    = gem.files.grep(%r{^spec/})
-  gem.require_paths = %w[lib]
 
-  gem.add_runtime_dependency 'puma', '~> 5.1'
-  gem.add_runtime_dependency 'sinatra', '~>2.1'
-  gem.add_runtime_dependency 'slim', '~> 4.1'
+  gem.add_runtime_dependency 'sinatra', '~>2.0', '>= 2.0.1'
+  gem.add_runtime_dependency 'slim', '~> 3.0', '>= 3.0.0'
+  gem.add_runtime_dependency 'puma', '~> 3.11', '>= 3.11.0'
 
-  gem.add_development_dependency 'bundler', '~> 2.0'
-  gem.add_development_dependency 'minitest', '~> 5.14'
-  gem.add_development_dependency 'nokogiri', '~> 1.10'
-  gem.add_development_dependency 'rack-test', '~> 1.1'
-  gem.add_development_dependency 'rake', '~> 13.0'
-  gem.add_development_dependency 'rubocop', '~> 1.9'
-  gem.add_development_dependency 'rubocop-minitest', '~> 0.10'
-  gem.add_development_dependency 'rubocop-performance', '~> 1.3'
-  gem.add_development_dependency 'rubocop-rake', '~> 0.5'
+  gem.add_development_dependency 'bundler', '~> 1.3'
+  gem.add_development_dependency 'minitest', '~> 5.11', '>= 5.11.0'
+  gem.add_development_dependency 'nokogiri', '~> 1.8', '>= 1.8.0'
+  gem.add_development_dependency 'rack-test', '~> 0.8', '>= 0.8.0'
+  gem.add_development_dependency 'rake', '~> 12.3', '>= 12.3.0'
+  gem.add_development_dependency 'rubocop', '~> 0.52', '>= 0.52.0'
 
-  gem.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  gem.required_ruby_version = Gem::Requirement.new('>= 2.2.0')
 end

data/public/css/main.css

@@ -11,15 +11,11 @@ body {
   line-height: 120%;
 }
 
-.indent {
+.tperson {
   font-size: small;
   margin-left: 12em;
 }
 
-.indent a {
-  color: #0f0;
-}
-
 ul {
   list-style: none;
 }
@@ -31,6 +27,7 @@ li {
 }
 
 .ttitle {
+  /*font-style: italic;*/
   font-weight: bold;
   background-color: #0ff;
   color: #000;

data/spec/acceptance_spec.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
-
+#
+# Acceptance tests for the meetup generator. Yeah, I know.
+#
 %w[minitest minitest/unit minitest/autorun rack/test pathname json
    yaml cgi nokogiri].each { |f| require f }
 
@@ -8,25 +9,21 @@ MGROOT = Pathname.new(__FILE__).realpath.dirname.parent
 
 OUTER_APP = Rack::Builder.parse_file((MGROOT + 'config.ru').to_s).first
 
-# Acceptance tests for the meetup generator. Yeah, I know.
-#
 class TestApp < MiniTest::Test
   attr_reader :things
-
   include Rack::Test::Methods
 
   def initialize(args)
     super(args)
-    @things = YAML.safe_load(IO.read(MGROOT + 'lib' + 'all_the_things.yaml'),
-                             symbolize_names: true)
+    @things = YAML.load_file(MGROOT + 'lib' + 'all_the_things.yaml')
   end
 
   def app
     OUTER_APP
   end
 
-  # Load the page a thousand times and make sure no talk titles
-  # occur twice
+  # Load the page 1000 times and make sure no talk titles occur
+  # twice
   #
   def test_no_repeats
     1000.times do
@@ -36,80 +33,54 @@ class TestApp < MiniTest::Test
     end
   end
 
-  # Get all of the templates used to generate talk titles, and
-  # re-run the test until we've seen them all. Then we know no
-  # template causes a crash. That's good enough.
-  #
   def test_default
+    #
+    # Get all of the templates used to generate talk titles, and re-run
+    # the test until we've seen them all. Then we know no template
+    # causes a crash. That's good enough.
+    #
     templates = things[:template].map do |t|
       escaped = Regexp.escape(CGI.escapeHTML(t))
-      matcher = escaped.gsub(/%\w+%/, '[\w\-]+').gsub(/RAND\d+/, '\d+')
-                       .gsub(/FNOPS/, '\w+')
+      matcher = escaped.gsub(/%\w+%/, '\w+').gsub(/RAND\d+/, '\d+')
       Regexp.new('^.*ttitle">' + matcher + '</span>.*$')
     end
 
     until templates.empty?
       get '/'
-      assert_equal('text/html;charset=utf-8',
-                   last_response.header['Content-Type'])
-      last_response.ok?
-      resp = last_response.body
-      assert_match(/The code./, resp)
-      assert_match(/DevOps Meetup/, resp)
-      templates.each { |t| templates.delete(t) if resp.match?(t) }
+      assert last_response.ok?
+      assert last_response.header['Content-Type'] == 'text/html;charset=utf-8'
+      x = last_response.body
+      assert_match(/The code./, x)
+      assert_match(/DevOps Meetup/, x)
+      templates.each { |t| templates.delete(t) if x.match(t) }
     end
   end
 
-  def test_api_talker
-    get format('/api/talker')
-    assert last_response.ok?
-    assert_instance_of(String, last_response.body)
-    assert_match(/^"\w+ \w+"$/, last_response.body)
-    assert last_response.header['Content-Type'] == 'application/json'
-  end
-
-  def test_api_company
-    get format('/api/company')
+  def test_api_talk
+    get '/api/talk'
     assert last_response.ok?
-    assert_instance_of(String, last_response.body)
-    assert_match(/^"\w+.io"$/, last_response.body)
     assert last_response.header['Content-Type'] == 'application/json'
+    resp = last_response.body
+    refute_empty resp
+    j = JSON.parse(resp)
+    fields = %w[talk talker role company]
+    assert_equal(j.keys, fields)
+    fields.each { |f| refute_empty j[f] }
+    name = j['talker'].split
+    assert_includes(things[:first_name], name.first)
+    assert_includes(things[:last_name], name.last)
+    assert j['company'].end_with?('.io')
   end
 
   def test_api_misc
-    %w[title role refreshment location date].each do |word|
-      get format('/api/%<word>s', word: word)
+    %w[title talker company role refreshment].each do |word|
+      get format('/api/%s', word)
       assert last_response.ok?
-      assert_instance_of(String, last_response.body)
       assert last_response.header['Content-Type'] == 'application/json'
     end
   end
 
-  def test_api_talk
-    get format('/api/talk')
-    assert last_response.ok?
-    assert_instance_of(String, last_response.body)
-    as_obj = JSON.parse(last_response.body, symbolize_names: true)
-    assert_equal(%i[title talker role company], as_obj.keys)
-  end
-
-  def test_api_agenda
-    get format('/api/agenda')
-    assert last_response.ok?
-    assert_instance_of(String, last_response.body)
-    agenda = JSON.parse(last_response.body, symbolize_names: true)
-    assert_equal(%i[date location refreshment talks], agenda.keys.sort)
-
-    agenda[:talks].each do |t|
-      assert_equal(%i[title talker role company], t.keys)
-    end
-
-    assert_instance_of(String, agenda[:refreshment])
-    assert_instance_of(String, agenda[:date])
-    assert_instance_of(String, agenda[:location])
-  end
-
-  def test_api_not_found
+  def test_api_404
     get '/api/no_such_thing'
     assert_equal(last_response.status, 404)
   end

data/spec/unit_spec.rb

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+
+require 'minitest/autorun'
+require_relative '../lib/meetup-generator'
+
+THINGS = { food_style: %w[artisan],
+           food:       %w[flatbread],
+           first_name: %w[John],
+           last_name:  %w[Smith],
+           job_role:   %w[Neckbeard],
+           job_title:  ['Without Portfolio'],
+           tech:       %w[Ruby],
+           template:   ['RAND20 %tech% things'] }.freeze
+
+class Giblets < MeetupGenerator
+  def initialize; end
+end
+
+class GibletsTest < MiniTest::Test
+  attr_reader :m
+
+  def setup
+    @m = Giblets.new
+    m.instance_variable_set(:@lib, THINGS)
+  end
+
+  def test_title
+    x = m.title
+    assert_instance_of(String, x)
+    assert !x.empty?
+    refute_match(/%\w+%/, x)
+    refute_match(/RAND/, x)
+  end
+
+  def test_talk
+    x = m.talks(1)
+    assert_instance_of(Array, x)
+    assert_instance_of(String, x.first)
+    toks = x.first.split
+    number = toks.first.to_i
+    assert number > 0
+    assert number <= 20
+    assert_equal('Ruby', toks[1])
+    assert_equal('things', toks[2])
+  end
+
+  def test_talker
+    assert_equal(m.talker, 'John Smith')
+  end
+
+  def test_role
+    assert_equal(m.role, 'Neckbeard Without Portfolio')
+  end
+
+  def test_company_no_e
+    m.instance_variable_set(:@words, %w[leadswinger])
+    assert_equal(m.company, 'leadswingr.io')
+  end
+
+  def test_company
+    m.instance_variable_set(:@words, %w[Cabbage])
+    assert_equal(m.company, 'cabbage.io')
+  end
+
+  def test_refreshment
+    assert_equal(m.refreshment, 'artisan flatbread')
+  end
+end

data/views/default.slim

@@ -7,42 +7,42 @@ html
 
   body
     #container
-      h1
-        ' #DevOps Meetup //
-        => @agenda[:location]
-        ' //
-        == @agenda[:date]
+      h1 #DevOps Meetup // Shoreditch, probably // #{(Date.today + 1).strftime("%d/%m/%Y")}
 
       ul
         li 18:00 // Introduction
 
         li
           ' 18:10 // Lightning talk //
-          == slim :partial_talk
+          span.ttitle=@talks.pop
+          .tperson=@jobs.pop
 
         li
           ' 18:20 //
-          == slim :partial_talk
+          span.ttitle=@talks.pop
+          .tperson=@jobs.pop
 
-        li
-          ' 18:50 // break
-          .indent=@agenda[:refreshment]
+        li 18:50 // break
+        .tperson=@food
 
         li
           ' 19:20 //
-          == slim :partial_talk
+          span.ttitle=@talks.pop
+          .tperson=@jobs.pop
 
         li
           ' 19:40 // Ignite //
-          == slim :partial_talk
+          span.ttitle=@talks.pop
+          .tperson=@jobs.pop
 
         li
           ' 20:00 //
-          == slim :partial_talk
+          span.ttitle=@talks.pop
+          .tperson=@jobs.pop
 
         li
           ' 20:30 // Close
-          .indent Everyone is hiring, but no one's paying
+          .tperson Everyone is hiring, but no one's paying
 
       #footer
         a href='https://github.com/snltd/meetup-generator' The code.

data/{package/meetup-generator.xml → website.xml}

@@ -5,7 +5,7 @@
 <service_bundle type='manifest' name='snltd:sinatra:meetup-generator'>
 
 <service
-  name='sysdef/meetup-generator'
+  name='application/sinatra/meetup-generator'
 	type='service'
 	version='1'>
 
@@ -90,7 +90,7 @@
 	</common_name>
 
 	<documentation>
-    <doc_link name='meetup.sysdef.xyz' uri='http://meetup.sysdef.xyz' />
+    <doc_link name='meetup.rfisher.co.uk' uri='http://meetup.rdfisher.co.uk' />
 	</documentation>
 
 </template>