bodhi-slam 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d83b1c6ce8f644e9108c2c8fc4c3b0996851d572
-  data.tar.gz: 75a57b10b96e572fad43651f55d2d037950f16e6
+  metadata.gz: a9e0fc2114db2a841586eb0937833f53d7696cf4
+  data.tar.gz: c47da0ee237f0a404ec5d3e8b8f12c2c957ba1b4
 SHA512:
-  metadata.gz: 8ce0f4f00314d5d366450444f39d2883314352a679a08876580252417df685f680a105e4525f6d9a7707d43f4652552357d538d2e0bd3cf5175cb0e6d0591d50
-  data.tar.gz: 0a5b7e3955f4b3a331e2aba1741d6439cccd81c9ed353b3f00351b110eaef575d4ca60ddc10a919e8a0a8a48c80e0d360c056672cb595e636b6174817249cc72
+  metadata.gz: 0fd1e845bdf7e809e7bf8ba750a60e9d1a2e27924846c576fa838ec1ce300e8f78eba9b1b6d23dd02c00886c982d37456ae9e3bf651428ceb62ff037568b3d87
+  data.tar.gz: 86440102243b951b235e7a4eb9bce696c530d86fe6a8193a9e1fe7470915b9582d30c4df36948da0b666a0e03ae549a6152aedf6d6b2d7ea44bb174de1b9e290

data/lib/bodhi-slam.rb

@@ -3,6 +3,7 @@ require 'net/http/persistent'
 require "json"
 require "time"
 require "SecureRandom"
+require 'regexp-examples'
 
 require 'bodhi-slam/validations'
 require 'bodhi-slam/errors'

data/lib/bodhi-slam/factory.rb

@@ -82,16 +82,34 @@ module Bodhi
     #   Resource.factory.add_generator("name", type: "String")
     #   Resource.factory.add_generator("test", type: "Integer", multi: true, required: true)
     def add_generator(name, options)
+      options = options.reduce({}) do |memo, (k, v)| 
+        memo.merge({ k.to_s.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase.to_sym => v})
+      end
+
       case options[:type]
       when "String"
         characters = [('a'..'z'), ('A'..'Z'), ('0'..'9')].map { |i| i.to_a }.flatten
         "~!@#$%^&*()_+-=:;<>?,./ ".each_char{ |c| characters.push(c) }
 
-        generator = lambda do
-          if options[:multi]
-            [*0..5].sample.times.collect{ [*0..100].sample.times.map{ characters[rand(characters.length)] }.join }
+        if options[:multi]
+          if options[:is_not_blank]
+            generator = lambda{ [*0..5].sample.times.collect{ [*1..100].sample.times.map{ characters[rand(characters.length)] }.join } }
+          elsif options[:is_email]
+            generator = lambda{ [*0..5].sample.times.collect{ /\p{Alnum}{5,10}@\p{Alnum}{5,10}\.\p{Alnum}{2,3}/i.random_example } }
+          elsif options[:matches]
+            generator = lambda{ [*0..5].sample.times.collect{ Regexp.new(options[:matches]).random_example } }
+          else
+            generator = lambda{ [*0..5].sample.times.collect{ [*0..100].sample.times.map{ characters[rand(characters.length)] }.join } }
+          end
+        else
+          if options[:is_not_blank]
+            generator = lambda{ [*1..100].sample.times.map{ characters[rand(characters.length)] }.join }
+          elsif options[:is_email]
+            generator = lambda{ /\p{Alnum}{5,10}@\p{Alnum}{5,10}\.\p{Alnum}{2,3}/i.random_example }
+          elsif options[:matches]
+            generator = lambda{ Regexp.new(options[:matches]).random_example }
           else
-            [*0..100].sample.times.map{ characters[rand(characters.length)] }.join
+            generator = lambda{ [*0..100].sample.times.map{ characters[rand(characters.length)] }.join }
           end
         end
 

data/lib/bodhi-slam/resource.rb

@@ -21,6 +21,24 @@ module Bodhi
         batch
       end
 
+      # Counts all of the Resources records and returns the result
+      def count(context)
+        if context.invalid?
+          raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
+        end
+
+        result = context.connection.get do |request|
+          request.url "/#{context.namespace}/resources/#{name}/count"
+          request.headers[context.credentials_header] = context.credentials
+        end
+
+        if result.status != 200
+          raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+        end
+
+        JSON.parse(result.body)
+      end
+
       # Returns a single resource from the Bodhi Cloud that matches the given +id+
       # 
       #   context = Bodhi::Context.new

data/lib/bodhi-slam/types.rb

@@ -8,7 +8,6 @@ module Bodhi
 
     attr_accessor *ATTRIBUTES
     attr_reader *SYSTEM_ATTRIBUTES
-    attr_reader :validations
     attr_accessor :bodhi_context
 
     validates :name, required: true, is_not_blank: true
@@ -38,31 +37,10 @@ module Bodhi
         send("#{attribute}=", params[attribute])
       end
 
+      # Format type name to be compatible with Ruby Constants
       if !name.nil? && name[0] == name[0].downcase
         name.capitalize!
       end
-
-      # build validator objects
-      @validations = {}
-      if properties
-        properties.each_pair do |attr_name, attr_properties|
-          @validations[attr_name.to_sym] = []
-          attr_properties.each_pair do |option, value|
-            underscored_name = option.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase.to_sym
-            unless [:system, :trim, :ref, :unique, :default, :is_current_user, :to_lower].include? underscored_name
-              klass = Bodhi::Validator.constantize(underscored_name)
-              if option.to_s == "type" && value == "Enumerated"
-                if attr_properties["ref"].nil?
-                  raise RuntimeError.new("No reference property found!  Cannot build enumeration validator for #{name}.#{attr_name}")
-                end
-                @validations[attr_name.to_sym] << klass.new(value, attr_properties["ref"])
-              else
-                @validations[attr_name.to_sym] << klass.new(value)
-              end
-            end
-          end
-        end
-      end
     end
 
     # Returns a Hash of the Objects form attributes
@@ -183,8 +161,6 @@ module Bodhi
     #   type = Bodhi::Type.new({name: "TestType", properties: { foo:{ type:"String" }}})
     #   klass = Bodhi::Type.create_class_with(type)
     #   klass # => #<Class:0x007fbff403e808 @name="TestType">
-    #
-    #   # Additional class methods
     #   klass.validations # => { foo: [#<TypeValidator:0x007fbff403e808 @type="String">] }
     #   klass.factory # => #<Bodhi::Factory:0x007fbff403e808 @klass="TestType", @generators=[]>
     def self.create_class_with(type)
@@ -197,11 +173,10 @@ module Bodhi
         attr_accessor *type.properties.keys
       })
 
-      type.validations.each_pair do |attribute, validations|
-        attr_options = Hash.new
-        validations.each{ |validation| attr_options.merge!(validation.to_options) }
-        klass.validates(attribute, attr_options)
-        klass.factory.add_generator(attribute, attr_options)
+      type.properties.each_pair do |attr_name, attr_properties|
+        attr_properties.delete_if{ |key, value| ["system", "trim", "unique", "default", "isCurrentUser"].include?(key) }
+        klass.validates(attr_name.to_sym, attr_properties)
+        klass.factory.add_generator(attr_name.to_sym, attr_properties)
       end
 
       klass

data/lib/bodhi-slam/validations.rb

@@ -45,8 +45,14 @@ module Bodhi
           raise ArgumentError.new("Invalid :options argument. Options can not be empty")
         end
 
+        options = options.reduce({}) do |memo, (k, v)| 
+          memo.merge({ k.to_sym => v})
+        end
+
         @validators[attribute] = []
         options.each_pair do |key, value|
+          key = key.to_s.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase.to_sym
+          
           unless [:ref].include?(key)
             if key == :type && value == "Enumerated"
               @validators[attribute] << Bodhi::Validator.constantize(key).new(value, options[:ref])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - willdavis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: regexp-examples
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement