AR2H 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ddcf2999c0a5f1d385fa137606b3a12823e6fea
-  data.tar.gz: 0dad5c3f0262e3d7e383436f9335fda42f8e1668
+  metadata.gz: 78cd604ee19ed84f6cc042874bb82930dc92c408
+  data.tar.gz: 7d3a2974b396088dac1a9af9e969f231013c29e4
 SHA512:
-  metadata.gz: 225b070df89f6c25865c136550f0fe25c1cfd0a6ea7ba270894dd373c76f5bde1af47013a2153db3c71cc7a707f1d57c85fd0e1341f57d2c2444e1b4a0ec6a42
-  data.tar.gz: d3cc358a946eb4ca388afb67eeaf3be46b7b422dcfeea1a3d5ea4c4b9a2e449a5ca05d00fcc9425dec643748e6e46c43a2be57cae712a9b570f25f2fadc17f67
+  metadata.gz: 595e245e38640802f4156a3b5af38bc6ef73a5ec1c695acc4e381972eaa28ecc8d9433834532448468e3f29b8c4ddbc992d7c19b454502d8b2afbc7f95f55c06
+  data.tar.gz: b84c618822e9105e0992d75e6baa3834356d018b0e8a047cdc7eb15ff04746efd2f01e78f06aa65dc90ac926fbded3ae5fe66fc2f4c79e56fdf0f20c6d2c396d

data/AR2H.gemspec

@@ -1,28 +1,30 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |spec|
-  spec.name          = 'AR2H'
-  spec.version       = '0.0.0'
-  spec.authors       = ['Eugene Yak']
-  spec.email         = ['GeneAYak@gmail.com']
-
-  spec.summary       = ''
-  spec.description   = ''
-  spec.homepage      = 'https://gitlab.com/yak/AR2H'
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler',     '~> 1.13'
-  spec.add_development_dependency 'rake',        '~> 10.0'
-  spec.add_development_dependency 'rspec',       '~> 3.5'
-
-  spec.add_runtime_dependency     'activerecord'
-  spec.add_runtime_dependency     'activesupport'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = 'AR2H'
+  spec.version       = '0.0.1'
+  spec.authors       = ['Eugene Yak']
+  spec.email         = ['GeneAYak@gmail.com']
+
+  spec.summary       = ''
+  spec.description   = ''
+  spec.homepage      = 'https://gitlab.com/yak/AR2H'
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler',     '~> 1.13'
+  spec.add_development_dependency 'rake',        '~> 10.0'
+  spec.add_development_dependency 'rspec',       '~> 3.5'
+  spec.add_development_dependency 'sqlite3',     '~> 1.3', '>= 1.3.12'
+  spec.add_development_dependency 'simplecov',   '~> 0.12.0'
+
+  spec.add_runtime_dependency     'activerecord'
+  spec.add_runtime_dependency     'activesupport'
+end

data/lib/AR2H.rb

@@ -1,7 +1,7 @@
 require 'AR2H/executor'
 
-require 'AR2H/extensions/base'
-require 'AR2H/extensions/relation'
+require 'AR2H/concerns/active_record/base'
+require 'AR2H/concerns/active_record/relation'
 
-require 'AR2H/hashers/collection'
-require 'AR2H/hashers/hasher'
+require 'AR2H/presenters/collection'
+require 'AR2H/presenters/presenter'

data/lib/AR2H/concerns/active_record/base.rb

@@ -0,0 +1,31 @@
+require 'active_record'
+
+module AR2H
+  module Concerns
+    module ActiveRecordConcern
+      module Base
+        extend ActiveSupport::Concern
+
+        def present(presenter = :default)
+          Executor.run(self, presenter)
+        end
+
+        def presenters
+          self.class.presenters
+        end
+
+        module ClassMethods
+          def presenter(name = :default, &block)
+            presenters.add Presenters::Presenter.new(name, block)
+          end
+
+          def presenters
+            @presenters ||= Presenters::Collection.new(self.name)
+          end
+        end
+      end
+
+      ActiveRecord::Base.send :include, ActiveRecordConcern::Base
+    end
+  end
+end

data/lib/AR2H/concerns/active_record/relation.rb

@@ -0,0 +1,18 @@
+require 'active_record'
+
+module AR2H
+  module Concerns
+    module ActiveRecordConcern
+      module Relation
+        extend ActiveSupport::Concern
+
+        def present(presenter = :default)
+          self.map { |e| Executor.run(e, presenter) }
+        end
+      end
+
+      ActiveRecord::Relation.send :include, ActiveRecordConcern::Relation
+    end
+  end
+end
+

data/lib/AR2H/executor.rb

@@ -1,43 +1,43 @@
 module AR2H
   class Executor
-    def self.run(object, hasher)
-      self.new(object, hasher).execute
+    def self.run(object, presenter)
+      self.new(object, presenter).execute
     end
 
-    def initialize(object, hasher)
-      @object = object
-      @hasher = object.hashers.find hasher
-      @result = {}
+    def initialize(object, presenter)
+      @object    = object
+      @presenter = object.presenters.find presenter
+      @result    = Hash.new
     end
 
     attr_reader :object
 
     def execute
-      instance_eval &@hasher.block
+      instance_eval(&@presenter.block)
       @result
     end
 
     private
 
-    def attr(attr)
-      @result[attr] = block_given? ? yield : object[attr]
+    def attr(attr, &block)
+      @result[attr] = block ? block.call : object[attr]
     end
 
     def attrs(*attrs)
       attrs.each { |attr| attr(attr) }
     end
 
-    def has_one(node)
-      node(node)
+    def has_one(model, &block)
+      _has_branch(model, &block)
     end
 
-    def has_many(node)
-      node(node)
+    def has_many(model, &block)
+      _has_branch(model, &block)
     end
 
-    def branch(node)
-      hasher = block_given? ? yield : @hasher.name
-      @result[node] = object.send(node).hasherize(hasher)
+    def _has_branch(child, &block) # :nodoc:
+      child_presenter = block ? block.call : @presenter.name
+      @result[child] = object.send(child).present(child_presenter)
     end
   end
 end

data/lib/AR2H/presenters/collection.rb

@@ -0,0 +1,36 @@
+module AR2H
+  module Presenters
+    class Collection
+      def initialize(model_name)
+        @model_name = model_name
+        @presenters = Array.new
+      end
+
+      def add(presenter)
+        if self.include? presenter.name
+          raise Exception.new("#{@model_name}: presenter #{presenter.name} is already exists")
+        else
+          @presenters << presenter
+        end
+      end
+
+      def all
+        @presenters
+      end
+
+      def list
+        @presenters.map{ |presenter| presenter.name }
+      end
+
+      def include?(name)
+        list.include? name
+      end
+
+      def find(name)
+        presenter = @presenters.find{ |hasher| hasher.name == name }
+        raise Exception.new("#{@model_name}: presenter #{name} not found") unless presenter
+        presenter
+      end
+    end
+  end
+end

data/lib/AR2H/{hashers/hasher.rb → presenters/presenter.rb}

@@ -1,6 +1,6 @@
 module AR2H
-  module Hashers
-    class Hasher
+  module Presenters
+    class Presenter
       def initialize(name, block)
         @name  = name
         @block = block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: AR2H
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Eugene Yak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.12
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -95,11 +129,11 @@ files:
 - bin/console
 - bin/setup
 - lib/AR2H.rb
+- lib/AR2H/concerns/active_record/base.rb
+- lib/AR2H/concerns/active_record/relation.rb
 - lib/AR2H/executor.rb
-- lib/AR2H/extensions/base.rb
-- lib/AR2H/extensions/relation.rb
-- lib/AR2H/hashers/collection.rb
-- lib/AR2H/hashers/hasher.rb
+- lib/AR2H/presenters/collection.rb
+- lib/AR2H/presenters/presenter.rb
 homepage: https://gitlab.com/yak/AR2H
 licenses: []
 metadata: {}

data/lib/AR2H/extensions/base.rb

@@ -1,31 +0,0 @@
-module AR2H
-  module Extensions
-    module Base
-      extend ActiveSupport::Concern
-
-      def hasherize(hasher = :default)
-        # require 'AR2H/executor'
-        logger.info { "  Hashing #{self.class}" }
-        Executor.run(self, hasher)
-      end
-
-      def hashers
-        self.class.hashers
-      end
-
-      module ClassMethods
-        # require 'AR2H/hashers'
-
-        def hasher(name = :default, &block)
-          hashers.add Hashers::Hasher.new(name, block)
-        end
-
-        def hashers
-          @hashers ||= Hashers::Collection.new(self.name)
-        end
-      end
-    end
-
-    ActiveRecord::Base.send :include, Base
-  end
-end

data/lib/AR2H/extensions/relation.rb

@@ -1,15 +0,0 @@
-module AR2H
-  module Extensions
-    module Relation
-      extend ActiveSupport::Concern
-
-      def hasherize(hasher = :default)
-        logger.info { "  Hashing #{self.model.to_s.pluralize}" }
-        self.map { |e| Executor.run(e, hasher) }
-      end
-    end
-
-    ActiveRecord::Relation.send :include, Relation
-  end
-end
-

data/lib/AR2H/hashers/collection.rb

@@ -1,37 +0,0 @@
-module AR2H
-  module Hashers
-    class Collection
-      def initialize(label)
-        @label   = label
-        @hashers = Array.new
-      end
-
-      def add(hasher)
-        raise Exception.new('NOT hasher') if hasher.class != Hasher
-        if self.include? hasher.name
-          raise Exception.new('DOUBLING hasher')
-        else
-          @hashers << hasher
-        end
-      end
-
-      def include?(name)
-        list.include? name
-      end
-
-      def all
-        @hashers
-      end
-
-      def list
-        @hashers.map{ |hasher| hasher.name }
-      end
-
-      def find(name)
-        hasher = @hashers.find{ |hasher| hasher.name == name }
-        raise Exception.new("#{@label}: hasher :#{name} NOT FOUND") unless hasher
-        hasher
-      end
-    end
-  end
-end