silicon 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adab41a6ed0b0a061fa8342724d6c7ddea1ec9ce
-  data.tar.gz: bee0524057d03b79906ea0d162963082f9a949fd
+  metadata.gz: b42a17f2843d05d79a364238d2acab60af7b58fb
+  data.tar.gz: 3ef558e06e125ce333da1076ecf95e07deed709b
 SHA512:
-  metadata.gz: f8d7ea151bab27929bb6bce0ba34ce56b54bfa9c7d5a5b73bab7122db39e351cfbec2241f617db8c60816bda171844f9955d7980f1a1ab383dfaec796ff91731
-  data.tar.gz: 800c81254ae7a6ee8aea32e56eb3ace062a71d9e215a37c18851a7460584dc3f41727b88aa4634e3dd6df49edba2af3479f36be9bab8ecc2a7629017402086af
+  metadata.gz: 6090adf8bb5518c4da8239908592d7be26aa35f7ae3af6c2b9c0d8ac2d2bb586ea5a99c9a2ac9e289820046c03400022d34a79d1b6090ca341c489c4258eeeeb
+  data.tar.gz: a9892ea638f31505e4df44368e26bee167c93ee040bdff42f70b2f58b8e01f6a1836f6308d57362b31c13b3c63154721ae2541d5bb39595211b6df727baefcb5

data/README.md

@@ -347,13 +347,6 @@ Or install it yourself as:
 
 ## Development
 
-Before making any contributions please make sure you are agree:
-
-* 3 lines of code is better than 100 for the same functionality implementation, 0 lines is the best.
-* Keep initial idea as simple as it possible. Plugins for additional functionality are more preferable. 
-* Do not use comments for obvious code; if your code is not obvious then try to make it obvious - 
-extract method, variable, perform more steps to make it more clear.
-
 Usual, but always helpful steps:
  
 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.

data/lib/silicon/app.rb

@@ -15,6 +15,8 @@ require 'silicon/routing/routing'
 
 module Silicon
   class App
+    attr_reader :routes
+
     def initialize(container = Hypo::Container.new)
       @container = container
 
@@ -43,7 +45,8 @@ module Silicon
 
     def register_dependencies
       instances = {
-        config_file_path: 'silicon.yaml'
+        config_file_path: 'silicon.yml',
+        silicon_env: ENV['SILICON_ENV'] || 'development'
       }
 
       instances.keys.each do |name|
@@ -83,8 +86,8 @@ module Silicon
     end
 
     def parse_routes
-      routes = @route_parser.parse
-      @route_matcher = Routing::Matcher.new(routes)
+      @routes = @route_parser.parse
+      @route_matcher = Routing::Matcher.new(@routes)
     end
   end
 end

data/lib/silicon/generators/cli.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'terminal-table'
 
 module Silicon
   class CLI < Thor
@@ -8,15 +9,49 @@ module Silicon
       File.dirname(__FILE__)
     end
 
-    desc 'new NAME', 'create new Silicon application'
+    desc 'new NAME', 'Create new Silicon application'
     def new(name)
-      copy_file 'templates/app.rb', "#{name}/app/app.rb"
-      copy_file 'templates/app.routes', "#{name}/app/app.routes"
+      copy_file 'templates/app/app.rb', "#{name}/app/app.rb"
+      copy_file 'templates/app/app.routes', "#{name}/app/app.routes"
       copy_file 'templates/silicon.yml', "#{name}/silicon.yml"
       copy_file 'templates/config.ru', "#{name}/config.ru"
       copy_file 'templates/views/show_welcome.json.jbuilder', "#{name}/app/views/show_welcome.json.jbuilder"
       copy_file 'templates/actions/common/handle_errors.rb', "#{name}/app/actions/common/handle_errors.rb"
+      copy_file 'templates/Gemfile', "#{name}/Gemfile"
       template 'templates/actions/welcome.tt', "#{name}/app/actions/welcome.rb", {app_name: name}
+
+      inside name do
+        run 'bundle'
+      end
+    end
+
+    desc 'routes', 'Show Silicon application routes'
+    def routes
+      require './app/app'
+      app = App.new
+
+      headings = ['HTTP Verb', 'Path', 'Action Chain']
+      rows = app.routes.map do |route|
+        indent = ''
+        commands = []
+        route.commands.each_with_index do |c, index|
+          indent += '  ' if c.sequential? && index > 0
+
+          prefix = '->' if c.sequential?
+          prefix = '=>' if c.parallel?
+          prefix = '=*' if c.async?
+
+          commands << "#{indent} #{prefix} #{c.name}"
+        end
+
+
+        commands = commands.join("\n")
+        [route.http_verb, route.path, commands]
+      end
+
+      table = Terminal::Table.new(headings: headings, rows: rows)
+      table.style = {all_separators: true}
+      puts table
     end
   end
 end

data/lib/silicon/generators/templates/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rack-cors'
+gem 'silicon'

data/lib/silicon/generators/templates/config.ru

@@ -1,8 +1,17 @@
 require 'rack'
-require './app'
+require 'rack/cors'
+require './app/app'
 
 use Rack::Parser, :content_types => {
   'application/json'  => Proc.new { |body| ::MultiJson.decode body }
 }
 
+use Rack::Cors do
+  # Setup your CORS policy
+end
+
+if ENV['SILICON_ENV'] == 'development' || ENV['SILICON_ENV'] == ''
+  use Rack::Reloader
+end
+
 run App.new

data/lib/silicon/loaders/dependency_loader.rb

@@ -1,11 +1,18 @@
 module Silicon
   class DependencyLoader
-    def initialize(container, type_loader)
+    def initialize(container, type_loader, silicon_env)
       @container = container
+      @type_loader = type_loader
       @types = type_loader.load_types
+      @silicon_env = silicon_env
     end
 
     def load_components
+      if @silicon_env == 'development'
+        # every time reload types in development mode
+        @types = @type_loader.load_types
+      end
+
       @types.each do |type|
         @container.register(type).using_lifetime(:scope).bound_to(:silicon_request)
       end

data/lib/silicon/routing/builder.rb

@@ -1,4 +1,4 @@
-require 'silicon/routing/route'
+  require 'silicon/routing/route'
 
 module Silicon
   module Routing
@@ -14,7 +14,7 @@ module Silicon
         result = []
 
         node = sections.node
-        restore_hierarchy(node, nil,node.to_hash)
+        restore_hierarchy(node, nil, node.to_hash)
 
         @route_params.each do |route|
           if route[:actions]

data/lib/silicon/routing/matcher.rb

@@ -8,7 +8,7 @@ module Silicon
       end
 
       def match(path, http_method)
-        segments = path.split('/')
+        segments = path.split('/').concat(['/'])
         params = {}
         matched = nil
 

data/lib/silicon/routing/route.rb

@@ -6,12 +6,16 @@ module Silicon
 
       def initialize(hash)
         @http_verb = hash[:http_verb]
-        @path = hash[:path].sub('.', '')
+
+        @path = hash[:path].sub('.', '/').sub('//', '/')
+
         @params = hash[:params]
         @commands = hash[:commands]
         @view = hash[:view]
         @http_status = hash[:http_status]
-        @segments = @path.split('/')
+
+        @segments = @path.split('/').concat(['/'])
+
         @catch = hash[:catch]
       end
     end

data/lib/silicon/template_registry.rb

@@ -1,11 +1,18 @@
 module Silicon
   class TemplateRegistry
-    def initialize(template_loader, silicon_config)
+    def initialize(template_loader, silicon_config, silicon_env)
+      @template_loader = template_loader
       @templates = template_loader.load_templates
       @config = silicon_config
+      @silicon_env = silicon_env
     end
 
     def get(name, type)
+      if @silicon_env == 'development'
+        # every time reload templates in development mode
+        @templates = @template_loader.load_templates
+      end
+
       directory = @config[:path][:views]
       template_path = File.join(directory, name + ".#{type}")
       match = @templates.keys.find{|k| k.include? template_path}

data/lib/silicon/version.rb

@@ -1,3 +1,3 @@
 module Silicon
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/silicon.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['vova.kalinkin@gmail.com']
 
   spec.summary       = 'Silicon is a minimalistic web API framework.'
-  spec.description   = 'The philosophy of Silicon is to provide minimum' \
+  spec.description   = 'The philosophy of Silicon is to provide minimalistic' \
                        ' middleware between your model and API client.'
 
   spec.homepage      = 'https://github.com/cylon-v/silicon'
@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'treetop', '~> 1.6.8'
   spec.add_dependency 'jbuilder', '~> 2.7.0'
   spec.add_dependency 'rack-parser', '~> 0.7.0'
+  spec.add_dependency 'terminal-table', '~> 1.8.0'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: silicon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vladimir Kalinkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hypo
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,8 +178,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-description: The philosophy of Silicon is to provide minimum middleware between your
-  model and API client.
+description: The philosophy of Silicon is to provide minimalistic middleware between
+  your model and API client.
 email:
 - vova.kalinkin@gmail.com
 executables:
@@ -194,10 +208,11 @@ files:
 - lib/silicon/errors/view_engine_error.rb
 - lib/silicon/extensions/hash.rb
 - lib/silicon/generators/cli.rb
+- lib/silicon/generators/templates/Gemfile
 - lib/silicon/generators/templates/actions/common/handle_errors.rb
 - lib/silicon/generators/templates/actions/welcome.tt
-- lib/silicon/generators/templates/app.rb
-- lib/silicon/generators/templates/app.routes
+- lib/silicon/generators/templates/app/app.rb
+- lib/silicon/generators/templates/app/app.routes
 - lib/silicon/generators/templates/config.ru
 - lib/silicon/generators/templates/silicon.yml
 - lib/silicon/generators/templates/views/show_welcome.json.jbuilder