mvc_one 0.1.0.pre.rc2 → 0.1.0.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9156a3747a1449345c6139d1759d2b4666d5eb449daf2eebe37e7f47986d072
-  data.tar.gz: 3cf5f42bfe96721e029ca91efcf05a1f358b91e5353dea53fe0fdc557e20c4d1
+  metadata.gz: 584b655c4c21ec1bc91d22c75ad156d5589192a809cb57e9ef5a6429ece09ea5
+  data.tar.gz: d5f3c5067a607a1ad7679e1ac41ab11bad2313a18a090610f7c40dae2f571d42
 SHA512:
-  metadata.gz: 28398e4661ba3ba1886acb70073eadfe69544cf0bbc61be2ac0d9a6916aa6a52cbe01fbdc3f44c520381a645ea35f13ea46d5af66d3f9e24eff2bc5c6e5b970d
-  data.tar.gz: 232cb7052c15497e64225ef73ccef1385eb59f8c23873a64dfa6de18cfae734d08aeb922e1d4bc452156c3b5ecc519e6e7ad2caf11bad7c2c51890e33a8956a9
+  metadata.gz: a21a9373694e01b29bf60a578004b3d063c6ace39ec4ab8f1e3adea4dc6c8cd75d4f2d3b30bf7a78dec7bd7a45a58b25bd77f1816f901352d8c48eabd84ebd20
+  data.tar.gz: a3ee6770db6b480a0665b6b4ea337abfc2ca6c81845e5e2466d92a4887fa87dd27624ab9bab9805a5245fe8236b475d6681914e913aa6ac956f06bf1b34dc3ba

data/.rubocop.yml

@@ -1,13 +1,36 @@
+require:
+  - rubocop-rake
+  - rubocop-sequel
+  - rubocop-rspec
+
 AllCops:
-  TargetRubyVersion: 2.6
+  NewCops: enable
+
+Metrics/BlockLength:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 50
+
+Metrics/ClassLength:
+  Max: 150
 
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
+Metrics/MethodLength:
+  Enabled: false
 
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
+Style/Documentation:
+  Enabled: false
 
-Layout/LineLength:
-  Max: 120
+Naming/PredicateName:
+  AllowedMethods:
+    - 'has_many'
+    - 'has_one'

data/Gemfile

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mvc_one.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
-
-gem "rubocop", "~> 1.21"
+gem 'rake', '~> 13.0'
+gem 'rspec', '~> 3.0'
+gem 'rubocop', require: false
+gem 'rubocop-rake', require: false
+gem 'rubocop-rspec', require: false
+gem 'rubocop-sequel', require: false

data/Gemfile.lock

@@ -1,18 +1,84 @@
 PATH
   remote: .
   specs:
-    mvc_one (0.1.0.pre.rc1)
-      thor
+    mvc_one (0.1.0.pre.rc4)
+      bcrypt (~> 3.1)
+      dry-struct (~> 1.5)
+      dry-transaction (~> 0.14)
+      dry-validation (~> 1.9)
+      rack (~> 3)
+      rack-session (~> 2)
+      sequel (~> 5.60)
+      slim (~> 5)
+      sqlite3 (~> 1.5)
+      thor (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    bcrypt (3.1.18)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.0)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-events (1.0.1)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+    dry-inflector (1.0.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-matcher (0.10.0)
+      dry-core (~> 1.0)
+    dry-monads (1.6.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.5, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
+      ice_nine (~> 0.11)
+      zeitwerk (~> 2.6)
+    dry-transaction (0.15.0)
+      dry-core (~> 1.0)
+      dry-events (~> 1.0)
+      dry-matcher (~> 0.10)
+      dry-monads (~> 1.6)
+    dry-types (1.7.1)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    dry-validation (1.10.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-schema (>= 1.12, < 2)
+      zeitwerk (~> 2.6)
+    ice_nine (0.11.2)
     json (2.6.3)
     parallel (1.22.1)
     parser (3.2.1.0)
       ast (~> 2.4.1)
+    rack (3.0.4.2)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.7.0)
@@ -42,9 +108,26 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.26.0)
       parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.18.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    rubocop-sequel (0.3.4)
+      rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
+    sequel (5.66.0)
+    slim (5.0.0)
+      temple (~> 0.10.0)
+      tilt (>= 2.0.6, < 2.1)
+    sqlite3 (1.6.1-x86_64-darwin)
+    temple (0.10.0)
     thor (1.2.1)
+    tilt (2.0.11)
     unicode-display_width (2.4.2)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   x86_64-darwin-20
@@ -53,7 +136,10 @@ DEPENDENCIES
   mvc_one!
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 1.21)
+  rubocop
+  rubocop-rake
+  rubocop-rspec
+  rubocop-sequel
 
 BUNDLED WITH
    2.4.7

data/Rakefile

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-require "rubocop/rake_task"
+require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
 

data/exe/mvc_one

@@ -1,17 +1,19 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'thor'
 require 'erb'
 require 'pry'
 
 module MvcOne
   class MyCLI < Thor
-    desc "new PROJECT_NAME", "Generate new application"
+    desc 'new PROJECT_NAME', 'Generate new application'
     def new(name)
       puts "Generating #{name}"
       project_template(name)
     end
 
-    desc "generate controller/model/view/contract name", "Generate new controller/model/view."
+    desc 'generate controller/model/view/contract name', 'Generate new controller/model/view.'
     def generate(layer, layer_name)
       case layer
       when 'controller'
@@ -30,16 +32,18 @@ module MvcOne
     private
 
     def generate_controller(name)
-      raise Error, 'cd into your project repository' unless Dir.exists? 'app/controllers'
+      raise Error, 'cd into your project repository' unless Dir.exist? 'app/controllers'
+
       file_name = "app/controllers/#{name}_controller.rb"
-      template = ERB.new(File.read('../templates/app/controller_template.erb'))
+      template = ERB.new(File.read(File.join(gem_path, 'templates/app/controller_template.erb')))
       File.write(file_name, template.result(binding))
     end
 
     def generate_model(name)
-      raise Error, 'cd into your project repository' unless Dir.exists? 'app/models'
+      raise Error, 'cd into your project repository' unless Dir.exist? 'app/models'
+
       file_name = "app/models/#{name}.rb"
-      template = ERB.new(File.read('../templates/app/model_template.erb'))
+      template = ERB.new(File.read(File.join(gem_path, 'templates/app/model_template.erb')))
       File.write(file_name, template.result(binding))
     end
 
@@ -47,38 +51,41 @@ module MvcOne
       name_normalized = name.downcase.gsub(/\s/, '_')
       make_default_dirs(name_normalized)
       make_default_files(name_normalized)
-      template = ERB.new <<-EOF
+      template = ERB.new <<-ERBTEMPLATE
           class ApplicationController
             def name
               <%= name %>
             end
           end
-      EOF
+      ERBTEMPLATE
       template.result(binding)
     end
 
     def make_default_files(name_normalized)
-      config_ru = ERB.new(File.read('templates/general/config_ru.erb'))
+      config_ru = ERB.new(File.read(File.join(gem_path, 'templates/general/config_ru.erb')))
       File.write "#{name_normalized}/config.ru", config_ru.result(binding)
 
-      rakefile = ERB.new(File.read('templates/general/rakefile.erb'))
+      rakefile = ERB.new(File.read(File.join(gem_path, 'templates/general/rakefile.erb')))
       File.write "#{name_normalized}/Rakefile", rakefile.result(binding)
 
-      application_rb = ERB.new(File.read('templates/general/application_rb.erb'))
-      File.write "#{name_normalized}/application.rb", config_ru.result(binding)
+      application_rb = ERB.new(File.read(File.join(gem_path, 'templates/general/application_rb.erb')))
+      File.write "#{name_normalized}/application.rb", application_rb.result(binding)
 
-      routes_rb = ERB.new(File.read('templates/config/routes_rb.erb'))
+      routes_rb = ERB.new(File.read(File.join(gem_path, 'templates/config/routes_rb.erb')))
       File.write "#{name_normalized}/app/config/routes.rb", routes_rb.result(binding)
 
-      database_yml = ERB.new(File.read('templates/general/database_yml.erb'))
+      database_yml = ERB.new(File.read(File.join(gem_path, 'templates/general/database_yml.erb')))
       File.write "#{name_normalized}/config/database.yml", database_yml.result(binding)
 
-      secrets_yml = ERB.new(File.read('templates/general/secrets_yml.erb'))
+      secrets_yml = ERB.new(File.read(File.join(gem_path, 'templates/general/secrets_yml.erb')))
       File.write "#{name_normalized}/config/secrets.yml", secrets_yml.result(binding)
+
+      gemfile = ERB.new(File.read(File.join(gem_path, 'templates/general/gemfile.erb')))
+      File.write "#{name_normalized}/Gemfile", gemfile.result(binding)
     end
 
     def make_default_dirs(root_dir_name)
-      raise Error, "Project directory already exists: #{root_dir_name}" if Dir.exists? root_dir_name
+      raise Error, "Project directory already exists: #{root_dir_name}" if Dir.exist? root_dir_name
 
       Dir.mkdir(root_dir_name)
 
@@ -92,7 +99,10 @@ module MvcOne
       end
     end
   end
-end
 
+  def gem_path
+    File.expand_path("#{File.dirname(__FILE__)}/..")
+  end
+end
 
 MvcOne::MyCLI.start(ARGV)

data/lib/mvc_one/application.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'rack'
+require 'rack/session'
+
+module MvcOne
+  # Rack friendly launcher for project
+  class Application
+    # Main application config
+    class Config
+      def self.env
+        ENV.fetch('APP_ENV', 'development')
+      end
+
+      def self.test?
+        env == 'test'
+      end
+
+      def self.secrets
+        YAML.load_file('config/secrets.yml')[Application::Config.env]
+      end
+
+      def self.db_config
+        YAML.load_file('config/database.yml')[Application::Config.env]
+      end
+    end
+
+    def initialize
+      @router = RegexpRouter.new(File.join(File.dirname(__FILE__), 'app', 'config', 'routes.rb'))
+    end
+
+    def self.launch
+      Rack::Builder.new do |builder|
+        builder.use Rack::Session::Cookie, domain: 'localhost', path: '/', expire_after: 3600 * 24,
+                                           secret: Application::Config.secrets['session_cookie']
+        builder.run Application.new
+      end
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+      result = @router.resolve(request.path, request.request_method)
+      controller = result.controller.new(env, result.params, request)
+      controller.resolve(result.action)
+    end
+  end
+end
+
+require_relative 'regexp_router'
+require_relative 'contracts/application_contract'
+require_relative 'controllers/application_controller'
+require_relative 'models/application_model'
+require_relative 'repositories/application_relation'
+require_relative 'repositories/application_repository'
+require_relative 'serializers/application_serializer'

data/lib/mvc_one/contracts/application_contract.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require 'dry-validation'
+
 # Abstract class for Contract realisation in application
-class MvcOne::ApplicationContract < Dry::Validation::Contract
+module MvcOne
+  class ApplicationContract < Dry::Validation::Contract
+  end
 end

data/lib/mvc_one/controllers/application_controller.rb

@@ -4,70 +4,72 @@ require 'slim/include'
 require 'json'
 
 # All app controllers must be subclasses of ApplicationController
-class MvcOne::ApplicationController
-  DEFAULT_LAYOUT = './app/views/application_layout.slim'
-  DEFAULT_HTTP_CODE = 200
+module MvcOne
+  class ApplicationController
+    DEFAULT_LAYOUT = './app/views/application_layout.slim'
+    DEFAULT_HTTP_CODE = 200
 
-  attr_accessor :env
-  attr_reader :action, :params, :request
+    attr_accessor :env
+    attr_reader :action, :params, :request
 
-  def self.before_action(*methods)
-    define_method :before_action do
-      methods.each { |method| send(method) }
+    def self.before_action(*methods)
+      define_method :before_action do
+        methods.each { |method| send(method) }
+      end
     end
-  end
 
-  def initialize(env, params, request)
-    @env = env
-    @params = params
-    @request = request
-  end
+    def initialize(env, params, request)
+      @env = env
+      @params = params
+      @request = request
+    end
 
-  def resolve(action)
-    before_action if respond_to?(:before_action)
+    def resolve(action)
+      before_action if respond_to?(:before_action)
 
-    @action = action
-    send(action)
-  end
+      @action = action
+      send(action)
+    end
 
-  def render(code: DEFAULT_HTTP_CODE, headers: {}, body: nil, layout: DEFAULT_LAYOUT, template: nil)
-    return [code, headers, [body]] unless body.nil?
+    def render(code: DEFAULT_HTTP_CODE, headers: {}, body: nil, layout: DEFAULT_LAYOUT, template: nil)
+      return [code, headers, [body]] unless body.nil?
 
-    body = prepare_body(layout, template || template_path(action))
-    [code, headers, [body]]
-  end
+      body = prepare_body(layout, template || template_path(action))
+      [code, headers, [body]]
+    end
 
-  def head(code, headers: {})
-    [code, headers, []]
-  end
+    def head(code, headers: {})
+      [code, headers, []]
+    end
 
-  def request_params
-    return @request_params if defined?(@request_params)
-    return @request_params = {} if request.body.nil?
+    def request_params
+      return @request_params if defined?(@request_params)
+      return @request_params = {} if request.body.nil?
 
-    @request_params =
-      case request.content_type
-      when 'application/json' then JSON.parse(request.body.read).transform_keys(&:to_sym)
-      else request.params.transform_keys(&:to_sym)
-      end
-  end
+      @request_params =
+        case request.content_type
+        when 'application/json' then JSON.parse(request.body.read).transform_keys(&:to_sym)
+        else request.params.transform_keys(&:to_sym)
+        end
+    end
 
-  def render_partial(name, options = {}, &block)
-    Slim::Template.new("#{name}.slim", options).render(self, &block)
-  end
+    def render_partial(name, options = {}, &block)
+      Slim::Template.new("#{name}.slim", options).render(self, &block)
+    end
 
-  private
+    private
 
-  def template_path(action)
-    path = self.class.to_s.delete_suffix('Controller').split('::').map(&:downcase).join('/')
-    "./app/views/#{path}/#{action}.slim"
-  end
+    def template_path(action)
+      path = self.class.to_s.delete_suffix('Controller').split('::').map(&:downcase).join('/')
+      "./app/views/#{path}/#{action}.slim"
+    end
 
-  def prepare_body(layout, template)
-    return Slim::Template.new(template).render(self) if layout.nil?
+    def prepare_body(layout, template)
+      return Slim::Template.new(template).render(self) if layout.nil?
 
-    Slim::Template.new(layout).render(self) do
-      Slim::Template.new(template).render(self)
+      Slim::Template.new(layout).render(self) do
+        Slim::Template.new(template).render(self)
+      end
     end
   end
 end

data/lib/mvc_one/models/application_model.rb

@@ -7,5 +7,7 @@ module Types
 end
 
 # Domain model
-class MvcOne::ApplicationModel < Dry::Struct
+module MvcOne
+  class ApplicationModel < Dry::Struct
+  end
 end