easy-resources 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d9b6700f3653dd9566b5729a9d6e66ba4f907b3a9a0acbbcb04f87133ef5f17
-  data.tar.gz: 53bf19d9f64aeb138b5b3361d90e89195e9e33a03b162fdd22e1166b0fcb276f
+  metadata.gz: b85a42c7639123ae5e49f48cb3dd8839d59a35d5059f2ee03376c127a0f7ced1
+  data.tar.gz: 6357e94c84e9b9d14763879ca5687d0b8931be7e4b475ff2a9ccfa989130a0ae
 SHA512:
-  metadata.gz: a3c19e4a0fb3d2164a58893ca0cfc0828c1d968e941777b4f5bac25386b4c925388f4426719b44fa35e94be9865f832e50ae606e3785488569205c92a41f42eb
-  data.tar.gz: 3100dd93d7c0fa71744b64b0734427bb753b70d981df18bc245c44bb576a1528e1ae31b75eabb9759ff079909d19237c43befcc5e8eb5fce375e4625d8c944c9
+  metadata.gz: d6e0cf8e924c4fee86ae9cfcb61a89ecababc5af0cfd9c821c526554e1c8cf4e0d5f6d223a8abcb85e70875344594c89a155db9582f5f0a747352c5c4a27bc10
+  data.tar.gz: 29b8b4f9b8e47dbd3d275034f469a73e0ecd8b25bbd1df087df6d91ed36d76ab95b53f4cd4b35f528ea117da8908deecd0f7982d733ba5473773013850cc3d78

data/lib/easy/resource.rb

@@ -2,7 +2,21 @@ module Easy
   class Resource < ActiveResource::Base
 
     def self.configure(conf)
-      self.site = conf[:url]
+      if conf.is_a?(::Hash)
+        if conf[:url].present? && conf[:token].present?
+          configure_bearer(conf[:url], conf[:token])
+        elsif conf[:url].present?
+          self.site = conf[:url]
+        end
+      elsif conf.is_a?(::OAuth2::AccessToken)
+        configure_bearer(conf.client.site, conf.token)
+      end
+    end
+
+    def self.configure_bearer(url, token)
+      self.site                    = url
+      self.connection.auth_type    = :bearer
+      self.connection.bearer_token = token
     end
 
     def becomes(entity_class)

data/lib/easy/resources/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-resources
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - petr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -134,7 +134,6 @@ 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
@@ -199,40 +198,40 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Summary of Easy::Resources.
 test_files:
-- spec/spec_helper.rb
-- spec/models/easy-resources/redmine/project_spec.rb
+- spec/easy_resources_spec.rb
+- spec/support/active_resource.rb
+- spec/support/redmine_active_resource.rb
+- spec/support/fixtures.rb
+- spec/models/easy-resources/resource_spec.rb
+- spec/models/easy-resources/redmine/easy_web_application_spec.rb
+- spec/models/easy-resources/redmine/user_spec.rb
 - spec/models/easy-resources/redmine/easy_crm_case_spec.rb
+- spec/models/easy-resources/redmine/redmine_base_spec.rb
 - spec/models/easy-resources/redmine/easy_contact_spec.rb
 - spec/models/easy-resources/redmine/issue_spec.rb
-- spec/models/easy-resources/redmine/redmine_base_spec.rb
 - spec/models/easy-resources/redmine/easy_web_application_activity_spec.rb
-- spec/models/easy-resources/redmine/easy_web_application_spec.rb
-- spec/models/easy-resources/redmine/user_spec.rb
-- spec/models/easy-resources/resource_spec.rb
-- spec/support/active_resource.rb
-- spec/support/fixtures.rb
-- spec/support/redmine_active_resource.rb
-- spec/easy_resources_spec.rb
+- spec/models/easy-resources/redmine/project_spec.rb
+- spec/fixtures/files/project/show.xml
+- spec/fixtures/files/easy_server/show.xml
+- spec/fixtures/files/easy_server/index.xml
+- spec/fixtures/files/project.json
 - spec/fixtures/files/easy_contact/show.xml
-- spec/fixtures/files/easy_crm_case.json
 - spec/fixtures/files/easy_crm_case/show.xml
-- spec/fixtures/files/project.json
+- spec/fixtures/files/easy_crm_case.json
 - spec/fixtures/files/issue.json
 - spec/fixtures/files/user/show.xml
-- spec/fixtures/files/project/show.xml
-- spec/fixtures/files/issue/show.xml
 - spec/fixtures/files/easy_contact.json
-- spec/fixtures/files/easy_server/index.xml
-- spec/fixtures/files/easy_server/show.xml
-- spec/fixtures/files/easy_web_application/index.xml
 - spec/fixtures/files/easy_web_application/with_ewaa.xml
-- spec/fixtures/files/easy_web_application/with_custom_fields.xml
 - spec/fixtures/files/easy_web_application/show.xml
 - spec/fixtures/files/easy_web_application/with_easy_contact.xml
-- spec/fixtures/files/easy_web_application/with_easy_crm_case.xml
+- spec/fixtures/files/easy_web_application/with_custom_fields.xml
+- spec/fixtures/files/easy_web_application/index.xml
 - spec/fixtures/files/easy_web_application/show.json
+- spec/fixtures/files/easy_web_application/with_easy_crm_case.xml
+- spec/fixtures/files/issue/show.xml
+- spec/spec_helper.rb

data/lib/easy/resources/microservice_base.rb

@@ -1,14 +0,0 @@
-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