steam_fi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 958b4b84c5a4e2e65facedc3b8fa607d3bb98aac
-  data.tar.gz: 3d8dea1b4eec8bac87ea155a1fbfe084a19a5651
+  metadata.gz: b917587d22dd4d7c0a28e3b52304256b2f226d0e
+  data.tar.gz: 1fa1a45fe9b6d08bafdbe45caad67a63e9c605cf
 SHA512:
-  metadata.gz: 81870bff0f0c41095e0faf79c75bd5ec815d0b1862f9b7c24ff6b0f9117ae58d21ed79f03f9099340aa3f134506ccd5d5ec17866cf51b9f8a5c69a9e3f5f9eeb
-  data.tar.gz: d7436984354f36d363da82e21925a1862fdba0c170992587c14d7891b911d40a5e9f68b02578199c231a30ea0e3b5d698954f62bf740247928f2602757ca6cf4
+  metadata.gz: ce68680bce0745ddf74c7ad9686c7928a948376c148c651e22daa6c89dde6e14b38f48859dbcea176fc454ba050bf28e13c1f579989786ccec8e4108d6f007ab
+  data.tar.gz: 5e28752b7b618d47a99f8ee6a09e71085533e4cc27e3f18964359a769a6bd688fc21c9f868328ed4a97d4a4001e59f244e078637bdbf72f3f4247ef3c09eefaa

data/README.md

@@ -35,6 +35,12 @@ Send SMS:
 SteamFi::API.send_sms('1234PHONE', 'Hello world')
 ```
 
+Set logger:
+
+```ruby
+SteamFi::API.logger = MyLogger.new
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/steam_fi/fork )

data/lib/steam_fi/api.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'uri'
+require 'yaml'
 
 module SteamFi
   class API
@@ -9,61 +10,67 @@ module SteamFi
       :username => nil,
       :password => nil
     }
+
+    @@logger = nil
     
-    cattr_accessor :logger
-    
-    # Logger
-    @@logger = Logger.new File.join(RAILS_ROOT, '/log/', "steam_fi_#{RAILS_ENV}.log")
-    
-    # Set configuration parameters
-    def self.setup(options)
-      @@config.merge!(options)
-    end
-    
-    # Send SMS message
-    def self.send_sms(msisdn, message, params = {})
-      params.merge! :msisdn => msisdn, :msg => message
-      self.request @@config[:sms_url], params
-    end
-    
-    protected
-    
-    # Send request
-    def self.request(url, params = {})
-      # add username & password
-      params.merge! :l => @@config[:username], :p => @@config[:password]
+    class << self
+      def setup(options)
+        @@config.merge!(options)
+      end
       
-      @@logger.info "#{Time.now} REQUEST\n#{url}\n#{params.to_yaml}"
+      # Send SMS message
+      def send_sms(msisdn, message, params = {})
+        params.merge! :msisdn => msisdn, :msg => message
+        request @@config[:sms_url], params
+      end
 
-      begin
-        # build & send request
-        uri = URI.parse(url)
-        req = Net::HTTP::Post.new(uri.path)
-        
-        req.set_form_data(params)
-        req.initialize_http_header({ 
-          'Content-Type' => 'application/x-www-form-urlencoded; charset=UTF-8'
-        })
-        
-        http          = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl  = (uri.port == 443)
-        res           = http.request(req) 
-      rescue Exception => e
-        self.handle_error e
+      def logger
+        @@logger
       end
+      
+      def logger=(logger)
+        @@logger = logger
+      end    
+      
+      protected
+      
+      # Send request
+      def request(url, params = {})
+        # add username & password
+        params.merge! :l => @@config[:username], :p => @@config[:password]
         
-      case res
-      when Net::HTTPSuccess
-        @@logger.info "#{Time.now} RESPONSE\n#{res.body}"
-        res.body
-      else
-        self.handle_error SteamFi::SteamException.new(res.inspect)
+        logger.info "#{Time.now} REQUEST\n#{url}\n#{params.to_yaml}" if logger
+
+        begin
+          # build & send request
+          uri = URI.parse(url)
+          req = Net::HTTP::Post.new(uri.path)
+          
+          req.set_form_data(params)
+          req.initialize_http_header({ 
+            'Content-Type' => 'application/x-www-form-urlencoded; charset=UTF-8'
+          })
+          
+          http          = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl  = (uri.port == 443)
+          res           = http.request(req) 
+        rescue Exception => e
+          handle_error e
+        end
+          
+        case res
+        when Net::HTTPSuccess
+          logger.info "#{Time.now} RESPONSE\n#{res.body}" if logger
+          res.body
+        else
+          handle_error SteamFi::SteamException.new(res.inspect)
+        end
       end
-    end
-    
-    def self.handle_error(e)
-      @@logger.error "#{Time.now} ERROR\n#{e.message}"
-      raise SteamFi::SteamException.new(e.message)      
-    end
+      
+      def handle_error(e)
+        logger.error "#{Time.now} ERROR\n#{e.message}" if logger
+        raise SteamFi::SteamException.new(e.message)      
+      end
+    end  
   end
 end

data/lib/steam_fi/version.rb

@@ -1,3 +1,3 @@
 module SteamFi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: steam_fi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Laurynas Butkus