bodhi-slam 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d37d15d216eee1331997b6c36c8354c96f2a5cc8
-  data.tar.gz: 1f718df6ea9586e6af5f3b24c82b3d3a7a54af7a
+  metadata.gz: 5555fc31ea61537f2cf853ef20bc9abcc3be90cd
+  data.tar.gz: 9e8a0aef642e02f2a562f882efb5e7209783ea5c
 SHA512:
-  metadata.gz: 9dd80e02c44454dbb8abf5d813578186e4492fb43fe4bd76ddf60fff63e76f0674689d0cdbe301e5e77c3233ecff49d9a66eac3604eb53b5e73030bb562319ad
-  data.tar.gz: a1d883d59e1f0aae13bb8cdff2f86dfa8e30a4891d4bb4f5f872cd169b4de42fad77ae62b9a8627f7cc60a9535ec0d8eb29625c30102733dfcad13cd8c1d2835
+  metadata.gz: 95543f83c7aa4df83dd787c8286104408ef8c9f2eba82ed6716e7140549e2ed31ba7fd54710e1b3aded240d904b805bab3c4cb20ff50e83ea47ab28fc362b7c3
+  data.tar.gz: 07de99d9bbdc16829deb95a056cc979ac959d03ed054ecdb60b5e997ca7c411e0402d3c25ba9c8a50d68c50f4f0eaad7cfe075a640cd231f943e7c75a667b6ad

data/lib/bodhi-slam/batches/resource.rb

@@ -25,7 +25,7 @@ module Bodhi
         request.url "/#{context.namespace}/resources/#{type}"
         request.headers['Content-Type'] = 'application/json'
         request.headers[context.credentials_header] = context.credentials
-        request.body = records.to_json
+        request.body = records.map(&:attributes).to_json
       end
 
       if response.status != 200

data/lib/bodhi-slam/factory.rb

@@ -33,8 +33,7 @@ module Bodhi
         memo.merge({ k.to_sym => v})
       end
 
-      object = klass.new
-      object.bodhi_context = options[:bodhi_context]
+      object = klass.new(bodhi_context: options[:bodhi_context])
       @generators.each_pair do |attribute, generator|
         if options.has_key?(attribute)
           object.send("#{attribute}=", options[attribute])
@@ -60,19 +59,6 @@ module Bodhi
     #   Resource.factory.create(context) # => #<Resource:0x007fbff403e808 @name="2-3lmwp^oef@245">
     #   Resource.factory.create(context, name: "test") # => #<Resource:0x007fbff403e808 @name="test">
     def create(options={})
-      # symbolize the option keys
-      options = options.reduce({}) do |memo, (k, v)| 
-        memo.merge({ k.to_sym => v})
-      end
-      
-      if options[:bodhi_context].nil?
-        raise ArgumentError.new("Missing option :bodhi_context")
-      end
-
-      if options[:bodhi_context].invalid?
-        raise options[:bodhi_context].errors, options[:bodhi_context].errors.to_a.to_s
-      end
-
       object = build(options)
       object.save!
       object
@@ -84,19 +70,6 @@ module Bodhi
     #   Resource.factory.create_list(10, context) # => [#<Resource:0x007fbff403e808 @name="2-3lmwp^oef@245">, #<Resource:0x007fbff403e808 @name="p7:n#$903<u1">, ...]
     #   Resource.factory.create_list(10, context, name: "test") # => [#<Resource:0x007fbff403e808 @name="test">, #<Resource:0x007fbff403e808 @name="test">, ...]
     def create_list(size, options={})
-      # symbolize the option keys
-      options = options.reduce({}) do |memo, (k, v)| 
-        memo.merge({ k.to_sym => v})
-      end
-      
-      if options[:bodhi_context].nil?
-        raise ArgumentError.new("Missing option :bodhi_context")
-      end
-
-      if options[:bodhi_context].invalid?
-        raise options[:bodhi_context].errors, options[:bodhi_context].errors.to_a.to_s
-      end
-
       resources = build_list(size, options)
       resources.each{ |resource| resource.save! }
       resources

data/lib/bodhi-slam/properties.rb

@@ -42,8 +42,16 @@ module Bodhi
       #   object.attributes # => { foo: "test", bar: 12345 }
       def attributes
         attributes = Hash.new
+
         self.class.properties.each do |property|
-          attributes[property] = send(property)
+          value = send(property)
+          if value.respond_to?(:attributes)
+            attributes[property] = value.attributes.delete_if { |k, v| v.nil? }
+          elsif value.is_a?(Array) && value.first.respond_to?(:attributes)
+            attributes[property] = value.map(&:attributes).collect{ |item| item.delete_if { |k, v| v.nil? } }
+          else
+            attributes[property] = value
+          end
         end
 
         attributes.delete_if { |k, v| v.nil? }

data/lib/bodhi-slam/resource.rb

@@ -276,6 +276,10 @@ module Bodhi
       #   obj.save!
       #   obj.persisted? # => true
       def save!
+        if bodhi_context.invalid?
+          raise Bodhi::ContextErrors.new(bodhi_context.errors.messages), bodhi_context.errors.to_a.to_s
+        end
+
         result = bodhi_context.connection.post do |request|
           request.url "/#{bodhi_context.namespace}/resources/#{self.class}"
           request.headers['Content-Type'] = 'application/json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - willdavis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday