shaf 0.3.1 → 0.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -10,28 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRowGAYDVQQDDBFzYW1t
-  eS5oZW5uaW5nc3NvbjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPy
-  LGQBGRYDY29tMB4XDTE3MDcwODE0MDUxOVoXDTE4MDcwODE0MDUxOVowSDEaMBgG
-  A1UEAwwRc2FtbXkuaGVubmluZ3Nzb24xFTATBgoJkiaJk/IsZAEZFgVnbWFpbDET
-  MBEGCgmSJomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAK+SDC1mfyhucJ6Va21rIHUGscEtQrdvyBqxFG1s2TgPMAv4RbqwdJVPa7kj
-  tbCzslADlUE1oru2C+rcJsMtVGX02ukMIPHT1OjTyy0/EMqLqSy3WeRI8APyDSxC
-  Vbe+h5BMf3zZnYfddR6AeG7ln09T1P/tX+9lTMc+I+DW1fUlQgY48CNUayvtJR61
-  svXvXMrhLhi29SQig1qmH6Zoe22/JgH+m2JksPndY5Ep3gqfDc6Imwu2vGvmGErJ
-  D63FB0XQ/wb4WVH4l7sHQSTfKDp8SImCt1xqNgIyjw578ZG2geGLoncuxgDrbQ/U
-  FIJ11lDZd4vLevMhnIxTSJpPr2cCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUukjj1Cd2ea6IOHDLZe0ymzs2jWkwJgYDVR0RBB8w
-  HYEbc2FtbXkuaGVubmluZ3Nzb25AZ21haWwuY29tMCYGA1UdEgQfMB2BG3NhbW15
-  Lmhlbm5pbmdzc29uQGdtYWlsLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAGBReofO0
-  CDGI8uQNn/btde+zQBiCX0mONJMQ6An760MzOHMlWFi6VaVeeKmYj5xCpI2nWaJN
-  49ALW/v7GZ+JIW5YmbzWIuD8YfwHJYCFPoH0llzg3GCFCMxbYqI3nDtHX3dMxpOc
-  01A72okERe0ne/O5Z4Ym/fOECkyXr0fYondhDQcSuqxU22jsXs1ZjISN8IuHmVkA
-  GtGteOIqmA05lP+eCXGvyARGLg1GwZDTjnlH5OfpiT1Oy7Dghewi58Gn4/AlZ4bY
-  CNZdF8Vavp6xMQbPHZwqjaeZz2WRXYS7jyYSvCunjwa3OtvXtfbIEGEWE6IM+t9k
-  H1g6Q+B6qk9O6g==
+  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFzYW1t
+  eS5oZW5uaW5nc3Nvbi9EQz1nbWFpbC9EQz1jb20wHhcNMTgwNzE2MTYzNTMzWhcN
+  MjAwNzE2MTYzNTMzWjAsMSowKAYDVQQDDCFzYW1teS5oZW5uaW5nc3Nvbi9EQz1n
+  bWFpbC9EQz1jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvkgwt
+  Zn8obnCelWttayB1BrHBLUK3b8gasRRtbNk4DzAL+EW6sHSVT2u5I7Wws7JQA5VB
+  NaK7tgvq3CbDLVRl9NrpDCDx09To08stPxDKi6kst1nkSPAD8g0sQlW3voeQTH98
+  2Z2H3XUegHhu5Z9PU9T/7V/vZUzHPiPg1tX1JUIGOPAjVGsr7SUetbL171zK4S4Y
+  tvUkIoNaph+maHttvyYB/ptiZLD53WORKd4Knw3OiJsLtrxr5hhKyQ+txQdF0P8G
+  +FlR+Je7B0Ek3yg6fEiJgrdcajYCMo8Oe/GRtoHhi6J3LsYA620P1BSCddZQ2XeL
+  y3rzIZyMU0iaT69nAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFLpI49QndnmuiDhwy2XtMps7No1pMCYGA1UdEQQfMB2BG3NhbW15
+  Lmhlbm5pbmdzc29uQGdtYWlsLmNvbTAmBgNVHRIEHzAdgRtzYW1teS5oZW5uaW5n
+  c3NvbkBnbWFpbC5jb20wDQYJKoZIhvcNAQELBQADggEBAFJZqH6sgeiTLvMLpxaK
+  K1GaYSCyZbMutf5C3tIAgkmU5UD6B8R0bw6gTM1deM5NJ60LjzqY7rlK3YKDIbTn
+  iXMCe9vd4yE/jb5Zi8Wk//9n8CMG68dQpBvmcQ58/M4gTtgsx+lIgXuI5dPQMmRi
+  bhWQqqWqxT9X6njjfXFk4xn3z6mfFQNPAYqRVeTHUpXBQZPt+bYXRwHPFZGWkx4l
+  BnuuhYKt3CR7YIgvnsQWlTAcU1Ipdayj6UfYqUtlc6cF3CL96NOx7mgZXV8URFiX
+  ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
+  M40=
   -----END CERTIFICATE-----
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,182 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: hal_presenter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.6'
-- !ruby/object:Gem::Dependency
-  name: sinatra-sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-- !ruby/object:Gem::Dependency
-  name: bcrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.11
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: minitest-hooks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.3
 description: A framework for building hypermedia driven APIs with sinatra and sequel.
 email: sammy.henningsson@gmail.com
 executables:
@@ -238,10 +61,8 @@ extra_rdoc_files: []
 files:
 - bin/shaf
 - lib/shaf.rb
-- lib/shaf/api_doc.rb
 - lib/shaf/api_doc/comment.rb
 - lib/shaf/api_doc/document.rb
-- lib/shaf/api_doc/task.rb
 - lib/shaf/app.rb
 - lib/shaf/command.rb
 - lib/shaf/command/console.rb
@@ -249,6 +70,7 @@ files:
 - lib/shaf/command/new.rb
 - lib/shaf/command/server.rb
 - lib/shaf/command/templates/Gemfile.erb
+- lib/shaf/command/upgrade.rb
 - lib/shaf/doc_model.rb
 - lib/shaf/errors.rb
 - lib/shaf/extensions.rb
@@ -261,6 +83,7 @@ files:
 - lib/shaf/generator/controller.rb
 - lib/shaf/generator/migration.rb
 - lib/shaf/generator/migration/add_column.rb
+- lib/shaf/generator/migration/add_index.rb
 - lib/shaf/generator/migration/create_table.rb
 - lib/shaf/generator/migration/drop_column.rb
 - lib/shaf/generator/migration/empty.rb
@@ -282,6 +105,9 @@ files:
 - lib/shaf/helpers/payload.rb
 - lib/shaf/middleware.rb
 - lib/shaf/middleware/request_id.rb
+- lib/shaf/rake.rb
+- lib/shaf/rake/db.rb
+- lib/shaf/rake/test.rb
 - lib/shaf/registrable_factory.rb
 - lib/shaf/settings.rb
 - lib/shaf/spec.rb
@@ -295,8 +121,13 @@ files:
 - lib/shaf/spec/payload_utils.rb
 - lib/shaf/spec/serializer_spec.rb
 - lib/shaf/tasks.rb
-- lib/shaf/tasks/db.rb
-- lib/shaf/tasks/test.rb
+- lib/shaf/tasks/api_doc_task.rb
+- lib/shaf/tasks/db_task.rb
+- lib/shaf/tasks/test_task.rb
+- lib/shaf/upgrade.rb
+- lib/shaf/upgrade/manifest.rb
+- lib/shaf/upgrade/package.rb
+- lib/shaf/upgrade/version.rb
 - lib/shaf/utils.rb
 - lib/shaf/version.rb
 - templates/Rakefile

data/lib/shaf/api_doc.rb

@@ -1,3 +0,0 @@
-require 'shaf/api_doc/document'
-require 'shaf/api_doc/comment'
-require 'shaf/api_doc/task'

data/lib/shaf/tasks/db.rb

@@ -1,81 +0,0 @@
-namespace :db do
-  desc "Prints current schema version"
-  task :version do
-    require 'config/database'
-    if DB.tables.include?(:schema_migrations)
-      migration = DB[:schema_migrations].order(:filename).last
-      filename = migration && migration[:filename]
-      if match = /(\d*)_(.*).rb/.match(filename)
-        puts "Schema version: #{match[1]} (#{match[2]})"
-      else
-        puts "No migration found"
-      end
-    else
-      puts "No schema_info table"
-    end
-  end
-
-  desc "Prints all schema versions"
-  task :versions do
-    require 'config/database'
-    if DB.tables.include?(:schema_migrations)
-      DB[:schema_migrations].each do |migration|
-        filename = migration && migration[:filename]
-        if match = /(\d*)_(.*).rb/.match(filename)
-          puts "#{match[1]}: #{match[2]}"
-        end
-      end
-    else
-      puts "No schema_info table"
-    end
-  end
-
-  desc "Run migrations"
-  task :migrate, [:version] do |t, args|
-    require 'config/database'
-    Sequel.extension :migration
-    if args[:version]
-      puts "Migrating to version #{args[:version]}"
-      Sequel::Migrator.run(DB, MIGRATIONS_DIR, target: args[:version].to_i)
-    else
-      puts "Migrating to latest"
-      Sequel::Migrator.run(DB, MIGRATIONS_DIR)
-    end
-  end
-
-  desc "Perform rollback to specified number of steps back or to the previous version"
-  task :rollback, :target do |t, args|
-    args.with_defaults(target: 1)
-    require 'config/database'
-    Sequel.extension :migration
-    all_migrations = DB[:schema_migrations].all
-    target = -(args[:target].to_i + 1)
-    target = 0 if -target > all_migrations.size
-    filename = all_migrations.dig(target, :filename)
-    version = filename[/(\d*)_.*.rb/, 1].to_i
-
-    warn_if_rolling_back_more_than = 5
-    if target == 0 || -target > warn_if_rolling_back_more_than
-      puts "This would migrate the Database to version: #{version}. Continue [N/y]?"
-      next unless /\Ay/i =~ STDIN.gets.chomp&.downcase
-    end
-    Sequel::Migrator.run(DB, MIGRATIONS_DIR, target: version)
-  end
-
-  desc "Reset the database by deleting all rows in all columns"
-  task :reset do
-    require 'config/database'
-    Sequel.extension :migration
-    version = 0
-    Sequel::Migrator.run(DB, MIGRATIONS_DIR, target: version)
-    Sequel::Migrator.run(DB, MIGRATIONS_DIR)
-  end
-
-  Rake::Task["db:migrate"].enhance do
-    Rake::Task["db:version"].invoke
-  end
-
-  Rake::Task["db:rollback"].enhance do
-    Rake::Task["db:version"].invoke
-  end
-end

data/lib/shaf/tasks/test.rb

@@ -1,48 +0,0 @@
-require 'rake/testtask'
-
-namespace :test do |ns|
-  Rake::TestTask.new(:integration) do |t|
-    t.libs = %w(. api spec)
-    t.pattern = "spec/integration/**/*_spec.rb"
-    t.verbose = true
-    t.warning = false
-  end
-
-  Rake::TestTask.new(:models) do |t|
-    t.libs = %w(. api spec)
-    t.pattern = "spec/models/**/*_spec.rb"
-    t.verbose = true
-    t.warning = false
-  end
-
-  Rake::TestTask.new(:serializers) do |t|
-    t.libs = %w(. api spec)
-    t.pattern = "spec/serializers/**/*_spec.rb"
-    t.verbose = true
-    t.warning = false
-  end
-
-  Rake::TestTask.new(:lib) do |t|
-    t.libs = %w(. api spec)
-    t.pattern = "spec/lib/**/*_spec.rb"
-    t.verbose = true
-    t.warning = false
-  end
-
-  Rake::TestTask.new(:all) do |t|
-    t.libs = %w(. api spec)
-    t.pattern = [
-      "spec/lib/**/*_spec.rb",
-      "spec/models/**/*_spec.rb",
-      "spec/serializers/**/*_spec.rb",
-      "spec/integration/**/*_spec.rb"
-    ]
-    t.verbose = true
-    t.warning = false
-  end
-
-end
-
-desc "Run all tests"
-task test: 'test:all'
-