marty 1.0.38 → 1.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da04fa860827fce8185e800389eb73a792061a9
-  data.tar.gz: e722057ed242f9090f05d1c916ccb729d055c728
+  metadata.gz: c3d5f574966052ae97f6cd32ce6de46d6ba0349c
+  data.tar.gz: 2d168acee2a87a80112c67a1c9bdb312f5b6025d
 SHA512:
-  metadata.gz: '058dda8d8f51acba402b91a95204ad19eca47e4e142c502bd18f6a03556f8e91ef713b1ad1931c813d21824e3db4fd035a9b6cf05b07cad696f2d96df6f3db43'
-  data.tar.gz: 91c8ab2dddb5ab07e27547dd7eef1280b9828e1930a3bd6864bbcfb70aeac8fdb8faa592181459e0221c7caf85781340a3e679bf4f585cd1a2c7b6b123977aea
+  metadata.gz: 2406f23f35850e9d905afb94c89242879a9f0cd86d481d07d1b134c41cc5e9f1060493ae9f613ffbbdb3adfcac97790627ced29479dc37481000bf5e4dbdb325
+  data.tar.gz: d7085ca103f7b0401389dd8b990caa33ff72f8543d311fef60dd05401103afb4562a35fe03013fa7490b58dc325916a6c6bb0f632eea2070efbe99c5723f86ad

data/.gitignore

@@ -22,7 +22,6 @@ spec/dummy/.sass-cache
 *~
 *.komodoproject
 /pkg
-/Gemfile.lock
 *.swp
 
 /spec/dummy/public/extjs

data/Gemfile.lock

@@ -0,0 +1,225 @@
+PATH
+  remote: .
+  specs:
+    marty (1.0.39)
+      axlsx (= 2.1.0pre)
+      coderay
+      delorean_lang (~> 0.1)
+      json-schema
+      mcfly (= 0.0.19)
+      net-ldap (~> 0.12.0)
+      netzke-basepack (~> 1.0.0)
+      netzke-core (~> 1.0.0)
+      pg (~> 0.17)
+      rubyzip
+      sqlite3
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.9)
+      activesupport (= 4.2.9)
+      globalid (>= 0.3.0)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
+      arel (~> 6.0)
+    activesupport (4.2.9)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (6.0.4)
+    axlsx (2.1.0.pre)
+      htmlentities (~> 4.3.1)
+      nokogiri (>= 1.4.1)
+      rubyzip (~> 1.1.7)
+    builder (3.2.3)
+    capybara (2.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    childprocess (0.7.1)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.2)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
+    daemons (1.1.9)
+    database_cleaner (1.6.1)
+    delayed_job (4.1.3)
+      activesupport (>= 3.0, < 5.2)
+    delayed_job_active_record (4.1.2)
+      activerecord (>= 3.0, < 5.2)
+      delayed_job (>= 3.0, < 5)
+    delorean_lang (0.3.30)
+      activerecord (>= 3.2)
+      treetop (~> 1.5)
+    diff-lcs (1.3)
+    erubis (2.7.0)
+    execjs (2.7.0)
+    ffi (1.9.18)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    htmlentities (4.3.4)
+    i18n (0.8.6)
+    json-schema (2.8.0)
+      addressable (>= 2.4)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    marty_rspec (0.1)
+      rspec-by
+    mcfly (0.0.19)
+      delorean_lang (~> 0.1)
+      pg (~> 0.17)
+    method_source (0.8.2)
+    mime-types (2.99.3)
+    mini_mime (0.1.4)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    net-ldap (0.12.1)
+    netzke-basepack (1.0.1.0)
+    netzke-core (1.0.1.0)
+      execjs
+      mime-types (< 3)
+      uglifier
+    netzke-testing (1.0.1.0)
+      coffee-script
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    pg (0.18.4)
+    polyglot (0.3.5)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-rails (0.3.6)
+      pry (>= 0.10.4)
+    public_suffix (3.0.0)
+    rack (1.6.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.9)
+      actionmailer (= 4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      activemodel (= 4.2.9)
+      activerecord (= 4.2.9)
+      activesupport (= 4.2.9)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.9)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.1.0)
+    rspec-by (0.0.7)
+      rspec-core (>= 3)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubyzip (1.1.7)
+    selenium-webdriver (3.5.2)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
+    slop (3.6.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    treetop (1.6.8)
+      polyglot (~> 0.3)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    uglifier (3.2.0)
+      execjs (>= 0.3.0, < 3)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara
+  daemons (~> 1.1.9)
+  database_cleaner
+  delayed_job_active_record
+  marty!
+  marty_rspec
+  mime-types (< 3.0)
+  netzke-basepack
+  netzke-core
+  netzke-testing
+  pg (~> 0.18.4)
+  pry-rails
+  rails (~> 4.2.1)
+  rspec-rails (~> 3.0)
+  selenium-webdriver
+  sqlite3
+  timecop
+
+BUNDLED WITH
+   1.15.4

data/app/components/marty/report_form.rb

@@ -178,7 +178,7 @@ class Marty::ReportForm < Marty::Form
       raise engine.to_s if engine.is_a?(Hash)
 
       items, title, format = engine.
-        evaluate_attrs(root_sess[:selected_node],
+        evaluate(root_sess[:selected_node],
                        ["form", "title", "format"],
                        {},
                        )

data/app/components/marty/report_select.rb

@@ -113,7 +113,7 @@ class Marty::ReportSelect < Marty::Form
       next if roles && !roles.any?{ |r| Marty::User.has_role(r) }
 
       begin
-        title, format = engine.evaluate_attrs(node, ["title", "format"])
+        title, format = engine.evaluate(node, ["title", "format"])
         format ? [node, "#{title} (#{format})"] : nil
       rescue
         [node, node]

data/app/controllers/marty/rpc_controller.rb

@@ -24,7 +24,7 @@ class Marty::RpcController < ActionController::Base
   def get_schemas(tag, sname, node, attrs)
     begin
       engine = Marty::ScriptSet.new(tag).get_engine(sname+'Schemas')
-      result = engine.evaluate_attrs(node, attrs, {})
+      result = engine.evaluate(node, attrs, {})
       attrs.zip(result)
     rescue => e
       use_message = e.message == 'No such script' ?
@@ -120,7 +120,7 @@ class Marty::RpcController < ActionController::Base
         result = engine.background_eval(node, params, attrs)
         return retval = {"job_id" => result.__promise__.id}
       end
-      res = engine.evaluate_attrs(node, attrs, params)
+      res = engine.evaluate(node, attrs, params)
 
       validation_error = {}
       err_count = 0

data/lib/marty/promise_job.rb

@@ -114,7 +114,7 @@ class Marty::PromiseJob < Struct.new(:promise,
 
       engine = Marty::ScriptSet.new(tag).get_engine(sname)
 
-      attrs_eval = engine.evaluate_attrs(node, attrs, params)
+      attrs_eval = engine.evaluate(node, attrs, params)
       res = attrs.zip(attrs_eval).each_with_object({}) do |(attr, val), h|
         h[attr] = val
       end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.38"
+  VERSION = "1.0.39"
 end

data/spec/lib/xl_spec.rb

@@ -95,7 +95,7 @@ describe Marty::Xl do
     map = {'C1' => c[0].to_s, 'C2' => c[1].to_s}
     map.each { |k,v| code.sub!(k,v)  }
     engine.parse(code)
-    engine.evaluate_attrs("M", ["result"]).flatten(1)
+    engine.evaluate("M", ["result"]).flatten(1)
   end
 
   before(:all) do

data/spec/lib/xl_styles_spec.rb

@@ -43,7 +43,7 @@ describe Marty::Xl do
   before(:each) do
     code = STYLE_CODE.clone
     engine.parse(code)
-    @ws =  engine.evaluate_attrs("S", ["result"]).flatten(1)
+    @ws =  engine.evaluate("S", ["result"]).flatten(1)
   end
 
   it "should be able to create a spreadsheet with overlapping border styles" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.38
+  version: 1.0.39
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -195,6 +195,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - INDEPENDENCE_ISSUES.md
 - MIT-LICENSE
 - README.md