atd 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b56849012d758725dd43a64adb95b444ccc1463
-  data.tar.gz: 191e644b14b1e580d287fdf9bbf3f57ff575ed2d
+  metadata.gz: 58bc7fc139c91e5ac91f51cf29e1c8638484bef7
+  data.tar.gz: a2956310bdbe71f6abb96cc840fad813815e0d5a
 SHA512:
-  metadata.gz: 88469bdf52fa8fdcab4991a76237ee5e60423140c22b59e633cfdced92d670e8c1a986ef6fb77b9a41a8d219e414431725e20ad2c4ba021687ed7c80cd508620
-  data.tar.gz: ddd182383a818a671fcf998ae14d2f0f6d0b4db9021f52037798e416a6fd22be8273b5f27c581675d611b5dd785bc687fe6c8d016344b7b537b037a06fbbee51
+  metadata.gz: dce06c37ffcd1b2265052fc3b8149003f7a9e8e05e478f6e8a887496b34a3d0877d90c37040db783f226b3e3c28edd8b341b256e6022d188fbd173193588df17
+  data.tar.gz: d92f10cdc008a8f848178f36be680831786f738dfa759325d39bb24b4b7603cb5a64a5fb5072c2194304731cc3dddb132171c57cd925571f2e0c9482c8d48a84

data/.gitignore

@@ -2,14 +2,12 @@
 /.yardoc
 /Gemfile.lock
 /_yardoc/
-/coverage/
 /doc/
 /pkg/
 /spec/reports/
 /tmp/
 .DS_Store
 /.idea/
-/doc/
-/.yardoc/
 coverage
-/*.gem
+/*.gem
+/updated_README.md

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.3.2:
+    - Really began using Gitlab issues
+    - Synchronized development branch with master
+    - Dealt with edge cases in route creation
+
 v0.3.1:
     - Skipped bugfix version because v0.3.0 was yanked.
     - Added controller structure

data/README.md

@@ -1,6 +1,6 @@
 [![build status][build status badge]][build status link] [![coverage report][coverage report badge]][coverage report link] [![gem version][gem version badge]][gem version link] [![documentation coverage][documentation coverage badge]][documentation coverage link]
 
-[documentation coverage badge]: https://img.shields.io/badge/YARD%20coverage-93.02%-green.svg?style=flat-square
+[documentation coverage badge]: https://img.shields.io/badge/YARD%20coverage-93.18%-green.svg?style=flat-square
 [documentation coverage link]: http://izwick-schachter.gitlab.io/atd/YARD/coverage
 
 [build status badge]: https://gitlab.com/izwick-schachter/atd/badges/master/build.svg?style=flat-square
@@ -19,21 +19,24 @@
     - [Setup](#setup)
 - [Routing](#routing)
     - [Basic Routing](#basic-routing)
+        - [Serving Files](#serving-files)
     - [Advanced Routing](#advanced-routing)
         - [DefaultApp](#defaultapp)
         - [Inheritance](#inheritance)
+        - [Blocks](#blocks)
             - [@http](#http)
+        - [Controllers](#controllers)
     - [Apps](#apps)
         - [App Creation](#app-creation)
         - [Starting the App](#starting-the-app)
         - [App Routing](#app-routing)
     - [Logging](#logging)
     - [Compilation](#compilation)
+- [Design Paradigms](#design-paradigms)
 - [Documentation](#documentation)
 - [Development](#development)
 - [Contributing](#contributing)
 
-
 # ATD
 
 ATD is a new web development backend framework for Ruby. It is built on top of rack, and is meant to be small easy and light. That is why it provides a very minimalist way of writing your backend. It treats a request as a request, without splitting it based on the HTTP method. 
@@ -64,9 +67,7 @@ Or install it from the repository with:
 
 This will also allow you to use the current development version (USE WITH CAUTION), and to use that you can `git checkout development` and then `bundle exec rake install`. 
 
-## Usage
-
-### Setup
+## Setup
 
 Setup is as easy as `require "atd"` at the top of whatever file you need it in
 
@@ -124,11 +125,21 @@ Or, a simpler way would be with `:ignore`:
 request "/", "Hello World", ignore: :delete
 ```
 
+#### Serving Files
+
+All files that you want to serve must be in the `assets` directory if they are, then it is simple to just create a route, and put the filename as the output. For example this will serve `assets/index.html`:
+
+```ruby
+request "/", "index.html"
+```
+
+There are certain modifications which can be made to files between the route being requested and the files being served. That information can be found in the [compilation section](#compilation).
+
 ### Advanced Routing
 
 #### DefaultApp
 
-`DefaultApp` is just another app which extends `ATD::App`, it is the app which doesn't have to be written to in `class DefaultApp`, any routes that are created in `main` will be added to `DefaultApp`, well... by default!
+`DefaultApp` is just another app which extends `ATD::App`, it is the app which doesn't have to be written to in `class DefaultApp`, any routes that are created in `main` will be added to `DefaultApp`, well... by default! To find out more about Apps, you can go to the [Apps section](#apps).
 
 #### Inheritance
 
@@ -197,6 +208,20 @@ The `@http` instance variable can be used to work with the http request the the
 
 While you can use `@http[:status_code]` to change the status code, you can also set a status code with `r "/", status_code: 200`. That status code must be >= 100, as per the Rack Specification.
 
+#### Controllers
+
+ATD also had the capabilities to use controllers. A controller is an object which responds to controller methods, usually a module with `extend self`. Here is an example of an app using controllers:
+
+```ruby
+module MyController
+  def test_route
+    return "You've reached test_route"
+  end
+end
+
+request "/", "MyController#test_route" #=> "You've reached test_route"
+```
+
 ### Apps
 
 ATD also allows you to use different "apps". Each app is independent of the others and lives is a class with the same name as the app. A file can have any number of apps, each of which can have it's own settings, files, and routes. By default, adding routes to `main` will make them a part of the app `DefaultApp`, which will work fine if you only need one app.
@@ -268,6 +293,10 @@ end
 
 The compilation works by going through the file extensions from last to first and running the compilations for each extension in that order. For example `file.html.erb` will first be compiled by the ERB compiler, then the output of the ERB compiler will be compiled by the HTML compiler.
 
+## Design Paradigms
+
+ATD is designed to fit into many different design paradigms, and to allow each person to adopt their own styles while leaving code readable to everyone. Do do this, the code was left fairly unstructured, but [here are a few examples from well known frameworks](https://gitlab.com/izwick-schachter/atd-examples.git).
+
 ## Documentation
 
 You can find the YARD docs at http://izwick-schachter.gitlab.io/atd/YARD/.

data/lib/atd.rb

@@ -24,9 +24,8 @@ module ATD
 
     # The first two arguments must me the path and the output.
     def initialize(*args, &block)
-      args -= [nil]
-      args.reject! { |arg| arg.is_a?(File) ? false : arg.empty? } # File doesn't respond to empty
-      @method = (args.last.is_a?(Hash) && !args.last[:methods].nil? ? args.last[:methods] : [:get, :post, :put, :patch, :delete])
+      @method = [:get, :post, :put, :patch, :delete]
+      @method = [] if args.last.is_a?(Hash) && !(args.last[:respond_to].nil? || args.last[:ignore].nil?)
       @app = :DefaultApp
       parse_args(*args, &block)
     end
@@ -69,7 +68,6 @@ module ATD
       define_method(method) do |*args, &block|
         @method = [method] if @method.length == 5
         @method += [method]
-        @method += args.last[:respond_to] if args.last.is_a?(Hash) && !args.last[:respond_to].nil?
         @method.uniq!
         parse_args(*args, &block)
       end
@@ -95,15 +93,19 @@ module ATD
 
     # This should also manage @message at some point
     def parse_args(*args, &block)
+      args.compact!
+      args.flatten!
+      args.reject! { |arg| arg.is_a?(File) ? false : arg.empty? } # File doesn't respond to empty
       @block = block
-      @path = args.shift if @path.nil?
-      @output = args.shift if @output.nil?
-      @args = Array(@args).concat(args) - [nil] unless args.nil?
+      @path ||= args.shift
+      @output ||= args.shift
+      @args = Array(@args).concat(args) unless args.nil?
       if @output =~ /^\w*#\w*$/ # Check if @path is a controller#action combo
         controller, action = @output.split("#")
         @action = Object.const_get(controller.to_sym).method(action.to_sym)
         @output = @action.call
       end
+      @method += Array(args.last[:respond_to]) if args.last.is_a?(Hash) && !args.last[:respond_to].nil?
       @method -= Array(args.last[:ignore]) if args.last.is_a?(Hash) && !args.last[:ignore].nil?
       self
     end

data/lib/atd/version.rb

@@ -1,3 +1,3 @@
 module ATD
-  VERSION = "0.3.1".freeze # The current version number of {ATD}.
+  VERSION = "0.3.2".freeze # The current version number of {ATD}.
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: atd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - ACecretMaster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
 description: 
@@ -157,9 +157,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitlab-ci.yml
-- .rubocop.yml
+- ".gitignore"
+- ".gitlab-ci.yml"
+- ".rubocop.yml"
 - CHANGELOG
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -185,17 +185,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The assistant technical director of your website. It does the dirty work