rasti-app 6.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd449b3eaa10b93d8e5e3dfd5b87398963800140
-  data.tar.gz: c7bb240a8454801f295fe7e790da4bc7554b3fbe
+SHA256:
+  metadata.gz: 11b4efa00bb1294e325cf35ef3ad89ccc2cabb1df7558ee5f226a607a08eea7d
+  data.tar.gz: ecaa918db393e1ffb1f6cd177700ff441397796a0980b52a21a8498ab93fae19
 SHA512:
-  metadata.gz: c31a8a16f0f76e0bfe5cf79af19af2255196e3af17fb26da5599ab38f5728abfe631d4c05dceb9593648372b34a84341d761c780f18db28a22dcebfc517344a9
-  data.tar.gz: 0a5ce4373f79a723fdc73796a86b2692c1bd081ac665892fea0285ac422cf9c0f8a158386ea2e26a2feb5950c3aac3856ab45cb28317603b1d311536804a8e4a
+  metadata.gz: fcf00fe745da58450d55412d605fd0967cd402dd46be7582c2bb2d61c3c6da6f2d1fef6df60bb5d45bd17eec2b4ef510db4121d611cf53cc89fdb8e5d9df5309
+  data.tar.gz: e893314f523ecbbd53db892362de6427d5b8be4bf9937ceae7500cc425d2c1c04d71d99ae14f3d94fd5daccb3ba9b0a20d59ff318e75c2d0d8669f029e3a574e

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.0
+ruby-2.5.7

data/.travis.yml

@@ -5,10 +5,12 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
-  - 2.3.0
-  - 2.4.0
-  - jruby-1.7.25
-  - jruby-9.1.7.0
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - jruby-9.2.9.0
   - ruby-head
   - jruby-head
 
@@ -16,7 +18,4 @@ matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-
-before_install:
-  - gem install bundler
+    - rvm: jruby-head

data/lib/rasti/app.rb

@@ -70,13 +70,9 @@ module Rasti
     end
 
     def enqueue(name, permission, params={})
-      options = {
-        queue: params.delete(:queue),
-        job_id: params.delete(:job_id),
-        job_wrapper: params.delete(:job_wrapper)
-      }
+      options, attributes = Utils.split_hash params, [:queue, :job_id, :job_wrapper]
       
-      form = self.class.facade.build_form name, params
+      form = self.class.facade.build_form name, attributes
       authorize! permission, form
       result = self.class.facade.enqueue name, session, form, options
       after_call name, form.attributes, result

data/lib/rasti/app/asynchronic_interaction.rb

@@ -9,17 +9,19 @@ module Rasti
       private
 
       def job
-        @job ||= Asynchronic[context.fetch(:job_id)].job
+        @job ||= Asynchronic[session.job_id].job
       end
 
       def enqueue(interaction, params)
-        job.send :async, Job, queue:        params.delete(:queue) || Asynchronic.default_queue,
-                              alias:        params.delete(:alias) || interaction,
-                              dependency:   params.delete(:dependency),
-                              dependencies: params.delete(:dependencies),
+        options, attributes = Utils.split_hash params, [:queue, :alias, :dependency, :dependencies]
+
+        job.send :async, Job, queue:        options[:queue] || Asynchronic.default_queue,
+                              alias:        options[:alias] || interaction,
+                              dependency:   options[:dependency],
+                              dependencies: options[:dependencies],
                               interaction:  interaction,
-                              context:      context,
-                              params:       params
+                              session:      session,
+                              params:       attributes
       end
 
       def result_of(reference)

data/lib/rasti/app/service_factory.rb

@@ -9,6 +9,7 @@ module Rasti
 
           define_method name do
             cache[name] ||= begin
+              raise "Undefined settings for service: #{name}" unless settings.key? name
               adapter_class = Consty.get(settings[name][:adapter], self.class.services[name])
               self.class.services[name].new adapter_class.new(environment, settings[name][:options])
             end

data/lib/rasti/app/settings.rb

@@ -3,18 +3,18 @@ module Rasti
     class Settings
       class << self
 
-        def load(environment)
-          load_file File.join(Dir.pwd, "#{environment}.yml")
+        def load(environment, options={})
+          load_file File.join(Dir.pwd, "#{environment}.yml"), options
         end
 
-        def load_file(filename)
-          Hash::Accessible.new(evaluate(File.read(filename))).deep_freeze
+        def load_file(filename, options={})
+          Hash::Accessible.new(evaluate(File.read(filename), options)).deep_freeze
         end
 
         private
 
-        def evaluate(yml)
-          YAML.load ERB.new(yml).result
+        def evaluate(yml, options={})
+          YAML.load ERB.new(yml).result_with_hash(options)
         end
 
       end

data/lib/rasti/app/utils.rb

@@ -21,6 +21,10 @@ module Rasti
           namespace.empty? ? nil : Object.const_get(namespace)
         end
 
+        def split_hash(hash, keys)
+          [hash.slice(*keys), hash.slice(*(hash.keys - keys))]
+        end
+
       end
     end
   end

data/lib/rasti/app/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   class App
-    VERSION = '6.0.0'
+    VERSION = '7.1.0'
   end
 end

data/rasti-app.gemspec

@@ -19,13 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'inflecto', '~> 0.0'
-  spec.add_runtime_dependency 'asynchronic', '~> 2.0'
+  spec.add_runtime_dependency 'asynchronic', '~> 3.0', '>= 3.0.1'
   spec.add_runtime_dependency 'multi_require', '~> 1.0'
   spec.add_runtime_dependency 'hash_ext', '~> 0.5'
   spec.add_runtime_dependency 'consty', '~> 1.0'
-  spec.add_runtime_dependency 'rasti-form', '~> 3.0'
+  spec.add_runtime_dependency 'rasti-form', '~> 3.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-colorin', '~> 0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-app
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflecto
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: multi_require
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !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'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -261,8 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ''