granite 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 171acd12e388c4b1016581a76445ff1ae6dc9051
-  data.tar.gz: be9fdc3c8d64c3caab3c4ee0f944cbe3892d965d
+  metadata.gz: eee58f357db73ca54fa35ec5a68a13081bd450a8
+  data.tar.gz: 1042435a47b006d54caafc174552863a2024a52d
 SHA512:
-  metadata.gz: 4773a166e6b738430fa0300894bb4889c603404a2cba4dfc2a703000de1f7cb1679742abaf9e9ec2872f4edf1b397524abc3b0bc89b7c4ca99a57e44c5c33bbd
-  data.tar.gz: 61a75b1ecd04c0a43c13e8b06714080fdc31bdeeda6f6b0d52fabb19d9723fbfd73bf10a5747f4306962c96c8a214910e5796c74d9fe2dc63d84cdee463c69f9
+  metadata.gz: 59143c029f08dae76509be73e06b653eedbfb29b98cf8b79ffebcd0eb0183fd63fe9312a0fa51c8d7806097e5a70d7168e87e116c45ce7e16af3211886b03ed4
+  data.tar.gz: f3d6579fbd80170a55a3fef47e90db59236087a0ecd4b14c1f54f145553b38bc118efd7f24a535b5d6225143511db18b26f82187bcebb3f384063c03bdc997f2

data/lib/generators/granite/install_controller_generator.rb

@@ -3,7 +3,7 @@ require 'rails/generators/base'
 module Granite
   module Generators
     class InstallControllerGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../../..', __FILE__)
+      source_root File.expand_path('../../..', __dir__)
 
       desc 'Creates a Granite::Controller for further customization'
 

data/lib/generators/granite_generator.rb

@@ -1,5 +1,5 @@
 class GraniteGenerator < Rails::Generators::NamedBase
-  source_root File.expand_path('../templates', __FILE__)
+  source_root File.expand_path('templates', __dir__)
 
   argument :projector, type: :string, required: false
   class_option :collection, type: :boolean, aliases: '-C', desc: 'Generate collection action'

data/lib/granite.rb

@@ -1,6 +1,7 @@
 require 'active_support/dependencies'
 require 'action_controller'
 
+require 'granite/version'
 require 'granite/config'
 require 'granite/context'
 
@@ -17,8 +18,11 @@ module Granite
   singleton_class.delegate(*Granite::Context.delegated, to: :context)
 end
 
+require 'granite/base'
 require 'granite/dispatcher'
 require 'granite/action'
 require 'granite/projector'
 require 'granite/routing'
 require 'granite/rails' if defined?(::Rails)
+
+ActiveData.base_concern = Granite::Base

data/lib/granite/action.rb

@@ -4,14 +4,12 @@ require 'active_record/validations'
 require 'active_support/callbacks'
 
 require 'granite/action/types'
-require 'granite/action/represents'
 require 'granite/action/error'
 require 'granite/action/performing'
 require 'granite/action/performer'
 require 'granite/action/preconditions'
 require 'granite/action/policies'
 require 'granite/action/projectors'
-require 'granite/action/translations'
 require 'granite/action/subject'
 
 module Granite
@@ -41,20 +39,13 @@ module Granite
       end
     end
 
-    include ActiveSupport::Callbacks
-    include ActiveData::Model
-    include ActiveData::Model::Representation
-    include ActiveData::Model::Associations
-    include ActiveData::Model::Dirty
-    include ActiveModel::Validations::Callbacks
+    include Base
     include Performing
     include Subject
     include Performer
     include Preconditions
     include Policies
     include Projectors
-    include Translations
-    include Represents
     prepend AssignAttributes
 
     handle_exception ActiveRecord::RecordInvalid do |e|

data/lib/granite/action/performing.rb

@@ -89,7 +89,8 @@ module Granite
       def try_perform!(context: nil, **options)
         return unless satisfy_preconditions?
         transactional do
-          perform!(context: context, **options)
+          validate!(context)
+          perform_action!(**options)
         end
       end
 

data/lib/granite/base.rb

@@ -0,0 +1,24 @@
+require 'active_data/model'
+require 'active_data/model/primary'
+require 'active_data/model/lifecycle'
+require 'active_data/model/associations'
+
+require 'granite/translations'
+require 'granite/represents'
+
+module Granite
+  module Base
+    extend ActiveSupport::Concern
+
+    include ActiveSupport::Callbacks
+    include ActiveData::Model
+    include ActiveData::Model::Representation
+    include ActiveData::Model::Dirty
+    include ActiveData::Model::Associations
+    include ActiveData::Model::Primary
+    include ActiveModel::Validations::Callbacks
+
+    include Granite::Translations
+    include Granite::Represents
+  end
+end

data/lib/granite/represents.rb

@@ -0,0 +1,24 @@
+require 'granite/represents/reflection'
+
+module Granite
+  module Represents
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      private
+
+      def represents(*fields, &block)
+        options = fields.extract_options!.symbolize_keys
+
+        fields.each do |field|
+          add_attribute Granite::Represents::Reflection, field, options, &block
+
+          before_validation do
+            attribute(field).sync if __send__ "#{field}_changed?"
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/granite/represents/attribute.rb

@@ -0,0 +1,89 @@
+module Granite
+  module Represents
+    class Attribute < ActiveData::Model::Attributes::Attribute
+      delegate :writer, :reader, :reader_before_type_cast, to: :reflection
+
+      def initialize(*_args)
+        super
+
+        set_default_value
+        set_default_value_before_type_cast
+      end
+
+      def sync
+        return if reference.nil?
+        reference.public_send(writer, read)
+      end
+
+      def typecast(value)
+        return value if value.class == type
+
+        typecaster.call(value, self) unless value.nil?
+      end
+
+      def type
+        return reflection.options[:type] if reflection.options[:type].present?
+        active_data_type || type_from_type_for_attribute || super
+      end
+
+      def typecaster
+        @typecaster ||= begin
+                          type_class = type.instance_of?(Class) ? type : type.class
+                          @typecaster = ActiveData.typecaster(type_class.ancestors.grep(Class))
+                        end
+      end
+
+      private
+
+      def reference
+        owner.__send__(reflection.reference)
+      end
+
+      def set_default_value
+        return unless reference.respond_to?(reader)
+
+        variable_cache(:value) do
+          normalize(enumerize(reference.public_send(reader)))
+        end
+      end
+
+      def set_default_value_before_type_cast
+        return unless reference.respond_to?(reader_before_type_cast)
+
+        variable_cache(:value_before_type_cast) do
+          defaultize(reference.public_send(reader_before_type_cast))
+        end
+      end
+
+      def active_data_type
+        return nil unless reference.is_a?(ActiveData::Model)
+
+        reference_attribute = reference.attribute(name)
+
+        return Granite::Action::Types::Collection.new(reference_attribute.type) if [
+          ActiveData::Model::Attributes::ReferenceMany,
+          ActiveData::Model::Attributes::Collection,
+          ActiveData::Model::Attributes::Dictionary
+        ].any? { |klass| reference_attribute.is_a? klass }
+
+        reference_attribute.type # TODO: create `type_for_attribute` method inside of ActiveData
+      end
+
+      def type_from_type_for_attribute
+        return nil unless reference.respond_to?(:type_for_attribute)
+
+        attribute_type = reference.type_for_attribute(name.to_s)
+
+        return Granite::Action::Types::Collection.new(convert_type_to_value_class(attribute_type.subtype)) if attribute_type.respond_to?(:subtype)
+
+        convert_type_to_value_class(attribute_type)
+      end
+
+      def convert_type_to_value_class(attribute_type)
+        return attribute_type.value_class if attribute_type.respond_to?(:value_class)
+
+        ActiveData::Model::Associations::PersistenceAdapters::ActiveRecord::TYPES[attribute_type.type&.to_sym]
+      end
+    end
+  end
+end

data/lib/granite/represents/reflection.rb

@@ -0,0 +1,24 @@
+require 'granite/represents/attribute'
+
+module Granite
+  module Represents
+    class Reflection < ActiveData::Model::Attributes::Reflections::Represents
+      class << self
+        def build(target, generated_methods, name, *args, &block)
+          options = args.last
+
+          reference = target.reflect_on_association(options[:of]) if target.respond_to?(:reflect_on_association)
+          reference ||= target.reflect_on_attribute(options[:of]) if target.respond_to?(:reflect_on_attribute)
+
+          target.validates_presence_of(reference.name) if reference
+
+          super(target, generated_methods, name, *args, &block)
+        end
+
+        def attribute_class
+          @attribute_class ||= Granite::Represents::Attribute
+        end
+      end
+    end
+  end
+end

data/lib/granite/translations.rb

@@ -0,0 +1,37 @@
+module Granite
+  module Translations
+    extend ActiveSupport::Concern
+
+    def translate(*args)
+      I18n.translate(*self.class.scope_translation_args(args))
+    end
+    alias t translate
+
+    module ClassMethods
+      def scope_translation_args(args)
+        options = args.extract_options!
+
+        lookups = expand_relative_key(args.first).map(&:to_sym)
+        lookups += [options[:default]]
+        lookups = lookups.flatten.compact
+
+        key = lookups.shift
+        options[:default] = lookups
+
+        [key, options]
+      end
+
+      private
+
+      def expand_relative_key(key)
+        return [key] unless key.is_a?(String) && key.start_with?('.')
+
+        base_key = key.sub(/^\./, '')
+
+        lookup_ancestors.map do |klass|
+          :"#{klass.i18n_scope}.#{klass.model_name.i18n_key}.#{base_key}"
+        end.flatten + [base_key]
+      end
+    end
+  end
+end

data/lib/granite/version.rb

@@ -0,0 +1,3 @@
+module Granite
+  VERSION = '0.8.0'.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Arkadiy Zabazhanov & friends
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -28,16 +28,16 @@ dependencies:
   name: active_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -276,14 +290,11 @@ files:
 - lib/granite/action/preconditions/base_precondition.rb
 - lib/granite/action/preconditions/embedded_precondition.rb
 - lib/granite/action/projectors.rb
-- lib/granite/action/represents.rb
-- lib/granite/action/represents/attribute.rb
-- lib/granite/action/represents/reflection.rb
 - lib/granite/action/subject.rb
 - lib/granite/action/transaction.rb
-- lib/granite/action/translations.rb
 - lib/granite/action/types.rb
 - lib/granite/action/types/collection.rb
+- lib/granite/base.rb
 - lib/granite/config.rb
 - lib/granite/context.rb
 - lib/granite/dispatcher.rb
@@ -298,6 +309,9 @@ files:
 - lib/granite/projector/translations/helper.rb
 - lib/granite/projector/translations/view_helper.rb
 - lib/granite/rails.rb
+- lib/granite/represents.rb
+- lib/granite/represents/attribute.rb
+- lib/granite/represents/reflection.rb
 - lib/granite/routing.rb
 - lib/granite/routing/cache.rb
 - lib/granite/routing/caching.rb
@@ -311,6 +325,8 @@ files:
 - lib/granite/rspec/projector_helpers.rb
 - lib/granite/rspec/raise_validation_error.rb
 - lib/granite/rspec/satisfy_preconditions.rb
+- lib/granite/translations.rb
+- lib/granite/version.rb
 homepage: https://github.com/toptal/granite
 licenses:
 - MIT

data/lib/granite/action/represents.rb

@@ -1,26 +0,0 @@
-require 'granite/action/represents/reflection'
-
-module Granite
-  class Action
-    module Represents
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        private
-
-        def represents(*fields, &block)
-          options = fields.extract_options!.symbolize_keys
-
-          fields.each do |field|
-            add_attribute Granite::Action::Represents::Reflection, field, options, &block
-
-            before_validation do
-              attribute(field).sync if __send__ "#{field}_changed?"
-              true
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/granite/action/represents/attribute.rb

@@ -1,90 +0,0 @@
-module Granite
-  class Action
-    module Represents
-      class Attribute < ActiveData::Model::Attributes::Attribute
-        delegate :writer, :reader, :reader_before_type_cast, to: :reflection
-
-        def initialize(*_args)
-          super
-
-          set_default_value
-          set_default_value_before_type_cast
-        end
-
-        def sync
-          reference.public_send(writer, read)
-        end
-
-        def typecast(value)
-          return value if value.class == type
-
-          typecaster.call(value, self) unless value.nil?
-        end
-
-        def type
-          return reflection.options[:type] if reflection.options[:type].present?
-          active_data_type || type_from_type_for_attribute || super
-        end
-
-        def typecaster
-          @typecaster ||= begin
-                            type_class = type.instance_of?(Class) ? type : type.class
-                            @typecaster = ActiveData.typecaster(type_class.ancestors.grep(Class))
-                          end
-        end
-
-        private
-
-        def reference
-          owner.__send__(reflection.reference)
-        end
-
-        def set_default_value
-          return unless reference.respond_to?(reader)
-
-          variable_cache(:value) do
-            normalize(enumerize(reference.public_send(reader)))
-          end
-        end
-
-        def set_default_value_before_type_cast
-          return unless reference.respond_to?(reader_before_type_cast)
-
-          variable_cache(:value_before_type_cast) do
-            defaultize(reference.public_send(reader_before_type_cast))
-          end
-        end
-
-        def active_data_type
-          return nil unless reference.is_a?(ActiveData::Model)
-
-          reference_attribute = reference.attribute(name)
-
-          return Granite::Action::Types::Collection.new(reference_attribute.type) if [
-            ActiveData::Model::Attributes::ReferenceMany,
-            ActiveData::Model::Attributes::Collection,
-            ActiveData::Model::Attributes::Dictionary
-          ].any? { |klass| reference_attribute.is_a? klass }
-
-          reference_attribute.type # TODO: create `type_for_attribute` method inside of ActiveData
-        end
-
-        def type_from_type_for_attribute
-          return nil unless reference.respond_to?(:type_for_attribute)
-
-          attribute_type = reference.type_for_attribute(name.to_s)
-
-          return Granite::Action::Types::Collection.new(convert_type_to_value_class(attribute_type.subtype)) if attribute_type.respond_to?(:subtype)
-
-          convert_type_to_value_class(attribute_type)
-        end
-
-        def convert_type_to_value_class(attribute_type)
-          return attribute_type.value_class if attribute_type.respond_to?(:value_class)
-
-          ActiveData::Model::Associations::PersistenceAdapters::ActiveRecord::TYPES[attribute_type.type&.to_sym]
-        end
-      end
-    end
-  end
-end

data/lib/granite/action/represents/reflection.rb

@@ -1,15 +0,0 @@
-require 'granite/action/represents/attribute'
-
-module Granite
-  class Action
-    module Represents
-      class Reflection < ActiveData::Model::Attributes::Reflections::Represents
-        class << self
-          def attribute_class
-            @attribute_class ||= Granite::Action::Represents::Attribute
-          end
-        end
-      end
-    end
-  end
-end

data/lib/granite/action/translations.rb

@@ -1,39 +0,0 @@
-module Granite
-  class Action
-    module Translations
-      extend ActiveSupport::Concern
-
-      def translate(*args)
-        I18n.translate(*self.class.scope_translation_args(args))
-      end
-      alias t translate
-
-      module ClassMethods
-        def scope_translation_args(args)
-          options = args.extract_options!
-
-          lookups = expand_relative_key(args.first).map(&:to_sym)
-          lookups += [options[:default]]
-          lookups = lookups.flatten.compact
-
-          key = lookups.shift
-          options[:default] = lookups
-
-          [key, options]
-        end
-
-        private
-
-        def expand_relative_key(key)
-          return [key] unless key.is_a?(String) && key.start_with?('.')
-
-          base_key = key.sub(/^\./, '')
-
-          lookup_ancestors.map do |klass|
-            :"#{klass.i18n_scope}.#{klass.model_name.i18n_key}.#{base_key}"
-          end.flatten + [base_key]
-        end
-      end
-    end
-  end
-end