essay 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf366521203e669fbe983484c66fa8c90ada19f7
-  data.tar.gz: 7cf65ba5cc3e47c09ead5bb408422e558391125f
+  metadata.gz: afa4aa60e26f51a5545b57b7b0ad99e5088597a8
+  data.tar.gz: ee869072166075fe1a224378997d9efdf6f9a06f
 SHA512:
-  metadata.gz: 717c01be8ac2546beaf0b4718292fe897d84d24acb1c8f999443b3ca6ca74cae6d562e2e9f2d502e0affebc6efe0bc15f0e7ba683479a89cc37fb5afff56490d
-  data.tar.gz: 9ef1b952345a08f0dd1b795fe8a02d507c0573d2f64d24ae9d9337e9524a91f41d9ef60ee1e6818c98c5f98bded485df5b7bd29c18575db01463747e9b137f4f
+  metadata.gz: cb8a0a69b4a11e3298b773a46aae74474fbebef2362d43488fc7d0698d31966f175a67ab21f89623d06ce6c971f75b14fdfb309bc275dd087e9a1de7801cab67
+  data.tar.gz: 79a89ab38c33abf43732266128c3b4368e53a98741814abf16c026aeca31e44796a6ef87f5df35583aa1b622cf76b59053761148622390b5e5ebe4f0b3a575a0

data/lib/essay.rb

@@ -19,21 +19,17 @@ require 'essay/association/base_feature'
 class ActiveRecord::Base
   class << self
     def features
-      @features_for_model ||= Essay::ModelFeatures.new(model_class: self)
+      @model_features ||= Essay::ModelFeatures.new(active_record: self)
     end
 
-    def attribute_features(attr_name = nil)
-      @features_for_attrs ||= Essay::AttributeCollection.new(model_class: self)
-      attr_name ? @features_for_attrs[attr_name] : @features_for_attrs
+    def attribute_features(attribute = nil)
+      @attributes_features ||= Essay::AttributeCollection.new(active_record: self)
+      attribute ? @attributes_features[attribute] : @attributes_features
     end
 
-    def association_features(assoc_name = nil)
-      @features_for_assocs ||= Essay::AssociationCollection.new(model_class: self)
-      assoc_name ? @features_for_assocs[assoc_name] : @features_for_assocs
-    end
-
-    def essay_for(attr_or_assoc)
-      raise NotImplmentedError
+    def association_features(association = nil)
+      @associations_features ||= Essay::AssociationCollection.new(active_record: self)
+      association ? @associations_features[association] : @associations_features
     end
   end
 end

data/lib/essay/abstract_collection.rb

@@ -7,18 +7,16 @@ module Essay
   class AbstractCollection
     include ModelHelper
 
+    attr_reader :env
+
     def initialize(env)
-      @env          = env
-      @model_class  = env.fetch(:model_class)
-      @features_for = {}
+      @env           = env
+      @active_record = env.fetch(:active_record)
+      @features_for  = {}
     end
 
     def [](name)
-      @features_for[convert_key(name)] ||= construct_features(name)
-    end
-
-    def load_contents
-
+      @features_for[name.to_sym] ||= construct_features(name)
     end
 
     def to_hash
@@ -29,11 +27,7 @@ module Essay
 
   protected
     def construct_features(name)
-
-    end
-
-    def convert_key(key)
-      key.kind_of?(Symbol) ? key : key.to_sym
+      raise NotImplementedError
     end
   end
 end

data/lib/essay/abstract_feature.rb

@@ -3,17 +3,17 @@
 
 require 'essay/helpers/model_helper'
 require 'essay/helpers/serialize_helper'
-require 'essay/helpers/description_helper'
 
 module Essay
   class AbstractFeature
     include ModelHelper
     include SerializeHelper
-    include DescriptionHelper
+
+    attr_reader :env
 
     def initialize(env)
-      @env         = env
-      @model_class = env.fetch(:model_class)
+      @env           = env
+      @active_record = env.fetch(:active_record)
     end
   end
 end

data/lib/essay/abstract_features.rb

@@ -14,8 +14,8 @@ module Essay
     attr_reader :env
 
     def initialize(env)
-      @env         = env
-      @model_class = env.fetch(:model_class)
+      @env           = env
+      @active_record = env.fetch(:active_record)
     end
   end
 end

data/lib/essay/association/association_collection.rb

@@ -5,8 +5,8 @@ require 'essay/abstract_collection'
 
 module Essay
   class AssociationCollection < AbstractCollection
-    def construct_features(assoc_name)
-      Essay::AssociationFeatures.new(@env.merge(association_name: assoc_name))
+    def construct_features(name)
+      Essay::AssociationFeatures.new(env.merge(association: traits.associations.fetch(name)))
     end
 
     protected :construct_features

data/lib/essay/association/association_features.rb

@@ -2,15 +2,15 @@
 # frozen_string_literal: true
 
 require 'essay/abstract_features'
-require 'essay/helpers/association_helper'
 
 module Essay
   class AssociationFeatures < AbstractFeatures
-    include AssociationHelper
+    attr_reader :association
+    alias this_association association
 
     def initialize(env)
       super
-      @association_name = env.fetch(:association_name)
+      @association = env.fetch(:association)
     end
   end
 end

data/lib/essay/association/base_feature.rb

@@ -2,15 +2,15 @@
 # frozen_string_literal: true
 
 require 'essay/abstract_feature'
-require 'essay/helpers/association_helper'
 
 module Essay
   class AssociationFeatures::Base < AbstractFeature
-    include AssociationHelper
+    attr_reader :association
+    alias this_association association
 
     def initialize(env)
       super
-      @association_name = env.fetch(:association_name)
+      @association = env.fetch(:association)
     end
   end
 end

data/lib/essay/attribute/attribute_collection.rb

@@ -5,8 +5,8 @@ require 'essay/abstract_collection'
 
 module Essay
   class AttributeCollection < AbstractCollection
-    def construct_features(attr_name)
-      Essay::AttributeFeatures.new(@env.merge(attribute_name: attr_name))
+    def construct_features(name)
+      Essay::AttributeFeatures.new(env.merge(attribute: traits.attributes.fetch(name)))
     end
 
     protected :construct_features

data/lib/essay/attribute/attribute_features.rb

@@ -2,15 +2,15 @@
 # frozen_string_literal: true
 
 require 'essay/abstract_features'
-require 'essay/helpers/attribute_helper'
 
 module Essay
   class AttributeFeatures < AbstractFeatures
-    include AttributeHelper
+    attr_reader :attribute
+    alias this_attribute attribute
 
     def initialize(env)
       super
-      @attribute_name = env.fetch(:attribute_name)
+      @attribute = env.fetch(:attribute)
     end
   end
 end

data/lib/essay/attribute/base_feature.rb

@@ -2,15 +2,15 @@
 # frozen_string_literal: true
 
 require 'essay/abstract_feature'
-require 'essay/helpers/attribute_helper'
 
 module Essay
   class AttributeFeatures::Base < AbstractFeature
-    include AttributeHelper
+    attr_reader :attribute
+    alias this_attribute attribute
 
     def initialize(env)
       super
-      @attribute_name = env.fetch(:attribute_name)
+      @attribute = env.fetch(:attribute)
     end
   end
 end

data/lib/essay/helpers/model_helper.rb

@@ -3,28 +3,28 @@
 
 module Essay
   module ModelHelper
-    def model_class
-      @model_class
+    def active_record
+      @active_record
     end
 
-    def model_traits
-      model_class.traits
+    def traits
+      active_record.traits
     end
 
-    def model_associations
-      model_traits.associations
+    def active_record_traits
+      traits
     end
 
-    alias all_associations model_associations
-
-    def model_attributes
-      model_traits.attributes
+    def active_record_attributes
+      traits.attributes
     end
 
-    alias all_attributes model_attributes
+    def active_record_associations
+      traits.associations
+    end
 
-    def model_features
-      model_class.features
+    def active_record_features
+      traits.features
     end
   end
 end

data/lib/essay/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Essay
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: essay
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,9 +86,6 @@ files:
 - lib/essay/attribute/attribute_collection.rb
 - lib/essay/attribute/attribute_features.rb
 - lib/essay/attribute/base_feature.rb
-- lib/essay/helpers/association_helper.rb
-- lib/essay/helpers/attribute_helper.rb
-- lib/essay/helpers/description_helper.rb
 - lib/essay/helpers/feature_helper.rb
 - lib/essay/helpers/model_helper.rb
 - lib/essay/helpers/serialize_helper.rb

data/lib/essay/helpers/association_helper.rb

@@ -1,17 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module Essay
-  module AssociationHelper
-    def association_name
-      @association_name
-    end
-
-    def association_traits
-      model_traits.associations[association_name]
-    end
-
-    alias association association_traits
-    alias this_association association
-  end
-end

data/lib/essay/helpers/attribute_helper.rb

@@ -1,17 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module Essay
-  module AttributeHelper
-    def attribute_name
-      @attribute_name
-    end
-
-    def attribute_traits
-      model_traits.attributes[attribute_name]
-    end
-
-    alias attribute attribute_traits
-    alias this_attribute attribute
-  end
-end

data/lib/essay/helpers/description_helper.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module Essay
-  module DescriptionHelper
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :description, instance_predicate: false, instance_writer: false
-    end
-
-    module ClassMethods
-      def describe(description)
-        self.description = description
-      end
-    end
-  end
-end