lurker 0.6.12 → 1.0.0

data/features/multitype_request_support.feature

@@ -60,8 +60,6 @@ Feature: multitype request support
   Scenario: json schema tests response parameters and update request parameters using "users/update"
     Given a file named "spec/controllers/api/v2/users_controller_spec.rb" with:
       """ruby
-        require "spec_helper"
-
         describe Api::V2::UsersController, :lurker do
           render_views
 
@@ -70,7 +68,7 @@ Feature: multitype request support
           end
 
           it "updates a user surname as string" do
-            patch :update, id: user.id, user: { surname: 'Marley' }
+            patch :update, params: { id: user.id, user: { surname: 'Marley' } }
             expect(response).to be_success
           end
         end

data/features/partials.feature

@@ -65,8 +65,6 @@ Feature: partials
 
     Given a file named "spec/requests/repo_creation_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::ReposController, :lurker do
         let!(:user) do
           User.where(name: 'razum2um').first_or_create!
@@ -74,7 +72,7 @@ Feature: partials
 
         it "creates a new repo" do
           expect {
-            post "/api/v1/users/#{user.id}/repos.json", repo: { name: 'new-gem' }
+            post "/api/v1/users/#{user.id}/repos.json", params: { repo: { name: 'new-gem' } }
             expect(response).to be_success
             expect(JSON.parse(response.body)['user']).to eq JSON.parse(user.to_json)
           }.to change { Repo.count } .by(1)
@@ -91,7 +89,7 @@ Feature: partials
             Converting lurker to html
      using  lurker
 
-    create  public/lurker/index.html
-    create  public/lurker/api/v1/users/__user_id/repos-POST.html
+    public/lurker/index.html
+    public/lurker/api/v1/users/__user_id/repos-POST.html
     """
 

data/features/request_nested_schema_scaffolding.feature

@@ -5,8 +5,6 @@ Feature: request nested schema scaffolding
   Scenario: scaffold a json schema for a "repos/show" in a nested controller spec
     Given a file named "spec/requests/repos_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::ReposController, :lurker do
         let!(:user) do
           User.where(name: 'razum2um').first_or_create!.tap do |u|

data/features/request_schema_scaffolding.feature

@@ -7,8 +7,6 @@ Feature: request schema scaffolding
   Scenario: scaffold a json schema for a "users/index" in request spec
     Given a file named "spec/requests/users_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::UsersController, :lurker do
         let!(:user) do
           User.where(name: 'razum2um', surname: 'Marley').first_or_create!

data/features/schema_suffixes.feature

@@ -50,8 +50,6 @@ Feature: schema suffixes
       """
     And a file named "spec/requests/updating_repos_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::ReposController, :lurker, type: :request do
 
         let(:user) do
@@ -64,7 +62,7 @@ Feature: schema suffixes
 
         it "updates a repo name" do
           expect {
-            patch "/api/v1/users/#{user.name}/repos/#{repo.name}.json", repo: { name: 'updated-name' }
+            patch "/api/v1/users/#{user.name}/repos/#{repo.name}.json", params: { repo: { name: 'updated-name' } }
             expect(response).to be_success
           }.to change { repo.reload.name } .from('lurker').to('updated-name')
         end
@@ -115,8 +113,6 @@ Feature: schema suffixes
       """
     And a file named "spec/requests/failed_updating_repos_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::ReposController, type: :request do
 
         let(:user) do
@@ -129,7 +125,7 @@ Feature: schema suffixes
 
         it "fails to update a repo with a blank name", lurker: 'failed' do
           expect {
-            patch "/api/v1/users/#{user.name}/repos/#{repo.name}.json", repo: { name: '' }
+            patch "/api/v1/users/#{user.name}/repos/#{repo.name}.json", params: { repo: { name: '' } }
             expect(response).not_to be_success
           }.not_to change { repo.reload.name }
         end

data/features/schema_updating_within_test_suite.feature

@@ -62,8 +62,6 @@ Feature: schema updating within test suite
   Scenario: json schema tests response parameters and request parameters and show errors from both using "users/update"
   Given a file named "spec/controllers/api/v2/users_controller_blank_spec.rb" with:
     """ruby
-      require "spec_helper"
-
       describe Api::V2::UsersController, :lurker do
         render_views
 
@@ -72,7 +70,7 @@ Feature: schema updating within test suite
         end
 
         it "updates a user surname as string" do
-          patch :update, id: user.id, user: { name: '', surname: 'Marley' }
+          patch :update, params: { id: user.id, user: { name: '', surname: 'Marley' } }
           expect(response).not_to be_success
         end
       end
@@ -93,8 +91,6 @@ Feature: schema updating within test suite
   Scenario: json schema tests response parameters and update request parameters using "users/update"
   Given a file named "spec/controllers/api/v2/users_controller_spec.rb" with:
     """ruby
-      require "spec_helper"
-
       describe Api::V2::UsersController, :lurker do
         render_views
 
@@ -103,7 +99,7 @@ Feature: schema updating within test suite
         end
 
         it "updates a user surname as string" do
-          patch :update, id: user.id, user: { surname: 'Marley' }
+          patch :update, params: { id: user.id, user: { surname: 'Marley' } }
           expect(response).to be_success
         end
       end

data/features/step_definitions/additional_cli_steps.rb

@@ -2,17 +2,14 @@ Given /^a checked file "([^"]*)" with:$/ do |file_name, file_content|
   write_file(file_name, file_content)
 
   @files ||= {}
-  in_current_dir { @files[md5(file_name)] = checksum(file_name) }
-end
-
-Given /^an empty directory named "([^"]*)"$/ do |dir_name|
-  in_current_dir { _rm_rf(dir_name) }
-  create_dir(dir_name)
+  in_current_directory { @files[md5(file_name)] = checksum(file_name) }
 end
 
 Given /^a service file with:$/ do |file_content|
-  in_current_dir do
-    write_file("#{Lurker::DEFAULT_SERVICE_PATH}/#{Rails.application.class.parent_name}#{Lurker::Service::SUFFIX}", file_content)
+  in_current_directory do
+    rails_app_class = Rails.application.class
+    rails_app_name = rails_app_class.respond_to?(:module_parent_name) ? rails_app_class.module_parent_name : rails_app_class.parent_name
+    write_file("#{Lurker::DEFAULT_SERVICE_PATH}/#{rails_app_name}#{Lurker::Service::SUFFIX}", file_content)
   end
 end
 
@@ -83,7 +80,7 @@ end
 Then /^the output should contain (failures|these lines):$/ do |_, lines|
   out = all_output.dup
   lines.split(/\n/).map(&:strip).each do |line|
-    next if line.blank?
+    next if line.strip!.blank?
     expect(out).to match /#{Regexp.escape(line)}/
     out.gsub!(/.*?#{Regexp.escape(line)}/m, '')
   end
@@ -105,13 +102,13 @@ Then(/^I should see JSON response with "([^"]*)"$/) do |name|
 end
 
 Then /(?:a|the) checked file "([^"]*)" should not change$/ do |file_name|
-  in_current_dir do
+  in_current_directory do
     expect(@files.try(:[], md5(file_name))).to eq checksum(file_name)
   end
 end
 
 Then /(?:a|the) checked file "([^"]*)" should change$/ do |file_name|
-  in_current_dir do
+  in_current_directory do
     expect(@files.try(:[], md5(file_name))).not_to eq checksum(file_name)
   end
 end

data/features/support/env.rb

@@ -6,11 +6,19 @@ SimpleCov.start do
   end
 end
 
+def relative_example_path
+  if rails_version = ENV['BUNDLE_GEMFILE'].to_s.match(/rails_\d+/)
+    "tmp/lurker_app_#{rails_version}"
+  else
+    raise "Export BUNDLE_GEMFILE=gemfiles/rails... explicitly"
+  end
+end
+
 def example_path
-  if rails_version = ENV['BUNDLE_GEMFILE'].to_s.match(/rails_\d\d/)
+  if rails_version = ENV['BUNDLE_GEMFILE'].to_s.match(/rails_\d+/)
     File.expand_path("../../../tmp/lurker_app_#{rails_version}", __FILE__)
   else
-    raise "Use `appraisal rails-XY cucumber ...` or export BUNDLE_GEMFILE=gemfiles/... explicitly"
+    raise "Export BUNDLE_GEMFILE=gemfiles/rails... explicitly"
   end
 end
 
@@ -23,21 +31,53 @@ World(RSpec::Matchers)
 require 'capybara'
 require 'capybara/dsl'
 require 'capybara/cucumber'
-require 'capybara/poltergeist'
+require 'webdrivers/chromedriver'
 require "#{example_path}/config/environment"
 require 'database_cleaner'
 require 'database_cleaner/cucumber'
 
-Capybara.app = Rails.application
-Capybara.javascript_driver = :poltergeist
+Capybara.register_driver :chrome do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
+end
 
+Capybara.register_driver :headless_chrome do |app|
+  Selenium::WebDriver.logger.level = :debug if ENV['CAPYBARA_DEBUG'].present?
+  browser_capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(loggingPrefs: { browser: 'ALL' })
+  browser_options = Selenium::WebDriver::Chrome::Options.new(args: %w[headless disable-gpu no-sandbox disable-dev-shm-usage window-size=1900,1080])
+  browser_options.add_argument('--ignore-certificate-errors')
+  # Disable w3c mode (default as of Chrome 75) to allow for logging
+  browser_options.add_option(:w3c, false)
+  Capybara::Selenium::Driver.new app,
+                                 browser: :chrome,
+                                 options: browser_options,
+                                 desired_capabilities: browser_capabilities
+end
+
+Capybara.app = Rails.application
+Capybara.server = :puma, { Silent: true, Threads: '1:1' }
+Capybara.javascript_driver = ENV['CAPYBARA_JS_DRIVER']&.to_sym || :headless_chrome
 DatabaseCleaner.strategy = :truncation
 
+# otherwise it cleans up all rails folder
+# https://github.com/cucumber/aruba/blob/bf612766ac51e28ca354e735980cd8a5d7eb296f/lib/aruba/setup.rb#L27L31
+# it force deletes the working_directory,
+# but it has to be working_directory to cd in and run `bin/rspec`
+# this forces @no-clobber everywhere
+# use CLEAN=1 env var to clean proper places
+module ArubaSetupNoClobber
+  def working_directory(clobber = true)
+    super(false)
+  end
+end
+Aruba::Setup.prepend(ArubaSetupNoClobber)
+
 # see: https://github.com/colszowka/simplecov/issues/234
 Aruba.configure do |config|
-  config.before_cmd do |cmd|
-    set_env 'SIMPLECOV_CMDNAME', Digest::MD5.hexdigest(cmd)
-    set_env 'SIMPLECOV_ROOT',    File.expand_path('../../..', __FILE__)
+  config.working_directory = relative_example_path # Aruba::Contracts::RelativePath
+  config.activate_announcer_on_command_failure = [:stdout]
+  config.before :command do |cmd|
+    set_environment_variable 'SIMPLECOV_CMDNAME', Digest::MD5.hexdigest(cmd.object_id.to_s)
+    set_environment_variable 'SIMPLECOV_ROOT',    File.expand_path('../../..', __FILE__)
   end
 end
 
@@ -47,8 +87,8 @@ Before do
   DatabaseCleaner.start
   if ENV['CLEAN']
     system "bin/spring stop"
-    %w[lurker html public/lurker spec/requests spec/controllers].each do |dir_name|
-      in_current_dir { _rm_rf(dir_name) }
+    %w[lurker public/lurker spec/requests spec/controllers].each do |dir_name|
+      in_current_directory { remove(dir_name, force: true) }
     end
   end
 end

data/features/test_endpoint.feature

@@ -53,8 +53,6 @@ Feature: test endpoint
   Scenario: json schema tests request and response using "users/update"
     Given a file named "spec/controllers/api/v1/users_controller_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::UsersController, :lurker do
         render_views
 
@@ -63,7 +61,7 @@ Feature: test endpoint
         end
 
         it "updates a user" do
-          patch :update, id: user.id, user: { name: 'Bob' }
+          patch :update, params: { id: user.id, user: { name: 'Bob' } }
           expect(response).to be_success
         end
       end
@@ -75,8 +73,6 @@ Feature: test endpoint
   Scenario: json schema tests response parameters and tell what fails using "users/update"
     Given a file named "spec/controllers/api/v1/users_controller_blank_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::UsersController, :lurker do
         render_views
 
@@ -85,7 +81,7 @@ Feature: test endpoint
         end
 
         it "updates a user" do
-          patch :update, id: user.id, user: { name: '' }, format: 'json'
+          patch :update, params: { id: user.id, user: { name: '' }, format: 'json' }
           expect(response).not_to be_success
         end
       end

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2"
+gem "bigdecimal", "~> 1.4"
+gem "pg", "<= 0.20" # doesnt use 1.0 by install, 0.21 too many warnings
+
+gem "rails-forward_compatible_controller_tests", "> 0"
+
+gem "jquery-rails"
+gem "bootstrap-sass"
+gem "remotipart"
+gem "uglifier"
+
+gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2"
+
+gem "jquery-rails"
+gem "bootstrap-sass"
+gem "remotipart"
+gem "uglifier"
+
+gemspec :path => "../"

data/gemfiles/rails_6.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0"
+
+gem "jquery-rails"
+gem "bootstrap-sass"
+gem "remotipart"
+gem "uglifier"
+
+gemspec :path => "../"

data/lib/lurker.rb

@@ -60,7 +60,6 @@ require 'lurker/ref_object'
 require 'lurker/erb_schema_context'
 require 'lurker/service'
 require 'lurker/validator'
-require 'lurker/validation_error'
 require 'lurker/utils'
 require 'lurker/endpoint'
 require 'lurker/rendering_controller'

data/lib/lurker/cli.rb

@@ -18,7 +18,7 @@ module Lurker
     attr_accessor :content
 
     def self.templates_root
-      options[:template].present? ? Pathname.new(options[:templates]).expand_path : Lurker::BUNDLED_TEMPLATES_PATH
+      Lurker::BUNDLED_TEMPLATES_PATH
     end
 
     def self.assets_root
@@ -106,7 +106,10 @@ module Lurker
 
       def setup_rendering_engine!
         I18n.config.enforce_available_locales = true
-        Lurker::RenderingController.prepend_view_path templates_root
+        Lurker::RenderingController.prepend_view_path Lurker::Cli.templates_root
+        if options[:templates].present?
+          Lurker::RenderingController.prepend_view_path Pathname.new(options[:templates]).expand_path
+        end
         Lurker::RenderingController.config.assets_dir = assets_root
       end
 
@@ -159,7 +162,6 @@ module Lurker
         @html_options ||= {
             static_html: true,
             url_base_path: url_base_path.prepend('/'),
-            template_directory: templates_root,
             assets_directory: assets_root,
             assets: assets,
             html_directory: output_path,
@@ -197,10 +199,6 @@ module Lurker
       Lurker::Cli.assets_root
     end
 
-    def templates_root
-      Lurker::Cli.templates_root
-    end
-
     def asset_logical_path(path)
       path = Pathname.new(path) unless path.is_a? Pathname
       path.sub %r{-[0-9a-f]{40}\.}, '.'

data/lib/lurker/endpoint.rb

@@ -192,15 +192,15 @@ module Lurker
     def word_wrap(text)
       # strip .json# | .json.yml# | .json.yml.erb#
       text = text.reverse
-      text.gsub!(/(\n|^)#bre\./, "\nbre.")
-      text.gsub!(/(\n|^)#lmy\./, "\nlmy.")
-      text.gsub!(/(\n|^)#nosj\./, "\nnosj.")
+      text.gsub!(/(\n|^)#bre\./, "\nbre.")   # erb
+      text.gsub!(/(\n|^)#lmy\./, "\nlmy.")   # yml
+      text.gsub!(/(\n|^)#nosj\./, "\nnosj.") # json
       text.strip!
       text = text.reverse
 
       text.gsub!(/\s+in schema/m, "\n  in schema")
       if defined?(Rails)
-        text.gsub!(/file:\/\/#{Rails.root}\//m, "")
+        text.gsub!(Regexp.new("#{Rails.root}\/"), "")
       end
       text
     end

data/lib/lurker/json/concerns/validatable.rb

@@ -9,7 +9,11 @@ module Lurker
 
         def to_validation_schema
           set_additional_properties_false_on(to_hash).tap do |schema|
-            schema[Json::ID] = "file://#{uri}"
+            if uri.class == URI::Generic
+              schema[Json::ID] = uri.path
+            else
+              schema[Json::ID] = uri.to_s
+            end
           end
         end
 

data/lib/lurker/json/parser.rb

@@ -16,7 +16,7 @@ module Lurker
         @parent_schema = options[:parent_schema]
         @parent_property = options[:parent_property]
         @polymorph_if_empty = options.fetch(:polymorph_if_empty, false)
-        @uri = options[:uri] || @parent_schema.try(:uri)
+        @uri = options[:uri] || @parent_schema&.uri
         @strategy = nil
       end
 

data/lib/lurker/presenters/service_presenter.rb

@@ -1,4 +1,5 @@
 require 'active_support/inflector'
+require 'active_support/hash_with_indifferent_access'
 
 # An BasePresenter for Lurker::Service
 class Lurker::ServicePresenter < Lurker::BasePresenter
@@ -62,7 +63,7 @@ class Lurker::ServicePresenter < Lurker::BasePresenter
   end
 
   def url_name
-    @url_name ||= ActiveSupport::Inflector.parameterize(name, '_')
+    @url_name ||= name.gsub(/[^a-z0-9\-_]+/i, '_')
   end
 
   def url(extension = ".html")