posty_client 2.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 00df168ce22c4d7f2b85441c88da83c9ed096aef
-  data.tar.gz: 13fef9f004c83c5500009b3baf6fc4972bc0d4b5
+SHA256:
+  metadata.gz: 14a9b46e9672ce8aace8bf87f3d604d51e467454e687f2c0d016c179acd3231d
+  data.tar.gz: 7b8fa4e9483bd002c5ba18ea0216e56f454e610c41eb520906db8fabdf4736e5
 SHA512:
-  metadata.gz: fcac0ec8cfe5fbf4037e5baed2decc6f33c2862244af68bf665c8ccda77599d18ce3c258cc56b748b271f530d0afecf73934651fe29474e2e945dcdb1a3a7a91
-  data.tar.gz: 537cff17cc1ba6902f82c54ad15102e78270bb5814ecccc8121142b53aa8079c4a94a517c0705bec82be79aee3867cb8686c4de19278dad0da4b545831c21b34
+  metadata.gz: 9833df8aedab3aa6419e5929c00ba2d4ed80c08e9e8435175d6c091c68fbdf7aa551a5b44bc4e23773103564318c619c224a1cecef2f0af1f20c7860b83f96e4
+  data.tar.gz: cc0aaf80dfccb73737c35f835c7e2c494c93dd35335b28db05ae2f7411762e6158e100775bbe1c9571179aabf6fc87d036438c903019df1fb8598685aa18d80c

data/README.md

@@ -65,18 +65,13 @@ The cli supplies a command to create a template for you:
 	puts '--'*10
 	pp u.aliases
 
-## Information
+    # Usage with multiple servers
+    PostyClient::Settings.current_server = 'server1'
+    # Now all api calls execute on the settings defined for [production|development|test].servers.server1
+    d = PostyClient::Resources::Domain.new('posty-soft1.org')
 
-For more information about posty please visit our website:
-[www.posty-soft.org](http://www.posty-soft.org)
-
-## Support
-
-* IRC
-	* Server: irc.freenode.net
-	* Channel: #posty
-* Email:
-	* support@posty-soft.org
+    # The `PostyClient::Settings.current_server` setting is thread local setting. The following is thus save to use:
+    %w(server1 server2).map {|server| PostyClient::Settings.current_server = server; # ...}.map(&:join)
 
 ## Bug reports
 

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task :default => :test

data/config/posty_client.yml.dist

@@ -6,6 +6,31 @@ development:
   access_token: ask your admin
 
 production:
+  # default settings
   api_url: http://posty-api.herokuapp.com/api/
   api_version: v1
   access_token: ask your admin
+  # multi server settings
+  servers:
+    server1:
+      api_url: http://posty-api1.herokuapp.com/api/
+      api_version: v1
+      access_token: ask your admin
+    server2:
+      api_url: http://posty-api2.herokuapp.com/api/
+      api_version: v1
+      access_token: ask your admin
+
+test:
+  api_url: https://testmailer-default.herokuapp.com/api
+  api_version: v1
+  access_token: token12345
+  servers:
+    server1:
+      api_url: https://testmailer-server1.herokuapp.com/api
+      api_version: v1
+      access_token: token12345
+    server2:
+      api_url: https://testmailer-server2.herokuapp.com/api
+      api_version: v1
+      access_token: token12345

data/lib/posty_client.rb

@@ -25,7 +25,7 @@ module PostyClient
   end
 
   def self.env
-    'development' || ENV['POSTY_ENV']
+    ENV['POSTY_ENV'] || 'development'
   end
 
   def self.root

data/lib/posty_client/resources/base.rb

@@ -11,10 +11,14 @@ module PostyClient
         [:id, :virtual_domain_id, :created_at, :updated_at, :password]
       end
 
-      cattr_accessor :base_uri do
+      def self.base_uri
         URI.join(Settings.api_url, Settings.api_version)
       end
 
+      def base_uri
+        self.class.base_uri
+      end
+
       class_attribute :primary_key
       self.primary_key = 'name'
 

data/lib/posty_client/settings.rb

@@ -1,6 +1,39 @@
 module PostyClient
-  class Settings < ReadWriteSettings
-    source    PostyClient.settings_file
-    namespace PostyClient.env
+  class Settings
+    mattr_accessor :settings do
+      YAML.load(ERB.new(File.read(PostyClient.settings_file)).result)
+    end
+
+    def self.servers
+      settings[PostyClient.env]['servers'].keys
+    end
+
+    def self.current_server
+      Thread.current["attr_#{name}_current_server"]
+    end
+
+    def self.current_server=(server)
+      Thread.current["attr_#{name}_current_server"] = server
+    end
+
+    def self.current_settings
+      if current_server.present?
+        settings[PostyClient.env]['servers'][current_server]
+      else
+        settings[PostyClient.env]
+      end
+    end
+
+    def self.access_token
+      current_settings['access_token']
+    end
+
+    def self.api_url
+      current_settings['api_url']
+    end
+
+    def self.api_version
+      current_settings['api_version']
+    end
   end
-end
+end

data/lib/posty_client/version.rb

@@ -1,3 +1,3 @@
 module PostyClient
-  VERSION = "2.0.4"
+  VERSION = "3.0.0"
 end

data/posty_client.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "json"

data/test/settings_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class SettingsTest < Minitest::Test
+  def test_env
+    assert_equal 'test', PostyClient.env
+  end
+
+  def test_settings_file_exists
+    assert File.exist?(PostyClient::settings_file)
+  end
+
+  def test_default_settings
+    assert_kind_of Hash, PostyClient::Settings.current_settings
+    refute_nil PostyClient::Settings.access_token
+  end
+
+  def test_servers
+    assert PostyClient::Settings.servers.count > 1
+    assert_includes PostyClient::Settings.servers, 'server1'
+    assert_includes PostyClient::Settings.servers, 'server2'
+  end
+
+  def test_threaded_server_access
+    assert_nil PostyClient::Settings.current_server
+    default_api_url = PostyClient::Settings.api_url
+
+    threads = PostyClient::Settings.servers.map do |server|
+      Thread.start do
+        PostyClient::Settings.current_server = server
+        assert_equal server, PostyClient::Settings.current_server
+        assert_kind_of Hash, PostyClient::Settings.current_settings
+        refute_equal default_api_url, PostyClient::Settings.api_url
+        assert_match(/#{server}/, PostyClient::Settings.api_url)
+      end
+    end
+    assert_nil PostyClient::Settings.current_server
+    assert_equal default_api_url, PostyClient::Settings.api_url
+
+    assert_equal 2, threads.count
+    threads.map(&:join)
+
+    assert_equal [false], threads.map(&:status).uniq # all threads terminated normally
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'minitest/autorun'
+require 'posty_client'
+
+ENV['POSTY_ENV'] ||= 'test'

metadata

@@ -1,111 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: posty_client
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Thomas Steinhausen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: readwritesettings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A library and a command line tool to use the post api.
@@ -116,7 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -144,6 +158,8 @@ files:
 - lib/posty_client/settings.rb
 - lib/posty_client/version.rb
 - posty_client.gemspec
+- test/settings_test.rb
+- test/test_helper.rb
 homepage: https://github.com/iaddict/posty_client
 licenses:
 - MIT
@@ -154,19 +170,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Library and cli for the post api.
-test_files: []
-has_rdoc: 
+test_files:
+- test/settings_test.rb
+- test/test_helper.rb