light-services 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db84437c5190b2655be8840e05543d0e9c5cc27
-  data.tar.gz: 77bf318293be0f35ebb87062fc3f625a2f0e7a25
+  metadata.gz: 6dc81950e4f4b54c022aaf5541706b2571f65f5a
+  data.tar.gz: 114558b414ac617bf67aeb62ab24ed5e846b89b0
 SHA512:
-  metadata.gz: 7eb78b4a6126f9347047615a1f904237f9b0a62529a19eed29c585cdbc91ae1727f0079efc87b590df845d2577aa298b3b747c3f7f84a4d469b24f097cca6457
-  data.tar.gz: 017de716dc089d5031334fddc933ed030fdf33f0ec2f5cbdfc093d96a72937dbf16f10f66d595a9c12339a623842bc9504a8cdb566c0ee41b17a89e983cd7947
+  metadata.gz: 8447dc3a9f85f4fdf24d1ab6bc7f789a9caab8ffd81d9883de94e5f8c16b198a9b55a7837408383cb7b3610c409bf0067ffe5e0e4da33bcd8d5db40fff0d4a28
+  data.tar.gz: 7ef1779434b7836916605df9d05c09f613f79cf6d1cfd11d1ee2975a47ee64a8ec830be67ea09f1020130206ccdd413cccd6148019ad5118e988465fdad282b6

data/gemfiles/rails_4_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    light-services (0.1.0)
+    light-services (0.2.0)
       rails (> 4.0)
 
 GEM

data/gemfiles/rails_4_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    light-services (0.1.0)
+    light-services (0.2.0)
       rails (> 4.0)
 
 GEM

data/gemfiles/rails_4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    light-services (0.1.0)
+    light-services (0.2.0)
       rails (> 4.0)
 
 GEM

data/gemfiles/rails_5_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    light-services (0.1.0)
+    light-services (0.2.0)
       rails (> 4.0)
 
 GEM

data/lib/light/services/parameters.rb

@@ -28,6 +28,7 @@ module Light
           # Skip or raise exception if parameter not exist
           unless args.key?(options[:name])
             next unless options[:required]
+            next if options[:allow_nil]
             raise Light::Services::ParamRequired, "Parameter \"#{options[:name]}\" is required"
           end
 
@@ -35,7 +36,10 @@ module Light
           value = args[options[:name]]
 
           # Check type of parameter
-          if options[:type] && !value.is_a?(options[:type])
+          wrong_type    = options[:type] && !options[:type].include?(value.class)
+          not_allow_nil = !options[:allow_nil] || (options[:allow_nil] && !value.nil?)
+
+          if wrong_type && not_allow_nil
             raise Light::Services::ParamType, "Type of \"#{options[:name]}\" must be \"#{options[:type]}\""
           end
 
@@ -76,10 +80,11 @@ module Light
         def param(name, options = {})
           self.parameters ||= []
           self.parameters << {
-            name:     name,
-            required: options.fetch(:required, true),
-            public:   options.fetch(:private, false),
-            type:     options[:type] || nil
+            name:      name,
+            required:  options.fetch(:required, true),
+            public:    options.fetch(:private, false),
+            type:      [*options[:type]].compact,
+            allow_nil: options.fetch(:allow_nil, false)
           }
         end
 

data/lib/light/services/version.rb

@@ -1,5 +1,5 @@
 module Light
   module Services
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: light-services
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Emelianenko