service_factory 0.0.1 → 0.0.2

data/README.md

@@ -30,6 +30,11 @@ ServiceFactory.register do
   env :test, :development do
     user_info Fake::UserInfo
   end
+
+  memoize do
+    memoized_info { costly_operation }
+    memoized_class BigFatClass
+  end
 end
 ```
 
@@ -38,6 +43,7 @@ end
 ```ruby
 ServiceFactory.user_info("John Dou") #Same as UserInfo.new("John Dou") or Fake::UserInfo.new("John Dou")
 ServiceFactory.remote_data_service("http://service.com") #Same as RemoteData.new("http://service.com")
+ServiceFactory.memoized_info #Runs only once
 ```
 
 See spec/service_factory_spec.rb for the full list of features

data/lib/service_factory/version.rb

@@ -1,3 +1,3 @@
 module ServiceFactory
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/service_factory.rb

@@ -2,9 +2,8 @@ require "service_factory/version"
 
 module ServiceFactory
   @blocks = {}
-
   def register(&block)
-    Builder.new(@blocks).instance_eval(&block)
+    Builder.new(@blocks).build(&block)
   end
   module_function :register
 
@@ -17,18 +16,37 @@ module ServiceFactory
   end
 
   class Builder
+    class Error < RuntimeError; end
+    class UnexpectedParams < Error; end
+
     def initialize(blocks)
       @blocks = blocks
+      @memoized_values = {}
+      @memoization = false
+    end
+
+    def build(&block)
+      instance_eval(&block)
+      @blocks
     end
 
     def method_missing(m, *args, &block)
+      prepared_block = args_to_block(args, &block)
+      if @memoization
+        @blocks[m] = Proc.new { @memoized_values[m] ||= prepared_block.call }
+      else
+        @blocks[m] = prepared_block
+      end
+    end
+
+    def args_to_block(args, &block)
       if block_given?
-        @blocks[m] = block
+        block
       elsif args.first.is_a?(Class)
         cl = args.first
-        @blocks[m] = Proc.new { |*class_args| cl.new(*class_args) }
+        Proc.new { |*class_args| cl.new(*class_args) }
       else
-        super
+        raise UnexpectedParams.new("expected class or block")
       end
     end
 
@@ -37,5 +55,11 @@ module ServiceFactory
         instance_eval(&block)
       end
     end
+
+    def memoize(&block)
+      @memoization = true
+      instance_eval(&block)
+      @memoization = false
+    end
   end
 end

data/spec/service_factory_spec.rb

@@ -7,30 +7,76 @@ describe ServiceFactory do
       sample_var String
       sample_block { Object.new }
       sample_string { |s| String.new(s) }
+
+      memoize do
+        memo_var String
+        memo_block { Object.new }
+      end
+
+      var_after_memo { Object.new }
     end
   end
 
-  context "when class given" do
-    it "instantiates it every time" do
-      ServiceFactory.sample_var.object_id.should_not == ServiceFactory.sample_var.object_id
-    end
-    it "instantiates it without args" do
-      ServiceFactory.sample_var.should be_instance_of(String)
+  context 'when memoization is off' do
+    context "when class given" do
+      it "instantiates it every time" do
+        expect(ServiceFactory.sample_var.object_id).not_to eq(ServiceFactory.sample_var.object_id)
+      end
+      it "instantiates it without args" do
+        expect(ServiceFactory.sample_var).to be_instance_of(String)
+      end
+      it "instantiates it with args" do
+        expect(ServiceFactory.sample_var("sample")).to eq("sample")
+      end
     end
-    it "instantiates it with args" do
-      ServiceFactory.sample_var("sample").should == "sample"
+
+    context "when block given" do
+      it "executes block without args" do
+        expect(ServiceFactory.sample_block).to be_instance_of(Object)
+      end
+      it "executes block with args" do
+        expect(ServiceFactory.sample_string("sample")).to eq("sample")
+      end
+      it "executes block every time" do
+        expect(ServiceFactory.sample_block).not_to eq(ServiceFactory.sample_block)
+      end
     end
   end
 
-  context "when block given" do
-    it "executes block without args" do
-      ServiceFactory.sample_block.should be_instance_of(Object)
+  context 'when memoization is on' do
+    context "when class given" do
+      it "instantiates it only once" do
+        expect(ServiceFactory.memo_var.object_id).to eq(ServiceFactory.memo_var.object_id)
+      end
+      it "instantiates it without args" do
+        expect(ServiceFactory.memo_var).to be_instance_of(String)
+      end
+    end
+
+    context "when block given" do
+      it "executes block only once" do
+        expect(ServiceFactory.memo_block).to eq(ServiceFactory.memo_block)
+      end
+      it "executes block without args" do
+        expect(ServiceFactory.memo_block).to be_instance_of(Object)
+      end
+    end
+
+    it "doesn't memoize values after the end of the block" do
+      expect(ServiceFactory.var_after_memo.object_id).not_to eq(ServiceFactory.var_after_memo.object_id)
     end
-    it "executes block with args" do
-      ServiceFactory.sample_string("sample").should == "sample"
+  end
+
+  context 'when register is called twice' do
+    before do
+      ServiceFactory.register do |i|
+        sample_var_double String
+      end
     end
-    it "executes block every time" do
-      ServiceFactory.sample_block.should_not == ServiceFactory.sample_block
+
+    it 'should answer to all defined methods' do
+      expect(ServiceFactory.sample_var).to eq("")
+      expect(ServiceFactory.sample_var_double).to eq("")
     end
   end
 
@@ -40,15 +86,16 @@ describe ServiceFactory do
         sample_var { "test2" }
       end
     end
-    ServiceFactory.sample_var.should == "test2"
+    expect(ServiceFactory.sample_var).to eq("test2")
   end
 
   it "ignores data from another environment" do
     ServiceFactory.register do |i|
+      sample_var { "test1" }
       env :production, :development do
-        sampleVar { "test2" }
+        sample_var { "test2" }
       end
     end
-    ServiceFactory.sample_var.should_not == "test2"
+    expect(ServiceFactory.sample_var).not_to eq("test2")
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: service_factory
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails