activerecord-traits 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c19a931c6cf49fc903d0a26157fcee1e76c71115
-  data.tar.gz: 572102c9adbf4c8e0a751e9b18cdaac4bfb40620
+  metadata.gz: bdc960c412f73aa79f3f666e6654185ce398b6a1
+  data.tar.gz: 5afb7670fe9cfe16ab7ab8cc31e650b1b6561590
 SHA512:
-  metadata.gz: ef3f143af6c3ec68b3f6c92102b4a581b2b60dc6b32a7a8e4eed0359c3e53b8e337026c699fc33715aad29f0b61ba9a0fa5bd90bb32d3bf35cd97667c68ad787
-  data.tar.gz: 6e6c4af699dd5e632e07e31c37c1d7f744722ad4f4879f120da471390a6a6a4c6f79ab19e91238f339d2026b60201b4e5750dc96e7c0abe9d1c633fc4b903d12
+  metadata.gz: ff75cbae678809042dec2e2b0cdfdbf77f113bbf0f28efd804e0518abca5c4d34defd7b24c9f847031d68688ba25e825d4ffb5fbc886299e34d266f47a45a280
+  data.tar.gz: beb6ae1de4639e06c8f4dc4295bf499ee69a9671b513ee8b64b02101854a828fdf96257d122cfd14af4534496e058d1034600602dab8862deab0b371bfaab8d5

data/Gemfile

@@ -1,8 +1,7 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in confo.gemspec
+# Specify your gem's dependencies in activerecord-traits.gemspec
 gemspec
-
-gem 'essay', path: '~/Development/essay'
-gem 'essay-globalize', path: '~/Development/essay-globalize'
-gem 'essay-carrierwave', path: '~/Development/essay-carrierwave'

data/activerecord-traits.gemspec

@@ -1,13 +1,15 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 require File.expand_path('../lib/traits/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name            = 'activerecord-traits'
   s.version         = Traits::VERSION
   s.authors         = ['Yaroslav Konoplov']
-  s.email           = ['yaroslav@inbox.com']
-  s.summary         = 'Type information of ActiveRecord models, attributes and associations'
-  s.description     = 'Type information of ActiveRecord models, attributes and associations'
+  s.email           = ['eahome00@gmail.com']
+  s.summary         = 'Type information of activerecord models'
+  s.description     = 'Type information of activerecord models, attributes and associations in good and clear manner'
   s.homepage        = 'http://github.com/yivo/activerecord-traits'
   s.license         = 'MIT'
 
@@ -16,9 +18,6 @@ Gem::Specification.new do |s|
   s.test_files      = `git ls-files -z -- {test,spec,features}/*`.split("\x0")
   s.require_paths   = ['lib']
 
-  s.add_dependency 'activesupport', '>= 3.2.0'
-  s.add_dependency 'activerecord', '>= 3.2.0'
-  s.add_dependency 'essay', '~> 1.0.0'
-  s.add_dependency 'essay-globalize', '~> 1.0.0'
-  s.add_dependency 'essay-carrierwave', '~> 1.0.0'
-end
+  s.add_dependency 'activesupport', '>= 3.0', '< 6.0'
+  s.add_dependency 'activerecord',  '>= 3.0', '< 6.0'
+end

data/lib/activerecord-traits.rb

@@ -1,10 +1,14 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'active_support/all'
 require 'active_record'
+
 require 'essay'
-require 'essay-globalize'
-require 'essay-carrierwave'
+require 'essay-globalize'   if defined?(Globalize)
+require 'essay-carrierwave' if defined?(CarrierWave)
 
-require 'traits/engine'
+require 'traits/railtie'
 require 'traits/utilities'
 require 'traits/descendants_listing'
 require 'traits/base'
@@ -36,9 +40,13 @@ module Traits
     end
   end
 
+  def self.each_attribute(&block)
+    each { |traits| traits.attributes.each(&block) }
+  end
+
   def self.to_hash
     each_with_object({}) do |traits, memo|
       memo[traits.name] = traits.to_hash
     end
   end
-end
+end

data/lib/traits/{concerns/association → association}/essay_shortcuts.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association
     module EssayShortcuts
@@ -6,4 +9,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/association → association}/intermediate.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association
     module Intermediate
@@ -11,34 +14,39 @@ module Traits
       end
 
       def intermediate_table
-        if intermediate?
-          Arel::Table.new(reflection.join_table)
-        end
+        Arel::Table.new(reflection.join_table) if intermediate?
       end
 
       def intermediate_table_name
-        if intermediate?
-          reflection.join_table
+        return unless intermediate?
+        unless @im_table_name
+          name           = reflection.join_table
+          @im_table_name = name.kind_of?(String) ? name.to_sym : name
         end
+        @im_table_name
       end
 
       def intermediate_to_key
-        intermediate_table.try(:[], intermediate_to_key_name)
+        if intermediate?
+          intermediate_table[intermediate_to_key_name]
+        end
       end
 
       def intermediate_to_key_name
         if intermediate?
-          reflection.foreign_key.to_sym
+          @im_to_key_name ||= reflection.foreign_key.to_sym
         end
       end
 
       def intermediate_from_key
-        intermediate_table.try(:[], intermediate_from_key_name)
+        if intermediate?
+          intermediate_table[intermediate_from_key_name]
+        end
       end
 
       def intermediate_from_key_name
         if intermediate?
-          reflection.association_foreign_key.to_sym
+          @im_from_key_name ||= reflection.association_foreign_key.to_sym
         end
       end
 
@@ -52,4 +60,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/association → association}/join.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association
     module Join
@@ -86,4 +89,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/association → association}/macro.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association
     module Macro
@@ -40,4 +43,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/association → association}/members.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association
     module Members
@@ -32,4 +35,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/association → association}/naming.rb

@@ -1,10 +1,13 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association
     module Naming
       delegate :name, to: :reflection
 
       def plural_name
-        reflection.plural_name.to_sym
+        @plural_name ||= reflection.plural_name.to_sym
       end
 
       def to_hash
@@ -12,4 +15,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/association → association}/polymorphism.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association
     module Polymorphism
@@ -115,4 +118,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/association → association}/read_only.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association
     module ReadOnly
@@ -14,4 +17,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/association → association}/through.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association
     module Through
@@ -69,4 +72,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/association.rb

@@ -1,17 +1,20 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Association < Base
   end
 end
 
-require 'traits/concerns/association/intermediate'
-require 'traits/concerns/association/join'
-require 'traits/concerns/association/macro'
-require 'traits/concerns/association/members'
-require 'traits/concerns/association/naming'
-require 'traits/concerns/association/polymorphism'
-require 'traits/concerns/association/read_only'
-require 'traits/concerns/association/through'
-require 'traits/concerns/association/essay_shortcuts'
+require 'traits/association/intermediate'
+require 'traits/association/join'
+require 'traits/association/macro'
+require 'traits/association/members'
+require 'traits/association/naming'
+require 'traits/association/polymorphism'
+require 'traits/association/read_only'
+require 'traits/association/through'
+require 'traits/association/essay_shortcuts'
 
 module Traits
   class Association
@@ -32,8 +35,20 @@ module Traits
       @reflection = reflection
     end
 
-    def to_s
+    def inspect
       "#{from.class_name}##{name}"
     end
+
+    def to_s
+      name
+    end
+
+    def value_from(model)
+      model.send(name)
+    end
+
+    def validators
+      from_class.validators_on(name)
+    end
   end
-end
+end

data/lib/traits/{concerns/attribute → attribute}/essay_shortcuts.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Attribute
     module EssayShortcuts
@@ -6,4 +9,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/attribute/inheritance.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module Traits
+  class Attribute
+    module Inheritance
+      def inheritance_type?
+        (model.inheritance_base? || model.inheritance_derived?) and name == model.inheritance_attribute.name
+      end
+      alias sti_type? inheritance_type?
+
+      def to_hash
+        super.merge!(is_sti_type: sti_type?)
+      end
+    end
+  end
+end

data/lib/traits/{concerns/attribute → attribute}/key.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Attribute
     module Key
@@ -35,4 +38,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/attribute → attribute}/naming.rb

@@ -1,12 +1,15 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Attribute
     module Naming
       def name
-        column_definition.name.to_sym
+        @name ||= column_definition.name.to_sym
       end
 
       def quoted_name
-        model_class.connection.quote_column_name(name)
+        @quoted_name ||= model_class.connection.quote_column_name(name)
       end
 
       def to_hash
@@ -17,4 +20,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/attribute → attribute}/polymorphism.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Attribute
     module Polymorphism
@@ -25,4 +28,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/attribute → attribute}/querying.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Attribute
     module Querying
@@ -11,4 +14,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/attribute → attribute}/type.rb

@@ -1,8 +1,11 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Attribute
     module Type
       def type
-        column_definition.type.to_sym
+        @type ||= column_definition.type.to_sym
       end
 
       def string?
@@ -56,4 +59,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/attribute.rb

@@ -1,15 +1,18 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Attribute < Base
   end
 end
 
-require 'traits/concerns/attribute/key'
-require 'traits/concerns/attribute/naming'
-require 'traits/concerns/attribute/polymorphism'
-require 'traits/concerns/attribute/querying'
-require 'traits/concerns/attribute/sti'
-require 'traits/concerns/attribute/type'
-require 'traits/concerns/attribute/essay_shortcuts'
+require 'traits/attribute/key'
+require 'traits/attribute/naming'
+require 'traits/attribute/polymorphism'
+require 'traits/attribute/querying'
+require 'traits/attribute/inheritance'
+require 'traits/attribute/type'
+require 'traits/attribute/essay_shortcuts'
 
 module Traits
   class Attribute
@@ -18,7 +21,7 @@ module Traits
     include Type
     include Polymorphism
     include Querying
-    include STI
+    include Inheritance
     include EssayShortcuts
 
     attr_reader :model_class, :column_definition
@@ -42,11 +45,23 @@ module Traits
     end
 
     def value_from(model_instance)
-      model_instance[name]
+      model_instance.send(name)
     end
 
-    def to_s
+    def inspect
       "#{model}##{name}"
     end
+
+    def to_s
+      name
+    end
+
+    def association
+      model.associations.first_where(from_key_name: name)
+    end
+
+    def null?
+      column_definition.null
+    end
   end
-end
+end

data/lib/traits/base.rb

@@ -1,7 +1,10 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Base
     def to_hash
       {}
     end
   end
-end
+end

data/lib/traits/descendants_listing.rb

@@ -1,27 +1,31 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   module DescendantsListing
     def active_record_descendants_loaded?
-      !!@ar_descendants
+      !!@ar_descendants_loaded
     end
 
     def load_active_record_descendants!
-      # Railties are not necessary here
-      # Source: http://stackoverflow.com/questions/6497834/differences-between-railties-and-engines-in-ruby-on-rails-3
-      Rails::Engine.subclasses.map(&:instance).each { |i| i.eager_load! }
-      Rails.application.eager_load!
+      @ar_descendants_loaded ||= begin
+        # Railties are not necessary here
+        # Source: http://stackoverflow.com/questions/6497834/differences-between-railties-and-engines-in-ruby-on-rails-3
+        Rails::Engine.subclasses.map(&:instance).each { |i| i.eager_load! }
+        Rails.application.eager_load!
+        true
+      end
     end
 
     def invalidate_loaded_active_record_descendants!
-      @ar_descendants = nil
+      @ar_descendants        = nil
+      @ar_descendants_loaded = false
     end
 
     def active_record_descendants
       @ar_descendants ||= begin
         load_active_record_descendants!
-        descendants = ActiveRecord::Base.descendants
-
-        descendants.reject! { |ar| excluded_active_record_descendant?(ar) }
-        descendants
+        ActiveRecord::Base.descendants.reject! { |ar| excluded_active_record_descendant?(ar) }
       end
     end
 
@@ -48,4 +52,4 @@ module Traits
     /\AHABTM/,
     /::Translation\Z/
   ]
-end
+end

data/lib/traits/list.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class List
     include Enumerable
@@ -7,28 +10,14 @@ module Traits
     end
 
     def filter(hash)
-      select do |attr|
-        hash.all? do |method, expected|
-          returned = attr.send(method)
-          if expected.is_a?(Array)
-            expected.include?(returned)
-          else
-            returned == expected
-          end
-        end
+      select do |item|
+        hash.all? { |method, expected| compare(item, method, expected) }
       end
     end
 
     def first_where(hash)
-      find do |attr|
-        hash.all? do |method, expected|
-          returned = attr.send(method)
-          if expected.is_a?(Array)
-            expected.include?(returned)
-          else
-            returned == expected
-          end
-        end
+      find do |item|
+        hash.all? { |method, expected| compare(item, method, expected) }
       end
     end
 
@@ -41,12 +30,28 @@ module Traits
     end
 
     def by_name(name)
-      name = name.to_s.to_sym
+      name = name.to_sym if name.kind_of?(String)
       find { |attr| attr.name == name }
     end
 
     def to_hash
       each_with_object({}) { |item, memo| memo[item.name] = item.to_hash }
     end
+
+  protected
+    def compare(item, method, expected)
+      returned = item.send(method)
+      case expected
+        when Array  then expected.include?(returned)
+        when Regexp then returned =~ expected
+        else returned == expected
+      end
+    end
+  end
+
+  class AttributeList < List
+    def primary_key
+      first_where(primary_key?: true)
+    end
   end
-end
+end

data/lib/traits/{concerns/model → model}/essay_shortcuts.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Model
     module EssayShortcuts
@@ -6,4 +9,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/model/inheritance.rb

@@ -0,0 +1,76 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module Traits
+  class Model
+    module Inheritance
+      def uses_inheritance?
+        inheritance_base? || inheritance_derived?
+      end
+      alias uses_sti? uses_inheritance?
+
+      def inheritance_base?
+        model_class.descends_from_active_record? &&
+          !model_class.abstract_class? &&
+          model_class.subclasses.any? { |subclass| subclass.superclass == model_class }
+      end
+      alias sti_base? inheritance_base?
+
+      def inheritance_derived?
+        !model_class.descends_from_active_record?
+      end
+      alias sti_derived? inheritance_derived?
+
+      def inheritance_attribute
+        attributes[model_class.inheritance_column]
+      end
+      alias sti_attribute inheritance_attribute
+
+      def inheritance_attribute_name
+        inheritance_attribute.name if uses_inheritance?
+      end
+      alias sti_attribute_name inheritance_attribute_name
+
+      # class File < ActiveRecord::Base
+      # end
+      #
+      # class Photo < File
+      # end
+      #
+      # class Video < File
+      # end
+      #
+      # class Portrait < Photo
+      # end
+      #
+      # File.traits.inheritance_chain     => [File]
+      # Photo.traits.inheritance_chain    => [File, Photo]
+      # Video.traits.inheritance_chain    => [File, Video]
+      # Portrait.traits.inheritance_chain => [File, Photo, Portrait]
+      def inheritance_chain
+        Traits.load_active_record_descendants!
+        model_class = self.model_class
+        chain       = [model_class]
+        until model_class.superclass == ActiveRecord::Base do
+          model_class = model_class.superclass
+          chain.unshift(model_class)
+        end
+        chain
+      end
+      alias sti_chain inheritance_chain
+
+      def inheritance_base
+        inheritance_chain[0]
+      end
+
+      def to_hash
+        super.merge!(
+          is_sti_base:        sti_base?,
+          is_sti_derived:     sti_derived?,
+          sti_attribute_name: sti_attribute_name,
+          sti_chain:          sti_chain.map { |model_class| model_class.traits.name }
+        )
+      end
+    end
+  end
+end

data/lib/traits/{concerns/model → model}/naming.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Model
     module Naming
@@ -66,7 +69,9 @@ module Traits
       #   lookup_name(:underscore) => assets_photo
       #
       def lookup_name(namecase = :class)
-        namecase == :underscore ? name.gsub('/', '_') : class_name.gsub('::', '')
+        namecase == :underscore ?
+            @lookup_name_underscore_case ||= name.gsub('/', '_') :
+            @lookup_name_class_case      ||= class_name.gsub('::', '')
       end
 
       def to_hash
@@ -80,4 +85,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/model → model}/polymorphism.rb

@@ -1,8 +1,11 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Model
     module Polymorphism
       def polymorphic_type
-        model_class.base_class.name.to_sym
+        @polymorphic_type ||= model_class.base_class.name.to_sym
       end
 
       def to_hash
@@ -12,4 +15,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/{concerns/model → model}/querying.rb

@@ -1,8 +1,20 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Model
     module Querying
       def primary_key_name
-        model_class.primary_key.to_sym
+        # Sometimes table doesn't have primary key.
+        # This might be many-to-many tables (HABTM).
+        @pk_name ||= begin
+          pk = model_class.primary_key
+          pk.kind_of?(String) ? pk.to_sym : pk
+        end
+      end
+
+      def primary_key_attribute
+        @pk_attr ||= attributes[primary_key_name]
       end
 
       def arel
@@ -14,11 +26,11 @@ module Traits
       end
 
       def table_name
-        model_class.table_name
+        @table_name ||= model_class.table_name
       end
 
       def quoted_table_name
-        connection.quote_table_name(model_class.table_name)
+        @quote_table_name ||= connection.quote_table_name(model_class.table_name)
       end
 
       def to_hash
@@ -31,4 +43,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/model.rb

@@ -1,18 +1,21 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class Model < Base
   end
 end
 
-require 'traits/concerns/model/naming'
-require 'traits/concerns/model/polymorphism'
-require 'traits/concerns/model/sti'
-require 'traits/concerns/model/querying'
-require 'traits/concerns/model/essay_shortcuts'
+require 'traits/model/naming'
+require 'traits/model/polymorphism'
+require 'traits/model/inheritance'
+require 'traits/model/querying'
+require 'traits/model/essay_shortcuts'
 
 module Traits
   class Model
     include Naming
-    include STI
+    include Inheritance
     include Polymorphism
     include Querying
     include EssayShortcuts
@@ -45,34 +48,47 @@ module Traits
       )
     end
 
+    def descendants
+      Traits.load_active_record_descendants!
+      active_record.descendants
+    end
+
   protected
 
     # TODO Store, Storage, Virtual attributes
     def inspect_attributes
-      columns = model_class.columns_hash.values
-
-      if features.translates_with_globalize?
-        globalize       = features.globalize
-        tr_class        = globalize.model_class_for_translations
-        tr_columns_hash = tr_class.columns_hash
+      if model_class.abstract_class?
+        Traits::AttributeList.new([])
+      else
+        columns = model_class.columns_hash.values
+
+        if features.translates_with_globalize?
+          globalize       = features.globalize
+          tr_class        = globalize.model_class_for_translations
+          tr_columns_hash = tr_class.columns_hash
+
+          columns += globalize.translated_attribute_names.map do |el|
+            tr_columns_hash[el.to_s]
+          end
+        end
 
-        columns += globalize.translated_attribute_names.map do |el|
-          tr_columns_hash[el.to_s]
+        list = columns.map do |column|
+          Traits::Attribute.new(model_class, column)
         end
-      end
 
-      list = columns.map do |column|
-        Traits::Attribute.new(model_class, column)
+        Traits::AttributeList.new(list)
       end
-
-      Traits::List.new(list)
     end
 
     def inspect_associations
-      list = model_class.reflections.map do |pair|
-        Traits::Association.new(model_class, pair.last)
+      if model_class.abstract_class?
+        Traits::List.new([])
+      else
+        list = model_class.reflections.map do |pair|
+          Traits::Association.new(model_class, pair.last)
+        end
+        Traits::List.new(list)
       end
-      Traits::List.new(list)
     end
   end
-end
+end

data/lib/traits/{engine.rb → railtie.rb}

@@ -1,8 +1,9 @@
-module Traits
-  class Engine < Rails::Engine
-    isolate_namespace Traits
+# encoding: utf-8
+# frozen_string_literal: true
 
-    config.before_initialize do |app|
+module Traits
+  class Railtie < Rails::Railtie
+    initializer do |app|
       unless app.config.cache_classes
         ActionDispatch::Reloader.to_prepare do
           Traits.invalidate_loaded_active_record_descendants!
@@ -10,4 +11,4 @@ module Traits
       end
     end
   end
-end
+end

data/lib/traits/utilities.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
   class UnidentifiedModelReference < StandardError
   end
@@ -34,4 +37,4 @@ module Traits
   end
 
   extend Utilities
-end
+end

data/lib/traits/version.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 module Traits
-  VERSION = '1.0.0'
-end
+  VERSION = '1.0.1'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-traits
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,73 +16,44 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: essay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: essay-globalize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: essay-carrierwave
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-description: Type information of ActiveRecord models, attributes and associations
+        version: '6.0'
+description: Type information of activerecord models, attributes and associations
+  in good and clear manner
 email:
-- yaroslav@inbox.com
+- eahome00@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -91,37 +62,36 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - activerecord-traits.gemspec
 - lib/activerecord-traits.rb
 - lib/traits/association.rb
+- lib/traits/association/essay_shortcuts.rb
+- lib/traits/association/intermediate.rb
+- lib/traits/association/join.rb
+- lib/traits/association/macro.rb
+- lib/traits/association/members.rb
+- lib/traits/association/naming.rb
+- lib/traits/association/polymorphism.rb
+- lib/traits/association/read_only.rb
+- lib/traits/association/through.rb
 - lib/traits/attribute.rb
+- lib/traits/attribute/essay_shortcuts.rb
+- lib/traits/attribute/inheritance.rb
+- lib/traits/attribute/key.rb
+- lib/traits/attribute/naming.rb
+- lib/traits/attribute/polymorphism.rb
+- lib/traits/attribute/querying.rb
+- lib/traits/attribute/type.rb
 - lib/traits/base.rb
-- lib/traits/concerns/association/essay_shortcuts.rb
-- lib/traits/concerns/association/intermediate.rb
-- lib/traits/concerns/association/join.rb
-- lib/traits/concerns/association/macro.rb
-- lib/traits/concerns/association/members.rb
-- lib/traits/concerns/association/naming.rb
-- lib/traits/concerns/association/polymorphism.rb
-- lib/traits/concerns/association/read_only.rb
-- lib/traits/concerns/association/through.rb
-- lib/traits/concerns/attribute/essay_shortcuts.rb
-- lib/traits/concerns/attribute/key.rb
-- lib/traits/concerns/attribute/naming.rb
-- lib/traits/concerns/attribute/polymorphism.rb
-- lib/traits/concerns/attribute/querying.rb
-- lib/traits/concerns/attribute/sti.rb
-- lib/traits/concerns/attribute/type.rb
-- lib/traits/concerns/model/essay_shortcuts.rb
-- lib/traits/concerns/model/naming.rb
-- lib/traits/concerns/model/polymorphism.rb
-- lib/traits/concerns/model/querying.rb
-- lib/traits/concerns/model/sti.rb
 - lib/traits/descendants_listing.rb
-- lib/traits/engine.rb
 - lib/traits/list.rb
 - lib/traits/model.rb
+- lib/traits/model/essay_shortcuts.rb
+- lib/traits/model/inheritance.rb
+- lib/traits/model/naming.rb
+- lib/traits/model/polymorphism.rb
+- lib/traits/model/querying.rb
+- lib/traits/railtie.rb
 - lib/traits/utilities.rb
 - lib/traits/version.rb
 homepage: http://github.com/yivo/activerecord-traits
@@ -144,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Type information of ActiveRecord models, attributes and associations
+summary: Type information of activerecord models
 test_files: []

data/Rakefile

@@ -1 +0,0 @@
-require 'bundler/gem_tasks'

data/lib/traits/concerns/attribute/sti.rb

@@ -1,15 +0,0 @@
-module Traits
-  class Attribute
-    module STI
-      def sti_type?
-        (model.sti_base? || model.sti_derived?) and name == model.sti_attribute_name
-      end
-
-      def to_hash
-        super.merge!(
-          sti_type: sti_type?
-        )
-      end
-    end
-  end
-end

data/lib/traits/concerns/model/sti.rb

@@ -1,41 +0,0 @@
-module Traits
-  class Model
-    module STI
-      def uses_sti?
-        sti_base? || sti_derived?
-      end
-
-      def sti_base?
-        model_class.descends_from_active_record? && model_class.subclasses.any? do |subclass|
-          subclass.superclass == model_class
-        end
-      end
-
-      def sti_derived?
-        !model_class.descends_from_active_record?
-      end
-
-      def sti_attribute_name
-        model_class.inheritance_column.to_sym
-      end
-
-      def sti_chain
-        model_class = self.model_class
-        chain       = [model_class]
-        until model_class.superclass == ActiveRecord::Base do
-          model_class = model_class.superclass
-          chain.unshift(model_class)
-        end
-        chain
-      end
-
-      def to_hash
-        super.merge!(
-          sti_base:           sti_base?,
-          sti_derived:        sti_derived?,
-          sti_attribute_name: sti_attribute_name
-        )
-      end
-    end
-  end
-end