otoroshi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12cba26aea6aca35ae46692ed5f9e9e4a72c3231651a132c25e793d697c17dbc
-  data.tar.gz: eb24b1df208ef59c64f3a2ea045a52b578969d75fb6cef6907189b6512bb30e1
+  metadata.gz: 8928c55b726e2db1fb3bd19948c23be9c8fb0175650ae1f65cd0489bf7751c38
+  data.tar.gz: db9cc8034319672be477f1352508e6258d9ce105d6eedca6501630776e196407
 SHA512:
-  metadata.gz: cc8bd50a648a681442722ad6456535d76fe3bc2dfa2bb2e4041a1548f710c64634c9ebc10e5e02fd7b397f608f8abbc34f17a6aa4dc7dd190780e0d77cd9e60a
-  data.tar.gz: ab934b7e39d816afcaae0bb07d0a142904aecb11ece6e75fb4590974483fa9bcc476767583a2c74ae907d2e77afb04501e35044e9e999e89197025881c0a863b
+  metadata.gz: 44856f1f0d75272e70a49d07db5d7ce5218849ca9a0a04164c875d9277f18ce2afddc2cb254e8d9079232a23f384ec58c9ea0602ea6e170504ad1bd59e280895
+  data.tar.gz: 7978129f51d5ef3b224efa547e0ede889ffd4010ca8f571dde79830190f21b7a69defd70f8f44059ef1daf8647310fd9583944e7bbbcca05753417b1fec9d72a

data/lib/otoroshi/initializer.rb

@@ -17,11 +17,6 @@ module Otoroshi
       #     self.number = number
       #     self.message = message
       #     self.fruits = fruits
-      #     bind = self
-      #     @fruits.singleton_class.send(:define_method, :<<) do |v|
-      #       bind.send(:"validate_fruits!", [v])
-      #       push(v)
-      #     end
       #   end
       #   RUBY
       def draw(properties)
@@ -50,8 +45,7 @@ module Otoroshi
     def draw
       <<~RUBY
         def initialize(#{initialize_parameters})
-          #{initialize_assignments}
-          #{initialize_push_singletons}
+          #{initialize_body}
         end
       RUBY
     end
@@ -120,64 +114,12 @@ module Otoroshi
     #   self.foo = foo
     #   self.bar = bar
     #   RUBY
-    def initialize_assignments
+    def initialize_body
       assignments =
         properties.keys.map do |name|
           "self.#{name} = #{name}"
         end
       assignments.join("\n  ")
     end
-
-    # Generates push singleton for each array property
-    #
-    # @return [String]
-    #
-    # @example
-    #   <<-RUBY
-    #   bind = self
-    #   @fruits.singleton_class.send(:define_method, :<<) do |v|
-    #     bind.send(:"validate_fruits!", [v])
-    #     push(v)
-    #   end
-    #   @numbers.singleton_class.send(:define_method, :<<) do |v|
-    #     bind.send(:"validate_numbers!", [v])
-    #     push(v)
-    #   end
-    #   RUBY
-    def initialize_push_singletons
-      collections =
-        properties.select do |_, options|
-          options[:type].is_a?(Array) || options[:type] == Array
-        end
-      return if collections.empty?
-
-      singletons =
-        collections.keys.map do |name|
-          initialize_push_singleton(name)
-        end
-      # assign self to a variable so the instance is accessible from the singleton scope
-      ['bind = self', singletons.join].join("\n")
-    end
-
-    # Generates singleton on collection instance variable to overide <<
-    # so value is validated before being added to the collection
-    #
-    # @return [String]
-    #
-    # @example
-    #   <<-RUBY
-    #   @fruits.singleton_class.send(:define_method, :<<) do |v|
-    #     bind.send(:"validate_fruits!", [v])
-    #     push(v)
-    #   end
-    #   RUBY
-    def initialize_push_singleton(name)
-      <<-RUBY
-  @#{name}.singleton_class.send(:define_method, :<<) do |v|
-    bind.send(:"validate_#{name}!", [v])
-    push(v)
-  end
-      RUBY
-    end
   end
 end

data/lib/otoroshi/sanctuary.rb

@@ -47,10 +47,10 @@ module Otoroshi
         add_to_properties(name, type, allow_nil, default)
         expected_type = type.is_a?(Array) ? type.first || Object : type
         collection = expected_type == Array || type.is_a?(Array)
-        define_validate_type!(name, expected_type, collection, allow_nil)
-        define_validate_one_of!(name, collection, one_of, allow_nil)
-        define_validate_assertion!(name, collection, assert, allow_nil)
-        define_validate!(name)
+        define_validate_type(name, expected_type, collection, allow_nil)
+        define_validate_one_of(name, collection, one_of, allow_nil)
+        define_validate_assertion(name, collection, assert, allow_nil)
+        define_validate(name)
         define_getter(name)
         define_setter(name)
         class_eval Initializer.draw(properties), __FILE__, __LINE__ + 1
@@ -86,18 +86,18 @@ module Otoroshi
       #
       #   Given name = :score, type = Integer, allow_nil = false
       #
-      #   def validate_score_type!(value)
+      #   def validate_score_type(value)
       #     return if Integer.nil? || false && value.nil?
       #     return if value.is_a? Integer
       #
       #     raise Otoroshi::TypeError, :score, Integer
       #   end
-      def define_validate_type!(name, type, collection, allow_nil)
+      def define_validate_type(name, type, collection, allow_nil)
         validator = validate_type?(name, type, collection)
-        define_method :"validate_#{name}_type!" do |value|
+        define_method :"validate_#{name}_type" do |value|
           allow_nil && value.nil? || validator.call(value)
         end
-        private :"validate_#{name}_type!"
+        private :"validate_#{name}_type"
       end
 
       # Lambda that validates (value) respects the type condition
@@ -119,18 +119,18 @@ module Otoroshi
       #
       #   Given name = :side, collection = false, one_of = [:left, :right], allow_nil = false
       #
-      #   def validate_side_type!(value)
+      #   def validate_side_type(value)
       #     return if false && value.nil?
       #     return if [:left, :right].include? value
       #
       #     raise Otoroshi::OneOfError, :side, [:left, :right]
       #   end
-      def define_validate_one_of!(name, collection, one_of, allow_nil)
+      def define_validate_one_of(name, collection, one_of, allow_nil)
         validator = validate_one_of?(name, one_of, collection)
-        define_method(:"validate_#{name}_one_of!") do |value|
+        define_method(:"validate_#{name}_one_of") do |value|
           allow_nil && value.nil? || validator.call(value)
         end
-        private :"validate_#{name}_one_of!"
+        private :"validate_#{name}_one_of"
       end
 
       # Lambda that validates (value) respects the one_of condition
@@ -153,18 +153,18 @@ module Otoroshi
       #
       #   Given name = :score, assert = ->(v) { v >= 0 }, allow_nil = false
       #
-      #   def validate_score_assertion!(value)
+      #   def validate_score_assertion(value)
       #     return if false && value.nil?
       #     return if value >= 0
       #
       #     raise Otoroshi::AssertError, :score
       #   end
-      def define_validate_assertion!(name, collection, assert, allow_nil)
+      def define_validate_assertion(name, collection, assert, allow_nil)
         validator = validate_assert?(name, assert, collection)
-        define_method :"validate_#{name}_assertion!" do |value|
+        define_method :"validate_#{name}_assertion" do |value|
           allow_nil && value.nil? || validator.call(value)
         end
-        private :"validate_#{name}_assertion!"
+        private :"validate_#{name}_assertion"
       end
 
       # Lambda that validates (value) respects the assert condition
@@ -182,15 +182,15 @@ module Otoroshi
       #   Given name = :score
       #
       #   def validate_score!(value)
-      #     validate_score_type!(value)
-      #     validate_score_one_of!(value)
+      #     validate_score_type(value)
+      #     validate_score_one_of(value)
       #     validate_score_assert(value)
       #   end
-      def define_validate!(name)
+      def define_validate(name)
         define_method :"validate_#{name}!" do |value|
-          __send__(:"validate_#{name}_type!", value)
-          __send__(:"validate_#{name}_one_of!", value)
-          __send__(:"validate_#{name}_assertion!", value)
+          __send__(:"validate_#{name}_type", value)
+          __send__(:"validate_#{name}_one_of", value)
+          __send__(:"validate_#{name}_assertion", value)
         end
         private :"validate_#{name}!"
       end
@@ -203,7 +203,7 @@ module Otoroshi
       #     instance_variable_get(@score)
       #   end
       def define_getter(name)
-        define_method(name) { instance_variable_get("@#{name}") }
+        define_method(name) { instance_variable_get("@#{name}").clone.freeze }
       end
 
       # Defines a setter
@@ -211,7 +211,7 @@ module Otoroshi
       #   Given name = :score
       #
       #   def score=(value)
-      #     validate_score_type!(value)
+      #     validate_score_type(value)
       #     validate_score!(value)
       #     instance_variable_set(@score, value)
       #   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otoroshi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Edouard Piron