fasta 0.2.3 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efeb03fe536b61c0bab399a1b1b3fd9b70b11ee1ca5f1d9d67b0c363805ec1ca
-  data.tar.gz: afcd4d9dd668404fbd6eae37273245dfe82d23c3000568694d64cdc8a6bd5757
+  metadata.gz: '08c5c64f85b25b8bec374bf657193cb9588c6202553dcf64c04f62a05bca123a'
+  data.tar.gz: f5d31444581dc7a3a8339b03b0a6cd3d09cb06f517c782b83ff20892d2d1bc23
 SHA512:
-  metadata.gz: eb6ae3a4aee650aad0df7dc93f5aefb93d71cfa91acb30fbe3f746502cfe747d9ac471dddc7c52b8d9da32d3e98de56b481c5db7a8734e8360474ef601cd03ee
-  data.tar.gz: 11cf0dc511bdde8b00fede764798448896b30e8f8e8f2f6c3f91728dd5a0aa8b86b73440502ed9bf9210d4f507d6200578eacef60dd3bca513cc4c2ed3259072
+  metadata.gz: 04bd1706b7a16f4458e7b795d7c026e3e9b3867e7df117cd5a838a9ba645e153756eb21d539bdb1474cb6a8c6ce066834317e0c139523df5b22d8cad23a94841
+  data.tar.gz: adaa3ca4509d1f2fa84bda7f9e2899cfd386e90f254ebfae04628e85b7f10b30438397590bd7d36ebdc71f378374293aedbc23c5e755e4f248322acc9ad1ddc5

data/Gemfile.lock

@@ -1,64 +1,63 @@
 PATH
   remote: .
   specs:
-    fasta (0.2.2)
-      hanami-router (~> 1.3)
-      logger (~> 1.0)
-      oj (~> 3.6)
-      pg (~> 1.0)
-      puma (~> 3.0)
-      rack (~> 2.0)
-      sequel (~> 5.0)
-      thor (~> 0.20)
+    fasta (0.3.1)
+      hanami-router (~> 2.0.0.alpha3)
+      logger (~> 1)
+      oj (~> 3)
+      pg (~> 1)
+      puma (~> 4)
+      rack (~> 2)
+      sequel (~> 5)
+      thor (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.1)
     diff-lcs (1.3)
-    hanami-router (1.3.0)
-      hanami-utils (~> 1.3)
-      http_router (= 0.11.2)
+    hanami-router (2.0.0.alpha3)
+      mustermann (~> 1.0)
+      mustermann-contrib (~> 1.0)
       rack (~> 2.0)
-    hanami-utils (1.3.0)
-      concurrent-ruby (~> 1.0)
-      transproc (~> 1.0)
-    http_router (0.11.2)
-      rack (>= 1.0.0)
-      url_mount (~> 0.2.1)
-    logger (1.2.8)
-    oj (3.7.0)
-    pg (1.1.3)
-    puma (3.12.0)
-    rack (2.0.6)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    hansi (0.2.0)
+    logger (1.4.2)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-contrib (1.1.1)
+      hansi (~> 0.2.0)
+      mustermann (= 1.1.1)
+    nio4r (2.5.2)
+    oj (3.10.6)
+    pg (1.2.3)
+    puma (4.3.5)
+      nio4r (~> 2.0)
+    rack (2.2.2)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    sequel (5.14.0)
-    thor (0.20.0)
-    transproc (1.0.2)
-    url_mount (0.2.1)
-      rack
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    ruby2_keywords (0.0.2)
+    sequel (5.33.0)
+    thor (1.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.1)
   fasta!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.1
+   2.1.4

data/README.md

@@ -1,43 +1,133 @@
+<p align="center">
+   <a href="https://rubygems.org/gems/fasta"><img src="https://user-images.githubusercontent.com/2478436/48049394-346ac280-e1a7-11e8-946f-4f6fe5f422a8.png" width="256">
+</a>
+</p>
+
 # Fasta
+Just a mini web framework
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/fasta`. To experiment with that code, run `bin/console` for an interactive prompt.
+## Installation
 
-TODO: Delete this and the text above, and describe your gem
+```bash
+ $ gem install fasta
+```
 
-## Installation
+```bash
+ $ fasta plz NEW_APP_NAME
+```
+
+```bash
+ $ cd NEW_APP_NAME
+```
 
-Add this line to your application's Gemfile:
+## Start
 
-```ruby
-gem 'fasta'
+Before first start run
+```bash
+ $ rake db:create
 ```
 
-And then execute:
+To start server:
+```bash
+ $ fasta go [-e ENVIRONMENT] [-p PORT]
+```
 
-    $ bundle
+or advanced
+```bash
+ $ puma boot.ru -e production -p 3210
+```
 
-Or install it yourself as:
+## Add Endpoint
 
-    $ gem install fasta
+```bash
+ $ fasta endpoint <ENDPOINT_NAME> <ACTION> <ACTION> <ACTION> ... 
+ # fasta endpoint account index show custom
+```
 
-## Usage
+After generate endpoint add the appropriate routes in **routes.rb** and extend a migration with needed fields:
 
-TODO: Write usage instructions here
+```ruby
+ # routes.rb
+
+ $router = Fasta::Router.new do |mapper|
+   ...
+   mapper.reg(:<METHOD>, '/<PATH>', <ENDPOINT>::<ACTION>)  
+   
+ # mapper.reg(:get, '/accounts', Account::Index)
+   ...
+ end  
+```
 
-## Development
+Also after set up migration file run:
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+```bash
+ $ rake db:migrate
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-## Contributing
+## Associated Entities
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/fasta. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+```ruby
+    # app/endpoints/user/boards.rb
+
+    module User
+      class Boards < Model::Show
+        validate_fields :id
+        
+        def fetch
+          user_id = params[:id]
+          through = DB[:users_boards].where(user_id: user_id)
+          DB[:boards].where(id: through.select(:board_id)).to_a
+        end
+      end
+    end
 
-## License
+```
+
+```ruby
+    # routes.rb
+    $router = Fasta::Router.new do |mapper|
+      ...
+      mapper.reg(:get, '/users/:id/boards', User::Boards) 
+      ...
+    end
+```
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+### Namespaces
 
-## Code of Conduct
+```ruby
+    # app/endpoints/team/user.rb
+    
+    module Team
+      module User
+        extend Model
+      end
+    end
+ 
+```
+
+```ruby
+    # app/endpoints/team/user/index.rb
+    
+    module Team
+      module User
+        class Index < Model::Index; end
+      end
+    end 
+
+```
+
+```ruby
+    # routes.rb
+    $router = Fasta::Router.new do |mapper|
+      ...
+      mapper.reg(:get, 'team/users', Team::User::Index)
+      ...
+    end  
+```
+
+## Usage
 
-Everyone interacting in the Fasta project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/fasta/blob/master/CODE_OF_CONDUCT.md).
+TODO: 
+1. Write usage instructions here
+2. Show and Index considering

data/fasta.gemspec

@@ -32,17 +32,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'hanami-router', '~> 1.3'
-  spec.add_dependency 'logger', '~> 1.0'
-  spec.add_dependency 'oj', '~> 3.6'
-  spec.add_dependency 'pg', '~> 1.0'
-  spec.add_dependency 'rack', '~> 2.0'
-  spec.add_dependency 'sequel', '~> 5.0'
-  spec.add_dependency 'thor', '~> 0.20'
+  spec.add_dependency 'hanami-router', '~> 2.0.0.alpha3'
+  spec.add_dependency 'logger', '~> 1'
+  spec.add_dependency 'oj', '~> 3'
+  spec.add_dependency 'pg', '~> 1'
+  spec.add_dependency 'rack', '~> 2'
+  spec.add_dependency 'sequel', '~> 5'
+  spec.add_dependency 'thor', '~> 1'
 
-  spec.add_dependency 'puma', '~>3.0'
+  spec.add_dependency 'puma', '~> 4'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/fasta/cli.rb

@@ -2,12 +2,14 @@ require 'thor'
 
 module Fasta
   class Installer < Thor
+    DEFAULT_ACTIONS = %w[show index create delete patch put].freeze
+    DEFAULT_ACTION = :show
+
     include Thor::Actions
     source_root File.expand_path('../../templates', __dir__)
 
     desc 'plz NAME', 'Unpack Project'
     def plz(name)
-      @name = name
       directory 'config', "#{name}/config"
       create_file "#{name}/app/endpoints/.keep"
       create_file "#{name}/log/db.log"
@@ -19,5 +21,56 @@ module Fasta
       copy_file 'Procfile', "#{name}/Procfile"
       copy_file 'Rakefile', "#{name}/Rakefile"
     end
+
+    desc 'go', 'Start your application very fast!'
+    method_option :environment, default: 'development', aliases: "-e"
+    method_option :port, default: '3210', aliases: "-p"
+    def go
+      exec("puma boot.ru -e #{options[:environment]} -p #{options[:port]}")
+    end
+
+    desc 'endpoint', 'Create new Endpoint'
+    def endpoint(name, *actions)
+      normalized_name = name.downcase
+      create_file "./app/endpoints/#{normalized_name}.rb",
+      "module #{normalized_name.capitalize}
+  extend Fasta::Model
+end
+"
+      create_file "./app/endpoints/#{normalized_name}/.keep"
+      actions.each do |action|
+        default_action = DEFAULT_ACTIONS.include?(action)
+        build_action(normalized_name, action, default_action)
+      end
+
+      build_migration(normalized_name)
+    end
+
+    private
+
+    def build_action(endpoint_name, action_name, default_action)
+      fasta_action = default_action ? action_name : DEFAULT_ACTION
+
+      create_file "./app/endpoints/#{endpoint_name}/#{action_name}.rb",
+                  "module #{endpoint_name.capitalize}
+  class #{action_name.capitalize} < Fasta::Model::#{fasta_action.capitalize}
+  end
+end
+"
+    end
+
+    def build_migration(endpoint_name)
+      create_file "./db/migrations/#{Time.now.strftime('%Y%m%d%H%M%S')}_create_#{endpoint_name}s_table.rb",
+      "Sequel.migration do
+  change do
+    create_table(:#{endpoint_name}s) do
+      primary_key :id
+      DateTime    :created_at,              null: false
+      DateTime    :updated_at,              null: false
+    end
+  end
+end
+"
+    end
   end
 end

data/lib/fasta/services/router.rb

@@ -0,0 +1,23 @@
+require 'hanami/router'
+require_relative 'routes_mapper'
+
+module Fasta
+  class Router
+    def initialize
+      @router = Hanami::Router.new do
+        action = ->(klass) { ->(env) { klass.call(env) } }
+        root to: ->(_env) { [200, {}, ['Welcome to API']] }
+
+        mapper = Fasta::RoutesMapper.new(action, self)
+
+        yield(mapper)
+      end
+    end
+
+    def runnable
+      router
+    end
+
+    attr_reader :router
+  end
+end

data/lib/fasta/services/routes_mapper.rb

@@ -0,0 +1,16 @@
+module Fasta
+  class RoutesMapper
+    def initialize(action, router)
+      @action = action
+      @router = router
+    end
+
+    def reg(method, route, action_name)
+      router.public_send(method, route, to: action.call(action_name))
+    end
+
+    private
+
+    attr_reader :action, :router
+  end
+end

data/lib/fasta/version.rb

@@ -1,3 +1,3 @@
 module Fasta
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.3.2'.freeze
 end

data/tasks/database.rake

@@ -6,7 +6,7 @@ namespace :db do
   puts "Processing task in #{env} environment."
 
   $db_hash = begin
-               YAML.safe_load(File.read('config/database.yml'))[env]
+               YAML.load(File.read('config/database.yml'))[env]
              rescue StandardError
                {}
              end

data/templates/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-ruby '2.5.1'
+ruby '2.6.5'
 
 gem 'fasta'

data/templates/boot.ru

@@ -1,3 +1,3 @@
 require './application.rb'
 
-run $router
+run $router.runnable

data/templates/config/routes.rb

@@ -1,19 +1,16 @@
-require 'hanami/router'
+require 'fasta/services/router'
 
-$router = Hanami::Router.new do
-  action = ->(klass) { ->(env) { klass.call(env) } }
-
-  root                         to: ->(_env) { [200, {}, ['Welcome to API']] }
+$router = Fasta::Router.new do |mapper|
+  mapper.reg(:get,    '/users',            User::Index)
+  mapper.reg(:post,   '/users',            User::Create)
+  mapper.reg(:get,    '/users/:id',        User::Show)
+  mapper.reg(:put,    '/users/:id',        User::Put)
+  mapper.reg(:patch,  '/users/:id',        User::Patch)
+  mapper.reg(:delete, '/users/:id',        User::Delete)
+  mapper.reg(:get,    '/users/:id/boards', User::Boards)
+end
 
-  get     '/users',            to: action.call(User::Index)
-  post    '/users',            to: action.call(User::Create)
-  get     '/users/:id',        to: action.call(User::Show)
-  put     '/users/:id',        to: action.call(User::Put)
-  patch   '/users/:id',        to: action.call(User::Patch)
-  delete  '/users/:id',        to: action.call(User::Delete)
-  get     '/users/:id/boards', to: action.call(User::Boards)
+# get     '/accounts',         to: action.call(Account::Index)
+# get     '/accounts/:id',     to: action.call(Account::Show)
+# get     'team/users',        to: action.call(Team::User::Index)
 
-  # get     '/accounts',         to: action.call(Account::Index)
-  # get     '/accounts/:id',     to: action.call(Account::Show)
-  # get     'team/users',        to: action.call(Team::User::Index)
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fasta
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.2
 platform: ruby
 authors:
 - Yaro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-router
@@ -16,140 +16,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.0.alpha3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.0.alpha3
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,8 @@ files:
 - lib/fasta/server/core/read.rb
 - lib/fasta/server/core/responder.rb
 - lib/fasta/server/core/write.rb
+- lib/fasta/services/router.rb
+- lib/fasta/services/routes_mapper.rb
 - lib/fasta/version.rb
 - tasks/console.rake
 - tasks/database.rake
@@ -246,8 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Fasta is a mini web framework