rom-rails 0.3.0.beta1 → 0.3.0.rc1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta1
+  version: 0.3.0.rc1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta1
+        version: 0.6.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta1
+        version: 0.6.0.rc1
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -168,9 +168,9 @@ files:
 - lib/rom/rails/configuration.rb
 - lib/rom/rails/controller_extension.rb
 - lib/rom/rails/inflections.rb
+- lib/rom/rails/model/attributes.rb
 - lib/rom/rails/model/form.rb
-- lib/rom/rails/model/form/dsl.rb
-- lib/rom/rails/model/params.rb
+- lib/rom/rails/model/form/class_interface.rb
 - lib/rom/rails/model/validator.rb
 - lib/rom/rails/model/validator/uniqueness_validator.rb
 - lib/rom/rails/railtie.rb
@@ -229,12 +229,11 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
-- spec/dummy/spec/controllers/users_controller_spec.rb
 - spec/dummy/spec/features/users_spec.rb
 - spec/dummy/spec/integration/logger_spec.rb
+- spec/dummy/spec/integration/user_attributes_spec.rb
 - spec/dummy/spec/integration/user_commands_spec.rb
 - spec/dummy/spec/integration/user_model_mapping_spec.rb
-- spec/dummy/spec/integration/user_params_spec.rb
 - spec/dummy/vendor/assets/javascripts/.keep
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/lib/active_record/configuration_spec.rb
@@ -244,7 +243,6 @@ files:
 - spec/lib/generators/relation_generator_spec.rb
 - spec/spec_helper.rb
 - spec/unit/form_spec.rb
-- spec/unit/params_spec.rb
 - spec/unit/validator_spec.rb
 homepage: http://rom-rb.org
 licenses:
@@ -266,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Integrate Ruby Object Mapper with Rails
@@ -324,12 +322,11 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
-- spec/dummy/spec/controllers/users_controller_spec.rb
 - spec/dummy/spec/features/users_spec.rb
 - spec/dummy/spec/integration/logger_spec.rb
+- spec/dummy/spec/integration/user_attributes_spec.rb
 - spec/dummy/spec/integration/user_commands_spec.rb
 - spec/dummy/spec/integration/user_model_mapping_spec.rb
-- spec/dummy/spec/integration/user_params_spec.rb
 - spec/dummy/vendor/assets/javascripts/.keep
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/lib/active_record/configuration_spec.rb
@@ -339,6 +336,4 @@ test_files:
 - spec/lib/generators/relation_generator_spec.rb
 - spec/spec_helper.rb
 - spec/unit/form_spec.rb
-- spec/unit/params_spec.rb
 - spec/unit/validator_spec.rb
-has_rdoc: 

data/lib/rom/rails/model/form/dsl.rb

@@ -1,173 +0,0 @@
-module ROM
-  module Model
-    class Form
-      module DSL
-        attr_reader :params, :validator, :self_commands, :injectible_commands,
-          :model, :input_block, :validations_block
-
-        def inherited(klass)
-          klass.inject_commands_for(*injectible_commands) if injectible_commands
-          klass.commands(*self_commands) if self_commands
-          klass.input(readers: false, &input_block) if input_block
-          klass.validations(&validations_block) if validations_block
-          super
-        end
-
-        def commands(names)
-          names.each { |relation, _action| attr_reader(relation) }
-          @self_commands = names
-          self
-        end
-
-        def key(*keys)
-          if keys.any? && !@key
-            @key = keys
-            attr_reader(*keys)
-          elsif !@key
-            @key = [:id]
-            attr_reader :id
-          elsif keys.any?
-            @key = keys
-          end
-          @key
-        end
-
-        def input(options = {}, &block)
-          readers = options.fetch(:readers) { true }
-          define_params!(block)
-          define_attribute_readers! if readers
-          define_model!
-          self
-        end
-
-        def validations(&block)
-          define_validator!(block)
-          self
-        end
-
-        def inject_commands_for(*names)
-          @injectible_commands = names
-          names.each { |name| attr_reader(name) }
-          self
-        end
-
-        def build(input = {}, options = {})
-          new(clear_input(input), options.merge(command_registry))
-        end
-
-        def command_registry
-          @command_registry ||= setup_command_registry
-        end
-
-        def clear_input(input)
-          input.each_with_object({}) { |(key, value), object|
-            next if value.is_a?(String) && value.blank?
-
-            object[key] =
-              if value.is_a?(Hash)
-                clear_input(value)
-              elsif value.is_a?(Array)
-                value.map { |v| v.is_a?(Hash) ? clear_input(v) : v }
-              else
-                value
-              end
-          }.symbolize_keys
-        end
-
-        def define_params!(block)
-          @input_block = block
-          @params = ClassBuilder.new(name: "#{name}::Params", parent: Object).call { |klass|
-            klass.send(:include, ROM::Model::Params)
-          }
-          @params.class_eval(&block)
-          const_set(:Params, @params)
-        end
-
-        def define_attribute_readers!
-          @params.attribute_set.each do |attribute|
-            if public_instance_methods.include?(attribute.name)
-              raise(
-                ArgumentError,
-                "#{attribute.name} attribute is in conflict with #{self}##{attribute.name}"
-              )
-            end
-
-            class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def #{attribute.name}
-                params[:#{attribute.name}]
-              end
-            RUBY
-          end
-        end
-
-        def define_model!
-          @model = ClassBuilder.new(name: "#{name}::Model", parent: @params).call { |klass|
-            klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def persisted?
-                to_key.any?
-              end
-
-              def to_key
-                to_h.values_at(#{key.map(&:inspect).join(', ')}).compact
-              end
-            RUBY
-          }
-          key.each { |name| @model.attribute(name) }
-          const_set(:Model, @model)
-        end
-
-        def define_validator!(block)
-          @validations_block = block
-          @validator = ClassBuilder.new(name: "#{name}::Validator", parent: Object).call { |klass|
-            klass.send(:include, ROM::Model::Validator)
-          }
-          @validator.class_eval(&block)
-          const_set(:Validator, @validator)
-        end
-
-        private
-
-        def rom
-          ROM.env
-        end
-
-        def adapter
-          ROM.adapters.keys.first
-        end
-
-        def setup_command_registry
-          commands = {}
-
-          if self_commands
-            self_commands.each do |rel_name, name|
-              command = build_command(name, rel_name)
-              commands[rel_name] = CommandRegistry.new(name => command)
-            end
-          end
-
-          if injectible_commands
-            injectible_commands.each do |relation|
-              commands[relation] = rom.command(relation)
-            end
-          end
-
-          commands
-        end
-
-        def build_command(name, rel_name)
-          klass = Command.build_class(name, rel_name, adapter: adapter)
-
-          klass.result :one
-          klass.input @params
-          klass.validator @validator
-
-          relation = rom.relations[rel_name]
-          repository = rom.repositories[relation.repository]
-          repository.extend_command_class(klass, relation.dataset)
-
-          klass.build(relation)
-        end
-      end
-    end
-  end
-end

data/lib/rom/rails/model/params.rb

@@ -1,72 +0,0 @@
-require 'virtus'
-require 'active_model/conversion'
-
-module ROM
-  module Model
-    # Mixin for validatable and coercible parameters
-    #
-    # @example
-    #
-    #   class UserParams
-    #     include ROM::Model::Params
-    #
-    #     attribute :email, String
-    #     attribute :age, Integer
-    #
-    #     validates :email, :age, presence: true
-    #   end
-    #
-    #   user_params = UserParams.new(email: '', age: '18')
-    #
-    #   user_params.email # => ''
-    #   user_params.age # => 18
-    #
-    #   user_params.valid? # => false
-    #   user_params.errors # => #<ActiveModel::Errors:0x007fd2423fadb0 ...>
-    #
-    # @api public
-    module Params
-      VirtusModel = Virtus.model(strict: true, required: false)
-
-      def self.included(base)
-        base.class_eval do
-          include VirtusModel
-          include ActiveModel::Conversion
-        end
-        base.extend(ClassMethods)
-      end
-
-      def model_name
-        self.class.model_name
-      end
-
-      module ClassMethods
-        DEFAULT_TIMESTAMPS = [:created_at, :updated_at].freeze
-
-        def [](input)
-          input.is_a?(self) ? input : new(input)
-        end
-
-        def set_model_name(name)
-          class_eval <<-RUBY
-            def self.model_name
-              @model_name ||= ActiveModel::Name.new(self, nil, #{name.inspect})
-            end
-          RUBY
-        end
-
-        def timestamps(*attrs)
-          if attrs.empty?
-            DEFAULT_TIMESTAMPS.each do |t|
-              attribute t, DateTime, default: proc { DateTime.now }
-            end
-          else
-            attrs.each do |attr|
-              attribute attr, DateTime, default: proc { DateTime.now }
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/spec/dummy/spec/controllers/users_controller_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe UsersController, type: :controller do
-  describe 'injected relations' do
-    it 'exposes relation without required params' do
-      get :index
-
-      expect(controller.users).to eql(rom.read(:users).index.to_a)
-    end
-
-    it 'exposes relation with required params' do
-      get :search, name: 'Jane'
-
-      expect(controller.users).to eql(rom.read(:users).by_name('Jane').to_a)
-    end
-
-    it 'halts processing when required params are missing' do
-      get :search
-
-      expect(response.status).to be(400)
-    end
-
-    it 'skips injecting relation when :only option is used' do
-      get :ping
-
-      expect(controller.users).to be(nil)
-    end
-  end
-end

data/spec/unit/params_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe ROM::Model::Params do
-  let(:klass) {
-    Class.new do
-      include ROM::Model::Params
-
-      attribute :name, String
-    end
-  }
-
-  it 'fails loudly when given an incorrect type' do
-    expect {
-      klass.new(name: [])
-    }.to raise_error(Virtus::CoercionError, /name/)
-  end
-
-  it 'does not fail on nil or missing attributes' do
-    expect {
-      klass.new
-    }.not_to raise_error
-  end
-end