mno-enterprise-core 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df3c02b0aa5fa9cd97a8edb8aefb06a5cee969c2
-  data.tar.gz: ced81cbfa2e983dfa542b98ce104170c43f628a2
+  metadata.gz: e97f70735ab98bb1b3bff86657960ced3660fec3
+  data.tar.gz: 37550a7f9e952087af9528da9cf42b94ee5fdce9
 SHA512:
-  metadata.gz: 66791d40f8e3cd76e86b4d0fc072ac4d77b863e19bc31c655907b551529deb80c8b3ad685095f8fe4cf482c02eafef77f52e44a070ab484355ba7ced201672b7
-  data.tar.gz: 41388bf89759e93a4bedaa2c2605143a28bbb3be5204bc814b10f7eb48c8d0f80a374848ccaaa6304999730bedc0a583fda9332a30852cd27f61d36294e65013
+  metadata.gz: e5b872bbc67a77473f0bf98c4dce1cfbb73d5e92b7662305613af70ca0f399575922e99fd464799fef86784e616a1851b2908de0c783d39ae26fbf11a7a7bb89
+  data.tar.gz: b7f2a1a8f29ca87ee0dd196c703d32a0596d3e444409573ea3f026bdc8d4f607ec289973017fac519a3ddfa9e604dcaaafdccccc03a201fc775f343789e34b46

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

@@ -3,31 +3,29 @@ 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
+      MnoEnterprise::Organization.where('uid.in' => self.organization_ids).to_a
+    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
 
     def to_audit_event
       name

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/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/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 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: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -402,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Maestrano Enterprise - Core functionnality