ruby-features 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27643cb1fa6b12baf10bf86fbc40226e2e70bc08
-  data.tar.gz: 2be53a6cc1404b1709b910fb8390663f4fc2d801
+  metadata.gz: a3632d4e9a9c9f523e3c5279507d817125afd3b3
+  data.tar.gz: 96790e0dd4cc23a527c790490c328643cb0eb1ca
 SHA512:
-  metadata.gz: c03d3cef6917da453e06c12184e31988366f42183ed170a6308049ce87dd8790dfafb3a41df9151a49672c7d1a161359634638f3873f11b60d0695cbdc89f6d0
-  data.tar.gz: 170853e803e73904e1755fc688e24032d45df28304a5f12427f4e9a3f259b3de9a6978afb6f67c36af5ee4da7fb12836a894a786abc078ccba58c22383ba8a44
+  metadata.gz: d8826d60283b8688f51d71277fb105f0d3258e4714f64296247ef460e88208a826a4192baab2597c5cf88875930c83ab64e63cd8cd77316af1ac8d16de017433
+  data.tar.gz: 20aa851febfc4ce36ffb7b97c1436f9afb9b6a6ba98a13562250895c8a525fa34b3cad6f2f7bf2792e3c296da8d0cc2d9203f10697442ae09426eb511910ee77

data/lib/ruby-features/concern/apply_to.rb

@@ -26,38 +26,43 @@ module RubyFeatures
       end
 
       def class_methods(asserts = {}, &block)
-        _methods('Extend', asserts, block)
+        _methods('AddClassMethods', asserts, block)
       end
 
       def instance_methods(asserts = {}, &block)
-        _methods('Include', asserts, block)
+        _methods('AddInstanceMethods', asserts, block)
       end
 
       def rewrite_instance_methods(asserts = {}, &block)
-        _methods('RewriteInstance', asserts, block)
+        _methods('RewriteInstanceMethods', asserts, block)
       end
 
       def _apply_methods(target_class)
-        constants.each do |constant|
-          mixin_method, existing_methods_method, existing_methods_check = case(constant)
-          when /^Extend/ then [:extend, :methods, :exclusion]
-          when /^Include/ then [:include, :instance_methods, :exclusion]
-          when /^RewriteInstance/ then [:prepend, :instance_methods, :inclusion]
-          else raise ArgumentError.new("Wrong mixin constant: #{constant}")
-          end
+        target_class_methods = target_class.methods + target_class.private_methods
+        target_instance_methods = target_class.instance_methods + target_class.private_instance_methods
 
+        constants.each do |constant|
           mixin = const_get(constant)
+          mixin_methods = mixin.instance_methods + mixin.private_instance_methods
 
-          case(existing_methods_check)
-          when :exclusion
-            existing_methods = mixin.instance_methods & target_class.public_send(existing_methods_method)
-            raise NameError.new("Tried to #{mixin_method} already existing methods: #{existing_methods.inspect}") unless existing_methods.empty?
-          when :inclusion
-            not_existing_methods = mixin.instance_methods - target_class.public_send(existing_methods_method)
-            raise NameError.new("Tried to #{mixin_method} not existing methods: #{not_existing_methods.inspect}") unless not_existing_methods.empty?
-          end
+          case(constant)
+          when /^AddClassMethods/
+            existing_methods = mixin_methods & target_class_methods
+            raise NameError.new("Tried to add already existing class methods: #{existing_methods.inspect}") unless existing_methods.empty?
+            target_class.send(:extend, mixin)
 
-          target_class.send(mixin_method, mixin)
+          when /^AddInstanceMethods/
+            existing_methods = mixin_methods & target_instance_methods
+            raise NameError.new("Tried to add already existing instance methods: #{existing_methods.inspect}") unless existing_methods.empty?
+            target_class.send(:include, mixin)
+
+          when /^RewriteInstanceMethods/
+            not_existing_methods = mixin_methods - target_instance_methods
+            raise NameError.new("Tried to rewrite not existing instance methods: #{not_existing_methods.inspect}") unless not_existing_methods.empty?
+            target_class.send(:prepend, mixin)
+
+          else raise ArgumentError.new("Wrong mixin constant: #{constant}")
+          end
         end
       end
 

data/lib/ruby-features/version.rb

@@ -1,3 +1,3 @@
 module RubyFeatures
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/spec/conditions_spec.rb

@@ -54,7 +54,7 @@ describe RubyFeatures do
     expect(subject).to_not respond_to(:boolean_false)
 
     expect(subject.singleton_class.included_modules).to include(
-      RubyFeatures::Mixins::ConditionsTestFeature::ConditionsTestClass::ExtendIfBooleanIsTrueAndStringIsString
+      RubyFeatures::Mixins::ConditionsTestFeature::ConditionsTestClass::AddClassMethodsIfBooleanIsTrueAndStringIsString
     )
   end
 

data/spec/define_spec.rb

@@ -13,7 +13,7 @@ describe RubyFeatures::Concern::Feature do
 
 
     expect(test_class.singleton_class.included_modules).to include(
-      RubyFeatures::Mixins::DefineTestModule::DefineTestClass::ClassMethodsFeature::DefineTestModule::DefineTestClass::Extend
+      RubyFeatures::Mixins::DefineTestModule::DefineTestClass::ClassMethodsFeature::DefineTestModule::DefineTestClass::AddClassMethods
     )
   end
 
@@ -27,7 +27,7 @@ describe RubyFeatures::Concern::Feature do
     }.to change{test_class.new.respond_to?(:test_instance_method)}.from(false).to(true)
 
     expect(test_class.included_modules).to include(
-      RubyFeatures::Mixins::DefineTestModule::DefineTestClass::InstanceMethodsFeature::DefineTestModule::DefineTestClass::Include
+      RubyFeatures::Mixins::DefineTestModule::DefineTestClass::InstanceMethodsFeature::DefineTestModule::DefineTestClass::AddInstanceMethods
     )
   end
 
@@ -49,7 +49,7 @@ describe RubyFeatures::Concern::Feature do
     }.to change{test_class.new.test_rewrite_instance_method}.from(2).to(6)
 
     expect(test_class.included_modules).to include(
-      RubyFeatures::Mixins::DefineTestModule::DefineTestClass::RewriteInstanceMethodsFeature::DefineTestModule::DefineTestClass::RewriteInstance
+      RubyFeatures::Mixins::DefineTestModule::DefineTestClass::RewriteInstanceMethodsFeature::DefineTestModule::DefineTestClass::RewriteInstanceMethods
     )
   end
 
@@ -71,30 +71,40 @@ describe RubyFeatures::Concern::Feature do
 
   it 'should raise error if target already has feature class method' do
     test_class.class_eval do
-      def self.existing_class_method; end
+      class << self
+        def existing_class_method; end
+        private
+        def existing_private_class_method; end
+      end
     end
 
     expect{
       define_test_feature('existing_class_method') do
         class_methods do
           def existing_class_method; end
+          private
+          def existing_private_class_method; end
         end
       end.apply
-    }.to raise_error(/Tried to extend already existing methods: \[:existing_class_method\]/)
+    }.to raise_error(/Tried to add already existing class methods: \[:existing_class_method, :existing_private_class_method\]/)
   end
 
   it 'should raise error if target already has feature instance method' do
     test_class.class_eval do
       def existing_instance_method; end
+      private
+      def existing_private_instance_method; end
     end
 
     expect{
       define_test_feature('existing_instance_method') do
         instance_methods do
           def existing_instance_method; end
+          private
+          def existing_private_instance_method; end
         end
       end.apply
-    }.to raise_error(/Tried to include already existing methods: \[:existing_instance_method\]/)
+    }.to raise_error(/Tried to add already existing instance methods: \[:existing_instance_method, :existing_private_instance_method\]/)
   end
 
   it 'should raise error if target has no feature rewrite instance method' do
@@ -102,9 +112,11 @@ describe RubyFeatures::Concern::Feature do
       define_test_feature('not_existing_rewrite_instance_method') do
         rewrite_instance_methods do
           def not_existing_instance_method; end
+          private
+          def not_existing_private_instance_method; end
         end
       end.apply
-    }.to raise_error(/Tried to prepend not existing methods: \[:not_existing_instance_method\]/)
+    }.to raise_error(/Tried to rewrite not existing instance methods: \[:not_existing_instance_method, :not_existing_private_instance_method\]/)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-features
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sergey Tokarenko