bodhi-slam 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98cf6623880d11b702a150492d82187dd4cba869
-  data.tar.gz: f9f949910898bac2ac07517e412aa5825ba29d72
+  metadata.gz: 5a8e7d831dd4207afd22cb638010b5e61de531bc
+  data.tar.gz: 1edfd75cc8d195c1f5ac87b0de92d76ec8b33988
 SHA512:
-  metadata.gz: badc323a3402c4ae09b67aeb19e431857204f28b940ee24beacf58fd8284627f606ef3cd73f6d9e6d9f3f32f6a5df2a1264f72c65ed6742b3112539a67b02bee
-  data.tar.gz: 4b911fde1096640d8620f1ace4237b08c921db7284f3d2166f021efebe41e580fe53136a7f9aaf96066330b9128dbe19df61e1fb1e416aa8848c13ef4d555ddd
+  metadata.gz: f1a1ec09ae102cd96f3902b07219ac349902f98cb04f672483a9ff20f079bde115a7b1412071e29d2e3d5744ac26ba6ceaa1ef71c37ed296933c693c0f816bb6
+  data.tar.gz: de78dfa1895ef645561bd36e9d010f699fe4b5b7be307917c105b47ac4219fb93d4049f55299bd21685ed4531ac5c3ea5866c43b65f9758297c527d1ccb225f3

data/lib/bodhi-slam/factory.rb

@@ -27,19 +27,17 @@ module Bodhi
     # 
     #   Resource.factory.build # => #<Resource:0x007fbff403e808 @name="2-3lmwp^oef@245">
     #   Resource.factory.build(name: "test") # => #<Resource:0x007fbff403e808 @name="test">
-    def build(*args)
-      if args.last.is_a?(Hash)
-        params = args.last.reduce({}) do |memo, (k, v)| 
-          memo.merge({ k.to_sym => v})
-        end
-      else
-        params = Hash.new
+    def build(options={})
+      # symbolize the option keys
+      options = options.reduce({}) do |memo, (k, v)| 
+        memo.merge({ k.to_sym => v})
       end
 
       object = klass.new
+      object.bodhi_context = options[:bodhi_context]
       @generators.each_pair do |attribute, generator|
-        if params.has_key?(attribute)
-          object.send("#{attribute}=", params[attribute])
+        if options.has_key?(attribute)
+          object.send("#{attribute}=", options[attribute])
         else
           object.send("#{attribute}=", generator.call)
         end
@@ -51,8 +49,8 @@ module Bodhi
     # 
     #   Resource.factory.build_list(10) # => [#<Resource:0x007fbff403e808 @name="2-3lmwp^oef@245">, #<Resource:0x007fbff403e808 @name="p7:n#$903<u1">, ...]
     #   Resource.factory.build_list(10, name: "test") # => [#<Resource:0x007fbff403e808 @name="test">, #<Resource:0x007fbff403e808 @name="test">, ...]
-    def build_list(size, *args)
-      size.times.collect{ build(*args) }
+    def build_list(size, options={})
+      size.times.collect{ build(options) }
     end
 
     # Builds and saves a new resource to the given +context+
@@ -61,13 +59,21 @@ module Bodhi
     #   context = Bodhi::Context.new
     #   Resource.factory.create(context) # => #<Resource:0x007fbff403e808 @name="2-3lmwp^oef@245">
     #   Resource.factory.create(context, name: "test") # => #<Resource:0x007fbff403e808 @name="test">
-    def create(context, params={})
-      if context.invalid?
-        raise context.errors, context.errors.to_a.to_s
+    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
 
-      object = build(params)
-      object.bodhi_context = context
+      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
     end
@@ -77,17 +83,22 @@ 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, context, params={})
-      if context.invalid?
-        raise context.errors, context.errors.to_a.to_s
+    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
 
-      resources = build_list(size, params)
-      resources.each do |resource|
-        resource.bodhi_context = context
-        resource.save!
+      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
     end
 

data/lib/bodhi-slam/resource.rb

@@ -315,7 +315,7 @@ module Bodhi
           request.url "/#{bodhi_context.namespace}/resources/#{self.class}/#{sys_id}"
           request.headers['Content-Type'] = 'application/json'
           request.headers[bodhi_context.credentials_header] = bodhi_context.credentials
-          request.body = params.to_json
+          request.body = attributes.to_json
         end
 
         if result.status != 204
@@ -326,6 +326,30 @@ module Bodhi
       end
       alias :update :update!
 
+      def upsert!(params={})
+        update_attributes(params)
+
+        if invalid?
+          return false
+        end
+
+        result = bodhi_context.connection.put do |request|
+          request.url "/#{bodhi_context.namespace}/resources/#{self.class}?upsert=true"
+          request.headers['Content-Type'] = 'application/json'
+          request.headers[bodhi_context.credentials_header] = bodhi_context.credentials
+          request.body = attributes.to_json
+        end
+
+        unless [204, 201].include?(result.status)
+          raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+        end
+
+        if result.headers['location']
+          @sys_id = result.headers['location'].match(/(?<id>[a-zA-Z0-9]{24})/)[:id]
+        end
+      end
+      alias :upsert :upsert!
+
       def patch!(params)
         result = bodhi_context.connection.patch do |request|
           request.url "/#{bodhi_context.namespace}/resources/#{self.class}/#{sys_id}"

data/lib/bodhi-slam/types.rb

@@ -155,8 +155,37 @@ module Bodhi
       klass = Object.const_set(type.name, Class.new { include Bodhi::Resource })
 
       type.properties.each_pair do |attr_name, attr_properties|
-        attr_properties.delete_if{ |key, value| ["system", "trim", "unique", "default", "isCurrentUser", "toLower"].include?(key) }
-        klass.field(attr_name, attr_properties)
+        # symbolize the attr_properties keys
+        attr_properties = attr_properties.reduce({}) do |memo, (k, v)|
+          memo.merge({ k.to_sym => v})
+        end
+
+        # remove Sanitizers
+        attr_properties.delete_if{ |key, value| [:trim, :unique, :default, :isCurrentUser, :toLower].include?(key) }
+
+        # Do not add factories or validations for system properties
+        if attr_properties[:system] == true
+          klass.property attr_name
+        else
+          klass.field(attr_name, attr_properties)
+        end
+      end
+
+      # add indexes to the class
+      unless type.indexes.nil?
+        type.indexes.each do |index|
+          if index.is_a? Bodhi::TypeIndex
+            klass.index index.keys, index.options
+          else
+            # index is a raw json object
+            # symbolize the index option keys
+            index = index.reduce({}) do |memo, (k, v)|
+              memo.merge({ k.to_sym => v})
+            end
+
+            klass.index index[:keys], index[:options]
+          end
+        end
       end
 
       klass

data/lib/bodhi-slam/validators/precision.rb

@@ -0,0 +1,40 @@
+module Bodhi
+  class PrecisionValidator < Validator
+    attr_reader :number
+
+    def initialize(number)
+      if number.nil?
+        raise ArgumentError.new("Expected :number to not be nil")
+      end
+      @number = number
+    end
+
+    def validate(record, attribute, value)
+      unless value.nil?
+        
+        if value.is_a?(Array)
+          unless value.empty?
+            record.errors.add(attribute, "must contain only values with #{@number} decimal points") unless value.delete_if{ |v| decimals(v) == @number }.empty?
+          end
+        else
+          record.errors.add(attribute, "must have #{@number} decimal points") if decimals(value) != @number
+        end
+        
+      end
+    end
+    
+    def to_options
+      {self.to_sym => @number}
+    end
+
+    private
+    def decimals(a)
+      num = 0
+      while(a != a.to_i)
+        num += 1
+        a *= 10
+      end
+      num   
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - willdavis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -184,6 +184,7 @@ files:
 - lib/bodhi-slam/validators/min.rb
 - lib/bodhi-slam/validators/multi.rb
 - lib/bodhi-slam/validators/not_empty.rb
+- lib/bodhi-slam/validators/precision.rb
 - lib/bodhi-slam/validators/required.rb
 - lib/bodhi-slam/validators/type.rb
 - lib/bodhi-slam/validators/url.rb