marty 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b8269306b02f3bb10f11bd047f2e783cd872aab
-  data.tar.gz: 2f155d91d17c1762e9d3a3afb39b42767cad4c66
+  metadata.gz: a4034d6478ed76aa60f6a538c7b2e4162052101a
+  data.tar.gz: 76aac79be02a18505f8ac6d917ffc585894c9b3d
 SHA512:
-  metadata.gz: 6f4f8bc5924257516deebc50da556db5610de1847cf9ad5eb1897bd20121e26cdd4c9b4763f5a60cad8af76559f70cc2ba8d95d7858cb0345aee1da8e71eb21b
-  data.tar.gz: 26f820934252d3b4896e98fb334a345e803cb673666639022c112bcf2bcbea1fe91de39c45f3e7d29ab6e4cf2ed2a2aa740f96fb3b82447b5cd5e782f2278a73
+  metadata.gz: 809d837cfd29bbcda4d114e4db80b2c157139f0bbc70099d412684fed373fab2b74a8e6ed33c352e78e72392707d77b2b1fc1dcbc7f5227b1a3f913dac9f6a82
+  data.tar.gz: eea002896bfbbce23e51a2f710f21247900f802d594b183a8dfcd9d26792cf407d691f6c90bebf7ef7c29af90ab4238d91dee5369f1519194079cae050f5e509

data/app/components/marty/config_view.rb

@@ -0,0 +1,72 @@
+class Marty::ConfigView < Marty::Grid
+  has_marty_permissions \
+  create: :admin,
+  read: :admin,
+  update: :admin,
+  delete: :admin
+
+  include Marty::Extras::Layout
+
+  def configure(c)
+    super
+
+    c.title   = I18n.t('config', default: "Config")
+    c.model   = "Marty::Config"
+    c.columns = [:key, :value, :description]
+
+    c.enable_extended_search = false
+    c.data_store.sorters     = {property: :key, direction: 'ASC'}
+  end
+
+  # need a getter / setter to call the []= and [] methods now
+  # since value is no longer stored as is
+  def my_jsonb_getter
+    lambda { |r| Marty::Config[r.key].to_json }
+  end
+
+  def my_jsonb_setter
+    lambda { |r, v|
+      decoded = ActiveSupport::JSON.decode(v) rescue nil
+      r.set_value(decoded)
+    }
+  end
+
+  def default_fields_for_forms
+    [
+      :key,
+      {
+        name:        :value,
+        width:       "100%",
+        height:      150,
+        xtype:       :textareafield,
+        auto_scroll: true,
+        spellcheck:  false,
+        allow_blank: false,
+        field_style: {
+          font_family: 'courier new',
+          font_size:   '12px'
+        },
+        getter:  my_jsonb_getter,
+        setter:  my_jsonb_setter,
+      },
+      textarea_field(:description),
+    ]
+  end
+
+  column :key do |c|
+    c.flex = 1
+  end
+
+  column :value do |c|
+    c.flex = 3
+    c.getter  = my_jsonb_getter
+    c.setter  = my_jsonb_setter
+  end
+  column :description do |c|
+    c.flex = 1
+    c.width = 200
+  end
+
+end
+
+ConfigView = Marty::ConfigView

data/app/components/marty/extras/layout.rb

@@ -41,6 +41,20 @@ module Marty
         hbox({flex: 1, border: false}.merge(params))
       end
 
+      def textarea_field(name, options={})
+        {
+          name:        name,
+          width:       "100%",
+          height:      150,
+          xtype:       :textareafield,
+          auto_scroll: true,
+          spellcheck:  false,
+          field_style: {
+            font_family: 'courier new',
+            font_size:   '12px'
+          },
+        } + options
+      end
     end
   end
 end

data/app/components/marty/main_auth_app.rb

@@ -7,6 +7,7 @@ require 'marty/import_type_view'
 require 'marty/user_view'
 require 'marty/promise_view'
 require 'marty/api_auth_view'
+require 'marty/config_view'
 
 class Marty::MainAuthApp < Marty::AuthApp
   extend ::Marty::Permissions
@@ -53,6 +54,7 @@ class Marty::MainAuthApp < Marty::AuthApp
       menu:  [
               :import_type_view,
               :user_view,
+              :config_view,
               :api_auth_view,
               :reload_scripts,
              ],
@@ -150,6 +152,14 @@ class Marty::MainAuthApp < Marty::AuthApp
       !self.class.has_user_manager_perm?
   end
 
+  action :config_view do |a|
+    a.text      = I18n.t("config_view")
+    a.handler   = :netzke_load_component_by_action
+    a.icon      = :cog
+    a.disabled  = !self.class.has_admin_perm? &&
+      !self.class.has_user_manager_perm?
+  end
+
   action :api_auth_view do |a|
     a.text      = I18n.t("api_auth_view", default: "API Authorization")
     a.handler   = :netzke_load_component_by_action
@@ -256,6 +266,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   end
   component :import_type_view
   component :user_view
+  component :config_view
   component :api_auth_view do |c|
     c.disabled = Marty::Util.warped?
   end

data/app/models/marty/config.rb

@@ -0,0 +1,52 @@
+class Marty::Config < Marty::Base
+  class ConfigValidator < ActiveModel::Validator
+    def validate(entry)
+      v = entry.get_value
+      entry.errors[:base] = "bad JSON value" if !v
+      v
+    end
+  end
+
+  validates_presence_of :key, :value
+  validates_uniqueness_of :key
+  validates_with ConfigValidator
+
+  delorean_fn :lookup, sig: 1 do
+    |key|
+    self[key]
+  end
+
+  def get_value
+    self.value[0]
+  end
+
+  def set_value(v)
+    self.value = [v]
+  end
+
+  def self.[]=(key, value)
+    entry = find_by_key(key)
+    if !entry
+      entry = self.new
+      entry.key = key
+    end
+    entry.set_value(value)
+    entry.save!
+
+    value
+  end
+
+  def self.[](key)
+    entry = find_by_key(key)
+    entry and entry.get_value
+  end
+
+  def self.del(key)
+    entry = find_by_key(key)
+    if entry
+      result = entry.get_value
+      entry.destroy
+      result
+    end
+  end
+end

data/app/models/marty/user.rb

@@ -8,6 +8,8 @@ class Marty::User < Marty::Base
   validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i
   validates_length_of :login, :firstname, :lastname, maximum: 100
 
+  MARTY_IMPORT_UNIQUENESS = [:login]
+
   has_many :user_roles, dependent: :destroy
   has_many :roles, through: :user_roles
 

data/config/locales/en.yml

@@ -8,6 +8,7 @@ en:
   fields: Fields
   updated_at: Updated At
   user_view: User Management
+  config_view: Configuration
   reports: Reports
   import_synonym: Import Synonyms
   import_type: Import Types

data/db/migrate/099_create_marty_configs.rb

@@ -0,0 +1,11 @@
+class CreateMartyConfigs < ActiveRecord::Migration
+  def change
+    create_table :marty_configs do |t|
+      t.timestamps null: false
+
+      t.string :key
+      t.jsonb :value
+      t.text :description
+    end
+  end
+end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.23"
+  VERSION = "0.5.24"
 end

data/spec/models/config_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+module Marty
+  describe Config do
+    describe "validations" do
+      it "should return valid config value based on key" do
+        Marty::Config["TEST 1"] = 2
+        expect(Marty::Config.lookup("TEST 1")).to eq(2)
+        expect(Marty::Config["TEST 1"]).to eq(2)
+      end
+
+      def testval(val)
+        Marty::Config["testval"] = val
+        expect(Marty::Config.lookup("testval")).to eq(val)
+        expect(Marty::Config["testval"]).to eq(val)
+      end
+
+      it "should handle various structures correctly" do
+        testval("[1,2,3]")
+        testval("[1,\"2,3\"]")
+        testval([1,2,3])
+        testval([1,"2,3"])
+
+        testval({ "key1" => [1,2,3], "keystr" => { "val" => "val"}})
+        testval(%Q({ "key1" : [1,2,3], "keystr" : { "val" : "val"}}))
+
+        testval("123456.1234")
+        testval("a string")
+        testval("\"a string\"")
+      end
+
+      it "should return nil config value for non-existing key" do
+        expect(Marty::Config.lookup("TEST 2")).to eq(nil)
+        expect(Marty::Config["TEST 2"]).to eq(nil)
+      end
+
+      it "should handle del" do
+        (0..10).each { |i|
+          v = {"i" => i}
+          Marty::Config["k#{i}"] = v
+          expect(Marty::Config["k#{i}"]).to eq(v)
+        }
+
+        (0..10).each { |i|
+          Marty::Config.del("k#{i}")
+          expect(Marty::Config["k#{i}"]).to eq(nil)
+        }
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.23
+  version: 0.5.24
 platform: ruby
 authors:
 - Arman Bostani
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -161,6 +161,7 @@ files:
 - app/components/marty/api_auth_view.rb
 - app/components/marty/auth_app.rb
 - app/components/marty/auth_app/javascripts/auth_app.js
+- app/components/marty/config_view.rb
 - app/components/marty/extras/layout.rb
 - app/components/marty/extras/misc.rb
 - app/components/marty/form.rb
@@ -361,6 +362,7 @@ files:
 - app/helpers/marty/script_set.rb
 - app/models/marty/api_auth.rb
 - app/models/marty/base.rb
+- app/models/marty/config.rb
 - app/models/marty/enum.rb
 - app/models/marty/import_type.rb
 - app/models/marty/posting.rb
@@ -395,6 +397,7 @@ files:
 - db/migrate/096_add_user_roles_to_import_types.rb
 - db/migrate/097_drop_versions.rb
 - db/migrate/098_create_marty_api_auths.rb
+- db/migrate/099_create_marty_configs.rb
 - db/seeds.rb
 - gemini_deprecations.md
 - lib/marty.rb
@@ -533,6 +536,7 @@ files:
 - spec/lib/xl_spec.rb
 - spec/lib/xl_styles_spec.rb
 - spec/models/api_auth_spec.rb
+- spec/models/config_spec.rb
 - spec/models/posting_spec.rb
 - spec/models/promise_spec.rb
 - spec/models/script_spec.rb