mno-enterprise-core 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65ad5fd0badd5b1b262d37cec7072456038fb961
-  data.tar.gz: 5c4a566cd957070e836af6a3d7ada961f80242f2
+  metadata.gz: 7dada02d4020e090a4eefe3fc1edfb48026eb806
+  data.tar.gz: a034f5b750e6952c962dd2a73315b9b6c1f23920
 SHA512:
-  metadata.gz: 17d9bd4a3783ad23a7882ebac470cda39b8879df49050a17cee7a612afd1acf60b47f3d089d4335ada1900fecfed572ff4747139e7a19be6c650a2c562ff47e6
-  data.tar.gz: f42a459f8bd6e7f5b22d330e3d7fd2fbfa4de1b58ac5e05d716371ec9281dfa095fbbc3a2c60527d3ea5b9137f784924ced36b44e73d86125e6aa911ae3e4293
+  metadata.gz: 1f7f6a5606f76d090c4a1d7f962703ef121f061fca4eee4ea87f945c2cd32a1396894ffefb7e652e6a4477d4cc1e4c91783f2e33059924eeb04eb1aea20ba9ee
+  data.tar.gz: 601ee2dde7bfd0336c299920703ea6438c2d179fa7c29dfa9f225cc277372aae22bbcb6efb3f26155a4b6120a7011f7bcfb29bb81ea8806cb5129344c8d0e58e

data/app/models/mno_enterprise/base_resource.rb

@@ -143,7 +143,8 @@ module MnoEnterprise
       if perform_validations(options)
         ret = super()
         process_response_errors
-        raise_record_invalid
+        raise_record_invalid if self.errors.any?
+        ret
       else
         false
       end

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

@@ -19,9 +19,7 @@ module MnoEnterprise
     # 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
+      MnoEnterprise::Organization.where('uid.in' => self.organization_ids).to_a
     end
 
     def sorted_widgets

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

@@ -1,7 +1,7 @@
 module MnoEnterprise
   class Impac::Kpi < BaseResource
 
-    attributes :name, :settings, :targets, :extra_params, :endpoint, :source, :element_watched
+    attributes :settings, :targets, :extra_params, :endpoint, :source, :element_watched
 
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
     

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

@@ -1,7 +1,7 @@
 module MnoEnterprise
   class Impac::Widget < BaseResource
 
-  	attributes :name, :width, :widget_category, :settings
+    attributes :name, :width, :widget_category, :settings
 
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
 

data/app/models/mno_enterprise/tenant.rb

@@ -1,5 +1,7 @@
 module MnoEnterprise
   class Tenant < BaseResource
-
+    def self.show
+      self.get('tenant')
+    end
   end
-end
+end

data/config/locales/views/auth/registrations/en.yml

@@ -6,4 +6,4 @@ en:
           title: Sign Up
           create: Create my account!
           user_accept: I accept
-          tos: the Terms of Use
+          tos: the Terms of Use

data/lib/her_extension/model/associations/belongs_to_association.rb

@@ -0,0 +1,25 @@
+# Backport https://github.com/remiprev/her/pull/343/files
+# Fix belongs_to when foreign key is nil
+module Her
+  module Model
+    module Associations
+      class BelongsToAssociation < Association
+        # @private
+        def fetch
+          foreign_key_value = @parent.attributes[@opts[:foreign_key].to_sym]
+          data_key_value = @parent.attributes[@opts[:data_key].to_sym]
+          return @opts[:default].try(:dup) if (@parent.attributes.include?(@name) && @parent.attributes[@name].nil? && @params.empty?) || (foreign_key_value.blank? && data_key_value.blank?)
+
+          return @cached_result unless @params.any? || @cached_result.nil?
+          return @parent.attributes[@name] unless @params.any? || @parent.attributes[@name].blank?
+
+          path_params = @parent.attributes.merge(@params.merge(@klass.primary_key => foreign_key_value))
+          path = build_association_path lambda { @klass.build_request_path(path_params) }
+          @klass.get(path, @params).tap do |result|
+            @cached_result = result if @params.blank?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/her_extension/model/relation.rb

@@ -35,6 +35,16 @@ module Her
       end
       alias all where
 
+      # Patch to unwrap filter when creating
+      def first_or_create(attributes = {})
+        fetch.first || create((@params.delete(:filter) || {}).merge(attributes))
+      end
+
+      # Patch to unwrap filter when creating
+      def first_or_initialize(attributes = {})
+        fetch.first || build((@params.delete(:filter) || {}).merge(attributes))
+      end
+
       # E.g:
       # Product.order_by('created_at.desc','name.asc')
       def order_by(*args)

data/lib/mno_enterprise/core.rb

@@ -17,6 +17,7 @@ require "her_extension/model/parse"
 require "her_extension/model/associations/association"
 require "her_extension/model/associations/association_proxy"
 require "her_extension/model/associations/has_many_association"
+require "her_extension/model/associations/belongs_to_association"
 require "her_extension/middleware/mnoe_api_v1_parse_json"
 require "her_extension/middleware/mnoe_raise_error"
 require "faraday_middleware"

data/lib/mno_enterprise/testing_support/factories/impac/kpis.rb

@@ -4,7 +4,6 @@ FactoryGirl.define do
     factory :impac_kpi, class: MnoEnterprise::Impac::Kpi do
       
       sequence(:id) { |n| n }
-      sequence(:name) { |n| "Random Kpi #{n}" }
       dashboard { build(:impac_dashboard).attributes }
       endpoint "an/endpoint"
       element_watched "a_watchable"

data/lib/mno_enterprise/testing_support/factories/tenant.rb

@@ -1,6 +1,8 @@
 FactoryGirl.define do
 
-  factory :tenant, class: MnoEnterprise::Tenant do
+  # Tenant from an old MnoHub (<= v1.0.2)
+  # TODO: Remove once all mnohub are migrated to newer versions
+  factory :old_tenant, class: MnoEnterprise::Tenant do
     last_portfolio_amount Money.new(65644,'AUD')
     last_customers_invoicing_amount Money.new(687994,'AUD')
     last_customers_outstanding_amount Money.new(178986,'AUD')
@@ -9,4 +11,8 @@ FactoryGirl.define do
     # Properly build the resource with Her
     initialize_with { new(attributes).tap { |e| e.clear_attribute_changes! } }
   end
+
+  factory :tenant, parent: :old_tenant do
+    current_billing_amount Money.new(123456, 'AUD')
+  end
 end

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

data/spec/lib/her_extension/model/relation_spec.rb

@@ -4,7 +4,8 @@ module MnoEnterprise
   RSpec.describe Her::Model::Relation do
     pending "add specs for Her::Model::Relation monkey patch: #{__FILE__}"
 
-    let(:dummy_class) { Class.new { include Her::Model } }
+    before(:all) { Object.const_set('DummyClass', Class.new).send(:include, Her::Model) }
+    let(:dummy_class) { DummyClass }
 
     describe '.where' do
       it 'adds the filter to params[:filter]' do
@@ -17,5 +18,61 @@ module MnoEnterprise
         expect(rel.params[:filter]).to eq('id.in' => nil)
       end
     end
+
+    # We mostly test our request expectations
+    describe '.first_or_create' do
+      let(:relation) { Her::Model::Relation.new(dummy_class) }
+      subject { relation.where(foo: 'bar').first_or_create(baz: 'bar') }
+
+      context 'when matching record' do
+        let(:record) { dummy_class.new(foo: 'bar') }
+        before do
+          expect(dummy_class).to receive(:request).with(hash_including(filter: {foo: 'bar'}, _method: :get)).and_return([record])
+        end
+
+        it 'returns the record' do
+          expect(subject).to eq(record)
+        end
+      end
+
+      context 'when no matching record' do
+        before do
+          expect(dummy_class).to receive(:request).with(hash_including(filter: {foo: 'bar'}, _method: :get)).and_return([])
+          expect(dummy_class).to receive(:request).with(hash_including(foo: 'bar', baz: 'bar', _method: :post)).and_return(dummy_class.new)
+        end
+
+        it 'creates a new record' do
+          expect(subject).to eq(dummy_class.new(foo: 'bar', baz: 'bar'))
+        end
+      end
+    end
+
+    # We mostly test our request expectations
+    describe '.first_or_initialize' do
+      let(:relation) { Her::Model::Relation.new(dummy_class) }
+      subject { relation.where(foo: 'bar').first_or_initialize(baz: 'bar') }
+
+      context 'when matching record' do
+        let(:record) { dummy_class.new(foo: 'bar') }
+        before do
+          expect(dummy_class).to receive(:request).with(hash_including(filter: {foo: 'bar'}, _method: :get)).and_return([record])
+        end
+
+        it 'returns the record' do
+          expect(subject).to eq(record)
+        end
+      end
+
+      context 'when no matching record' do
+        before do
+          expect(dummy_class).to receive(:request).with(hash_including(filter: {foo: 'bar'}, _method: :get)).and_return([])
+          # No POST stub
+        end
+
+        it 'build a new record' do
+          expect(subject).to eq(dummy_class.new(foo: 'bar', baz: 'bar'))
+        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.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -481,6 +481,7 @@ files:
 - lib/her_extension/middleware/mnoe_raise_error.rb
 - lib/her_extension/model/associations/association.rb
 - lib/her_extension/model/associations/association_proxy.rb
+- lib/her_extension/model/associations/belongs_to_association.rb
 - lib/her_extension/model/associations/has_many_association.rb
 - lib/her_extension/model/attributes.rb
 - lib/her_extension/model/orm.rb
@@ -586,7 +587,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Maestrano Enterprise - Core functionnality