bodhi-slam 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e09a87b26acc4339643d71bf277dad6594e7ab4
-  data.tar.gz: 2e9a4a7d6c16223aeb5048f7db9ad62f67b16432
+  metadata.gz: 2740f7bb58fef86f5fcb168c16736c0c043f7825
+  data.tar.gz: 5211d0755728d31d4ffdf18ad60f755511b8eccc
 SHA512:
-  metadata.gz: b0bab9be47dc879b044428bd45ec76717d2bd0b9e75f14db089bd3d0777c53ee0ff8590ce0d4032cb507876b66c8fa460aa0e559d19cf79473b2421c4941d78e
-  data.tar.gz: b7be96e86df8a30bdc2692a025a873c68a5f6574badaa80a3bfc272de81a1adac11e857b6128f394d714e043d1a7e15c8d25ca321b6808d265b15315ac9ae0af
+  metadata.gz: 7a650291911ad699c807cf808b4dde162146cf395ab18e2c47057400956743cc0f8091a7ced958b048ffc55b9e3b2e8aa88977e1142c64c12cb9d0549d2dead5
+  data.tar.gz: 089278eff165608ff8f4bc45858aa678f22cf32ce9eda6d68828a6595dd32496fe66a3a61c4898b6630738732ebbd31bb9ba8b726d0eb212e766a06879f5917c

data/lib/bodhi-slam/factory.rb

@@ -29,12 +29,10 @@ module Bodhi
     #   Resource.factory.build(name: "test") # => #<Resource:0x007fbff403e808 @name="test">
     def build(options={})
       options = Bodhi::Support.symbolize_keys(options)
-      object = klass.new(bodhi_context: options[:bodhi_context])
+      object = klass.new(options)
 
       @generators.each_pair do |attribute, generator|
-        if options.has_key?(attribute)
-          object.send("#{attribute}=", options[attribute])
-        else
+        unless options.has_key?(attribute)
           object.send("#{attribute}=", generator.call)
         end
       end

data/lib/bodhi-slam/properties.rb

@@ -20,6 +20,7 @@ module Bodhi
       def id; @sys_id; end
       def persisted?; !@sys_id.nil?; end
       def new_record?; @sys_id.nil?; end
+      def each; attributes.each{ |k, v| yield(k, v) }; end
 
       # Initializes a new instance of the class.  Accepts a parameter Hash for mass assignment.
       # If a parameter does not exist for the class, an UndefinedMethod error is raised.
@@ -33,6 +34,10 @@ module Bodhi
       #   object.name #=> "Bob"
       #   object.email #=> "some@email.com"
       def initialize(options={})
+        if options.is_a?(String)
+          options = JSON.parse(options)
+        end
+
         options = Bodhi::Support.symbolize_keys(options)
         options.each do |property, value|
           property_options = self.class.properties[property]
@@ -93,7 +98,7 @@ module Bodhi
 
     def self.included(base)
       base.extend(ClassMethods)
-      base.include(InstanceMethods)
+      base.include(InstanceMethods, Enumerable)
       base.instance_variable_set(:@properties, Hash.new)
     end
   end

data/lib/bodhi-slam/types/index.rb

@@ -1,6 +1,5 @@
 module Bodhi
   class TypeIndex
-    include Enumerable
     include Bodhi::Properties
     include Bodhi::Validations
 
@@ -9,9 +8,5 @@ module Bodhi
 
     validates :keys, required: true, multi: true, type: "String"
     validates :options, type: "Object"
-
-    def each
-      self.attributes.each{ |k, v| yield(k, v) }
-    end
   end
 end

data/lib/bodhi-slam/types.rb

@@ -28,7 +28,6 @@ module Bodhi
     validates :properties, required: true
     validates :indexes, type: "Bodhi::TypeIndex", multi: true
 
-    generates :extends, type: "String", matches: "[a-zA-Z_-]{10,20}"
     generates :name, type: "String", required: true, is_not_blank: true
     generates :namespace, type: "String", required: true
     generates :properties, type: "Object", required: true

data/lib/bodhi-slam.rb

@@ -1,6 +1,7 @@
 require "json"
 require "time"
 require 'faraday'
+require 'SecureRandom'
 require 'faraday_middleware'
 require 'net/http/persistent'
 require 'regexp-examples'
@@ -39,10 +40,7 @@ class BodhiSlam
   end
 
   def self.define_resources(context, options={})
-    # symbolize keys for the options hash
-    options = options.reduce({}) do |memo, (k, v)|
-      memo.merge({ k.to_sym => v})
-    end
+    options = Bodhi::Support.symbolize_keys(options)
 
     if context.invalid?
       raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s

metadata

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