marty 0.5.34 → 0.5.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 347e54fa4ce94345e06e4e8a02d8af0877ecc937
-  data.tar.gz: 062fd26449823650225179b1e8f4d43d56102f46
+  metadata.gz: d57f8c7a1dc4a0af72bb259befade99ac6429049
+  data.tar.gz: 0856cfc7dcd8d85ee375f7022ad3a5acb1ddfa4f
 SHA512:
-  metadata.gz: f6091de960750e12f08c9e6d6059fc2372a015501e269745d7dddb6e63c151c7c6916d62972061f7fb56f645f03ffab0c49d61ef8f6152be23365c3856a03fcc
-  data.tar.gz: 66dc1a48a417059fff72a95fe49586e7e357b13e3a46c6f7c3f36bb0333342f821605ec2da73ae8326371282a7c517e0c6040558ca1a580d7a19a977264b700b
+  metadata.gz: 73090705b5bce0cdb0840db252c74d3549aad647081f27b3ae24ff540ebca97493b4a4f704c968468036958ccbabdcf79b263e357a959fd0a068fa7d7ad3defb
+  data.tar.gz: b9a101923c6dfdaeb97235c004eeeb0265e14916abb779f1b548b84d488986e910750227078f285acd8594213b5362d933c0ff7392806d500cac33fcb124e331

data/.gitignore

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

data/.travis.yml

@@ -10,9 +10,9 @@ before_script:
 
   - sh -e /etc/init.d/xvfb start
 
-  - wget http://cdn.sencha.com/ext/gpl/ext-5.1.0-gpl.zip
-  - unzip -q ext-5.1.0-gpl.zip
-  - mv ext-5.1.0 spec/dummy/public/extjs
+  - wget http://cdn.sencha.com/ext/gpl/ext-5.1.1-gpl.zip
+  - unzip -q ext-5.1.1-gpl.zip
+  - mv ext-5.1.1 spec/dummy/public/extjs
   - ln -s `pwd`/spec/dummy/public/icons/ spec/dummy/public/extjs/icons
 
 script:

data/Gemfile

@@ -8,9 +8,10 @@ gemspec
 gem 'responders'
 gem 'delayed_job_active_record'
 gem 'daemons', '~> 1.1.9'
+gem 'mime-types', '< 3.0', platforms: :ruby_19
+gem 'rails', '~> 4.2.1'
 
 group :development, :test do
-  gem 'rails', '~> 4.2.1'
   gem 'pry-rails'
   gem 'rspec-rails', '~>3.0'
   gem 'capybara'

data/app/components/marty/user_view.rb

@@ -31,6 +31,8 @@ class Marty::UserView < Marty::Grid
       property: :login,
       direction: 'ASC',
     } if c.columns.include?(:login)
+
+    c.scope = ->(arel) { arel.includes(:roles) }
   end
 
   def self.set_roles(roles, user)

data/app/models/marty/user.rb

@@ -10,7 +10,7 @@ class Marty::User < Marty::Base
   has_many :user_roles, dependent: :destroy
   has_many :roles, through: :user_roles
 
-  scope :active, -> { where("#{self.table_name}.active = ?", true) }
+  scope :active, -> { where(active: true) }
 
   validate :verify_changes
   before_destroy :destroy_user

data/config/locales/en.yml

@@ -23,6 +23,9 @@ en:
     dev: Developer
     user_manager: User Manager
 
+  posting_types:
+    BASE: BASE
+
   script:
     selection: Selection
     tester: Testing

data/db/seeds.rb

@@ -25,15 +25,14 @@ Marty::Role.all.map { |role|
   ur.save
 }
 
-# FIXME: this is a hack.  It's needed due to the fact that 'NOW'
-# posting requires a PostingType.
-Marty::PostingType.create name: 'BASE'
+# Create default PostingType from configuration
+default_p_type = Rails.configuration.marty.default_posting_type.to_s
+Marty::PostingType.create(name: default_p_type)
 
 # Create NOW posting
 unless Marty::Posting.find_by_name('NOW')
   sn                 = Marty::Posting.new
-  # FIXME: this is Gemini-specific
-  sn.posting_type_id = Marty::PostingType['BASE'].id
+  sn.posting_type_id = Marty::PostingType[default_p_type].id
   sn.comment         = '---'
   sn.created_dt      = 'infinity'
   sn.save!

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.34"
+  VERSION = "0.5.35"
 end

data/spec/dummy/config/application.rb

@@ -76,6 +76,7 @@ module Dummy
                           :viewer,
                           :user_manager,
                          ]
+    config.marty.default_posting_type = 'BASE'
     config.secret_key_base = "SECRET_KEY_BASE"
   end
 end

data/spec/dummy/db/seeds.rb

@@ -1,3 +1,5 @@
+Marty::Engine.load_seed
+
 # Gemini seeds needed for testing purposes
 Gemini::AmortizationType.create(name: "Fixed")
 Gemini::AmortizationType.create(name: "Adjustable")

data/spec/dummy/delorean/data_report.dl

@@ -1,4 +1,5 @@
 import Fields
+import Styles
 
 ######################################################################
 
@@ -11,11 +12,13 @@ TableReport:
     title       =? (class_name || "Table Report") + (
         if pt_name then "_" + pt_name else "")
     sort_field  =? nil
+    exclude_attrs =? nil
 
     result_raw  = Marty::DataChange.do_export(
         pt,
         if module_name then module_name + '::' + class_name else class_name,
         sort_field,
+        exclude_attrs || [],
         )
     row_count   = result_raw.length
     result      = Gemini::Helper.to_csv(result_raw)
@@ -77,7 +80,9 @@ CommaSepField:
     checked     = false
 
 DataImportReport:
-    roles       = ["price_manager", "rule_manager"]
+    background_only = true
+
+    roles       = ["admin", "dev"]
     import_type =? nil
     comma_sep   =? nil