phraseapp-ruby 1.2.4 → 1.2.5

data/lib/phraseapp-ruby/auth.rb

@@ -15,22 +15,15 @@ module PhraseApp
         @host
       end
 
-      def validate
+      def validate!
         if self.username.to_s == "" && self.token.to_s == ""
-          return raise("either username or token must be given")
-        else
-          return nil
+          raise ValidationError.new("either username or token must be given")
         end
       end
 
       def authenticate(req)
-        if err = load_config
-          return err
-        end
-
-        if err = validate
-          return err
-        end
+        load_config
+        validate!
 
         if self.token && self.token != ""
           req["Authorization"] = "token #{self.token}"
@@ -41,13 +34,11 @@ module PhraseApp
             raise "Multi-Factor Token required in config but not provided." unless self.tfa_token
             req["X-PhraseApp-OTP"] = auth.tfa_token
           end
-        else
-          raise "No authentication present"
         end
 
         return nil
-
       end
+
     private
       def load_config
         path = config
@@ -81,9 +72,10 @@ module PhraseApp
         if configCredentials.debug
           self.debug = configCredentials.debug
         end
-
-        return nil
       end
     end
   end
 end
+
+class ValidationError < StandardError
+end

data/lib/phraseapp-ruby/request_handler.rb

@@ -10,12 +10,10 @@ module PhraseApp
 
       def initialize(http_response)
         hash = JSON.load(http_response.body)
-        self.message = hash['message']
+        @message = hash['message']
       end
 
-      def error
-        self.message
-      end
+      alias_method :error, :message
     end
 
     class ValidationErrorResponse
@@ -24,8 +22,8 @@ module PhraseApp
 
       def initialize(http_response)
         hash = JSON.load(http_response.body)
-        self.message = hash['message']
-        self.errors = hash['errors'].map { |error| ValidationErrorMessage.new(error) }
+        @message = hash['message']
+        @errors = hash['errors'].map { |error| ValidationErrorMessage.new(error) }
       end
     end
 
@@ -33,13 +31,13 @@ module PhraseApp
       attr_reader :resource, :field, :message
 
       def initialize(error)
-        self.resource = error["resource"]
-        self.field = error["field"]
-        self.message = error["message"]
+        @resource = error["resource"]
+        @field = error["field"]
+        @message = error["message"]
       end
 
       def to_s
-  	    return sprintf("\t[%s:%s] %s", self.resource, self.field, self.message)
+        sprintf("\t[%s:%s] %s", self.resource, self.field, self.message)
       end
     end
 
@@ -47,13 +45,13 @@ module PhraseApp
       attr_reader :limit, :remaining, :reset
 
       def initialize(resp)
-        self.limit = resp["X-Rate-Limit-Limit"].to_i
-  	    self.remaining = resp["X-Rate-Limit-Remaining"].to_i
-        self.reset = Time.at(resp["X-Rate-Limit-Reset"].to_i)
+        @limit = resp["X-Rate-Limit-Limit"].to_i
+        @remaining = resp["X-Rate-Limit-Remaining"].to_i
+        @reset = Time.at(resp["X-Rate-Limit-Reset"].to_i)
       end
 
       def to_s
-  	    sprintf("Rate limit exceeded: from %d requests %d are remaning (reset in %d seconds)", self.limit, self.remaining, int64(rle.Reset.Sub(time.Now()).Seconds()))
+        sprintf("Rate limit exceeded: from %d requests %d are remaning (reset in %d seconds)", self.limit, self.remaining, int64(rle.Reset.Sub(time.Now()).Seconds()))
       end
     end
   end
@@ -64,15 +62,8 @@ module PhraseApp
       res << "Content-Disposition: form-data; name=\"#{k}\"\r\n"
       # res << "Content-Type: #{headers["Content-Type"]}\r\n" if headers["Content-Type"]
       res << "\r\n"
-      if v.is_a?(Array)
-        v.each do |vv|
-          res << vv+","
-        end
-        res << "\r\n"
-      else
-        res << "#{v}\r\n"
-      end
-      res
+      res << Array(v).join(',')
+      res << "\r\n"
     end
   end
 
@@ -151,7 +142,7 @@ module PhraseApp
     end
     resp = http.request(req)
 
-  	err = handleResponseStatus(resp, status)
+    err = handleResponseStatus(resp, status)
 
     return resp, err
   end
@@ -159,17 +150,17 @@ module PhraseApp
   def self.handleResponseStatus(resp, expectedStatus)
     case resp.code.to_i
       when expectedStatus
-	    	return
+        return
       when 400
         return PhraseApp::RequestErrors::ErrorResponse.new(resp)
       when 404
-    		return raise("not found")
+        return raise("not found")
       when 422
         return PhraseApp::RequestErrors::ValidationErrorResponse.new(resp)
       when 429
         return PhraseApp::RequestErrors::RateLimitingError.new(resp)
       else
-		    return raise("unexpected status code (#{resp.code}) received; expected #{expectedStatus}")
+        return raise("unexpected status code (#{resp.code}) received; expected #{expectedStatus}")
     end
   end
 end

data/lib/phraseapp-ruby/version.rb

@@ -1,3 +1,3 @@
 module PhraseApp
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - PhraseApp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies: []
 description: PhraseApp API client libary
 email:
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Interact with the PhraseApp API