bodhi-slam 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1190f2e6cece5ef43cb0e44f2ae900b1d84768a
-  data.tar.gz: a1f3103fe42f11f76a4b6385cc608cd195fe1f4d
+  metadata.gz: 74f006a6012ceaab5f918a7b6832a832d1dbf9b4
+  data.tar.gz: fe5a4a8bdc2c6e803ef560f892fa60a56ab3b79b
 SHA512:
-  metadata.gz: ea4a4951ac8e977e7ed264b72517306f83f28e25ec381ec32601f7af193158dcf2201d5376bd067b7c980822fed001d8c431672fbd3b82a4baefb16fcf31ecca
-  data.tar.gz: d24addea94ee3896b43737fb5f1422979b281367802e1145b875650dd0a51eb951e73d830111e1327ce087bace2240fc43664860ac34b5f6341cc134c02157db
+  metadata.gz: 8ca2122a8f1ae97c087033e60d81befc12b3c90f2e7e34595e75cd1907e805192dde8c5eaf870738aa29db56b9c18939cd82eeae7c73193d879e194dab525b7a
+  data.tar.gz: 9db6d4a31a8893620aded4fb57dcc44b5589c5ae3e283b8d3bc34dd9a1b91bcaf84226998e05aa3d6db47afe7e230953a27020098ec74896b9238e8aa98f23f3

data/lib/bodhi-slam.rb

@@ -4,22 +4,21 @@ require "json"
 require "time"
 
 require 'bodhi-slam/context'
+require 'bodhi-slam/errors'
 require 'bodhi-slam/resource'
 
 class BodhiSlam
   def self.context(params, &block)
     bodhi_context = BodhiContext.new params
-    bodhi_context.validate!
-    
-    puts "Switching context to: #{bodhi_context.attributes}"
-    
+    raise bodhi_context.errors unless bodhi_context.valid?
+
+    #puts "Switching context to: #{bodhi_context.attributes}"
     yield bodhi_context
-    
-    puts "Exiting context: #{bodhi_context.attributes}"
+    #puts "Exiting context: #{bodhi_context.attributes}"
   end
   
   def self.analyze(context)
-    context.validate!
+    raise context.errors unless context.valid?
 
     #Get the types for this namespace
     result = context.connection.get do |request|

data/lib/bodhi-slam/context.rb

@@ -1,5 +1,5 @@
 class BodhiContext
-  attr_reader :connection, :server, :namespace, 
+  attr_reader :errors, :connection, :server, :namespace, 
     :credentials, :credentials_type, :credentials_header
 
   def initialize(params)
@@ -22,19 +22,38 @@ class BodhiContext
       @credentials_header = "Authorization"
       @credentials_type = "HTTP_BASIC"
     end
+    
+    @errors = Bodhi::Errors.new
   end
   
   def attributes
     attributes = Hash.new
     self.instance_variables.each do |variable|
       attribute_name = variable.to_s.delete('@').to_sym
-      attributes[attribute_name] = send(attribute_name) unless [:connection, :credentials_header].include?(attribute_name)
+      attributes[attribute_name] = send(attribute_name)
     end
     attributes
   end
   
-  def validate!
-    raise ArgumentError, "Server URL must be a String" unless server.is_a?(String)
-    raise ArgumentError, "Namespace name must be a String" unless namespace.is_a?(String)
+  # - Runs all the specified validations and returns true if no errors were added otherwise false.
+  def valid?
+    errors.add(:server, "must be present") if server.nil?
+    errors.add(:server, "must be a string") unless server.is_a? String
+    
+    errors.add(:namespace, "must be present") if namespace.nil?
+    errors.add(:namespace, "must be a string") unless namespace.is_a? String
+    
+    return !errors.messages.any?
+  end
+  
+  # - Performs the opposite of valid?. Returns true if errors were added, false otherwise.
+  def invalid?
+    errors.add(:server, "must be present") if server.nil?
+    errors.add(:server, "must be a string") unless server.is_a? String
+    
+    errors.add(:namespace, "must be present") if namespace.nil?
+    errors.add(:namespace, "must be a string") unless namespace.is_a? String
+    
+    return errors.messages.any?
   end
 end

data/lib/bodhi-slam/errors.rb

@@ -0,0 +1,24 @@
+module Bodhi
+  class Errors < Exception
+    attr_accessor :messages
+    
+    def initialize(errors={})
+      @messages = errors
+    end
+
+    def add(symbol, msg)
+      @messages[symbol] = [] unless @messages.has_key?(symbol)
+      @messages[symbol].push(msg)
+    end
+    
+    def clear
+      @messages.clear
+    end
+    
+    def full_messages
+      results = []
+      @messages.each{ |key, values| values.each{ |value| results.push("#{key} #{value}") }}
+      results
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Will Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate data and push to the Bodhi API
 email: will.davis@hotschedules.com
 executables: []
@@ -60,6 +74,7 @@ extra_rdoc_files: []
 files:
 - lib/bodhi-slam.rb
 - lib/bodhi-slam/context.rb
+- lib/bodhi-slam/errors.rb
 - lib/bodhi-slam/resource.rb
 homepage: 
 licenses: