marty 0.5.28 → 0.5.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6599f34a4823efc8be3d05feef0d3fc937219e6
-  data.tar.gz: 41c960a54860d1c94d2138148725fdc5575c33f0
+  metadata.gz: 0eb409a0b5479f611d8ee7f84c28ee00198af598
+  data.tar.gz: 938c7c8e7d944f883d212800c6944d80c7382755
 SHA512:
-  metadata.gz: a7b66c7ca4c79c298aae4a82f38a20d856c83c94800575328062aba071aeb4f21f2f63b81a1af77a6ae2106eac838e694c1a9fcf0041b27922d03b3715afb88b
-  data.tar.gz: 6394925740fc4739765409d35205a57b6fc20fafa6089686b5438b35a49839c0c2c013eb8ccf843c7b45cff6639f55b5288b68dc6b94044f88e789f08bed1586
+  metadata.gz: 4d81bb14296b79c16a5ce0d1b78f85a81d4128210d17b166e87d449aa4dab61a66d1c624584c855a72e6c3fa068dc930d81f86fcfb342224eb44edf4dd891a0b
+  data.tar.gz: 3f58c2706f595e2e0c491c0fedf633f3abf5aa2925623d5d5f3ba30c52f4fa83a3578ef9555f193355dbb1414e6c3f5f38b4d09e775beed0728d2ac0230ed492

data/.gitignore

@@ -25,3 +25,4 @@ spec/dummy/.sass-cache
 *.swp
 
 /spec/dummy/public/extjs
+.rspec-results

data/app/components/marty/form.rb

@@ -1,5 +1,3 @@
-require 'marty/permissions'
-
 # Netzke Form with Marty permissions
 class Marty::Form < Netzke::Basepack::Form
   extend ::Marty::Permissions

data/app/components/marty/main_auth_app.rb

@@ -1,4 +1,3 @@
-require 'marty/permissions'
 require 'marty/scripting'
 require 'marty/reporting'
 require 'marty/posting_window'

data/app/components/marty/report_form.rb

@@ -1,5 +1,3 @@
-require 'delorean_lang'
-
 class Marty::ReportForm < Marty::Form
 
   # override apply for background generation

data/app/components/marty/script_form.rb

@@ -1,6 +1,3 @@
-require 'delorean_lang'
-require 'coderay'
-
 class Marty::ScriptForm < Marty::Form
   DASH = 0x2012.chr('utf-8')
 

data/app/models/marty/api_auth.rb

@@ -1,5 +1,3 @@
-require 'mcfly'
-
 class Marty::ApiAuth < Marty::Base
   has_mcfly
 

data/app/models/marty/script.rb

@@ -1,5 +1,3 @@
-require 'mcfly'
-
 class Marty::Script < Marty::Base
   has_mcfly
 

data/app/models/marty/user.rb

@@ -1,6 +1,3 @@
-require 'mcfly'
-require 'net/ldap'
-
 class Marty::User < Marty::Base
   validates_presence_of :login, :firstname, :lastname
   validates_uniqueness_of :login

data/config/routes.rb

@@ -1,5 +1,3 @@
-require 'netzke-core'
-
 Marty::Engine.routes.draw do
   match via: [:get, :post], "rpc/:action(.:format)" => "rpc", as: :rpc
   get "job/:action" => "job", as: :job

data/db/migrate/001_create_marty_scripts.rb

@@ -1,5 +1,3 @@
-require 'mcfly'
-
 class CreateMartyScripts < McflyMigration
   include Marty::Migrations
 

data/db/migrate/019_create_marty_postings.rb

@@ -1,5 +1,3 @@
-require 'marty/migrations'
-
 class CreateMartyPostings < McflyAppendOnlyMigration
   include Marty::Migrations
 

data/db/migrate/091_create_marty_promises.rb

@@ -1,5 +1,3 @@
-require 'marty/migrations'
-
 class CreateMartyPromises < ActiveRecord::Migration
   include Marty::Migrations
 

data/db/migrate/095_create_marty_tags.rb

@@ -1,5 +1,3 @@
-require 'marty/migrations'
-
 class CreateMartyTags < McflyAppendOnlyMigration
   include Marty::Migrations
 

data/db/migrate/098_create_marty_api_auths.rb

@@ -1,5 +1,3 @@
-require 'mcfly'
-
 class CreateMartyApiAuths < McflyMigration
   include Marty::Migrations
 

data/lib/marty.rb

@@ -1,19 +1,15 @@
 # Do not change order of require, since there are some dependencies
-# Do not require 'marty/permissions' - it relies on Rails being loaded first
-require 'marty/railtie'
+#
+# Do not include anything here that will be properly autoloaded by Rails - This
+# would be any file that define a properly namespaced module/class as Marty::<filename>
+# and that don't run code outside of that module/class
+#
+# Also note that anything required here will need to require in any classes that
+# they might be overriding methods in
+
 require 'marty/engine'
-require 'marty/monkey'
+require 'marty/railtie'
 require 'marty/mcfly_query'
-require 'marty/util'
-require 'marty/migrations'
-require 'marty/data_exporter'
-require 'marty/xl.rb'
-require 'marty/data_conversion'
-require 'marty/data_importer'
-require 'marty/data_change'
-require 'marty/relation'
+require 'marty/monkey'
 require 'marty/promise_job'
-require 'marty/promise_proxy'
-require 'marty/content_handler'
 require 'marty/lazy_column_loader'
-require 'marty/version'

data/lib/marty/content_handler.rb

@@ -1,5 +1,3 @@
-require 'csv'
-
 module Marty::ContentHandler
   GEN_FORMATS = {
     "csv"  => ['text/csv',                 'download'],

data/lib/marty/data_change.rb

@@ -1,5 +1,3 @@
-require 'delorean_lang'
-
 class Marty::DataChange
   include Delorean::Model
 

data/lib/marty/data_conversion.rb

@@ -1,5 +1,3 @@
-require 'mcfly'
-
 class Marty::DataConversion
   EXCEL_START_DATE = Date.parse('1/1/1900')-2
 

data/lib/marty/data_exporter.rb

@@ -1,8 +1,3 @@
-require 'base64'
-require 'zlib'
-require 'csv'
-require 'marty/data_conversion'
-
 class Marty::DataExporter
   # given an array of hashes, return set of all keys
   def self.hash_array_keys(hl)

data/lib/marty/data_importer.rb

@@ -1,6 +1,3 @@
-require 'csv'
-require 'marty/data_conversion'
-
 module Marty
   class DataImporterError < StandardError
     attr_reader :lines

data/lib/marty/engine.rb

@@ -2,6 +2,8 @@ module Marty
   class Engine < ::Rails::Engine
     isolate_namespace Marty
 
+    config.autoload_paths << File.expand_path("../../../lib", __FILE__)
+
     # generators add rspec tests
     config.generators do |g|
       g.test_framework :rspec, :view_specs => false

data/lib/marty/migrations.rb

@@ -1,5 +1,3 @@
-require 'digest/md5'
-
 module Marty::Migrations
   def tb_prefix
     "marty_"
@@ -73,7 +71,7 @@ module Marty::Migrations
                                     unique: true)
   end
 
-  def self.write_view(target_dir, klass, jsons, excludes)
+  def self.write_view(target_dir, target_view, klass, jsons, excludes, extras)
     colnames = klass.columns_hash.keys
     user_id_cols = ["user_id", "o_user_id"]
     excludes += user_id_cols
@@ -104,14 +102,16 @@ module Marty::Migrations
                      "= #{tn_alias}.id"
           target_name = c.gsub(/_id$/,'_name')
           columns.push "#{tn_alias}.name as #{target_name}"
+          extras.select { |(table, column)| table_name == table }.each do
+            |(table, column)|
+            columns.push "#{tn_alias}.#{column} as #{table_name}_#{column}"
+          end
         else
           columns.push "main.#{c}"
         end
       end
     end
-    table_name = klass.table_name
-    file_name = "vw_#{table_name}.sql"
-    File.open(File.join(target_dir,file_name), "w") do |f|
+    File.open(File.join(target_dir, "#{target_view}.sql"), "w") do |f|
       f.puts <<EOSQL
 create or replace function f_fixfalse(s text) returns text as $$
 begin
@@ -119,14 +119,14 @@ begin
 end
 $$ language plpgsql;
 
-drop view if exists vw_#{klass.table_name};
-create or replace view vw_#{klass.table_name} as
+drop view if exists #{target_view};
+create or replace view #{target_view} as
 select
     #{columns.join(",\n    ")}
 from #{klass.table_name} main
     #{joins.join("\n    ")};
 
-grant select on vw_#{klass.table_name} to public;
+grant select on #{target_view} to public;
 EOSQL
     end
   end

data/lib/marty/monkey.rb

@@ -4,15 +4,6 @@
 
 require 'delorean_lang'
 
-# Very hacky to overwrite delorean's whitelist.  But, there's no
-# better way now.
-
-Delorean::RUBY_WHITELIST.
-  merge!({
-         })
-
-######################################################################
-
 # Be able to access Enums from Delorean
 class Delorean::BaseModule::BaseClass
   class << self

data/lib/marty/relation.rb

@@ -1,5 +1,3 @@
-require 'mcfly'
-
 class Marty::Relation
   # Given a Mcfly class (klass) and a list of classes which can
   # reference klass, returns instaces of klass which have no references.

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.28"
+  VERSION = "0.5.29"
 end

data/lib/marty/xl.rb

@@ -1,10 +1,12 @@
-require 'axlsx'
-require 'delorean_lang'
-
 class Marty::Xl
   include Delorean::Model
 
   def self.spreadsheet(worksheets)
+    # hack: axlsx tries to modify its input when sent an empty
+    # array!  This fails when we sent it a frozen one => make sure
+    # we sent it an unfozen array.
+    worksheets = [] if worksheets == []
+
     xl = Marty::Xl.new(worksheets)
     xl.package
   end

data/marty.gemspec

@@ -1,6 +1,10 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 require "marty/version"
+require "digest/md5"
+require "base64"
+require "zlib"
+require "csv"
 
 Gem::Specification.new do |s|
   s.name        = "marty"

data/spec/features/jobs_dashboard_spec.rb

@@ -16,7 +16,7 @@ describe 'Jobs Dashboard', type: :feature, js: true, capybara: true do
       start_dt: Time.now
 
     visit "/"
-    all 'span', text: 'Sign in'
+    all 'span', text: 'Sign in', minimum: 1
     find(ext_button_id('Sign in')).click
     fill_in 'Login', with: 'marty'
     fill_in 'Password', with: 'marty'

data/spec/lib/migrations/vw_marty_postings.sql.expected

@@ -14,7 +14,8 @@ select
     main.created_dt,
     main.obsoleted_dt,
     main.name,
-    marty_posting_types1.name as posting_type_name
+    marty_posting_types1.name as posting_type_name,
+    marty_posting_types1.id as marty_posting_types_id
 from marty_postings main
     join marty_users u on main.user_id = u.id
     left join marty_users ou on main.o_user_id = ou.id

data/spec/lib/migrations_spec.rb

@@ -4,7 +4,10 @@ module Marty
   describe "Migrations" do
     it "writes db views correctly" do
       tdir = File.dirname(__FILE__) + "/migrations/"
-      Marty::Migrations.write_view(tdir, Marty::Posting, {}, ["comment"])
+      Marty::Migrations.write_view(tdir,
+                                   'vw_marty_postings',
+                                   Marty::Posting, {}, ["comment"],
+                                   [["marty_posting_types", "id"]])
       filename = "vw_marty_postings.sql"
       genfile = File.join(tdir,filename)
       generated = File.read(genfile)

data/spec/lib/xl_spec.rb

@@ -195,4 +195,8 @@ describe Marty::Xl do
       ["", "", "", "", "", "text", 72, 4, 75, 6, 78]
   end
 
+  it "should not raise an exception when given an empty, frozen arg" do
+    data = [].freeze
+    expect { Marty::Xl.spreadsheet(data).to_stream.read }.to_not raise_error
+  end
 end

data/spec/spec_helper.rb

@@ -43,6 +43,8 @@ RSpec.configure do |config|
 
   config.order = 'random'
 
+  config.example_status_persistence_file_path = '.rspec-results'
+
   config.before(:suite) do
     DatabaseCleaner.clean_with(:truncation)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.28
+  version: 0.5.29
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -576,3 +576,4 @@ signing_key:
 specification_version: 4
 summary: A framework for working with versioned data
 test_files: []
+has_rdoc: