sinclair 1.4.2 → 1.5.0

data/spec/lib/sinclair/method_definition/block_definition_spec.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Sinclair::MethodDefinition::BlockDefinition do
+  subject(:definition) do
+    described_class.new(method_name, **options, &block)
+  end
+
+  let(:method_name) { :the_method }
+  let(:block)       { proc { RandomGenerator.rand } }
+  let(:options)     { {} }
+
+  describe '#method_block' do
+    let(:klass)     { Class.new }
+    let(:instance)  { klass.new }
+    let(:new_block) { definition.method_block }
+
+    it 'returns the block' do
+      expect(definition.method_block).to eq(block)
+    end
+
+    it 'returns a block with no cache' do
+      expect(instance.instance_eval(&new_block))
+        .not_to eq(instance.instance_eval(&new_block))
+    end
+
+    context 'when cache true is given' do
+      let(:options) { { cached: true } }
+
+      it 'returns the a new block' do
+        expect(definition.method_block).to be_a(Proc)
+      end
+
+      it 'returns a block with cache' do
+        expect(instance.instance_eval(&new_block))
+          .to eq(instance.instance_eval(&new_block))
+      end
+
+      it 'returns a block that does not cache nil' do
+        instance.instance_variable_set("@#{method_name}", nil)
+
+        expect(instance.instance_eval(&new_block)).not_to be_nil
+      end
+    end
+
+    context 'when cache full is given' do
+      let(:options) { { cached: :full } }
+
+      it 'returns the a new block' do
+        expect(definition.method_block).to be_a(Proc)
+      end
+
+      it 'returns a block with cache' do
+        expect(instance.instance_eval(&new_block))
+          .to eq(instance.instance_eval(&new_block))
+      end
+
+      it 'returns a block that does caches nil' do
+        instance.instance_variable_set("@#{method_name}", nil)
+
+        expect(instance.instance_eval(&new_block)).to be_nil
+      end
+    end
+  end
+end

data/spec/lib/sinclair/method_definition/block_helper_spec.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Sinclair::MethodDefinition::BlockHelper do
+  subject(:helper) { described_class }
+
+  let(:name)     { :method_name }
+  let(:block)    { proc { RandomGenerator.rand } }
+  let(:instance) { Class.new.new }
+
+  describe '.cached_method_proc' do
+    let(:method_block) do
+      helper.cached_method_proc(name, &block)
+    end
+
+    it do
+      expect(method_block).to be_a(Proc)
+    end
+
+    context 'when block is ran' do
+      it 'returns the value from block' do
+        expect(instance.instance_eval(&method_block))
+          .to be_a(Numeric)
+      end
+
+      it 'cashes result of the call' do
+        expect(instance.instance_eval(&method_block))
+          .to eq(instance.instance_eval(&method_block))
+      end
+
+      it 'sets variable' do
+        expect { instance.instance_eval(&method_block) }
+          .to change { instance.instance_variable_get("@#{name}") }
+          .from(nil)
+      end
+
+      context 'when instance has instance variable with value' do
+        before do
+          instance.instance_variable_set("@#{name}", Random.rand)
+        end
+
+        it 'does not change variable value' do
+          expect { instance.instance_eval(&method_block) }
+            .not_to change { instance.instance_variable_get("@#{name}") }
+        end
+      end
+
+      context 'when instance has instance variable with nil' do
+        before do
+          instance.instance_variable_set("@#{name}", nil)
+        end
+
+        it 'changes variable value' do
+          expect { instance.instance_eval(&method_block) }
+            .to change { instance.instance_variable_get("@#{name}") }
+        end
+      end
+    end
+  end
+
+  describe '.full_cached_method_proc' do
+    let(:method_block) do
+      helper.full_cached_method_proc(name, &block)
+    end
+
+    it do
+      expect(method_block).to be_a(Proc)
+    end
+
+    context 'when block is ran' do
+      it 'returns the value from block' do
+        expect(instance.instance_eval(&method_block))
+          .to be_a(Numeric)
+      end
+
+      it 'cashes result of the call' do
+        expect(instance.instance_eval(&method_block))
+          .to eq(instance.instance_eval(&method_block))
+      end
+
+      it 'sets variable' do
+        expect { instance.instance_eval(&method_block) }
+          .to change { instance.instance_variable_get("@#{name}") }
+          .from(nil)
+      end
+
+      context 'when instance has instance variable with value' do
+        before do
+          instance.instance_variable_set("@#{name}", Random.rand)
+        end
+
+        it 'does not change variable value' do
+          expect { instance.instance_eval(&method_block) }
+            .not_to change { instance.instance_variable_get("@#{name}") }
+        end
+      end
+
+      context 'when instance has instance variable with nil' do
+        before do
+          instance.instance_variable_set("@#{name}", nil)
+        end
+
+        it 'does not change variable value' do
+          expect { instance.instance_eval(&method_block) }
+            .not_to change { instance.instance_variable_get("@#{name}") }
+        end
+      end
+    end
+  end
+end

data/spec/lib/sinclair/method_definition/string_definition_spec.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Sinclair::MethodDefinition::StringDefinition do
+  subject(:definition) do
+    described_class.new(method_name, code, **options)
+  end
+
+  let(:method_name) { :the_method }
+  let(:code)        { 'Random.rand' }
+  let(:options)     { {} }
+
+  describe '#code_line' do
+    let(:klass)     { Class.new }
+    let(:instance)  { klass.new }
+    let(:code_line) { definition.code_line }
+
+    it 'returns the code' do
+      expect(definition.code_line).to eq(code)
+    end
+
+    it 'returns a code with no cache' do
+      expect(instance.instance_eval(code_line))
+        .not_to eq(instance.instance_eval(code_line))
+    end
+
+    context 'when cache true is given' do
+      let(:options) { { cached: true } }
+
+      it 'returns the code with simple cache' do
+        expect(definition.code_line)
+          .to eq("@#{method_name} ||= #{code}")
+      end
+
+      it 'returns a code with cache' do
+        expect(instance.instance_eval(code_line))
+          .to eq(instance.instance_eval(code_line))
+      end
+
+      it 'returns a code that does not cache nil' do
+        instance.instance_variable_set("@#{method_name}", nil)
+
+        expect(instance.instance_eval(code_line)).not_to be_nil
+      end
+    end
+
+    context 'when cache full is given' do
+      let(:options) { { cached: :full } }
+      let(:expected) do
+        "defined?(@#{method_name}) ? @#{method_name} : (@#{method_name} = #{code})"
+      end
+
+      it 'returns the code with full cache' do
+        expect(definition.code_line).to eq(expected)
+      end
+
+      it 'returns a code with cache' do
+        expect(instance.instance_eval(code_line))
+          .to eq(instance.instance_eval(code_line))
+      end
+
+      it 'returns a code that caches nil' do
+        instance.instance_variable_set("@#{method_name}", nil)
+
+        expect(instance.instance_eval(code_line)).to be_nil
+      end
+    end
+  end
+end

data/spec/lib/sinclair/method_definition_spec.rb

@@ -3,107 +3,42 @@
 require 'spec_helper'
 
 describe Sinclair::MethodDefinition do
-  let(:klass)    { Class.new }
-  let(:instance) { klass.new }
+  let(:method_name) { :the_method }
 
-  describe '#build' do
-    let(:method_name) { :the_method }
+  describe '.default_value' do
+    subject(:klass) { Class.new(described_class) }
 
-    context 'when instantiating the class itself' do
-      subject(:method_definition) do
-        described_class.new(method_name)
-      end
+    let(:value)       { Random.rand }
+    let(:instance)    { klass.new(:other_method) }
 
-      it do
-        expect { method_definition.build(klass) }.to raise_error(
-          RuntimeError,
-          'Build is implemented in subclasses. ' \
-          "Use #{described_class}.from to initialize a proper object"
-        )
-      end
+    it do
+      expect { klass.default_value(method_name, value) }
+        .to add_method(method_name).to(klass)
     end
 
-    context 'when method was defined with a string for instance' do
-      subject(:method_definition) do
-        definition_class.new(method_name, code)
+    context 'when method is defined and called' do
+      before do
+        klass.default_value(method_name, value)
       end
 
-      let(:definition_class) { described_class::InstanceStringDefinition }
-
-      let(:code) { '@x = @x.to_i + 1' }
-
-      it_behaves_like 'MethodDefinition#build without cache'
-
-      context 'with cached options' do
-        subject(:method_definition) do
-          definition_class.new(method_name, code, cached: cached_option)
-        end
-
-        it_behaves_like 'MethodDefinition#build with cache options'
-      end
-    end
-
-    context 'when method was defined with a block for instance' do
-      subject(:method_definition) do
-        definition_class.new(method_name) do
-          @x = @x.to_i + 1
-        end
-      end
-
-      let(:definition_class) { described_class::InstanceBlockDefinition }
-
-      it_behaves_like 'MethodDefinition#build without cache'
-
-      context 'with cached options' do
-        subject(:method_definition) do
-          definition_class.new(method_name, cached: cached_option) do
-            @x = @x.to_i + 1
-          end
-        end
-
-        it_behaves_like 'MethodDefinition#build with cache options'
+      it 'adds method that always return given value' do
+        expect(instance.the_method).to eq(value)
       end
     end
+  end
 
-    context 'when method was defined with a string for class' do
-      subject(:method_definition) do
-        definition_class.new(method_name, code)
-      end
-
-      let(:definition_class) { described_class::ClassStringDefinition }
-
-      let(:code) { '@x = @x.to_i + 1' }
-
-      it_behaves_like 'ClassMethodDefinition#build without cache'
-
-      context 'with cached options' do
-        subject(:method_definition) do
-          definition_class.new(method_name, code, cached: cached_option)
-        end
-
-        it_behaves_like 'ClassMethodDefinition#build with cache options'
+  describe '.from' do
+    context 'when passing a block' do
+      it do
+        expect(described_class.from(method_name) { 1 })
+          .to be_a(described_class::BlockDefinition)
       end
     end
 
-    context 'when method was defined with a block for class' do
-      subject(:method_definition) do
-        definition_class.new(method_name) do
-          @x = @x.to_i + 1
-        end
-      end
-
-      let(:definition_class) { described_class::ClassBlockDefinition }
-
-      it_behaves_like 'ClassMethodDefinition#build without cache'
-
-      context 'with cached options' do
-        subject(:method_definition) do
-          definition_class.new(method_name, cached: cached_option) do
-            @x = @x.to_i + 1
-          end
-        end
-
-        it_behaves_like 'ClassMethodDefinition#build with cache options'
+    context 'when passing string' do
+      it do
+        expect(described_class.from(method_name, 'code'))
+          .to be_a(described_class::StringDefinition)
       end
     end
   end

data/spec/lib/sinclair/method_definitions_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Sinclair::MethodDefinitions do
+  subject(:definitions) { described_class.new }
+
+  describe '#add' do
+    let(:name) { :the_method }
+
+    context 'when passing block' do
+      it 'returns the resulting array' do
+        expect(definitions.add(name) { RandomGenerator.rand })
+          .to be_a(Array)
+      end
+
+      it 'returns an array of MethodDefinition' do
+        expect(definitions.add(name) { RandomGenerator.rand }.first)
+          .to be_a(Sinclair::MethodDefinition)
+      end
+
+      it 'creates a new BlockDefinition' do
+        expect(definitions.add(name) { RandomGenerator.rand }.first)
+          .to be_a(Sinclair::MethodDefinition::BlockDefinition)
+      end
+    end
+
+    context 'when passing block' do
+      it 'returns the resulting array' do
+        expect(definitions.add(name, 'RandomGenerator.rand'))
+          .to be_a(Array)
+      end
+
+      it 'returns an array of MethodDefinition' do
+        expect(definitions.add(name, 'RandomGenerator.rand').last)
+          .to be_a(Sinclair::MethodDefinition)
+      end
+
+      it 'creates a new StringDefinition' do
+        expect(definitions.add(name, 'RandomGenerator.rand').last)
+          .to be_a(Sinclair::MethodDefinition::StringDefinition)
+      end
+    end
+  end
+end

data/spec/support/models/random_generator.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RandomGenerator
+  KAPA = 3.9 + Random.rand / 10.0
+
+  class << self
+    def rand
+      @rand ||= Random.rand
+
+      @rand = KAPA * @rand * (1 - @rand)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinclair
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - DarthJee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.19
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.19
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
   name: yardstick
   requirement: !ruby/object:Gem::Requirement
@@ -266,6 +266,7 @@ files:
 - README.md
 - Rakefile
 - WARNINGS.md
+- config/check_specs.yml
 - config/rubycritc.rb
 - config/yardstick.rb
 - config/yardstick.yml
@@ -284,14 +285,13 @@ files:
 - lib/sinclair/matchers/add_instance_method_to.rb
 - lib/sinclair/matchers/add_method.rb
 - lib/sinclair/matchers/add_method_to.rb
+- lib/sinclair/method_builder.rb
+- lib/sinclair/method_builder/base.rb
+- lib/sinclair/method_builder/block_method_builder.rb
+- lib/sinclair/method_builder/string_method_builder.rb
 - lib/sinclair/method_definition.rb
 - lib/sinclair/method_definition/block_definition.rb
-- lib/sinclair/method_definition/class_block_definition.rb
-- lib/sinclair/method_definition/class_method_definition.rb
-- lib/sinclair/method_definition/class_string_definition.rb
-- lib/sinclair/method_definition/instance_block_definition.rb
-- lib/sinclair/method_definition/instance_method_definition.rb
-- lib/sinclair/method_definition/instance_string_definition.rb
+- lib/sinclair/method_definition/block_helper.rb
 - lib/sinclair/method_definition/string_definition.rb
 - lib/sinclair/method_definitions.rb
 - lib/sinclair/options_parser.rb
@@ -313,12 +313,6 @@ files:
 - spec/integration/yard/sinclair/matchers/add_class_method_to_spec.rb
 - spec/integration/yard/sinclair/matchers/add_instance_method_spec.rb
 - spec/integration/yard/sinclair/matchers/add_instance_method_to_spec.rb
-- spec/integration/yard/sinclair/method_definition/class_block_definition_spec.rb
-- spec/integration/yard/sinclair/method_definition/class_method_definition_spec.rb
-- spec/integration/yard/sinclair/method_definition/class_string_definition_spec.rb
-- spec/integration/yard/sinclair/method_definition/instance_block_definition_spec.rb
-- spec/integration/yard/sinclair/method_definition/instance_method_definition_spec.rb
-- spec/integration/yard/sinclair/method_definition/instance_string_definition_spec.rb
 - spec/integration/yard/sinclair/options_parser_spec.rb
 - spec/integration/yard/sinclair_spec.rb
 - spec/lib/sinclair/config/methods_builder_spec.rb
@@ -332,11 +326,14 @@ files:
 - spec/lib/sinclair/matchers/add_instance_method_spec.rb
 - spec/lib/sinclair/matchers/add_instance_method_to_spec.rb
 - spec/lib/sinclair/matchers_spec.rb
-- spec/lib/sinclair/method_definition/class_block_definition_spec.rb
-- spec/lib/sinclair/method_definition/class_string_definition_spec.rb
-- spec/lib/sinclair/method_definition/instance_block_definition_spec.rb
-- spec/lib/sinclair/method_definition/instance_string_definition_spec.rb
+- spec/lib/sinclair/method_builder/block_method_builder_spec.rb
+- spec/lib/sinclair/method_builder/string_method_builder_spec.rb
+- spec/lib/sinclair/method_builder_spec.rb
+- spec/lib/sinclair/method_definition/block_definition_spec.rb
+- spec/lib/sinclair/method_definition/block_helper_spec.rb
+- spec/lib/sinclair/method_definition/string_definition_spec.rb
 - spec/lib/sinclair/method_definition_spec.rb
+- spec/lib/sinclair/method_definitions_spec.rb
 - spec/lib/sinclair/options_parser_spec.rb
 - spec/lib/sinclair_spec.rb
 - spec/spec_helper.rb
@@ -364,6 +361,7 @@ files:
 - spec/support/models/my_server_config.rb
 - spec/support/models/person.rb
 - spec/support/models/purchase.rb
+- spec/support/models/random_generator.rb
 - spec/support/models/server.rb
 - spec/support/models/server_config.rb
 - spec/support/models/validator_builder.rb