virtus 1.0.0.beta8 → 1.0.0.rc1

data/spec/unit/virtus/value_object_spec.rb

@@ -14,10 +14,6 @@ describe Virtus::ValueObject do
       expect(subject.class.attribute_set[:name]).to_not be_public_writer
     end
 
-    it 'disallows mass-assignment' do
-      expect(subject.private_methods).to include(:attributes=)
-    end
-
     it 'disallows cloning' do
       expect(subject.clone).to be(subject)
     end
@@ -41,10 +37,20 @@ describe Virtus::ValueObject do
     end
   end
 
+  share_examples_for 'a valid value object with mass-assignment turned on' do
+    subject { model.new }
+
+    it 'disallows mass-assignment' do
+      expect(subject.private_methods).to include(:attributes=)
+    end
+  end
+
   context 'using new values {} block' do
     let(:model) {
+      model = Virtus.value_object(:coerce => false, :mass_assignment => mass_assignment)
+
       Class.new {
-        include Virtus.value_object(:coerce => false)
+        include model
 
         def self.name
           'Model'
@@ -57,30 +63,41 @@ describe Virtus::ValueObject do
       }
     }
 
-    it_behaves_like 'a valid value object'
+    context 'without mass-assignment' do
+      let(:mass_assignment) { false }
 
-    context 'with a model subclass' do
-      let(:subclass) {
-        Class.new(model) {
-          values do
-            attribute :email, String
-          end
+      it_behaves_like 'a valid value object'
+    end
+
+    context 'with mass-assignment' do
+      let(:mass_assignment) { true }
+
+      it_behaves_like 'a valid value object'
+      it_behaves_like 'a valid value object with mass-assignment turned on'
+
+      context 'with a model subclass' do
+        let(:subclass) {
+          Class.new(model) {
+            values do
+              attribute :email, String
+            end
+          }
         }
-      }
 
-      it_behaves_like 'a valid value object' do
-        subject { subclass.new(attributes) }
+        it_behaves_like 'a valid value object' do
+          subject { subclass.new(attributes) }
 
-        let(:attributes) { Hash[:id => 1, :name => 'Jane Doe', :email => 'jane@doe.com'] }
+          let(:attributes) { Hash[:id => 1, :name => 'Jane Doe', :email => 'jane@doe.com'] }
 
-        its(:email) { should eql('jane@doe.com') }
+          its(:email) { should eql('jane@doe.com') }
 
-        it 'sets private writers for additional values' do
-          expect(subclass.attribute_set[:email]).to_not be_public_writer
-        end
+          it 'sets private writers for additional values' do
+            expect(subclass.attribute_set[:email]).to_not be_public_writer
+          end
 
-        it 'defines valid #== for a subclass' do
-          expect(subject == subject.class.new(attributes.merge(:id => 2))).to be(false)
+          it 'defines valid #== for a subclass' do
+            expect(subject == subject.class.new(attributes.merge(:id => 2))).to be(false)
+          end
         end
       end
     end

data/virtus.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
   gem.description = "Attributes on Steroids for Plain Old Ruby Objects"
   gem.summary     = gem.description
   gem.homepage    = "https://github.com/solnic/virtus"
+  gem.license     = 'MIT'
 
   gem.require_paths    = [ "lib" ]
   gem.files            = `git ls-files`.split("\n")
@@ -19,5 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency('descendants_tracker', '~> 0.0.1')
   gem.add_dependency('equalizer',           '~> 0.0.7')
   gem.add_dependency('coercible',           '~> 0.2')
-  gem.add_dependency('axiom-types',         '~> 0.0.3')
+  gem.add_dependency('axiom-types',         '~> 0.0.4')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtus
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta8
+  version: 1.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descendants_tracker
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 description: Attributes on Steroids for Plain Old Ruby Objects
 email:
 - piotr.solnica@gmail.com
@@ -122,6 +122,8 @@ files:
 - lib/virtus/attribute/lazy_default.rb
 - lib/virtus/attribute/strict.rb
 - lib/virtus/attribute_set.rb
+- lib/virtus/builder.rb
+- lib/virtus/builder/hook_context.rb
 - lib/virtus/class_inclusions.rb
 - lib/virtus/class_methods.rb
 - lib/virtus/configuration.rb
@@ -129,7 +131,6 @@ files:
 - lib/virtus/extensions.rb
 - lib/virtus/instance_methods.rb
 - lib/virtus/model.rb
-- lib/virtus/module_builder.rb
 - lib/virtus/module_extensions.rb
 - lib/virtus/support/equalizer.rb
 - lib/virtus/support/options.rb
@@ -145,6 +146,7 @@ files:
 - spec/integration/embedded_value_spec.rb
 - spec/integration/extending_objects_spec.rb
 - spec/integration/hash_attributes_coercion_spec.rb
+- spec/integration/inheritance_spec.rb
 - spec/integration/injectible_coercers_spec.rb
 - spec/integration/mass_assignment_with_accessors_spec.rb
 - spec/integration/overriding_virtus_spec.rb
@@ -201,7 +203,8 @@ files:
 - spec/unit/virtus/value_object_spec.rb
 - virtus.gemspec
 homepage: https://github.com/solnic/virtus
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/virtus/module_builder.rb

@@ -1,192 +0,0 @@
-module Virtus
-
-  # Class to build a Virtus module with it's own configuration
-  #
-  # This allows for individual Virtus modules to be included in
-  # classes and not impacted by the global Virtus configuration,
-  # which is implemented using Virtus::Configuration.
-  #
-  # @private
-  class ExtensionBuilder
-
-    # Return module
-    #
-    # @return [Module]
-    #
-    # @api private
-    attr_reader :module
-
-    # Return configuration
-    #
-    # @return [Configuration]
-    #
-    # @api private
-    attr_reader :configuration
-
-    # Builds a new Virtus module
-    #
-    # The block is passed to Virtus::Configuration
-    #
-    # @example
-    #   ModuleBuilder.call do |config|
-    #     # config settings
-    #   end
-    #
-    # @return [Module]
-    #
-    # @api public
-    def self.call(options = {}, &block)
-      config  = Configuration.build(&block)
-      options.each { |key, value| config.public_send("#{key}=", value) }
-      builder = new(config)
-      builder.add_included_hook
-      builder.add_extended_hook
-      builder.module
-    end
-
-    # @api private
-    def self.pending
-      @pending ||= []
-    end
-
-    # Initializes a new ModuleBuilder
-    #
-    # @param [Configuration] configuration
-    #
-    # @param [Module] mod
-    #
-    # @return [undefined]
-    #
-    # @api private
-    def initialize(configuration, mod = Module.new)
-      @configuration = configuration
-      @module        = mod
-    end
-
-    # Adds the .included hook to the anonymous module which then defines the
-    # .attribute method to override the default.
-    #
-    # @return [Module]
-    #
-    # @api private
-    def add_included_hook
-      attribute_proc  = attribute_method(configuration)
-      constructor     = configuration.constructor
-      mass_assignment = configuration.mass_assignment
-      finalize        = configuration.finalize
-      extensions      = core_extensions
-      inclusions      = core_inclusions
-
-      self.module.define_singleton_method :included do |object|
-        super(object)
-        ExtensionBuilder.pending << object unless finalize
-        extensions.each { |mod| object.extend(mod) }
-        inclusions.each { |mod| object.send(:include, mod) }
-        object.send(:include, Model::Constructor)    if constructor
-        object.send(:include, Model::MassAssignment) if mass_assignment
-        object.send(:define_singleton_method, :attribute, attribute_proc)
-      end
-    end
-
-    # @api private
-    def add_extended_hook
-      attribute_proc  = attribute_method(configuration)
-      mass_assignment = configuration.mass_assignment
-      extensions      = core_inclusions + core_extensions
-
-      self.module.define_singleton_method :extended do |object|
-        super(object)
-        extensions.each { |mod| object.extend(mod) }
-        object.extend(Model::MassAssignment) if mass_assignment
-        object.send :define_singleton_method, :attribute, attribute_proc
-      end
-    end
-
-    # Wrapper for the attribute method that is used in .add_included_hook
-    # The coercer is passed in the unused key :configured_coercer to allow the
-    # property encapsulation by Virtus::Attribute::Coercer, where the
-    # coercion method is known.
-    #
-    # @return [Proc(lambda)]
-    #
-    # @api private
-    def attribute_method(configuration)
-      module_options = self.module_options
-
-      lambda do |name, type = Object, options = {}|
-        super(name, type, module_options.merge(options))
-      end
-    end
-
-    # @api private
-    def module_options
-      { :coerce             => configuration.coerce,
-        :finalize           => configuration.finalize,
-        :strict             => configuration.strict,
-        :configured_coercer => configuration.coercer }
-    end
-
-    # @api private
-    def core_inclusions
-      [Model::Core]
-    end
-
-    # @api private
-    def core_extensions
-      []
-    end
-
-  end # class ExtensionBuilder
-
-  # @private
-  class ModelExtensionBuilder < ExtensionBuilder
-  end # ModelExtensionBuilder
-
-  # @private
-  class ModuleExtensionBuilder < ExtensionBuilder
-
-    # @api private
-    def add_included_hook
-      attribute_proc = attribute_method(configuration)
-      inclusions     = core_inclusions
-
-      inclusions << Model::Constructor    if configuration.constructor
-      inclusions << Model::MassAssignment if configuration.mass_assignment
-
-      self.module.define_singleton_method :included do |object|
-        super(object)
-        object.extend(ModuleExtensions)
-        object.instance_variable_set('@inclusions', inclusions)
-        object.send(:define_singleton_method, :attribute, attribute_proc)
-      end
-    end
-
-  end # ModuleExtensionBuilder
-
-  # @private
-  class ValueObjectExtensionBuilder < ExtensionBuilder
-
-    # @api private
-    def initialize(configuration, mod = Module.new)
-      super
-      @configuration.constructor = true
-    end
-
-    # @api private
-    def module_options
-      super.update(:writer => :private)
-    end
-
-    # @api private
-    def core_inclusions
-      super << ValueObject::AllowedWriterMethods << ValueObject::InstanceMethods
-    end
-
-    # @api private
-    def core_extensions
-      super << ValueObject::AllowedWriterMethods
-    end
-
-  end # ValueObjectBuilder
-
-end # module Virtus