mno-enterprise-core 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfe546808d905e473abc105da4fbe5234f124896
-  data.tar.gz: 7e8dd015d9a5b54ee9ba1fce03695f7a67af9702
+  metadata.gz: c90db7a2040c41d7bdac3c6fc451f911f20a9e0b
+  data.tar.gz: 97d844facb19a294230b73ff698844cb92d544be
 SHA512:
-  metadata.gz: 5e36dd230d6124d058ee0f1cee11c5557df773693728292d401698d833f4332b242a8eab68e5f1ef4c6d4e60bcaf994e5697381cf9279d4eac1efcda4d91fb3e
-  data.tar.gz: 8ffb8ac19763e88b91288a3aeb665a12d38e6eaffbcc45b63bf97a99f151283649823df6909b7d42a4412323abf6680813fc704cfc585b01b0d8eacbc4b99d98
+  metadata.gz: 9c628595de057ec3cffb1ccaf242f0da9fde8543cb2b26f571ff6bc355db0f16b283c956b73440daeec93dedf0882be0de3ae528a287f7d9341ee16cf49aa441
+  data.tar.gz: 2ebbabb8f8ed5df2e7ffb5b47fa0a64ff345cd99e717ba2ab8dfba00a0752dcdb56baf0df9efab6614ce85ec14c8fa442271e7407375ffd053fa43b6c4a9c6f1

data/app/models/mno_enterprise/base_resource.rb

@@ -6,6 +6,7 @@ module MnoEnterprise
   class BaseResource
     include Her::Model
     include HerExtension::Validations::RemoteUniquenessValidation
+    include GlobalID::Identification
 
     include_root_in_json :data
     use_api MnoEnterprise.mnoe_api_v1

data/app/models/mno_enterprise/impac/dashboard.rb

@@ -3,31 +3,42 @@ module MnoEnterprise
 
     attributes :name, :widgets_order, :organization_ids, :widgets_templates, :currency
 
-	  has_many :widgets, class_name: 'MnoEnterprise::Impac::Widget', dependent: :destroy
-	  has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi', dependent: :destroy
-	  belongs_to :owner, polymorphic: true
-	  
-	  #============================================
-	  # Instance methods
-	  #============================================
-	  # Return the full name of this dashboard
-	  # Currently a simple accessor to the dashboard name (used to include the company name)
-	  def full_name
-	    self.name
-	  end
-	  
-	  # Return all the organizations linked to this dashboard and to which
-	  # the user has access
-	  def organizations
-	  	self.organization_ids.map do |uid|
-	    	MnoEnterprise::Organization.find_by(uid: uid)
-	  	end
-	  end
+    has_many :widgets, class_name: 'MnoEnterprise::Impac::Widget', dependent: :destroy
+    has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi', dependent: :destroy
+    belongs_to :owner, polymorphic: true
 
-	  def sorted_widgets
-	    order = self.widgets_order.map(&:to_i) | self.widgets.map{|w| w.id }
-	    order.map { |id| self.widgets.to_a.find{ |w| w.id == id} }.compact
-	  end
+    #============================================
+    # Instance methods
+    #============================================
+    # Return the full name of this dashboard
+    # Currently a simple accessor to the dashboard name (used to include the company name)
+    def full_name
+      self.name
+    end
+
+    # Return all the organizations linked to this dashboard and to which
+    # the user has access
+    def organizations
+      self.organization_ids.map do |uid|
+        MnoEnterprise::Organization.find_by(uid: uid)
+      end
+    end
+
+    def sorted_widgets
+      order = self.widgets_order.map(&:to_i) | self.widgets.map{|w| w.id }
+      order.map { |id| self.widgets.to_a.find{ |w| w.id == id} }.compact
+    end
+
+    # Filter widgets list based on config
+    def filtered_widgets_templates
+      if MnoEnterprise.widgets_templates_listing
+        return self.widgets_templates.select do |t|
+          MnoEnterprise.widgets_templates_listing.include?(t[:path])
+        end
+      else
+        return self.widgets_templates
+      end
+    end
 
     def to_audit_event
       name

data/app/models/mno_enterprise/user.rb

@@ -47,7 +47,7 @@ module MnoEnterprise
       :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, 
       :last_sign_in_ip, :confirmation_token, :confirmed_at, :confirmation_sent_at, :unconfirmed_email, 
       :failed_attempts, :unlock_token, :locked_at, :name, :surname, :company, :phone, :phone_country_code, 
-      :geo_country_code, :geo_state_code, :geo_city, :website, :orga_on_create, :sso_session, :current_password_required
+      :geo_country_code, :geo_state_code, :geo_city, :website, :orga_on_create, :sso_session, :current_password_required, :admin_role
     
     define_model_callbacks :validation #required by Devise
     devise :remote_authenticatable, :registerable, :recoverable, :rememberable,

data/lib/generators/mno_enterprise/install/install_generator.rb

@@ -6,8 +6,8 @@ module MnoEnterprise
       source_root File.expand_path("../templates", __FILE__)
       desc "Description:\n  Install Maestrano Enterprise Engine in your application\n\n"
 
-      class_option :skip_rspec, type: :boolean, default: false, desc: 'Skip rspec-rails installation'
-      class_option :skip_factory_girl, type: :boolean, default: false, desc: 'Skip factory_girl installation'
+      # class_option :skip_rspec, type: :boolean, default: false, desc: 'Skip rspec-rails installation'
+      # class_option :skip_factory_girl, type: :boolean, default: false, desc: 'Skip factory_girl installation'
       class_option :skip_frontend, type: :boolean, default: false, desc: 'Skip frontend installation'
       class_option :skip_admin, type: :boolean, default: false, desc: 'Skip admin installation'
 
@@ -90,8 +90,7 @@ module MnoEnterprise
       # Inject engine routes
       def notify_about_routes
         if (routes_file = destination_path.join('config', 'routes.rb')).file? && (routes_file.read !~ %r{mount\ MnoEnterprise::Engine})
-          mount = %Q{
-  # This line mount Maestrano Enterprise routes in your application under /mnoe.
+          mount = %Q{  # This line mount Maestrano Enterprise routes in your application under /mnoe.
   # If you would like to change where this engine is mounted, simply change the :at option to something different
   #
   # We ask that you don't use the :as option here, as Mnoe relies on it being the default of "mno_enterprise"
@@ -112,31 +111,6 @@ module MnoEnterprise
         end
       end
 
-      def install_rspec_rails
-        unless options[:skip_rspec]
-          say("\n")
-          @install_rspec = ask_with_default("Would you like to install rspec-rails?")
-          if @install_rspec
-            gem_group :test do
-              gem "rspec-rails"
-            end
-            generate "rspec:install"
-          end
-        end
-      end
-
-      def install_factory_girl
-        unless options[:skip_factory_girl]
-          say("\n")
-          @install_facto_girl = ask_with_default("Would you like to install factory_girl_rails?")
-          if @install_facto_girl
-            gem_group :test do
-              gem "factory_girl_rails"
-            end
-          end
-        end
-      end
-
       def install_summary
         unless options[:quiet]
           say("\n\n")

data/lib/generators/mno_enterprise/install/templates/Procfile.dev

@@ -1,2 +1,2 @@
 web: bundle exec puma -p 7000
-gulp: gulp serve --gulpfile ./tmp/build/frontend/gulpfile.js --cwd ./tmp/build/frontend/
+gulp: cd ./tmp/build/frontend && node_modules/.bin/gulp serve

data/lib/generators/mno_enterprise/install/templates/config/initializers/mno_enterprise.rb

@@ -135,4 +135,54 @@ MnoEnterprise.configure do |config|
   #   "xero",
   #   "wordpress"
   # ]
+
+  #====================================
+  # Impac! widgets templates listing
+  #====================================
+  # config.widgets_templates_listing = nil
+  # config.widgets_templates_listing = [
+  #   'accounts/balance',
+  #   'accounts/comparison',
+  #   'accounts/expenses_revenue',
+  #   'accounts/payable_receivable',
+  #   'accounts/assets_summary',
+  #   'accounts/custom_calculation',
+  #   'accounts/accounting_values/ebitda',
+  #   'accounts/accounting_values/turnover',
+  #   'accounts/accounting_values/workforce_costs',
+  #   'accounts/accounting_values/payroll_taxes_account',
+  #   'accounts/cash_summary',
+  #   'accounts/balance_sheet',
+  #   'accounts/profit_and_loss',
+  #   'invoices/list',
+  #   'invoices/summary',
+  #   'invoices/aged_payables_receivables',
+  #   'hr/workforce_summary',
+  #   'hr/salaries_summary',
+  #   'hr/employees_list',
+  #   'hr/employee_details',
+  #   'hr/payroll_taxes',
+  #   'hr/superannuation_accruals',
+  #   'hr/leaves_balance',
+  #   'hr/payroll_summary',
+  #   'hr/timesheets',
+  #   'sales/summary',
+  #   'sales/list',
+  #   'sales/growth',
+  #   'sales/segmented_turnover',
+  #   'sales/customer_details',
+  #   'sales/margin',
+  #   'sales/aged',
+  #   'sales/comparison',
+  #   'sales/leads_list',
+  #   'sales/number_of_leads',
+  #   'sales/cycle',
+  #   'sales/leads_funnel',
+  #   'sales/opportunities_funnel',
+  #   'sales/top_opportunities',
+  #   'sales/break_even',
+  #   'sales/forecast',
+  #   'sales/performance'
+  # ]
+
 end

data/lib/her_extension/model/parse.rb

@@ -33,7 +33,24 @@ module Her
             filtered_attributes
           end
         end
-        
+
+        # @private
+        # TODO: Handle has_one
+        def embeded_params(attributes)
+          associations[:has_many].select { |a| attributes.include?(a[:data_key])}.compact.inject({}) do |hash, association|
+            params = attributes[association[:data_key]].map(&:to_params)
+            # <PATCH> - Return hash
+            next hash if params.empty?
+            # </PATCH>
+            if association[:class_name].constantize.include_root_in_json?
+              root = association[:class_name].constantize.root_element
+              hash[association[:data_key]] = params.map { |n| n[root] }
+            else
+              hash[association[:data_key]] = params
+            end
+            hash
+          end
+        end
       end
     end
   end

data/lib/mno_enterprise/concerns/models/organization.rb

@@ -37,7 +37,7 @@ module MnoEnterprise::Concerns::Models::Organization
   included do
     attributes :uid, :name, :account_frozen, :free_trial_end_at, :soa_enabled, :mails, :logo,
       :latitude, :longitude, :geo_country_code, :geo_state_code, :geo_city, :geo_tz, :geo_currency,
-      :meta_data, :industry, :size
+      :meta_data, :industry, :size, :financial_year_end_month
 
     scope :in_arrears, -> { where(in_arrears?: true) }
 

data/lib/mno_enterprise/core.rb

@@ -210,6 +210,14 @@ module MnoEnterprise
   mattr_accessor :marketplace_listing
   @@marketplace_listing = nil
 
+  #====================================
+  # Impac! widgets templates listing
+  #====================================
+  # List of widget templates that should be offered on Impac!
+  # if nil, all widget templates available will be offered
+  mattr_accessor :widgets_templates_listing
+  @@widgets_templates_listing = nil
+
   #====================================
   # Module Methods
   #====================================

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/spec/models/mno_enterprise/impac/dashboard_spec.rb

@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  RSpec.describe Impac::Dashboard, type: :model do
+    subject(:dashboard) { build(:impac_dashboard) }
+
+    describe '#full_name' do
+      subject { dashboard.full_name }
+      it { is_expected.to eq(dashboard.name) }
+    end
+
+    describe '#sorted_widgets' do
+      it 'is pending'
+    end
+
+    describe '#filtered_widgets_templates' do
+      let(:templates) {
+        [
+          {path: 'accounts/balance', name: 'Account balance'},
+          {path: 'accounts/comparison', name: 'Accounts comparison'}
+        ]
+      }
+      subject(:dashboard) { build(:impac_dashboard, widgets_templates: templates) }
+
+      subject { dashboard.filtered_widgets_templates }
+
+      context 'with no filter' do
+        before { MnoEnterprise.widgets_templates_listing = nil}
+
+        it 'returns all the widgets' do
+          expect(subject).to eq(templates)
+        end
+      end
+
+      context 'with a filter' do
+        let(:filter) { ['accounts/balance'] }
+        before { MnoEnterprise.widgets_templates_listing = filter }
+
+        it 'returns a filtered list' do
+          expect(subject.size).to eq(1)
+          expect(subject.map{|h| h[:path]}).to eq(filter)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -511,6 +511,7 @@ files:
 - spec/models/mno_enterprise/app_spec.rb
 - spec/models/mno_enterprise/base_resource_spec.rb
 - spec/models/mno_enterprise/deletion_request_spec.rb
+- spec/models/mno_enterprise/impac/dashboard_spec.rb
 - spec/models/mno_enterprise/invoice_spec.rb
 - spec/models/mno_enterprise/organization_spec.rb
 - spec/models/mno_enterprise/user_spec.rb
@@ -536,24 +537,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Maestrano Enterprise - Core functionnality
 test_files:
-- spec/controllers/mno_enterprise/angular_csrf_spec.rb
-- spec/controllers/mno_enterprise/i18n_spec.rb
-- spec/lib/her_extension/her_orm_adapter.rb
-- spec/lib/her_extension/model/relation_spec.rb
-- spec/lib/mandrill_client_spec.rb
-- spec/lib/mno_enterprise/core_engine_spec.rb
-- spec/mno_enterprise_spec.rb
-- spec/models/mno_enterprise/app_instance_spec.rb
 - spec/models/mno_enterprise/app_spec.rb
-- spec/models/mno_enterprise/base_resource_spec.rb
+- spec/models/mno_enterprise/organization_spec.rb
+- spec/models/mno_enterprise/app_instance_spec.rb
+- spec/models/mno_enterprise/impac/dashboard_spec.rb
 - spec/models/mno_enterprise/deletion_request_spec.rb
 - spec/models/mno_enterprise/invoice_spec.rb
-- spec/models/mno_enterprise/organization_spec.rb
 - spec/models/mno_enterprise/user_spec.rb
-- spec/rails_helper.rb
+- spec/models/mno_enterprise/base_resource_spec.rb
 - spec/spec_helper.rb
+- spec/lib/mno_enterprise/core_engine_spec.rb
+- spec/lib/her_extension/her_orm_adapter.rb
+- spec/lib/her_extension/model/relation_spec.rb
+- spec/lib/mandrill_client_spec.rb
+- spec/rails_helper.rb
+- spec/controllers/mno_enterprise/i18n_spec.rb
+- spec/controllers/mno_enterprise/angular_csrf_spec.rb
+- spec/mno_enterprise_spec.rb