tarvit-helpers 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3444b7e3aa260a574ae016d797eaca0b76cc3a3a
-  data.tar.gz: 6f4bf42a2f01ea7fcc2748f8429d799d2498eacf
+  metadata.gz: f05ecb11ce055643c43b40cc820e3c66f999374f
+  data.tar.gz: d94035c4af11f06e9f0d16ad037cb8e09582d247
 SHA512:
-  metadata.gz: 3bde109522e483e5c094f6290ffce1b57ed882ad7073c0db90875b54312e6b792dabe285d155f69e66ede6b461465386db6199de4111ce872f78f48efb1a5c5e
-  data.tar.gz: b1c0c435db896eaf62dd96b7208bdbe8c3b31b9908a94c6f258d64136821064418fc6fc333e79d71688768c3d989437456f52e182be10764bab531b52c9c0b6b
+  metadata.gz: 36b61567a2c03af8f0c6223d5f41fee45a3d447a23fe0b940bb57fa8ded14c868aa1fbc30a65e9f30e50f6a2296df22ab3dfdae121409fd65b3e68711321945a
+  data.tar.gz: 45eb5df5f82f596c64d894d2016cf1e094bb64717c37b792b96d45d95fefb5b601c94ea7c7774494fd3604fefdd2eff4fe30c5c8962af7d4f2a858cf0b1e497a

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/lib/tarvit-helpers/modules/hash_presenter/cached_hash_presenter.rb

@@ -0,0 +1,15 @@
+module TarvitHelpers
+  module HashPresenter
+    class Cached < Simple
+      def initialize(hash, levels=[])
+        super
+        @cache = {}
+      end
+
+      def _value(method_name)
+        @cache[method_name] ||= super
+      end
+    end
+  end
+end
+

data/lib/tarvit-helpers/modules/hash_presenter/custom_hash_presenter.rb

@@ -0,0 +1,66 @@
+module TarvitHelpers
+  module HashPresenter
+
+    class Custom < Cached
+      attr_reader :_rules_holder
+
+      def initialize(hash, levels=[], rules_holder=nil, &rules)
+        super(hash, levels)
+        @_rules_holder = rules_holder || _init_rules_holder
+        _init_rules
+        rules.call(_rules_holder) if rules
+      end
+
+      def _current_path(method_name)
+        _levels + [ method_name ]
+      end
+
+      protected
+
+      def _hash_value(method_name)
+        value =  super
+        rule = _rules_holder.rule_for(_path(method_name))
+        rule ? rule.value_transformer.call(value, self) : value
+      end
+
+      def _new_level_presenter(value, method_name)
+        self.class.new(value, _path(method_name), _rules_holder)
+      end
+
+      def _init_rules; end
+
+      def _init_rules_holder
+        RulesHolder.new
+      end
+
+      def _accessor_method?(method_name)
+        super(method_name) || _rules_holder.rules.map{|r| r.path.last }.include?(method_name)
+      end
+
+      alias_method :_rules, :_rules_holder
+
+      class RulesHolder
+        attr_reader :rules
+
+        def initialize
+          @rules = []
+        end
+
+        def when(path, &_transform_value)
+          self.rules << Rule.new(path, _transform_value)
+        end
+
+        def rule_for(path)
+          rules.find{|r| r.path == path }
+        end
+      end
+
+      class Rule
+        attr_reader :path, :value_transformer
+        def initialize(path, value_transformer)
+          @path, @value_transformer = path, value_transformer
+        end
+      end
+    end
+  end
+end

data/lib/tarvit-helpers/modules/hash_presenter/observable_hash_presenter.rb

@@ -0,0 +1,14 @@
+module TarvitHelpers
+  module HashPresenter
+    class Observable < Simple
+      def initialize(hash, levels=[])
+        @_hash = hash
+        @_levels = levels
+      end
+
+      def _hash
+        _prepare_keys(@_hash)
+      end
+    end
+  end
+end

data/lib/tarvit-helpers/modules/hash_presenter/simple_hash_presenter.rb

@@ -0,0 +1,59 @@
+module TarvitHelpers
+  module HashPresenter
+
+    class Simple
+      require 'active_support/core_ext/string'
+
+      attr_reader :_hash, :_levels
+
+      def initialize(hash, levels=[])
+        @_hash = _prepare_keys(hash)
+        @_levels = levels
+      end
+
+      def method_missing(m, *args)
+        return _value(m) if _accessor_method?(m)
+        super
+      end
+
+      protected
+
+      def _value(method_name)
+        _transform_value(method_name, _hash_value(method_name))
+      end
+
+      def _hash_value(method_name)
+        _hash[method_name]
+      end
+
+      def _transform_value(method_name, value)
+        return value.map{|key| _transform_value(method_name, key) } if value.is_a?(Array)
+        value.is_a?(Hash) ? _new_level_presenter(value, method_name) : value
+      end
+
+      def _accessor_method?(method_name)
+        self._hash.keys.include?(method_name)
+      end
+
+      def _key_to_method(key)
+        key.to_s.gsub(/\s+/, ?_).underscore.to_sym
+      end
+
+      def _prepare_keys(hash)
+        res = hash.map do |k ,v|
+          [ _key_to_method(k), v ]
+        end
+        Hash[res]
+      end
+
+      def _path(key)
+        _levels + [ key ]
+      end
+
+      def _new_level_presenter(value, method_name)
+        self.class.new(value, _path(method_name))
+      end
+
+    end
+  end
+end

data/lib/tarvit-helpers/modules/hash_presenter.rb

@@ -1,5 +1,9 @@
 module TarvitHelpers
   module HashPresenter
+    require_relative '../modules/hash_presenter/simple_hash_presenter'
+    require_relative '../modules/hash_presenter/cached_hash_presenter'
+    require_relative '../modules/hash_presenter/observable_hash_presenter'
+    require_relative '../modules/hash_presenter/custom_hash_presenter'
 
     def self.present(hash, option = :cached )
       raise ArgumentError.new("#{ hash.class } is not a Hash") unless hash.is_a?(Hash)
@@ -7,146 +11,8 @@ module TarvitHelpers
     end
 
     def self.factory
-      { cached: CachedHashPresenter, observable: ObservableHashPresenter }
+      { cached: Cached, observable: Observable }
     end
 
-    class SimpleHashPresenter
-      require 'active_support/core_ext/string'
-
-      attr_reader :_hash, :_levels
-
-      def initialize(hash, levels=[])
-        @_hash = _prepare_keys(hash)
-        @_levels = levels
-      end
-
-      def method_missing(m, *args)
-        return _value(m) if _accessor_method?(m)
-        super
-      end
-
-      protected
-
-      def _value(method_name)
-        _transform_value(method_name, _hash_value(method_name))
-      end
-
-      def _hash_value(method_name)
-        _hash[method_name]
-      end
-
-      def _transform_value(method_name, value)
-        return value.map{|key| _transform_value(method_name, key) } if value.is_a?(Array)
-        value.is_a?(Hash) ? _new_level_presenter(value, method_name) : value
-      end
-
-      def _accessor_method?(method_name)
-        self._hash.keys.include?(method_name)
-      end
-
-      def _key_to_method(key)
-        key.to_s.gsub(/\s+/, ?_).underscore.to_sym
-      end
-
-      def _prepare_keys(hash)
-        res = hash.map do |k ,v|
-          [ _key_to_method(k), v ]
-        end
-        Hash[res]
-      end
-
-      def _path(key)
-        _levels + [ key ]
-      end
-
-      def _new_level_presenter(value, method_name)
-        self.class.new(value, _path(method_name))
-      end
-
-    end
-
-    class CachedHashPresenter < SimpleHashPresenter
-      def initialize(hash, levels=[])
-        super
-        @cache = {}
-      end
-
-      def _value(method_name)
-        @cache[method_name] ||= super
-      end
-    end
-
-    class ObservableHashPresenter < SimpleHashPresenter
-      def initialize(hash, levels=[])
-        @_hash = hash
-        @_levels = levels
-      end
-
-      def _hash
-        _prepare_keys(@_hash)
-      end
-    end
-
-    class CustomHashPresenter < CachedHashPresenter
-      attr_reader :_rules_holder
-
-      def initialize(hash, levels=[], rules_holder=nil, &rules)
-        super(hash, levels)
-        @_rules_holder = rules_holder || _init_rules_holder
-        _init_rules
-        rules.call(_rules_holder) if rules
-      end
-
-      def _current_path(method_name)
-        _levels + [ method_name ]
-      end
-
-      protected
-
-      def _hash_value(method_name)
-        value =  super
-        rule = _rules_holder.rule_for(_path(method_name))
-        rule ? rule.value_transformer.call(value, self) : value
-      end
-
-      def _new_level_presenter(value, method_name)
-        self.class.new(value, _path(method_name), _rules_holder)
-      end
-
-      def _init_rules; end
-
-      def _init_rules_holder
-        RulesHolder.new
-      end
-
-      def _accessor_method?(method_name)
-        super(method_name) || _rules_holder.rules.map{|r| r.path.last }.include?(method_name)
-      end
-
-      alias_method :_rules, :_rules_holder
-
-      class RulesHolder
-        attr_reader :rules
-
-        def initialize
-          @rules = []
-        end
-
-        def when(path, &_transform_value)
-          self.rules << Rule.new(path, _transform_value)
-        end
-
-        def rule_for(path)
-          rules.find{|r| r.path == path }
-        end
-      end
-
-      class Rule
-        attr_reader :path, :value_transformer
-        def initialize(path, value_transformer)
-          @path, @value_transformer = path, value_transformer
-        end
-      end
-    end
   end
 end

data/spec/modules/hash_presenter_spec.rb

@@ -34,16 +34,16 @@ module BaseHashPresenterTest
   end
 end
 
-describe HashPresenter::SimpleHashPresenter do
+describe HashPresenter::Simple do
 
   extend BaseHashPresenterTest
-  test_presenter(HashPresenter::SimpleHashPresenter)
+  test_presenter(HashPresenter::Simple)
 
   context 'Special Behavior' do
 
     it 'should not depend on an attribute object' do
       original = { a: 2 }
-      hp = HashPresenter::SimpleHashPresenter.new(original)
+      hp = HashPresenter::Simple.new(original)
 
       expect(hp.a).to eq(2)
 
@@ -53,22 +53,22 @@ describe HashPresenter::SimpleHashPresenter do
     end
 
     it 'should regenerate method result for a nested hash' do
-      hp = HashPresenter::SimpleHashPresenter.new(a: { b: 1 })
+      hp = HashPresenter::Simple.new(a: { b: 1 })
       expect(hp.a.object_id).to_not eq(hp.a.object_id)
     end
   end
 end
 
-describe HashPresenter::CachedHashPresenter do
+describe HashPresenter::Cached do
 
   extend BaseHashPresenterTest
-  test_presenter(HashPresenter::CachedHashPresenter)
+  test_presenter(HashPresenter::Cached)
 
   context 'Special Behavior' do
 
     it 'should not depend on an attribute object' do
       original = { a: 2 }
-      hp = HashPresenter::CachedHashPresenter.new(original)
+      hp = HashPresenter::Cached.new(original)
 
       expect(hp.a).to eq(2)
 
@@ -78,23 +78,23 @@ describe HashPresenter::CachedHashPresenter do
     end
 
     it 'should not calculate result for a nested hash twice' do
-      hp = HashPresenter::CachedHashPresenter.new(a: { b: 1 })
+      hp = HashPresenter::Cached.new(a: { b: 1 })
       expect(hp.a.object_id).to eq(hp.a.object_id)
     end
   end
 end
 
 
-describe HashPresenter::ObservableHashPresenter do
+describe HashPresenter::Observable do
 
   extend BaseHashPresenterTest
-  test_presenter(HashPresenter::ObservableHashPresenter)
+  test_presenter(HashPresenter::Observable)
 
   context 'Special Behavior' do
 
     it 'should observe an attribute object' do
       original = { a: 2 }
-      hp = HashPresenter::ObservableHashPresenter.new(original)
+      hp = HashPresenter::Observable.new(original)
 
       expect(hp.a).to eq(2)
 
@@ -112,16 +112,16 @@ describe HashPresenter::ObservableHashPresenter do
     end
 
     it 'should regenerate method result for a nested hash' do
-      hp = HashPresenter::ObservableHashPresenter.new(a: { b: 1 })
+      hp = HashPresenter::Observable.new(a: { b: 1 })
       expect(hp.a.object_id).to_not eq(hp.a.object_id)
     end
   end
 end
 
 
-describe HashPresenter::CustomHashPresenter do
+describe HashPresenter::Custom do
   extend BaseHashPresenterTest
-  test_presenter(HashPresenter::CustomHashPresenter)
+  test_presenter(HashPresenter::Custom)
 
   context 'Special Behavior' do
     before :each do
@@ -141,7 +141,7 @@ describe HashPresenter::CustomHashPresenter do
     end
 
     it 'should customize presenter' do
-      presenter = HashPresenter::CustomHashPresenter.new(@hash) do |rules|
+      presenter = HashPresenter::Custom.new(@hash) do |rules|
         rules.when([ :user, :date ]) do |value|
           Date.parse(value)
         end
@@ -158,7 +158,7 @@ describe HashPresenter::CustomHashPresenter do
     end
 
     it 'should declare nested presenters' do
-      presenter = HashPresenter::CustomHashPresenter.new(@hash) do |rules|
+      presenter = HashPresenter::Custom.new(@hash) do |rules|
 
         rules.when([ :user, :date ]) do |value|
           Date.parse(value)
@@ -166,7 +166,7 @@ describe HashPresenter::CustomHashPresenter do
 
         rules.when([ :user, :posts ])do |posts|
           posts.map do |post|
-            HashPresenter::CustomHashPresenter.new(post) do |post_rules|
+            HashPresenter::Custom.new(post) do |post_rules|
               post_rules.when([ :title ]){|title| title.upcase }
             end
           end
@@ -185,16 +185,14 @@ describe HashPresenter::CustomHashPresenter do
                     :id => 1,
                     :name => :director,
                     collections: [
-                        {
-                            :id => 42,
-                            :name => :test_collection,
-                        }
+                        { :id => 42, :name => :test_collection },
+                        { :id => 24, :name => :best_collection },
                     ]
                 }
             ]
         }
 
-        class AccountsPresenter < HashPresenter::CustomHashPresenter
+        class AccountsPresenter < HashPresenter::Custom
 
           def _init_rules
             rules = _rules
@@ -227,6 +225,8 @@ describe HashPresenter::CustomHashPresenter do
         expect(account.website).to eq('www.johndoe.com/director')
         expect(account.collections[0].name).to eq('TestCollection')
         expect(account.collections[0].folder).to eq('folders/TestCollection')
+        expect(account.collections[1].name).to eq('BestCollection')
+        expect(account.collections[1].folder).to eq('folders/BestCollection')
       end
 
     end
@@ -248,12 +248,12 @@ describe HashPresenter do
 
   it 'should get an observable presenter' do
     hp = HashPresenter.present({  }, :observable)
-    expect(hp).to be_a(HashPresenter::ObservableHashPresenter)
+    expect(hp).to be_a(HashPresenter::Observable)
   end
 
   it 'should get a cached presenter' do
     hp = HashPresenter.present({  }, :cached)
-    expect(hp).to be_a(HashPresenter::CachedHashPresenter)
+    expect(hp).to be_a(HashPresenter::Cached)
   end
 
 end

data/tarvit-helpers.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tarvit-helpers 0.0.16 ruby lib
+# stub: tarvit-helpers 0.0.17 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tarvit-helpers"
-  s.version = "0.0.16"
+  s.version = "0.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -30,6 +30,10 @@ Gem::Specification.new do |s|
     "lib/tarvit-helpers/extensions/counter.rb",
     "lib/tarvit-helpers/modules/conditional_logger.rb",
     "lib/tarvit-helpers/modules/hash_presenter.rb",
+    "lib/tarvit-helpers/modules/hash_presenter/cached_hash_presenter.rb",
+    "lib/tarvit-helpers/modules/hash_presenter/custom_hash_presenter.rb",
+    "lib/tarvit-helpers/modules/hash_presenter/observable_hash_presenter.rb",
+    "lib/tarvit-helpers/modules/hash_presenter/simple_hash_presenter.rb",
     "lib/tarvit-helpers/modules/non_shared_accessors.rb",
     "lib/tarvit-helpers/modules/recursive_loader.rb",
     "lib/tarvit-helpers/modules/simple_crypt.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarvit-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Vitaly Tarasenko
@@ -113,6 +113,10 @@ files:
 - lib/tarvit-helpers/extensions/counter.rb
 - lib/tarvit-helpers/modules/conditional_logger.rb
 - lib/tarvit-helpers/modules/hash_presenter.rb
+- lib/tarvit-helpers/modules/hash_presenter/cached_hash_presenter.rb
+- lib/tarvit-helpers/modules/hash_presenter/custom_hash_presenter.rb
+- lib/tarvit-helpers/modules/hash_presenter/observable_hash_presenter.rb
+- lib/tarvit-helpers/modules/hash_presenter/simple_hash_presenter.rb
 - lib/tarvit-helpers/modules/non_shared_accessors.rb
 - lib/tarvit-helpers/modules/recursive_loader.rb
 - lib/tarvit-helpers/modules/simple_crypt.rb