ivapi 0.0.5 → 0.0.6

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+bin/test.rb

data/README.md

@@ -18,13 +18,20 @@ Or install it yourself as:
 
 ## Usage
 
+Config file in **config/ivapi.yml**
+```ruby
+username: YOUR USERNAME
+password: YOUR PASSWORD
+```
+
+
 ```ruby
 require 'ivapi'
 
 API_NAME = "your_account_name" #You must to set it on https://klientams.iv.lt/users.php with description "API".
 API_PASSWORD = "your_account_password"
 
-account = Ivapi::Account.new(API_NAME, API_PASSWORD)
+account = Ivapi::Account.new
 
 puts "Account name: #{account.info['ac_name']}"
 puts "Account created: #{account.info['ac_created']}"
@@ -33,7 +40,7 @@ account.services.each do |order|
   puts "Id: #{order['se_id']} Description: #{order['se_description']}"
 end
 
-server = Ivapi::Server.new(API_NAME, API_PASSWORD).id(123) # Where is id, there is your service id.
+server = Ivapi::Server.new.id(123) # Where is id, there is your service id.
 server.tasks.each do |task| # can be: server.tasks(:count => 15) (Max: 1000)
 	puts "Id: #{task['ta_id']} Command: #{task['ta_command']}"
 end

data/lib/ivapi.rb

@@ -1,7 +1,35 @@
 require "ivapi/version"
 require "httparty"
+require "ivapi/railtie" if defined?(Rails)
+
+# Iv.lt returing invalid error status, so we don't want to see it while they don't fix it.
+module HTTParty
+  class Parser
+    protected
+    def json
+      if MultiJson.respond_to?(:adapter)
+        MultiJson.load(body) rescue {}
+      else
+        MultiJson.decode(body) rescue {}
+      end
+    end
+  end
+end
 
 module Ivapi
   autoload :Account, 	'ivapi/account'
   autoload :Server, 	'ivapi/server'
+  
+  def self.config=(hash)
+    @@config = hash
+  end
+
+  def self.config
+    raise 'Set Ivapi config before connecting.' unless defined?(@@config)
+    @@config
+  end
+  
+  def self.setup(config)
+    self.config = config
+  end
 end

data/lib/ivapi/account.rb

@@ -12,18 +12,18 @@ module Ivapi
       options = { :command => 'account_orders' }
       self.class.get(self.file, :query => options.merge!(@auth))
     end
-    
+
     def services
       options = { :command => 'account_services' }
       self.class.get(self.file, :query => options.merge!(@auth))
     end
-    
-	def credits(o = { :count => 10 })
+
+    def credits(o = { :count => 10 })
       options = { :command => 'account_credits' }.merge!(o)
       self.class.get(self.file, :query => options.merge!(@auth))
     end
-    
-	def bonuses(o = { :count => 10 })
+
+    def bonuses(o = { :count => 10 })
       options = { :command => 'account_bonuses' }.merge!(o)
       self.class.get(self.file, :query => options.merge!(@auth))
     end

data/lib/ivapi/base.rb

@@ -2,15 +2,15 @@ require 'ivapi/account'
 
 module Ivapi
   class Base
-
+    
     include HTTParty
     base_uri 'https://api.iv.lt'
     format :json
 
     attr_reader :auth, :file
 
-    def initialize(u, p)
-      @auth = {:nick => u, :password => p }
+    def initialize
+      @auth = {:nick => Ivapi.config['username'], :password => Ivapi.config['password'] }
       @file = '/json.php'
     end
 
@@ -18,6 +18,6 @@ module Ivapi
       options = { :command => 'version' }
       self.class.get(self.file, :query => options.merge!(@auth))['version']
     end
-
+    
   end
 end

data/lib/ivapi/railtie.rb

@@ -0,0 +1,26 @@
+require "ivapi"
+require "rails"
+require "active_model/railtie"
+
+module Ivapi
+  class Railtie < Rails::Railtie
+
+    config.ivapi = ActiveSupport::OrderedOptions.new
+
+    initializer "ivapi.set_configs" do |app|
+      ActiveSupport.on_load(:ivapi) do
+        app.config.ivapi.each do |k,v|
+          send "#{k}=", v
+        end
+      end
+    end
+
+    initializer "ivapi.initialize_database" do |app|
+      config_file = Rails.root.join('config/ivapi.yml')
+      if config_file.file?
+        config = YAML.load(ERB.new(config_file.read).result)
+        Ivapi.setup(config)
+      end
+    end
+  end
+end

data/lib/ivapi/server.rb

@@ -19,7 +19,7 @@ module Ivapi
       options = { :command => 'server_tasks' , :id => self.server_id, :count => 10 }.merge!(o)
       self.class.get(self.file, :query => options.merge!(@auth))
     end
-    
+
     def graphs(o={})
       options = { :command => 'server_graphs' , :id => self.server_id }.merge!(o)
       self.class.get(self.file, :query => options.merge!(@auth))
@@ -29,31 +29,31 @@ module Ivapi
       options = { :command => 'server_os' , :id => self.server_id }
       self.class.get(self.file, :query => options.merge!(@auth))
     end
-    
+
     def reboot
       options = { :command => 'server_reboot' , :id => self.server_id }
       self.class.get(self.file, :query => options.merge!(@auth))
     end
-    
+
     def recreate(o={})
       options = { :command => 'server_recreate' , :id => self.server_id }.merge!(o)
       self.class.get(self.file, :query => options.merge!(@auth))
     end
-    
+
     def reset_password
       options = { :command => 'server_reset_password' , :id => self.server_id }
       self.class.get(self.file, :query => options.merge!(@auth))
     end
-    
+
     def change(o={})
       options = { :command => 'server_change' , :id => self.server_id }.merge!(o)
       self.class.get(self.file, :query => options.merge!(@auth))
-    end    
+    end
 
     def domain(o={})
       options = { :command => 'server_domain' , :id => self.server_id }.merge!(o)
       self.class.get(self.file, :query => options.merge!(@auth))
-    end    
+    end
 
   end
 end

data/lib/ivapi/version.rb

@@ -1,3 +1,3 @@
 module Ivapi
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ivapi
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -44,6 +44,7 @@ files:
 - lib/ivapi.rb
 - lib/ivapi/account.rb
 - lib/ivapi/base.rb
+- lib/ivapi/railtie.rb
 - lib/ivapi/server.rb
 - lib/ivapi/version.rb
 - spec/spec_helper.rb