clickmeetings 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eb3acae05e1d5649ffeba362990811c515842ce
-  data.tar.gz: dc3bd99acd772dc6aaf8a427d32d8ca925ec35ac
+  metadata.gz: 691edaedf8001434781df6680946dff8e5b3ae2c
+  data.tar.gz: 5a6398fd604bacc615ce07e78190199366111f2f
 SHA512:
-  metadata.gz: 4838201083a7e921890ac862b3e576f5730d56f94ebf9efe0de05bf0f788bad3aa08682227df486ab1bcd920fc61fe157bbb8ee8a49858f3af10e4efbf199355
-  data.tar.gz: 2b6da840b51cd4c662e6bc675652877a8ba8e6666beac9d2e1174ab32fc5443d817034377bc40f19b6653e62f99ea8ad4abde1ab9231a16d8bc355ce5f7bb42e
+  metadata.gz: 3e30ce8e040f11f47ff29a478eb1c98d7dce0aa41eed160ec82a27f1ae78bd8a1696e1e05e34b8425bea311d0f57660eaa3c12c30586712aaf3fdb60243c10ee
+  data.tar.gz: f8004f0f9a24dc12761d4d67f2d668757a84bbac1b139afd49731b28bafbefc5b058b90baa3339fdd5a90bfb6ba8fa196a2f38900c6fe138881400104ab66b0b

data/lib/clickmeetings.rb

@@ -4,6 +4,13 @@ require 'clickmeetings/client'
 require 'clickmeetings/model'
 require 'clickmeetings/exceptions'
 
+require 'clickmeetings/models/privatelabel/model'
+require 'clickmeetings/models/privatelabel/account'
+require 'clickmeetings/models/privatelabel/conference'
+require 'clickmeetings/models/privatelabel/profile'
+
+Gem.find_files('clickmeetings/models/open_api/*.rb').each { |f| require f }
+
 module Clickmeetings
   def self.config
     @config ||= Config.new
@@ -41,6 +48,4 @@ module Clickmeetings
   end
 
   require 'clickmeetings/engine' if defined?(Rails)
-  Gem.find_files('clickmeetings/models/open_api/*.rb').each { |f| require f }
-  Gem.find_files('clickmeetings/models/privatelabel/*.rb').each { |f| require f }
 end

data/lib/clickmeetings/model.rb

@@ -44,23 +44,16 @@ module Clickmeetings
         @resource_name = name
       end
 
-      def set_client_host(host = nil)
-        @client_host = host
-      end
-
-      def set_client_api_key(api_key = nil)
-        @client_api_key = api_key
-      end
-
       def client_options
         {
-          url: @client_host ||= Clickmeetings.config.host,
-          api_key: @client_api_key ||= Clickmeetings.config.api_key
+          url: Clickmeetings.config.host,
+          api_key: Clickmeetings.config.api_key
         }
       end
     end
 
     delegate :resource_name, to: :class
+    delegate :client_options, to: :class
 
     def client
       Clickmeetings.client
@@ -110,8 +103,6 @@ module Clickmeetings
 
     private
 
-    delegate :client_options, to: :class
-
     def merge_attributes(attrs)
       if attrs.is_a?(Array)
         merge_collection(attrs)

data/lib/clickmeetings/models/privatelabel/account.rb

@@ -1,9 +1,6 @@
 module Clickmeetings
   module PrivateLabel
-    class Account < ::Clickmeetings::Model
-      set_client_host Clickmeetings.config.privatelabel_host
-      set_client_api_key Clickmeetings.config.privatelabel_api_key
-
+    class Account < ::Clickmeetings::PrivateLabel::Model
       attr_accessor :account_expiration_date,
                     :meetings_allowed,
                     :package,

data/lib/clickmeetings/models/privatelabel/conference.rb

@@ -1,9 +1,6 @@
 module Clickmeetings
   module PrivateLabel
-    class Conference < ::Clickmeetings::Model
-      set_client_host Clickmeetings.config.privatelabel_host
-      set_client_api_key Clickmeetings.config.privatelabel_api_key
-
+    class Conference < Model
       attr_accessor :id, :room_type, :room_pin, :name, :name_url, :description,
                     :access_type, :lobby_description, :status, :created_at,
                     :updated_at, :permanent_room, :ccc, :starts_at, :ends_at,

data/lib/clickmeetings/models/privatelabel/model.rb

@@ -0,0 +1,14 @@
+module Clickmeetings
+  module PrivateLabel
+    class Model < ::Clickmeetings::Model
+      class << self
+        def client_options
+          {
+            url: Clickmeetings.config.privatelabel_host,
+            api_key: Clickmeetings.config.privatelabel_api_key
+          }
+        end
+      end
+    end
+  end
+end

data/lib/clickmeetings/models/privatelabel/profile.rb

@@ -1,9 +1,6 @@
 module Clickmeetings
   module PrivateLabel
-    class Profile < ::Clickmeetings::Model
-      set_client_host Clickmeetings.config.privatelabel_host
-      set_client_api_key Clickmeetings.config.privatelabel_api_key
-
+    class Profile < Model
       attr_accessor :id, :account_manager_email, :email, :phone,
                     :account_manager_name, :account_manager_phone,
                     :name, :packages

data/lib/clickmeetings/version.rb

@@ -1,3 +1,3 @@
 module Clickmeetings
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/helpers/webmock_helpers.rb

@@ -1,7 +1,8 @@
 module ClickmeetingWebMock
-  def mock_api(verb = nil, action = nil, status = 200)
+  def mock_api(verb = nil, action = nil, status = 200, open: false)
+    host = open ? Clickmeetings.config.host : Clickmeetings.config.privatelabel_host
     params = [
-      verb, Clickmeetings.config.privatelabel_host,
+      verb, host,
       action, status
     ]
     action_stub(*params) unless action.nil? || verb.nil?

data/spec/model_spec.rb

@@ -1,15 +1,10 @@
 require 'spec_helper'
 
 describe Clickmeetings::Model do
-  before(:each) do
-    described_class.set_client_host Clickmeetings.config.privatelabel_host
-    described_class.set_client_api_key Clickmeetings.config.privatelabel_api_key
-  end
-
   context "class methods" do
     context ".find" do
       subject { described_class.find(1) }
-      before(:each) { mock_api(:get, "#{described_class.resource_name}/1") }
+      before(:each) { mock_api(:get, "#{described_class.resource_name}/1", open: true) }
 
       it "returns Model object", :aggregate_failures do
         expect(subject).to be_instance_of described_class
@@ -19,7 +14,7 @@ describe Clickmeetings::Model do
 
     context ".all" do
       subject { described_class.all }
-      before(:each) { mock_api(:get, described_class.resource_name) }
+      before(:each) { mock_api(:get, described_class.resource_name, open: true) }
 
       it "returns array of model objects", :aggregate_failures do
         expect(subject).to be_instance_of Array
@@ -46,7 +41,7 @@ describe Clickmeetings::Model do
 
     context ".create" do
       subject { described_class.create }
-      before(:each) { mock_api(:post, described_class.resource_name) }
+      before(:each) { mock_api(:post, described_class.resource_name, open: true) }
 
       it "returns Model objects" do
         expect(subject).to be_instance_of described_class
@@ -61,7 +56,7 @@ describe Clickmeetings::Model do
       let(:object) { described_class.new(id: 1) }
       subject { object.update(params) }
 
-      before(:each) { mock_api(:put, "#{described_class.resource_name}/#{object.id}") }
+      before(:each) { mock_api(:put, "#{described_class.resource_name}/#{object.id}", open: true) }
 
       it "returns updated Mode object" do
         expect(subject).to be_instance_of described_class
@@ -73,7 +68,7 @@ describe Clickmeetings::Model do
       let(:object) { described_class.new(id: 1) }
       subject { object.destroy }
 
-      before(:each) { mock_api(:delete, "#{described_class.resource_name}/#{object.id}") }
+      before(:each) { mock_api(:delete, "#{described_class.resource_name}/#{object.id}", open: true) }
 
       it "returns destroyed object" do
         expect(subject).to be_instance_of described_class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clickmeetings
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sergei Alekseenko
@@ -188,6 +188,7 @@ files:
 - lib/clickmeetings/models/open_api/.keep
 - lib/clickmeetings/models/privatelabel/account.rb
 - lib/clickmeetings/models/privatelabel/conference.rb
+- lib/clickmeetings/models/privatelabel/model.rb
 - lib/clickmeetings/models/privatelabel/profile.rb
 - lib/clickmeetings/version.rb
 - spec/clickmeetings_spec.rb
@@ -233,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple REST API client for ClickMeetings Private Label API