dandy 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35729ef648356d307df4cbb9a49aa1df7e053949
-  data.tar.gz: 695e1200d2c7066ed4f989842322437c5635779b
+  metadata.gz: 874927c6a6c9fe878b77341cb699df8e1826a4c4
+  data.tar.gz: c29ffb2cf1211bb9a5eedb21c93c2117171e15af
 SHA512:
-  metadata.gz: 52323c799596e094a5f2dd26a3a0b178f5016696fa4cd7cf33b0df4add8209f5fda43e908cdd1cfa26024bca443f599e048ecd7f17d85def852a3797e111b71b
-  data.tar.gz: 37757ebdc264e506788c398c0c525dac7f2b2cd882b27501283434faa8b0c60beeb813b85eb885eecacdac0f904e54f0bc34d35c527f725d1854c9275b4bada5
+  metadata.gz: 1feb5fbc692297aba11bde80a584aeb7679d2cfab5d1144dba410e6f8178d38fd30ce0b088a897f7a08048cd35a1763c707d32ea91277d6a2ec102a34e854d6f
+  data.tar.gz: 5eb3ba4c287233663f58be493a4f9ed5fcaadc5f1ebdeddc1a80de2f46e4f3f4c60a7f838e5b47fa0af07607bd302fb503024ac94628ea8179ed6b7ae0558300

data/lib/dandy/generators/cli.rb

@@ -10,16 +10,30 @@ module Dandy
     end
 
     desc 'new NAME', 'Create new Dandy application'
+    method_options :jet_set => :boolean
     def new(name)
-      copy_file 'templates/app/app.rb', "#{name}/app/app.rb"
+
+      if options[:jet_set]
+        copy_file 'templates/app/app_jet_set.rb', "#{name}/app/app.rb"
+        copy_file 'templates/Gemfile_jet_set', "#{name}/Gemfile"
+        copy_file 'templates/db/mapping.rb', "#{name}/db/mapping.rb"
+        copy_file 'templates/actions/common/open_db_session.rb', "#{name}/app/actions/common/open_db_session.rb"
+      else
+        copy_file 'templates/app/app.rb', "#{name}/app/app.rb"
+        copy_file 'templates/Gemfile', "#{name}/Gemfile"
+      end
+
       copy_file 'templates/app/app.routes', "#{name}/app/app.routes"
       copy_file 'templates/dandy.yml', "#{name}/dandy.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}
 
+      if options[:jet_set]
+        insert_into_file "#{name}/app/app.routes", "        :before -> common/open_db_session\n", :after => ".->\n"
+      end
+
       inside name do
         run 'bundle'
       end

data/lib/dandy/generators/templates/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'rack-cors'
+gem 'hypo'
 gem 'dandy'

data/lib/dandy/generators/templates/Gemfile_jet_set

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'rack-cors'
+gem 'hypo'
+gem 'dandy'
+
+gem 'sqlite'
+#gem 'pg'
+
+gem 'sequel'
+gem 'jet_set'

data/lib/dandy/generators/templates/actions/common/open_db_session.rb

@@ -0,0 +1,24 @@
+require 'sequel'
+require 'jet_set'
+require 'logger'
+
+class OpenDbSession
+  def initialize(container, dandy_config, dandy_env)
+    @container = container
+    @config = dandy_config
+    @dandy_env = dandy_env
+  end
+
+  def call
+    # Instead of :url you can specify required Sequel connection parameters in dandy.yml.
+    # Additional details about Sequel connection configuration
+    # see at http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html
+    connection = Sequel.connect(@config[:db][:url])
+
+    if @dandy_env == 'development'
+      connection.loggers << Logger.new($stdout)
+    end
+
+    JetSet::open_session(connection, :dandy_request)
+  end
+end

data/lib/dandy/generators/templates/app/app_jet_set.rb

@@ -0,0 +1,13 @@
+require 'dandy'
+require 'jet_set'
+require './db/mapping'
+
+class App < Dandy::App
+  include Mapping
+
+  def initialize(container = Hypo::Container.new)
+    super(container)
+
+    JetSet::init(load_mapping, container)
+  end
+end

data/lib/dandy/generators/templates/dandy.yml

@@ -0,0 +1,9 @@
+path:
+  dependencies:
+    - app/actions
+  views: app/views
+  routes: app/app.routes
+action:
+  async_timeout: 10 # in seconds
+db:
+  url: sqlite:/ # replace it with connection string to your source

data/lib/dandy/generators/templates/db/mapping.rb

@@ -0,0 +1,25 @@
+# Don't forget add dependencies
+# require './domain/user'
+# require './domain/invoice'
+
+module Mapping
+  def load_mapping
+    JetSet::map do
+      # Example:
+      #
+      # entity User do
+      #   field :first_name
+      #   field :last_name
+      #   field :company
+      #   collection :invoices, type: Invoice
+      # end
+      #
+      # entity Invoice do
+      #   field :amount
+      #   field :date
+      #   field :created_at
+      #   reference :user, type: User
+      # end
+    end
+  end
+end

data/lib/dandy/loaders/dependency_loader.rb

@@ -14,7 +14,7 @@ module Dandy
       end
 
       @types.each do |type|
-        @container.register(type).using_lifetime(:scope).bound_to(:dandy_request)
+        @container.register(type[:class], type[:path].to_sym).using_lifetime(:scope).bound_to(:dandy_request)
       end
     end
   end

data/lib/dandy/loaders/type_loader.rb

@@ -8,14 +8,17 @@ module Dandy
       types = []
       @directories.each do |directory|
         dir = File.join(directory, '**/*')
-        files = Dir.glob(dir).reject {|file_path| File.directory? file_path}
+        files = Dir.glob(dir).reject {|file_path| File.directory?(file_path)}
 
         files.each do |file|
-          path = File.join Dir.pwd, file
+          path = File.join(Dir.pwd, file)
           require path
           file_name = File.basename(file).gsub(File.extname(file), '')
           class_name = file_name.split('_').each(&:capitalize!).join('')
-          types << Object.const_get(class_name)
+          types << {
+            class: Object.const_get(class_name),
+            path: file.gsub(File.extname(file), '').gsub(directory + '/', '')
+          }
         end
       end
 

data/lib/dandy/routing/file_reader.rb

@@ -7,10 +7,15 @@ module Dandy
 
       def read
         path = File.join('./', @config[:path][:routes])
-        content = File.read(path)
+        raw_content = File.read(path)
+
+        raw_content.gsub!(/\\\s*\n+\s*->/, '->')
+        raw_content.gsub!(/\\\s*\n+\s*=>/, '=>')
+        raw_content.gsub!(/\\\s*\n+\s*=\*/, '=>')
+
 
         # use '^' instead spaces and tabs
-        raw_content = content.gsub(/\t/, '  ')
+        raw_content = raw_content.gsub(/\t/, '  ')
                         .gsub('  ', '^')
                         .gsub(' ', '')
 
@@ -20,7 +25,7 @@ module Dandy
         ###
         raw_content = raw_content.gsub('->', '*>').gsub('<-', '<*')
 
-        raw_content.gsub!("\n", ';') + ';'
+        raw_content.gsub("\n", ';') + ';'
       end
     end
   end

data/lib/dandy/routing/syntax_grammar.tt

@@ -40,7 +40,7 @@ grammar Syntax
   end
 
   rule command
-    (arrow result_name [a-z0-9_]+) 1..1 <Command>
+    (arrow result_name [a-z0-9_\/]+) 1..1 <Command>
   end
 
   rule result_name

data/lib/dandy/version.rb

@@ -1,3 +1,3 @@
 module Dandy
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandy
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Vladimir Kalinkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-01 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hypo
@@ -210,12 +210,16 @@ files:
 - lib/dandy/extensions/hash.rb
 - lib/dandy/generators/cli.rb
 - lib/dandy/generators/templates/Gemfile
+- lib/dandy/generators/templates/Gemfile_jet_set
 - lib/dandy/generators/templates/actions/common/handle_errors.rb
+- lib/dandy/generators/templates/actions/common/open_db_session.rb
 - lib/dandy/generators/templates/actions/welcome.tt
 - lib/dandy/generators/templates/app/app.rb
 - lib/dandy/generators/templates/app/app.routes
+- lib/dandy/generators/templates/app/app_jet_set.rb
 - lib/dandy/generators/templates/config.ru
-- lib/dandy/generators/templates/silicon.yml
+- lib/dandy/generators/templates/dandy.yml
+- lib/dandy/generators/templates/db/mapping.rb
 - lib/dandy/generators/templates/views/show_welcome.json.jbuilder
 - lib/dandy/loaders/dependency_loader.rb
 - lib/dandy/loaders/template_loader.rb

data/lib/dandy/generators/templates/silicon.yml

@@ -1,7 +0,0 @@
-path:
-  dependencies:
-    - app/actions
-  views: app/views
-  routes: app/app.routes
-action:
-  async_timeout: 10 # in seconds