rasti-app 7.0.1 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 142dc067d4a36842117ab120c8c562ff25b4cae8
-  data.tar.gz: 1eac819553b800ba8fba24061e071d828c76b45e
+SHA256:
+  metadata.gz: c42c07b7fa78222a470a0333706bbbebd3d34d5bad6f192d5279820469f0895d
+  data.tar.gz: dd85a56fa4fc1fd531131ab82fa1213ede2c868605f361004bf01dfc0b8220f6
 SHA512:
-  metadata.gz: 432d5d28ac9496a0c02d9e68c99331879b0eb4ef97d7d3d2c56fa71ff3757d8209927ba98f4bfbabdfe5dbe066e02430c70dfdc14966bf619f7cd942853a4cd2
-  data.tar.gz: ceaa848dd8eb180e6fa0c75f27244bce1f96b10086a162571ddabdfc3cdc85017cf9b2094e5e78ce4f4609db9f12932e2c2ecae3cf53a3011121d6dac157b265
+  metadata.gz: ec32ec4361ee507ada6a7ce36ee4cf7ec0edb7d161d0718e6950fb7f7a9041a5afc7d29a8c094d203d5ff8d4c37f251d89cb459b620764845cd8375f3cc9f0ef
+  data.tar.gz: d1429899556f7041b617380a8870d62d3bfce8e5d0e567e1ae001c6f2663e3d30472cef1413382e7de9984364611ba5b09f6f12f9198f7bbd9ba6a926ce1adb2

data/.ruby-version

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

data/.travis.yml

@@ -1,14 +1,15 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 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 +17,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

@@ -22,7 +22,7 @@ module Rasti
       def_delegators :facade, :interactions,
                               :synchronic_interactions,
                               :asynchronic_interactions,
-                              :permissions, 
+                              :permissions,
                               :valid_permission?
 
       attr_reader :facade
@@ -64,22 +64,18 @@ module Rasti
       form = self.class.facade.build_form name, params
       authorize! permission, form
       result = self.class.facade.call name, environment, session, form
-      after_call name, form.attributes, result
+      after_call name, form.to_h, result
 
       result
     end
 
     def enqueue(name, permission, params={})
-      options = {
-        queue: params.delete(:queue),
-        job_id: params.delete(:job_id),
-        job_wrapper: params.delete(:job_wrapper)
-      }
-      
-      form = self.class.facade.build_form name, params
+      options, attributes = Utils.split_hash params, [:queue, :job_id, :job_wrapper]
+
+      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
+      after_call name, form.to_h, result
 
       result
     end

data/lib/rasti/app/asynchronic_interaction.rb

@@ -13,13 +13,15 @@ module Rasti
       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,
                               session:      session,
-                              params:       params
+                              params:       attributes
       end
 
       def result_of(reference)

data/lib/rasti/app/facade.rb

@@ -35,7 +35,7 @@ module Rasti
         end
 
         def form_attributes
-          interaction.const_defined?(:Form) ? interaction.const_get(:Form).attributes : {}
+          interaction.const_defined?(:Form) ? interaction.const_get(:Form).attributes : []
         end
 
       end
@@ -92,7 +92,7 @@ module Rasti
                     alias:        interaction,
                     interaction:  interaction,
                     session:      session,
-                    params:       form.attributes
+                    params:       form.to_h
       end
 
       def synchronic_interactions
@@ -125,4 +125,4 @@ module Rasti
 
     end
   end
-end
+end

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 = '7.0.1'
+    VERSION = '8.0.1'
   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', '~> 3.0', '>= 3.0.1'
+  spec.add_runtime_dependency 'asynchronic', '~> 3.0', '>= 3.0.3'
   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', '~> 4.0'
 
-  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'
@@ -33,10 +32,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'pry-nav', '~> 0.2'
-
-  if RUBY_VERSION < '2'
-    spec.add_development_dependency 'term-ansicolor', '~> 1.3.0'
-    spec.add_development_dependency 'tins', '~> 1.6.0'
-    spec.add_development_dependency 'json', '~> 1.8'
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-app
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 8.0.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflecto
@@ -33,7 +33,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: multi_require
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   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: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -267,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: ''