atheme 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 965a87f20ccbdf56a383fefbaf857c1855886cdb
-  data.tar.gz: 699192c08b30c5ea61a518697f0519eed8252fe7
+  metadata.gz: b15500edb979b29e50bc1cb01f91e5507be129c8
+  data.tar.gz: 35f5730fa0e94e25971eef9e50f6600834add6ba
 SHA512:
-  metadata.gz: 9a5c2372e79507f0bac68b003081fb968e214e9887548754fd6f9b2a06ac08b79996bd8b37c222b3981b16fcaeccf5131d05235274ec2059dea5a3fb8ff24e23
-  data.tar.gz: a1c8f12fdc3b0ac1c97cc313381f0a548a3fd510a9e8ae39496bddc57343de59af89052dc163e3986e428329700ded8c3a51b67d027c4a1e7f3e5506b3e9a877
+  metadata.gz: c7ae6e9f1c3cbfc740d65ffa8300229ad43a18be4d5c443e597d2ba11a1adffa2f1c6a068cf035319305b5fbe91346a5b9b229c82d105d3a376421a5a513c7ee
+  data.tar.gz: a72b4205d9bf18f369f0465add1310298d81652e1e3407f4c2a999cd1471597f50b3728454a6efec72edc29109dbe63716c39c0610fdca8acd5671bb730e1041

data/README.md

@@ -26,11 +26,13 @@ You need to be using [Atheme IRC Services](http://www.atheme.net) with httpd and
 
 ```ruby
 Atheme.configure do |config|
-  config.url = 'http://example.com'
+  config.hostname = 'example.com'
   config.port = 9876
 end
 ```
 
+Optional: `protocol` (default http)
+
 ### Authentication
 
 ```ruby

data/lib/atheme.rb

@@ -17,7 +17,7 @@ module Atheme
   extend Authenticate
 
   def self.server
-    XMLRPC::Client.new2("#{Atheme.url}:#{Atheme.port}/xmlrpc")
+    XMLRPC::Client.new2("#{Atheme.protocol}://#{Atheme.hostname}:#{Atheme.port}/xmlrpc")
   end
 
   def self.call(*args)

data/lib/atheme/configuration.rb

@@ -1,15 +1,9 @@
 module Atheme::Configuration
-  VALID_CONFIG_OPTIONS = [:url, :port].freeze
-
-  attr_accessor *VALID_CONFIG_OPTIONS
+  attr_accessor :hostname, :port, :protocol
 
   def configure
-    yield self
-  end
+    self.protocol ||= 'http'
 
-  def options
-    VALID_CONFIG_OPTIONS.inject({}) do |option, key|
-      option.merge!(key => send(key))
-    end
+    yield self
   end
 end

data/lib/atheme/version.rb

@@ -1,3 +1,3 @@
 module Atheme
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/config.yml.example

@@ -1,7 +1,8 @@
 # Change this to your testing services xmlrpc information
 
-url: http://example.com
+hostname: example.com
 port: 1234
+protocol: http
 
 nick: a_nick_that_exists
 password: the_nicks_password

data/spec/lib/configuration_spec.rb

@@ -3,11 +3,13 @@ require 'spec_helper'
 describe Atheme::Configuration do
   it 'should have a port' do
     expect(Atheme.port).to eql atheme_config['port']
-    expect(Atheme.options[:port]).to eql atheme_config['port']
   end
 
   it 'should have a url' do
-    expect(Atheme.url).to eql atheme_config['url']
-    expect(Atheme.options[:url]).to eql atheme_config['url']
+    expect(Atheme.hostname).to eql atheme_config['hostname']
+  end
+
+  it 'should have a protocol' do
+    expect(Atheme.protocol).to eql atheme_config['protocol']
   end
 end

data/spec/spec_helper.rb

@@ -11,7 +11,8 @@ end
 def configure_atheme
   Atheme.configure do |config|
     config.port = atheme_config['port']
-    config.url = atheme_config['url']
+    config.hostname = atheme_config['hostname']
+    config.protocol = atheme_config['protocol']
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atheme
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - James Newton