marty 0.5.26 → 0.5.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e88e75d270f7cc03ce9ddbc77fcff6b1e1629b63
-  data.tar.gz: 6f905a9038c414ec5722804b60ef273aebc2d2db
+  metadata.gz: 7a3336670f870920df522354766443beb74444a6
+  data.tar.gz: 024d51ba48f744d2f79cf94c944aba5738bfb162
 SHA512:
-  metadata.gz: 097760432e2d1378f55b67c1346717c187aeae219337f44ba2198baba28b68d35ae1270598e2026a51e7212700eaa93968c6dfce579156172af3d69d453d1818
-  data.tar.gz: 512672c23ba38b00572a2e16b7fa6b0ff50086276fa0e44cd5474b3b58d04b054d7d86051818f4e5d2740e05b422642e2ca7458c30a8d16d8c620a614b0c042c
+  metadata.gz: 1943c8292da687d88f7d005fef66476b384a2172022c35dcef00b5ad0bbea0da2f215d7d7ff72464f2f114cd7441fbec51792c2d84454e52f6129a596ed604fe
+  data.tar.gz: 75eb4fef14e9c12212ff5aed7a70d7d9d3c042f3d335a53494a8b9e07554a3ac38bbee77124170b2cfb281e2daa7da18c9f1221eeccd2e32a1103c2fc758585e

data/db/migrate/099_create_marty_configs.rb

@@ -3,9 +3,10 @@ class CreateMartyConfigs < ActiveRecord::Migration
     create_table :marty_configs do |t|
       t.timestamps null: false
 
-      t.string :key
-      t.jsonb :value
+      t.string :key, null: false
+      t.jsonb :value, null: false
       t.text :description
     end
+    add_index :marty_configs, :key, unique: true
   end
 end

data/lib/marty/migrations.rb

@@ -73,6 +73,64 @@ module Marty::Migrations
                                     unique: true)
   end
 
+  def self.write_view(target_dir, klass, jsons, excludes)
+    colnames = klass.columns_hash.keys
+    user_id_cols = ["user_id", "o_user_id"]
+    excludes += user_id_cols
+    joins = ["join marty_users u on main.user_id = u.id",
+             "left join marty_users ou on main.o_user_id = ou.id"]
+    columns = ["concat(u.firstname, ' ', u.lastname) AS user_name",
+               "concat(ou.firstname, ' ', ou.lastname) AS obsoleted_user"]
+    jointabs = {}
+    colnames.each do |c|
+      if jsons[c]
+        jsons[c].each do |subc|
+          if subc.class == Array
+            subcol, type = subc
+            columns.push "f_fixfalse(main.#{c} ->> '#{subcol}')::#{type} " +
+                         "as \"#{c}_#{subcol}\""
+          else
+            columns.push "main.#{c} ->> '#{subc}' as \"#{c}_#{subc}\""
+          end
+        end
+      elsif !excludes.include?(c)
+        assoc = klass.reflections.find { |(n, h)| h.foreign_key == c }
+        if assoc && assoc[1].klass.columns_hash["name"]
+          table_name = assoc[1].table_name
+          jointabs[table_name] ||= 0
+          jointabs[table_name] += 1
+          tn_alias = "#{table_name}#{jointabs[table_name]}"
+          joins.push "left join #{table_name} #{tn_alias} on main.#{c} " +
+                     "= #{tn_alias}.id"
+          target_name = c.gsub(/_id$/,'_name')
+          columns.push "#{tn_alias}.name as #{target_name}"
+        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|
+      f.puts <<EOSQL
+create or replace function f_fixfalse(s text) returns text as $$
+begin
+    return case when s = 'false' then null else s end;
+end
+$$ language plpgsql;
+
+drop view if exists vw_#{klass.table_name};
+create or replace view vw_#{klass.table_name} as
+select
+    #{columns.join(",\n    ")}
+from #{klass.table_name} main
+    #{joins.join("\n    ")};
+
+grant select on vw_#{klass.table_name} to public;
+EOSQL
+    end
+  end
+
 private
   def fk_opts(from, to, column)
     name = "fk_#{from}_#{to}_#{column}"

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.26"
+  VERSION = "0.5.27"
 end

data/marty.gemspec

@@ -6,12 +6,14 @@ Gem::Specification.new do |s|
   s.name        = "marty"
   s.version     = Marty::VERSION
   s.authors     = [
-                   "Arman Bostani",
-                   "Eric Litwin",
-                   "Brian VanLoo",
-                   "Iliana Toneva",
-                   "Chad Edie",
-                  ]
+    "Arman Bostani",
+    "Brian VanLoo",
+    "Chad Edie",
+    "Eric Litwin",
+    "Iliana Toneva",
+    "Jock Cooper",
+    "Masaki Matsuo",
+  ]
   s.email       = ["arman.bostani@pnmac.com"]
   s.homepage    = "https://github.com/arman000/marty"
   s.summary     = "A framework for working with versioned data"

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

@@ -0,0 +1,23 @@
+create or replace function f_fixfalse(s text) returns text as $$
+begin
+    return case when s = 'false' then null else s end;
+end
+$$ language plpgsql;
+
+drop view if exists vw_marty_postings;
+create or replace view vw_marty_postings as
+select
+    concat(u.firstname, ' ', u.lastname) AS user_name,
+    concat(ou.firstname, ' ', ou.lastname) AS obsoleted_user,
+    main.id,
+    main.group_id,
+    main.created_dt,
+    main.obsoleted_dt,
+    main.name,
+    marty_posting_types1.name as posting_type_name
+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
+    left join marty_posting_types marty_posting_types1 on main.posting_type_id = marty_posting_types1.id;
+
+grant select on vw_marty_postings to public;

data/spec/lib/migrations_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+module Marty
+  describe "Migrations" do
+    it "writes db views correctly" do
+      tdir = File.dirname(__FILE__) + "/migrations/"
+      Marty::Migrations.write_view(tdir, Marty::Posting, {}, ["comment"])
+      filename = "vw_marty_postings.sql"
+      genfile = File.join(tdir,filename)
+      generated = File.read(genfile)
+      expected = File.read(File.join(tdir,"#{filename}.expected"))
+      expect(generated).to eq(expected)
+      File.delete(genfile)
+    end
+  end
+end

data/spec/models/config_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Marty
-  describe Config do
+  describe Marty::Config do
     describe "validations" do
       it "should return valid config value based on key" do
         Marty::Config["TEST 1"] = 2

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.26
+  version: 0.5.27
 platform: ruby
 authors:
 - Arman Bostani
-- Eric Litwin
 - Brian VanLoo
-- Iliana Toneva
 - Chad Edie
+- Eric Litwin
+- Iliana Toneva
+- Jock Cooper
+- Masaki Matsuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -533,6 +535,8 @@ files:
 - spec/job_helper.rb
 - spec/lib/data_exporter_spec.rb
 - spec/lib/data_importer_spec.rb
+- spec/lib/migrations/vw_marty_postings.sql.expected
+- spec/lib/migrations_spec.rb
 - spec/lib/xl_spec.rb
 - spec/lib/xl_styles_spec.rb
 - spec/models/api_auth_spec.rb