mno-enterprise-core 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8839b4855e37d406f71969e03cd1807342a6d80d
-  data.tar.gz: dbcff8946f9af7727002fd3932f123bef15a1392
+  metadata.gz: dbc28286415a3dba2f5e47526dbe72c64a8b1733
+  data.tar.gz: 04b1ea9f9202953209dd0aea50ed75d2bf5bc150
 SHA512:
-  metadata.gz: 0d213f95880a2b892ad1e8a9db994f88e55a556a69003c3eab5a1169e6b322baeb223d4bd77e9ec614b725a1c69479b3627dc2b6bad4c2f254a1f4e8a75ff479
-  data.tar.gz: 782c91dfa3a452ee12b56f4b0d2306f4c2d4068ea84298854a915f66c5311d33470481d25c585a437df2bb6650e4dca10348a23881853f36b5b96456c7dbd9ce
+  metadata.gz: f338f4c5ee9aea85d2b2932566b09897ec2a79e2660eae46469ccaa9330a1be73ef4743788dd6cbc044cad067e533777db922b5094e3f286f4164b140257f927
+  data.tar.gz: 8a92ad1e78f595cf02b57083eccd41d2096cb505591f19466e6f5e2672dd4302122bf3e55557fbfe29624e2a6358890296b548d6f2238771220aa87a9778e18f

data/app/controllers/mno_enterprise/application_controller.rb

@@ -112,5 +112,21 @@ module MnoEnterprise
     def after_sign_out_path_for(resource_or_scope)
       MnoEnterprise.router.after_sign_out_url || super
     end
+
+    private
+
+    # Append params to the fragment part of an existing url String
+    #   add_param("/#/platform/accounts", 'foo', 'bar')
+    #     => "/#/platform/accounts?foo=bar"
+    #   add_param("/#/platform/dashboard/he/43?en=690", 'foo', 'bar')
+    #     => "/#/platform/dashboard/he/43?en=690&foo=bar"
+    def add_param_to_fragment(url, param_name, param_value)
+      uri = URI(url)
+      fragment = URI(uri.fragment || "")
+      params = URI.decode_www_form(fragment.query || "") << [param_name, param_value]
+      fragment.query = URI.encode_www_form(params)
+      uri.fragment = fragment.to_s
+      uri.to_s
+    end
   end
 end

data/lib/devise/models/remote_authenticatable.rb

@@ -30,7 +30,7 @@ module Devise
         def serialize_from_session(key,salt)
           record = Rails.cache.fetch(['user', key], expires_in: 1.minutes) do
             to_adapter.get(key)
-          end.tap(&:clear_association_cache)
+          end.tap {|r| r && r.clear_association_cache}
           record if record && record.authenticatable_salt == salt
         end
         

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

@@ -14,11 +14,15 @@ FactoryGirl.define do
       team { build(:team).attributes }
       user_role 'Member'
       
-      created_at 3.days.ago
+      created_at 1.days.ago
       updated_at 1.hour.ago
       
       # Properly build the resource with Her
       initialize_with { new(attributes).tap { |e| e.clear_attribute_changes! } }
+
+      trait :expired do
+        created_at 1.month.ago
+      end
     end
   end
 end

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/spec/controllers/mno_enterprise/application_controller_spec.rb

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  describe ApplicationController, type: :controller do
+    describe '#add_param_to_fragment' do
+      let(:controller) { MnoEnterprise::ApplicationController.new }
+
+      it { expect(subject.send(:add_param_to_fragment, '/#/platform/accounts', 'foo', 'bar')).to eq('/#/platform/accounts?foo=bar') }
+      it { expect(subject.send(:add_param_to_fragment, '/', 'foo', 'bar')).to eq('/#?foo=bar') }
+      it { expect(subject.send(:add_param_to_fragment, '/#/platform/dashboard/he/43?en=690', 'foo', 'bar')).to eq('/#/platform/dashboard/he/43?en=690&foo=bar') }
+      it { expect(subject.send(:add_param_to_fragment, '/#/platform/dashboard/he/43?en=690', 'foo', [{msg: 'yolo'}])).to eq('/#/platform/dashboard/he/43?en=690&foo=%7B%3Amsg%3D%3E%22yolo%22%7D') }
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -367,6 +367,7 @@ files:
 - lib/mno_enterprise/version.rb
 - lib/tasks/mno_enterprise_tasks.rake
 - spec/controllers/mno_enterprise/angular_csrf_spec.rb
+- spec/controllers/mno_enterprise/application_controller_spec.rb
 - spec/lib/her_extension/her_orm_adapter.rb
 - spec/lib/her_extension/model/relation_spec.rb
 - spec/lib/mandrill_client_spec.rb
@@ -382,7 +383,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://maestrano.com
 licenses:
-- Maestrano Enterprise License V1
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -418,4 +419,5 @@ test_files:
 - spec/lib/mandrill_client_spec.rb
 - spec/rails_helper.rb
 - spec/controllers/mno_enterprise/angular_csrf_spec.rb
+- spec/controllers/mno_enterprise/application_controller_spec.rb
 - spec/mno_enterprise_spec.rb