yaoc 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ccbf393e54fe0ddf71fa88ea5fc06801413c441
-  data.tar.gz: 7e903edc8bffc06266e8da21162533232e3b8071
+  metadata.gz: 7d41454b6c8f8f911daba762a29d4d4447f826a6
+  data.tar.gz: cb825e83ede21f8f54033564bbc7864627a580d3
 SHA512:
-  metadata.gz: 53b94a0ca841ee218140036df34b1e627180d3296eb863c08da1b8ee11a35f2a7f0dc45723f69c3c71267f84630814d5664e315deb12066017126ebc3ddfe266
-  data.tar.gz: 7481d47939d4ab1560f82155ba787340875976da3a5e6a2fbcbff1709eaad2ab89d5545d7bd2da9ae43de5b6dc401b021c0a097f8ae71fcda8449d66d42ea813
+  metadata.gz: 60701029b179a8c63f027c07344eafddafcdda486141c0abe5d036b787a5c31aae4a99fa0e1317bdc3a33e866073d54a415f5e079c96266d005a435dc2722d11
+  data.tar.gz: 0663cc0309770642fc542b246175b4881d43ef77d2ceeecd7f620a2ca7326fb1ba5bb3fa1fd650af64e304eda02b2b383d5b9090aec1bb4f29da8de54a717f82

data/lib/yaoc.rb

@@ -1,10 +1,9 @@
 require "yaoc/version"
 
+require 'scoped_storage'
+
 require 'yaoc/helper/struct_hash_constructor'
 require 'yaoc/helper/to_proc_delegator'
-require 'yaoc/helper/thread_local_storage'
-require 'yaoc/helper/thread_global_storage'
-require 'yaoc/helper/scope'
 
 require 'yaoc/mapper_registry'
 require 'yaoc/mapping_base'

data/lib/yaoc/mapper_registry.rb

@@ -3,11 +3,11 @@ module Yaoc
     module_function
 
     def scope_storage(new_storage)
-      @scope = Helper::Scope.new("mappings", new_storage)
+      @scope = ScopedStorage::Scope.new("mappings", new_storage)
     end
 
     def scope
-      @scope ||= Helper::Scope.new("mappings")
+      @scope ||= ScopedStorage::Scope.new("mappings")
     end
 
     def add(key, mapper)

data/lib/yaoc/version.rb

@@ -1,3 +1,3 @@
 module Yaoc
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/unit/lib/yaoc/mapper_registry_spec.rb

@@ -21,7 +21,7 @@ describe Yaoc::MapperRegistry do
 
   describe '.scope_storage' do
     it 'supports the change of scope storage' do
-      expect {subject.scope_storage(Yaoc::Helper::ThreadLocalStorage)}.not_to raise_error
+      expect {subject.scope_storage(ScopedStorage::ThreadLocalStorage)}.not_to raise_error
     end
 
   end

data/yaoc.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.0.0'
+  spec.add_runtime_dependency 'scoped_storage'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: yaoc
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Dieter Späth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: scoped_storage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -215,10 +229,7 @@ files:
 - examples/all_examples.rb
 - lib/yaoc.rb
 - lib/yaoc/converter_builder.rb
-- lib/yaoc/helper/scope.rb
 - lib/yaoc/helper/struct_hash_constructor.rb
-- lib/yaoc/helper/thread_global_storage.rb
-- lib/yaoc/helper/thread_local_storage.rb
 - lib/yaoc/helper/to_proc_delegator.rb
 - lib/yaoc/many_to_one_mapper_chain.rb
 - lib/yaoc/mapper_registry.rb
@@ -239,14 +250,10 @@ files:
 - spec/acceptance/map_to_objects_with_lazy_loading_spec.rb
 - spec/acceptance/map_to_objects_with_positional_constructors_spec.rb
 - spec/integration/lib/yaoc/converter_builder_spec.rb
-- spec/integration/lib/yaoc/helper/scope_spec.rb
 - spec/spec_helper.rb
 - spec/support/feature.rb
 - spec/unit/lib/yaoc/converter_builder_spec.rb
-- spec/unit/lib/yaoc/helper/scope_spec.rb
 - spec/unit/lib/yaoc/helper/struct_hash_constructor_spec.rb
-- spec/unit/lib/yaoc/helper/thread_global_storage_spec.rb
-- spec/unit/lib/yaoc/helper/thread_local_storage_spec.rb
 - spec/unit/lib/yaoc/helper/to_proc_delegator_spec.rb
 - spec/unit/lib/yaoc/many_to_one_mapper_chain_spec.rb
 - spec/unit/lib/yaoc/mapper_registry_spec.rb
@@ -292,14 +299,10 @@ test_files:
 - spec/acceptance/map_to_objects_with_lazy_loading_spec.rb
 - spec/acceptance/map_to_objects_with_positional_constructors_spec.rb
 - spec/integration/lib/yaoc/converter_builder_spec.rb
-- spec/integration/lib/yaoc/helper/scope_spec.rb
 - spec/spec_helper.rb
 - spec/support/feature.rb
 - spec/unit/lib/yaoc/converter_builder_spec.rb
-- spec/unit/lib/yaoc/helper/scope_spec.rb
 - spec/unit/lib/yaoc/helper/struct_hash_constructor_spec.rb
-- spec/unit/lib/yaoc/helper/thread_global_storage_spec.rb
-- spec/unit/lib/yaoc/helper/thread_local_storage_spec.rb
 - spec/unit/lib/yaoc/helper/to_proc_delegator_spec.rb
 - spec/unit/lib/yaoc/many_to_one_mapper_chain_spec.rb
 - spec/unit/lib/yaoc/mapper_registry_spec.rb

data/lib/yaoc/helper/scope.rb

@@ -1,34 +0,0 @@
-module Yaoc
-  module Helper
-    class Scope
-
-      attr_accessor :scope_name, :storage_source
-
-      def initialize(scope_name="default", storage_source=ThreadGlobalStorage)
-        self.scope_name  = scope_name
-        self.storage_source = storage_source
-      end
-
-      def storage
-        storage_source.for(scope_name)
-      end
-
-      def []=(key, value)
-        self.storage[key]=value
-      end
-
-      def [](key)
-        self.storage[key]
-      end
-
-      def clear!
-        self.storage.clear
-      end
-
-      def fetch(*args, &block)
-        self.storage.fetch(*args, &block)
-      end
-
-    end
-  end
-end

data/lib/yaoc/helper/thread_global_storage.rb

@@ -1,56 +0,0 @@
-module Yaoc
-  module Helper
-    require 'thread'
-
-    class ThreadGlobalStorage
-      class << self
-        private :new
-      end
-
-      attr_accessor :data
-
-      @mutex = Mutex.new
-
-      def self.mutex
-        @mutex
-      end
-
-      def self.for(scope_name="default")
-        mutex.synchronize {
-          @storage ||= {}
-          @storage[scope_name] ||= new
-        }
-      end
-
-      def initialize
-        self.data||={}
-      end
-
-      def []=(key, value)
-        mutex.synchronize {
-          self.data[key]=value
-        }
-      end
-
-      def [](key)
-        self.data[key]
-      end
-
-      def clear!
-        mutex.synchronize {
-          self.data.clear
-        }
-      end
-
-      def fetch(*args, &block)
-        self.data.fetch(*args, &block)
-      end
-
-      def mutex
-        self.class.mutex
-      end
-      
-    end
-  end
-end
-

data/lib/yaoc/helper/thread_local_storage.rb

@@ -1,37 +0,0 @@
-module Yaoc
-  module Helper
-    class ThreadLocalStorage
-      class << self
-        private :new
-      end
-
-      attr_accessor :data
-
-      def self.for(scope_name="default")
-        Thread.current["_#{name}_#{scope_name}"] ||= new
-      end
-
-      def initialize
-        self.data||={}
-      end
-
-      def []=(key, value)
-        self.data[key]=value
-      end
-
-      def [](key)
-        self.data[key]
-      end
-
-      def clear!
-        self.data.clear
-      end
-
-      def fetch(*args, &block)
-        self.data.fetch(*args, &block)
-      end
-
-    end
-  end
-end
-

data/spec/integration/lib/yaoc/helper/scope_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe Yaoc::Helper::Scope do
-
-  subject{
-    Yaoc::Helper::Scope.new("default")
-  }
-
-  it 'works with the default storage' do
-    subject['new_value'] = 123
-    expect(subject.fetch('new_value')).to eq 123
-  end
-
-end

data/spec/unit/lib/yaoc/helper/scope_spec.rb

@@ -1,57 +0,0 @@
-require 'spec_helper'
-
-describe Yaoc::Helper::Scope do
-  class DummyStorage
-    def initialize(new_data)
-      @data = new_data
-    end
-
-    def for(*args)
-      data
-    end
-
-    def data
-      @data
-    end
-
-  end
-
-  subject{
-    Yaoc::Helper::Scope.new("default", DummyStorage.new(data_double))
-  }
-
-  let(:data_double){
-    {}
-  }
-
-  describe '#[]=' do
-    it 'let me set values' do
-      subject['new_value'] = 123
-      expect(subject.fetch('new_value')).to eq 123
-    end
-  end
-
-  describe '#[]' do
-    it 'let me fetch values' do
-      subject['new_value'] = 123
-      expect(subject['new_value']).to eq 123
-    end
-  end
-
-  describe '#clear!' do
-    it 'let me fetch values' do
-      subject['new_value'] = 123
-      subject.clear!
-      expect(subject['new_value']).to be_nil
-    end
-  end
-
-  describe '#fetch' do
-    it 'works like hash fetch' do
-      fetched_value = subject.fetch('some_key'){|*args| args}
-
-      expect(fetched_value).to eq ['some_key']
-    end
-  end
-
-end

data/spec/unit/lib/yaoc/helper/thread_global_storage_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe Yaoc::Helper::ThreadGlobalStorage do
-  subject{
-    Yaoc::Helper::ThreadGlobalStorage
-  }
-
-  let(:storage){
-    subject.for
-  }
-
-  describe '.for' do
-    it 'creates a new object for all threads' do
-      subject.for
-
-      threat_one_object_id = nil
-      threat_two_object_id = nil
-      threats = []
-
-      threats << Thread.new{
-        threat_one_object_id = Yaoc::Helper::ThreadLocalStorage.for
-      }
-
-      threats << Thread.new{
-        threat_two_object_id = Yaoc::Helper::ThreadLocalStorage.for
-      }
-
-      threats.each &:join
-
-      expect(threat_one_object_id).not_to eq  threat_two_object_id
-    end
-
-    it 'supports naming different scopes' do
-      second_scope = subject.for 'the second scope'
-      expect(second_scope.object_id).not_to be subject.for.object_id
-    end
-  end
-
-  it 'supports hash like accessors' do
-    storage['key'] = 1
-    expect(storage['key']).to eq 1
-    expect(storage.fetch 'key').to eq 1
-
-    storage.clear!
-
-    expect(storage['key']).to be_nil
-  end
-
-end

data/spec/unit/lib/yaoc/helper/thread_local_storage_spec.rb

@@ -1,50 +0,0 @@
-require 'spec_helper'
-
-describe Yaoc::Helper::ThreadLocalStorage do
-  subject{
-    Yaoc::Helper::ThreadLocalStorage
-  }
-
-  let(:storage){
-    subject.for
-  }
-
-  describe '.for' do
-    it 'creates a new object for every thread' do
-      subject.for
-
-      threat_one_object_id = nil
-      threat_two_object_id = nil
-      threats = []
-
-      threats << Thread.new{
-        threat_one_object_id = Yaoc::Helper::ThreadLocalStorage.for
-      }
-
-      threats << Thread.new{
-        threat_two_object_id = Yaoc::Helper::ThreadLocalStorage.for
-      }
-
-      threats.each &:join
-
-      expect(threat_one_object_id).not_to eq  threat_two_object_id
-    end
-
-    it 'supports naming different scopes' do
-      second_scope = subject.for 'the second scope'
-      expect(second_scope.object_id).not_to be subject.for.object_id
-    end
-  end
-
-  it 'supports hash like accessors' do
-    storage['key'] = 1
-    expect(storage['key']).to eq 1
-    expect(storage.fetch 'key').to eq 1
-
-    storage.clear!
-
-    expect(storage['key']).to be_nil
-
-  end
-
-end