tarvit-helpers 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f05ecb11ce055643c43b40cc820e3c66f999374f
-  data.tar.gz: d94035c4af11f06e9f0d16ad037cb8e09582d247
+  metadata.gz: 1e736059b1e4ba9be2a14c72da7181ed9ac8ff9a
+  data.tar.gz: 15a634622c8d7f8ffcd3912019d0868af0732f81
 SHA512:
-  metadata.gz: 36b61567a2c03af8f0c6223d5f41fee45a3d447a23fe0b940bb57fa8ded14c868aa1fbc30a65e9f30e50f6a2296df22ab3dfdae121409fd65b3e68711321945a
-  data.tar.gz: 45eb5df5f82f596c64d894d2016cf1e094bb64717c37b792b96d45d95fefb5b601c94ea7c7774494fd3604fefdd2eff4fe30c5c8962af7d4f2a858cf0b1e497a
+  metadata.gz: 3d0e930b2cd0cd563471183b86c6210243623557fabb09c8a36eebd286b6606562829804b439b3fb15fef62bd5715e5f42bbbaa638182c19f6d0b5b30120fd42
+  data.tar.gz: 27c9eceaa2616e5ac1288e353293d6961a3862aeda69210cea0bd87475d2f403873d9a7a6f0ada8352dbde46194cd602897d5639f7d5f158940231ca22f7e629

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

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

@@ -12,4 +12,3 @@ module TarvitHelpers
     end
   end
 end
-

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

@@ -1,66 +1,48 @@
 module TarvitHelpers
   module HashPresenter
 
-    class Custom < Cached
-      attr_reader :_rules_holder
+    class Custom < WithRules
 
-      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 ]
+      def _custom_hash
+        _rules_holder.rules.each_with_object(_hash.clone) do |rule, res|
+          _apply_rule(res, rule, rule.path.clone, [])
+        end
       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 _apply_rule(node, rule, rule_path, current_path)
+        current_level = rule_path.shift
 
-      def _new_level_presenter(value, method_name)
-        self.class.new(value, _path(method_name), _rules_holder)
-      end
+        if rule_path.empty?
+          _assign_value(node, rule, current_path, current_level) && return
+        end
 
-      def _init_rules; end
+        current_node = node[current_level]
+        current_path << current_level
 
-      def _init_rules_holder
-        RulesHolder.new
+        if current_node.is_a?(Array)
+          current_node.each_with_index do |node_element, index|
+            _apply_rule(node_element, rule, rule_path.clone, (current_path + [ index ]))
+          end
+        else
+          _apply_rule(current_node, rule, rule_path.clone, current_path.clone)
+        end
       end
 
-      def _accessor_method?(method_name)
-        super(method_name) || _rules_holder.rules.map{|r| r.path.last }.include?(method_name)
+      def _assign_value(node, rule, current_path, current_level)
+        presenter = _path_presenter(current_path)
+        node[ current_level ] = rule.value_transformer.call(node[current_level], presenter)
       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 }
+      def _path_presenter(path)
+        res = self
+        path.each do |level|
+          res = res.is_a?(Array) ? res[level] : res.send(level)
         end
+        res
       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/with_rules_hash_presenter.rb

@@ -0,0 +1,62 @@
+module TarvitHelpers
+  module HashPresenter
+
+    class WithRules < Cached
+      attr_reader :_rules_holder
+
+      def initialize(hash, levels=[], rules_holder=nil, &rules)
+        super(hash, levels)
+        @_rules_holder = rules_holder || RulesHolder.new
+        _init_rules if _rules_holder.rules.empty?
+        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 _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.rb

@@ -3,6 +3,7 @@ module TarvitHelpers
     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/with_rules_hash_presenter'
     require_relative '../modules/hash_presenter/custom_hash_presenter'
 
     def self.present(hash, option = :cached )

data/spec/modules/hash_presenter_spec.rb

@@ -148,7 +148,7 @@ describe HashPresenter::Custom do
 
         rules.when([ :user, :age ]){|age| age.to_i }
         rules.when([ :user, :posts, :title ]){|title| title.capitalize }
-        rules.when([ :user,:address ]){|list| list.join(?/) }
+        rules.when([ :user, :address ]){|list| list.join(?/) }
       end
 
       expect(presenter.user.date).to eq(Date.new(2015, 11, 11))
@@ -227,8 +227,21 @@ describe HashPresenter::Custom do
         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
 
+        expect(@presenter._custom_hash).to eq({
+            :accounts => [
+                {
+                    :id=>1,
+                    :name=>'director',
+                    :collections=>[
+                        {:id=>42, :name=>'TestCollection', :folder=>'folders/TestCollection'},
+                        {:id=>24, :name=>'BestCollection', :folder=>'folders/BestCollection'},
+                    ],
+                    :website=>'www.johndoe.com/director'
+                }
+            ]
+        })
+      end
     end
   end
 end

data/tarvit-helpers.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tarvit-helpers 0.0.17 ruby lib
+# stub: tarvit-helpers 0.0.18 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tarvit-helpers"
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Vitaly Tarasenko"]
-  s.date = "2015-10-26"
+  s.date = "2015-10-27"
   s.description = " Simple extensions to standard Ruby classes and useful helpers. "
   s.email = "vetal.tarasenko@gmail.com"
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "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/hash_presenter/with_rules_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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarvit-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Vitaly Tarasenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -117,6 +117,7 @@ files:
 - 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/hash_presenter/with_rules_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