easy-resources 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64a20718aae7ffc73d9edfc4c85e72753304cf64f9b2f46110495188e69069fb
-  data.tar.gz: 0b2b651ccb2de8b5e2f4c1dd621cccf99e09d6125bf03deaffa02ca1485ba7fb
+  metadata.gz: 4d9b6700f3653dd9566b5729a9d6e66ba4f907b3a9a0acbbcb04f87133ef5f17
+  data.tar.gz: 53bf19d9f64aeb138b5b3361d90e89195e9e33a03b162fdd22e1166b0fcb276f
 SHA512:
-  metadata.gz: f7bbd2dfa99cd99f3ffe8b131915cd3f987a330dcbb3b4a670b5afd3c7fdc734b54bc4aef50a178fb551a7a2082bc0d74a88509085137eecaf6e1dacd8acb065
-  data.tar.gz: fc51e66045ed5cd92619a30c0f0267fe4f9d3e35ec220f38bb905a1ca3628d9625ce5e77418d4471ed33991934493b498609f13ae4fefa8d04781ca523ba1f2a
+  metadata.gz: a3c19e4a0fb3d2164a58893ca0cfc0828c1d968e941777b4f5bac25386b4c925388f4426719b44fa35e94be9865f832e50ae606e3785488569205c92a41f42eb
+  data.tar.gz: 3100dd93d7c0fa71744b64b0734427bb753b70d981df18bc245c44bb576a1528e1ae31b75eabb9759ff079909d19237c43befcc5e8eb5fce375e4625d8c944c9

data/lib/easy/resource.rb

@@ -2,8 +2,7 @@ module Easy
   class Resource < ActiveResource::Base
 
     def self.configure(conf)
-      self.api_key = conf[:api_key]
-      self.site    = conf[:url]
+      self.site = conf[:url]
     end
 
     def becomes(entity_class)

data/lib/easy/resources.rb

@@ -8,18 +8,19 @@ module Easy
 
   module Resources
 
+    autoload :MicroserviceBase, "easy/resources/microservice_base"
+
     module Redmine
-      extend ActiveSupport::Autoload
-
-      autoload :RedmineBase
-      autoload :EasyContact
-      autoload :EasyCrmCase
-      autoload :EasyServer
-      autoload :EasyWebApplication
-      autoload :EasyWebApplicationActivity
-      autoload :Issue
-      autoload :Project
-      autoload :User
+
+      autoload :RedmineBase, "easy/resources/redmine/redmine_base"
+      autoload :EasyContact, "easy/resources/redmine/easy_contact"
+      autoload :EasyCrmCase, "easy/resources/redmine/easy_crm_case"
+      autoload :EasyServer, "easy/resources/redmine/easy_server"
+      autoload :EasyWebApplication, "easy/resources/redmine/easy_web_application"
+      autoload :EasyWebApplicationActivity, "easy/resources/redmine/easy_web_application_activity"
+      autoload :Issue, "easy/resources/redmine/issue"
+      autoload :Project, "easy/resources/redmine/project"
+      autoload :User, "easy/resources/redmine/user"
 
     end
 

data/lib/easy/resources/microservice_base.rb

@@ -0,0 +1,14 @@
+module Easy
+  module Resources
+    class MicroserviceBase < ::Easy::Resource
+
+      def self.configure(conf)
+        super(conf)
+
+        self.connection.auth_type    = :bearer
+        self.connection.bearer_token = conf[:token]
+      end
+
+    end
+  end
+end

data/lib/easy/resources/redmine/easy_server.rb

@@ -7,6 +7,10 @@ module Easy
 
         has_many :easy_web_applications, class_name: 'Easy::Resources::Redmine::EasyWebApplication'
 
+        def url
+          host_name
+        end
+
       end
     end
   end

data/lib/easy/resources/redmine/redmine_base.rb

@@ -15,13 +15,16 @@ module Easy
 
           # @param [Hash, nil] conf
           def configure(conf = nil)
-            conf ||= Easy.config.sites.redmine
+            conf ||= ::Easy.config.sites.redmine
+
+            self.api_key = conf[:api_key]
+
             super(conf)
           end
 
           def headers
             h                      = super
-            h['X-Redmine-API-Key'] ||= @api_key
+            h['X-Redmine-API-Key'] = @api_key
             h
           end
 

data/lib/easy/resources/version.rb

@@ -1,5 +1,5 @@
 module Easy
   module Resources
-    VERSION = '0.6.1'
+    VERSION = '0.6.3'
   end
 end

data/spec/models/easy-resources/redmine/redmine_base_spec.rb

@@ -5,4 +5,15 @@ RSpec.describe Easy::Resources::Redmine::RedmineBase do
     described_class.api_key = nil
     expect { described_class.find :first }.to raise_exception NoMethodError
   end
+
+  describe ".api_key=" do
+    it "change api_key on-fly, changed request headers" do
+      described_class.api_key = "secret1"
+      expect(described_class.headers).to include "X-Redmine-API-Key" => "secret1"
+
+      described_class.api_key = "xxxx"
+      expect(described_class.headers).to include "X-Redmine-API-Key" => "xxxx"
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-resources
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - petr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -134,6 +134,7 @@ files:
 - Rakefile
 - lib/easy/resource.rb
 - lib/easy/resources.rb
+- lib/easy/resources/microservice_base.rb
 - lib/easy/resources/railtie.rb
 - lib/easy/resources/redmine/easy_contact.rb
 - lib/easy/resources/redmine/easy_crm_case.rb
@@ -198,8 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Summary of Easy::Resources.