ispmanager 0.1.1 → 0.1.2

data/README.rdoc

@@ -10,7 +10,7 @@ Run in terminal:
 == Examples
 
 	panel = ISPManager.new(
-		:host => 'example.com',
+		:url => 'https://example.com/manager',
 		:user => 'user',
 		:password => 'password'
 	)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/ispmanager.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ispmanager"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksei Kvitinskii"]
-  s.date = "2012-05-28"
+  s.date = "2012-05-30"
   s.description = "API client for ISPManager panel"
   s.email = "aleksei.wm@gmail.com"
   s.extra_rdoc_files = [

data/lib/ispmanager.rb

@@ -1,12 +1,15 @@
+require 'uri'
+
 class ISPManager
 	require 'ispmanager/base'
 	require 'ispmanager/domain'
 
 	def initialize params
-		unless params[:host] && params[:user] && params[:password]
+		unless params[:url] && params[:user] && params[:password]
 			raise RequireConnectionParams
 		end
-		params[:port] ||= 443
+
+		params[:uri] = URI params[:url]
 		@params = params
 	end
 
@@ -19,7 +22,8 @@ class ISPManager
 
 	class Request
 		def self.create function, params, connection
-			http = Net::HTTP.new connection[:host], connection[:port]
+			uri = connection[:uri]
+			http = Net::HTTP.new uri.host, uri.port
 			http.use_ssl = true
 			http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
@@ -28,8 +32,8 @@ class ISPManager
 			params[:out] = :json
 			params[:func] = function
 			query = URI.encode_www_form(params)
-			path = "/manager/ispmgr?#{query}"
-			request = Net::HTTP::Get.new(path)
+			url = "#{uri.url}/ispmgr?#{query}"
+			request = Net::HTTP::Get.new(url)
 			result = http.start {|http| http.request(request) }.body
 		end
 	end

data/spec/ispmanager/domain_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'fakeweb'
 
 describe ISPManager::Domain do
 	before( :each ) do
@@ -26,10 +25,10 @@ REQUREST
 		
 	end
 
-	subject { ISPManager::Domain.new :host => 'example.com', :user => 'user', :password => 'password'}
+	subject { ISPManager::Domain.new :url => 'https://example.com/manager', :user => 'user', :password => 'password'}
 
-	describe "list" do
+	describe "all" do
 
-		it {should have(2).list}
+		it {should have(2).all}
 	end
 end

data/spec/ispmanager_spec.rb

@@ -1,14 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe ISPManager do
-	let(:params){{host: 'example.com', user: 'user', password: 'password'}}
+	let(:params){{url: 'https://example.com/manager', user: 'user', password: 'password'}}
 
 	it "should not raise exceptions" do
 		ISPManager.new params
 	end
 
 	it "should require host" do
-		params.delete(:host)
+		params.delete(:url)
 		expect {ISPManager.new params}.should raise_exception( ISPManager::RequireConnectionParams)
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ispmanager
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 824617611789640730
+      hash: -628948793599473283
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: