marty 0.5.27 → 0.5.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3336670f870920df522354766443beb74444a6
-  data.tar.gz: 024d51ba48f744d2f79cf94c944aba5738bfb162
+  metadata.gz: b6599f34a4823efc8be3d05feef0d3fc937219e6
+  data.tar.gz: 41c960a54860d1c94d2138148725fdc5575c33f0
 SHA512:
-  metadata.gz: 1943c8292da687d88f7d005fef66476b384a2172022c35dcef00b5ad0bbea0da2f215d7d7ff72464f2f114cd7441fbec51792c2d84454e52f6129a596ed604fe
-  data.tar.gz: 75eb4fef14e9c12212ff5aed7a70d7d9d3c042f3d335a53494a8b9e07554a3ac38bbee77124170b2cfb281e2daa7da18c9f1221eeccd2e32a1103c2fc758585e
+  metadata.gz: a7b66c7ca4c79c298aae4a82f38a20d856c83c94800575328062aba071aeb4f21f2f63b81a1af77a6ae2106eac838e694c1a9fcf0041b27922d03b3715afb88b
+  data.tar.gz: 6394925740fc4739765409d35205a57b6fc20fafa6089686b5438b35a49839c0c2c013eb8ccf843c7b45cff6639f55b5288b68dc6b94044f88e789f08bed1586

data/app/components/marty/grid.rb

@@ -1,7 +1,3 @@
-require 'netzke-basepack'
-require 'netzke/basepack/grid'
-require 'marty/permissions'
-
 class Marty::Grid < ::Netzke::Basepack::Grid
   extend ::Marty::Permissions
 

data/app/models/marty/import_type.rb

@@ -19,6 +19,14 @@ class Marty::ImportType < Marty::Base
     end
   end
 
+  before_validation do
+    # Fix issue with blank strings in popup edit form or grid
+    # being interpreted as a function
+    self.cleaner_function = nil if self.cleaner_function.blank?
+    self.validation_function = nil if self.validation_function.blank?
+    self.preprocess_function = nil if self.preprocess_function.blank?
+  end
+
   belongs_to :role
 
   validates_presence_of :name, :db_model_name, :role_id
@@ -26,7 +34,7 @@ class Marty::ImportType < Marty::Base
   validates_with ImportTypeValidator
 
   def get_model_class
-    db_model_name.constantize
+    db_model_name.constantize if db_model_name
   end
 
   def allow_import?

data/lib/marty/permissions.rb

@@ -1,64 +1,62 @@
-module Marty
-  module Permissions
-    # Make sure there are admin and user_manager roles,
-    # even if hosting app doesn't define them
-    REQ_ROLES = [:admin, :user_manager]
-    ALL_ROLES = Rails.configuration.marty.roles.to_set.merge(REQ_ROLES)
-
-    # Call using following format
-    #   has_marty_permissions   create: [:dev, :admin],
-    #                           read: :any,
-    #                           update: :admin,
-    #                           delete: []
-    #
-    # :any gives permission to the action if user belongs to at least 1 role
-    def has_marty_permissions(attrs)
-      raise "bad attrs" unless attrs.is_a?(Hash)
-      raise "unknown role" unless
-        attrs.values.flatten.to_set.subset? (ALL_ROLES << :any)
+module Marty::Permissions
+  # Make sure there are admin and user_manager roles,
+  # even if hosting app doesn't define them
+  REQ_ROLES = [:admin, :user_manager]
+  ALL_ROLES = Rails.configuration.marty.roles.to_set.merge(REQ_ROLES)
+
+  # Call using following format
+  #   has_marty_permissions   create: [:dev, :admin],
+  #                           read: :any,
+  #                           update: :admin,
+  #                           delete: []
+  #
+  # :any gives permission to the action if user belongs to at least 1 role
+  def has_marty_permissions(attrs)
+    raise "bad attrs" unless attrs.is_a?(Hash)
+    raise "unknown role" unless
+      attrs.values.flatten.to_set.subset? (ALL_ROLES << :any)
+
+    self.define_singleton_method(:marty_permissions) { attrs }
+  end
 
-      self.define_singleton_method(:marty_permissions) { attrs }
-    end
+  def current_user_roles
+    roles = Mcfly.whodunnit.roles rescue []
+    roles.map {|r| r.name.to_sym}.to_set
+  end
 
-    def current_user_roles
-      roles = Mcfly.whodunnit.roles rescue []
-      roles.map {|r| r.name.to_sym}.to_set
-    end
+  def can_perform_action?(action)
+    return false unless self.respond_to?(:marty_permissions)
 
-    def can_perform_action?(action)
-      return false unless self.respond_to?(:marty_permissions)
+    roles = self.current_user_roles
+    roles = roles << :any if self.has_any_perm?
 
-      roles = self.current_user_roles
-      roles = roles << :any if self.has_any_perm?
+    aroles = self.marty_permissions[action.to_sym] || []
+    # TODO: Use code below when switching to Ruby 2.1
+    # Set[ *aroles].intersect? roles.to_set
+    (Set[ *aroles] & roles.to_set).length > 0
+  end
 
-      aroles = self.marty_permissions[action.to_sym] || []
-      # TODO: Use code below when switching to Ruby 2.1
-      # Set[ *aroles].intersect? roles.to_set
-      (Set[ *aroles] & roles.to_set).length > 0
-    end
+  def can_perform_actions
+    return [] unless self.respond_to?(:marty_permissions)
 
-    def can_perform_actions
-      return [] unless self.respond_to?(:marty_permissions)
+    roles = self.current_user_roles
+    roles = roles << :any if self.has_any_perm?
 
-      roles = self.current_user_roles
-      roles = roles << :any if self.has_any_perm?
+    self.marty_permissions.map { |action, aroles|
+      # TODO: Use code below when switching to Ruby 2.1
+      #action if Set[ *aroles].intersect? roles.to_set
+      action if (Set[ *aroles] & roles.to_set).length > 0
+    }.compact
+  end
 
-      self.marty_permissions.map { |action, aroles|
-        # TODO: Use code below when switching to Ruby 2.1
-        #action if Set[ *aroles].intersect? roles.to_set
-        action if (Set[ *aroles] & roles.to_set).length > 0
-      }.compact
+  # generate has_xxx_perm? methods for all permissions.
+  Rails.configuration.marty.roles.each { |role|
+    define_method("has_#{role}_perm?") do
+      current_user_roles.member? role
     end
+  }
 
-    # generate has_xxx_perm? methods for all permissions.
-    Rails.configuration.marty.roles.each { |role|
-      define_method("has_#{role}_perm?") do
-        current_user_roles.member? role
-      end
-    }
-
-    def has_any_perm?
-      !(current_user_roles & ALL_ROLES).empty?
-    end
+  def has_any_perm?
+    !(current_user_roles & ALL_ROLES).empty?
   end
 end

data/lib/marty/version.rb

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

data/spec/models/import_type_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+module Marty
+  class Marty::ARTestModel < ActiveRecord::Base
+    def self.import_cleaner
+    end
+
+    def self.import_validator
+    end
+  end
+
+  class Marty::TestModel
+  end
+
+  describe ImportType do
+    let(:role_id) { Marty::Role.first.id }
+
+    before(:each) do
+      @import = ImportType.new
+      @import.name = "Test1"
+      @import.db_model_name = "Marty::ARTestModel"
+      @import.role_id = role_id
+      @import.save!
+    end
+
+    describe "validations" do
+      it "require name, db_model and role" do
+        it = ImportType.new
+        expect(it).to_not be_valid
+        expect(it.errors[:name].any?).to be true
+        expect(it.errors[:db_model_name].any?).to be true
+        expect(it.errors[:role_id].any?).to be true
+      end
+
+      it "require a unique name" do
+        it = ImportType.new
+        it.name = "Test1"
+        it.db_model_name = "Marty::ARTestModel"
+        it.role_id = role_id
+        expect(it).to_not be_valid
+        expect(it.errors[:name].any?).to be true
+      end
+
+      it "require an ActiveRecord model for the db_model_name" do
+        it = ImportType.new
+        it.name = "Test1"
+        it.db_model_name = "Marty::TestModel"
+        it.role_id = role_id
+        expect(it).to_not be_valid
+        expect(it.errors[:base][0]).to eq "bad model name"
+      end
+
+      it "do not fail on blank strings for functions" do
+        @import.cleaner_function = ""
+        @import.validation_function = " "
+        @import.preprocess_function = "  "
+
+        expect(@import).to be_valid
+        @import.save!
+        expect(@import.cleaner_function).to be nil
+        expect(@import.validation_function).to be nil
+        expect(@import.preprocess_function).to be nil
+      end
+
+      it "require valid functions for cleaner/validation/preprocess" do
+        @import.cleaner_function = "import_cleaner"
+        @import.validation_function = "import_validator"
+        expect(@import).to be_valid
+
+        @import.preprocess_function = "missing_func"
+        expect(@import).to_not be_valid
+        expect(@import.errors[:base][0]).
+          to eq "unknown class method missing_func"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.27
+  version: 0.5.28
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -541,6 +541,7 @@ files:
 - spec/lib/xl_styles_spec.rb
 - spec/models/api_auth_spec.rb
 - spec/models/config_spec.rb
+- spec/models/import_type_spec.rb
 - spec/models/posting_spec.rb
 - spec/models/promise_spec.rb
 - spec/models/script_spec.rb