shaf 0.8.0 → 1.0.0

data/templates/config.ru

@@ -1,4 +1,4 @@
 $:.unshift __dir__
 require 'config/bootstrap'
 
-run Shaf::App.instance
+Shaf::App.run!

data/templates/config/bootstrap.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 Bundler.require(:default, ENV['RACK_ENV'])
 
 $logger = nil
 require 'shaf/settings'
-require 'config/constants'
+require 'config/paths'
 require 'config/database'
 require 'config/initializers'
 require 'config/directories'

data/templates/config/database.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'sinatra/base'
 require 'sequel'
-require 'config/constants'
 require 'fileutils'
 
 config = {
@@ -15,17 +16,16 @@ config = {
 
   development: {
     adapter: 'sqlite',
-    database: File.join(APP_ROOT, 'db', 'development.sqlite3'),
+    database: 'db/development.sqlite3'
   }.freeze,
 
   test: {
     adapter: 'sqlite',
-    database: File.join(APP_ROOT, 'db', 'test.sqlite3'),
+    database: 'db/test.sqlite3'
   }.freeze
 
 }.freeze
 
-
 env = Sinatra::Application.settings.environment
 
 unless config[env]
@@ -33,8 +33,7 @@ unless config[env]
   exit 1
 end
 
-MIGRATIONS_DIR = File.join(APP_ROOT, Shaf::Settings.migrations_dir)
-FileUtils.mkdir_p(MIGRATIONS_DIR) unless Dir.exist?(MIGRATIONS_DIR)
+migrations_dir = 'db/migrations'
+FileUtils.mkdir_p(migrations_dir) unless Dir.exist?(migrations_dir)
 
 DB = Sequel.connect(config[env])
-

data/templates/config/directories.rb

@@ -1,4 +1,4 @@
-require 'config/constants'
+require 'shaf/settings'
 
 def sort_files(files)
   files.sort_by do |file|
@@ -43,7 +43,8 @@ def require_ruby_files
   end
 end
 
-[LIB_DIR, SRC_DIR, APP_DIR].each do |dir|
+%i[lib_dir src_dir app_dir].each do |cfg|
+  dir = Shaf::Settings.send cfg
   next unless Dir.exist? dir
   $LOAD_PATH.unshift dir
 

data/templates/config/helpers.rb

@@ -1,4 +1,4 @@
-dir = File.join(APP_DIR, 'helpers')
+dir = File.join(Shaf::Settings.app_dir, 'helpers')
 if Dir.exist? dir
   Dir.chdir(dir) do
     modules = []

data/templates/config/initializers/db_migrations.rb

@@ -2,11 +2,18 @@ require 'sequel'
 require 'config/database'
 
 Sequel.extension :migration
-Dir[File.join(MIGRATIONS_DIR, "*")]
 
-def is_current?
-  return true unless Dir[File.join(MIGRATIONS_DIR, "*")].any?
-  Sequel::Migrator.is_current?(DB, MIGRATIONS_DIR)
+def current?
+  return true unless Dir[migrations_dir_glob].any?
+  Sequel::Migrator.is_current?(DB, migrations_dir)
+end
+
+def migrations_dir
+  File.join(Shaf::Settings.app_root, Shaf::Settings.migrations_dir)
+end
+
+def migrations_dir_glob
+  File.join(migrations_dir, '*')
 end
 
 def environment
@@ -14,18 +21,17 @@ def environment
 end
 
 def init
-  return if is_current?
+  return if current?
 
   if environment == 'test'
     $logger.info "Running migrations in 'test' environment.."
-    Sequel::Migrator.run(DB, "#{APP_ROOT}/db/migrations")
+    Sequel::Migrator.run(DB, migrations_dir)
   else
     msg = "Database for environment '#{environment}' is not " \
-      "updated to the latest migration"
+      'updated to the latest migration'
     STDERR.puts msg
     $logger&.warn msg
   end
 end
 
 init
-

data/templates/config/initializers/logging.rb

@@ -1,7 +1,7 @@
 require 'logger'
 
-log_dir = File.join(APP_ROOT, 'logs')
-Dir.mkdir log_dir unless Dir.exist? log_dir 
+log_dir = File.join(Shaf::Settings.app_root, 'logs')
+Dir.mkdir log_dir unless Dir.exist? log_dir
 
 $logger = Logger.new(File.join(log_dir, "#{Sinatra::Application.settings.environment}.log"))
 DB.loggers << $logger

data/templates/config/initializers/sequel.rb

@@ -1,4 +1,5 @@
 require 'config/database'
 
 Sequel::Model.plugin :timestamps
+Sequel.extension :blank
 DB.extension(:pagination)

data/templates/config/paths.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+app_root = File.expand_path('../', __dir__)
+Shaf::Settings.app_root = app_root
+Shaf::Settings.app_dir = File.expand_path('api', app_root)
+Shaf::Settings.src_dir = File.expand_path('src', app_root)
+Shaf::Settings.lib_dir = File.expand_path('lib', app_root)

data/templates/config/settings.yml

@@ -12,6 +12,11 @@ default: &default
   hostname: localhost
   protocol: http
   port: 3000
+  auth_token_header: X-Auth-Token
+  form_profile_name: shaf-form
+  form_profile_uri: https://gist.githubusercontent.com/sammyhenningsson/39c8aafeaf60192b082762cbf3e08d57/raw/shaf-form.md
+  error_profile_name: shaf-error
+  error_profile_uri: https://gist.githubusercontent.com/sammyhenningsson/049d10e2b8978059cde104fc5d6c2d52/raw/shaf-error.md
 
 production:
   <<: *default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,60 +30,63 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.10'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,9 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-    - - ">="
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +158,7 @@ files:
 - lib/shaf/generator.rb
 - lib/shaf/generator/base.rb
 - lib/shaf/generator/controller.rb
+- lib/shaf/generator/helper.rb
 - lib/shaf/generator/migration.rb
 - lib/shaf/generator/migration/add_column.rb
 - lib/shaf/generator/migration/add_index.rb
@@ -167,6 +182,7 @@ files:
 - lib/shaf/generator/templates/spec/serializer_spec.rb.erb
 - lib/shaf/helpers.rb
 - lib/shaf/helpers/cache_control.rb
+- lib/shaf/helpers/http_header.rb
 - lib/shaf/helpers/json_html.rb
 - lib/shaf/helpers/paginate.rb
 - lib/shaf/helpers/payload.rb
@@ -177,6 +193,7 @@ files:
 - lib/shaf/rake/db.rb
 - lib/shaf/rake/test.rb
 - lib/shaf/registrable_factory.rb
+- lib/shaf/router.rb
 - lib/shaf/settings.rb
 - lib/shaf/spec.rb
 - lib/shaf/spec/base.rb
@@ -210,9 +227,9 @@ files:
 - templates/api/serializers/error_serializer.rb
 - templates/api/serializers/form_serializer.rb
 - templates/api/serializers/root_serializer.rb
+- templates/api/serializers/validation_error_serializer.rb
 - templates/config.ru
 - templates/config/bootstrap.rb
-- templates/config/constants.rb
 - templates/config/customize.rb
 - templates/config/database.rb
 - templates/config/directories.rb
@@ -222,6 +239,7 @@ files:
 - templates/config/initializers/hal_presenter.rb
 - templates/config/initializers/logging.rb
 - templates/config/initializers/sequel.rb
+- templates/config/paths.rb
 - templates/config/settings.yml
 - templates/frontend/assets/css/main.css
 - templates/frontend/views/form.erb
@@ -233,6 +251,7 @@ files:
 - upgrades/0.4.0.tar.gz
 - upgrades/0.5.0.tar.gz
 - upgrades/0.6.0.tar.gz
+- upgrades/1.0.0.tar.gz
 homepage: https://github.com/sammyhenningsson/shaf
 licenses:
 - MIT
@@ -246,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/templates/config/constants.rb

@@ -1,8 +0,0 @@
-APP_ROOT = File.expand_path('../', __dir__)
-APP_DIR = File.expand_path('api', APP_ROOT)
-SRC_DIR = File.expand_path('src', APP_ROOT)
-LIB_DIR = File.expand_path('lib', APP_ROOT)
-VIEWS_DIR = File.join(APP_ROOT, Shaf::Settings.views_folder)
-ASSETS_DIR = File.join(APP_ROOT, Shaf::Settings.public_folder)
-AUTH_TOKEN_HEADER = 'HTTP_X_AUTH_TOKEN'
-PAGINATION_PER_PAGE = Shaf::Settings.paginate_per_page || 25