mixture 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a06213e3ee4013a1fe25d92d323c63cce983155
-  data.tar.gz: 665043f967551267637cc68d2dfd02e2065d6da7
+  metadata.gz: 4c822237c85384a60d89edebd9cc47e992741047
+  data.tar.gz: e5a9cecb2887162a042bed5b32dc99331159f8f6
 SHA512:
-  metadata.gz: 10ac1ebccc00a4777bef5695df536c73752c2b74d27b9796ab88c0626950641fb1d5b45c9ae139ea25f22cddfa0644eacf490aabac6fc808a81a8e5b83009f1b
-  data.tar.gz: 3f8725495e23ab9fb3f287055c3dad37b4047f6b6764c9308537388f0e01d41962a190f3a7e8faeb99e282151b0b4f1f2e982afb8cfa271fe2ab675ba3593d8c
+  metadata.gz: 6179364b8124dae17d3070aa96ac5ec1033665cba7b73db39220e8dbb1486e2a2fb2310550ffa10dcfab72cfc48df29d7b7797cfcd92992b8c62513b50eb38b4
+  data.tar.gz: 5cf47b98592aaeeda5d8732f797ebe36703406e860b6fab245e32a498d1d2e43da0ca75bf1ff8e24f8ee5da878db4d6121fd59a4cdefe4aa06606f563e5d7806

data/.rubocop.yml

@@ -1,9 +1,40 @@
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
+AllCops:
+  TargetRubyVersion: 2.3
+
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Max: 15
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/*.rb'
+    - 'spec/**/*.rb'
+Metrics/AbcSize:
+  Max: 25
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+Style/SignalException:
+  EnforcedStyle: only_fail
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+Style/Documentation:
+  Enabled: false
 Style/Encoding:
   Enabled: true
+  EnforcedStyle: always
   AutoCorrectEncodingComment: "# encoding: utf-8\n"
 Style/RegexpLiteral:
   EnforcedStyle: mixed
-Metrics/MethodLength:
-  Max: 15
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+Style/AlignHash:
+  EnforcedLastArgumentHashStyle: ignore_implicit
+Style/AlignArray:
+  Enabled: false
+Style/IndentArray:
+  Enabled: false
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+Style/ParallelAssignment:
+  Enabled: false

data/Gemfile

@@ -1,10 +1,11 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 source "https://rubygems.org"
 
 # These are in here for reasons.
+gem "coveralls"
 gem "pry"
 gem "rubocop"
-gem "coveralls"
 
 gemspec

data/Rakefile

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"

data/lib/mixture/attribute.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   # An attribute for a mixture object.

data/lib/mixture/attribute_list.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "set"
 require "forwardable"
@@ -13,7 +14,36 @@ module Mixture
     # If it quacks like a duck...
     include Comparable
     # Then it must be a duck.
-    delegate [:fetch, :[], :[]=, :key?, :each, :<=>] => :@list
+    delegate [:<=>, :[]=, :to_h] => :@list
+
+    # @!method fetch(key, value = Undefined, &block)
+    #   Fetches the given key from the attribute list.  If the current attribute
+    #   list does not have the key, it passes it up to the parent, if there is
+    #   one.  If there is no parent, it behaves as normal.
+    #
+    #   @param key [::Symbol]
+    #   @param value [::Object]
+    #   @return [Attribute]
+    # @!method [](key)
+    #   Looks up the given key.  If the current attribute list does not have the
+    #   key, it passes it up to the parent, if there is one.  Otherwise, it
+    #   returns the default value for the list (`nil`).
+    #
+    #   @param key [::Symbol]
+    #   @return [Attribute]
+    # @!method key?(key)
+    #   Returns if the attribute exists.  If it doesn't exist on this list,
+    #   it passes it up to the parent.
+    #
+    #   @param key [::Symbol]
+    #   @return [::Boolean]
+    # @!method each(&block)
+    #   Iterates over the attribute list.  If there is a parent, the current
+    #   attribute list is merged into the parent, then iterated over; otherwise,
+    #   it iterates over the current.
+    #
+    #   @return [void]
+    delegate [:fetch, :[], :key?, :keys, :values, :each, :has_key?] => :with_parent
 
     # Returns a set of options used for the attributes.  This isn't
     # used at the moment.
@@ -27,10 +57,21 @@ module Mixture
     # @return [Hash{Symbol => Array<Proc>}]
     attr_reader :callbacks
 
+    # The parent of this attribute list.  This is "merged" into this attribute
+    # list.  This shouldn't be set since it is automatically assumed; however,
+    # sometimes it can be assumed wrong.
+    #
+    # @return [AttributeList, nil]
+    attr_accessor :parent
+
     # Initializes the attribute list.
-    def initialize
+    #
+    # @param parent [AttributeList] The parent {AttributeList}.  This is used
+    #   primarily for inheritance.
+    def initialize(parent = nil)
       @list = {}
       @options = {}
+      @parent = parent
       @callbacks = Hash.new { |h, k| h[k] = Set.new }
     end
 
@@ -42,5 +83,11 @@ module Mixture
     def create(name, options = {})
       @list[name] = Attribute.new(name, self, options)
     end
+
+  protected
+
+    def with_parent
+      @parent ? @list.merge(@parent.with_parent) : @list
+    end
   end
 end

data/lib/mixture/coerce/array.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/base.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "singleton"
 
@@ -101,12 +102,11 @@ module Mixture
       # @yieldreturn (see .coerce_to)
       # @return [void]
       def self.data_block(data, &block)
-        case
-        when data.is_a?(::Symbol)
+        if data.is_a?(::Symbol)
           proc { |value| value.public_send(data) }
-        when data.is_a?(::Proc)
+        elsif data.is_a?(::Proc)
           data
-        when block_given?
+        elsif block_given?
           block
         else
           fail ArgumentError, "Expected a block, got #{data.inspect}"
@@ -127,9 +127,11 @@ module Mixture
       def to(type)
         coercions = self.class.coercions
         coercable = type.inheritable
-                    .find { |ancestor| coercions.key?(ancestor) }
-        fail CoercionError, "Undefined coercion #{self.class.type} " \
-          "=> #{type}" unless coercable
+                        .find { |ancestor| coercions.key?(ancestor) }
+        unless coercable
+          fail CoercionError, "Undefined coercion #{self.class.type} " \
+            "=> #{type}"
+        end
 
         public_send(coercions[coercable])
       end

data/lib/mixture/coerce/boolean.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/class.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce
@@ -9,8 +10,10 @@ module Mixture
       coerce_to(Types::Object, Itself)
       coerce_to(Types::Class) do |value, type|
         member = type.options.fetch(:members).first
-        fail CoercionError, "Cannot coerce #{value.class} =>" \
-             " #{member}" unless value.is_a?(member)
+        unless value.is_a?(member)
+          fail CoercionError, "Cannot coerce #{value.class} =>" \
+               " #{member}"
+        end
         value
       end
     end

data/lib/mixture/coerce/date.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/datetime.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/float.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/hash.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/integer.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/nil.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/object.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce
@@ -13,11 +14,8 @@ module Mixture
       TryMethods = proc do |*methods|
         proc do |value|
           method = methods.find { |m| value.respond_to?(m) }
-          if method
-            value.public_send(method)
-          else
-            fail CoercionError, "Could not coerce #{value.class}"
-          end
+          fail CoercionError, "Could not coerce #{value.class}" unless method
+          value.public_send(method)
         end
       end
 

data/lib/mixture/coerce/range.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/rational.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/set.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/string.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/symbol.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce/time.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Coerce

data/lib/mixture/coerce.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "mixture/coerce/base"
 require "mixture/coerce/array"
@@ -65,13 +66,11 @@ module Mixture
       begin
         block.call(value, to)
       rescue CoercionError
-        raise
+        fail
       rescue StandardError => e
-        raise CoercionError, "#{e.class}: #{e.message}", e.backtrace
+        fail CoercionError, "#{e.class}: #{e.message}", e.backtrace
       end
     end
-
-    # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
 
     # Registers the default coercions.

data/lib/mixture/errors.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   # All mixture errors inherit this.

data/lib/mixture/extensions/attributable.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Extensions
@@ -16,8 +17,10 @@ module Mixture
         def attribute(name, options = {})
           name = name.to_s.intern
           attr = attributes.create(name, options)
-          define_method(attr.getter) {     attribute(name)    }
-          define_method(attr.setter) { |v| attribute(name, v) }
+          define_method(attr.getter) {     attribute(name)    } unless
+            options[:wo] || options[:write_only]
+          define_method(attr.setter) { |v| attribute(name, v) } unless
+            options[:ro] || options[:read_only]
           attr
         end
 
@@ -26,7 +29,12 @@ module Mixture
         # @see AttributeList
         # @return [AttributeList]
         def attributes
-          @_attributes ||= AttributeList.new
+          return @_attributes if @_attributes
+          available = ancestors[1..-1]
+                      .select { |c| c.respond_to?(:attributes) }
+                      .first
+          parent = available ? available.attributes : nil
+          @_attributes = AttributeList.new(parent)
         end
       end
 

data/lib/mixture/extensions/coercable.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Extensions

data/lib/mixture/extensions/hashable.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "forwardable"
 
@@ -82,10 +83,9 @@ module Mixture
       #   @return [Object] The attribute's value, or the block's
       #     value instead.
       def fetch(key, default = Undefined)
-        case
-        when key?(key.to_s.intern) then attribute(key.to_s.intern)
-        when block_given?          then yield(key.to_s.intern)
-        when default != Undefined  then default
+        if key?(key.to_s.intern) then attribute(key.to_s.intern)
+        elsif block_given?          then yield(key.to_s.intern)
+        elsif default != Undefined  then default
         else fail KeyError, "Undefined attribute #{key.to_s.intern}"
         end
       end

data/lib/mixture/extensions/validatable.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Extensions

data/lib/mixture/extensions.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "mixture/extensions/attributable"
 require "mixture/extensions/coercable"

data/lib/mixture/model.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   # A model.

data/lib/mixture/types/access.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types
@@ -21,7 +22,7 @@ module Mixture
         end
       end
 
-      private
+    private
 
       # Actually creates the subtype.  This should never be called
       # outside of {.[]}.  If `:noinfer` is set in the supertype's

data/lib/mixture/types/array.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/boolean.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/class.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/collection.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/date.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/datetime.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/enumerable.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/float.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/hash.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/integer.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/nil.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/numeric.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/object.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/range.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/rational.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/set.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/string.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/symbol.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/time.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types/type.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Types

data/lib/mixture/types.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "thread_safe"
 

data/lib/mixture/validate/base.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Validate
@@ -37,7 +38,7 @@ module Mixture
         @value = value
       end
 
-      private
+    private
 
       # Raises an error with the given a message.
       #

data/lib/mixture/validate/exclusion.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Validate

data/lib/mixture/validate/inclusion.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Validate

data/lib/mixture/validate/length.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Validate
@@ -16,8 +17,6 @@ module Mixture
         super
         error("Length is not acceptable") unless acceptable.cover?(length)
       end
-
-      # rubocop:disable Metrics/AbcSize
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
 
@@ -97,10 +96,9 @@ module Mixture
       # @raise [ValidationError] If it cannot determine the length of
       #   the value.
       def length
-        case
-        when @value.respond_to?(:size)    then @value.size
-        when @value.respond_to?(:length)  then @value.length
-        when @value.respond_to?(:count)   then @value.count
+        if @value.respond_to?(:size) then @value.size
+        elsif @value.respond_to?(:length)  then @value.length
+        elsif @value.respond_to?(:count)   then @value.count
         else error("Value isn't countable")
         end
       end

data/lib/mixture/validate/match.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Validate
@@ -16,7 +17,7 @@ module Mixture
         error("Value does not match") unless match?
       end
 
-      private
+    private
 
       # Checks if the value matches the given matcher.  It uses the
       # `=~` operator.  If it fails (i.e. raises an error), it returns

data/lib/mixture/validate/presence.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   module Validate
@@ -15,7 +16,7 @@ module Mixture
         error("Value is empty") if empty?
       end
 
-      private
+    private
 
       # Determins if the given value is empty.  If it's not nil,
       # and it responds to `empty?`, it returns the value of `empty?`;

data/lib/mixture/validate.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mixture
   # Handles validation of attributes.  You can register validators

data/lib/mixture/version.rb

@@ -1,9 +1,10 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 #
 module Mixture
   # The current version of Mixture.
   #
   # @return [String]
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/lib/mixture.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "set"
 require "time"

data/mixture.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -16,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-    .reject { |f| f.match(%r{^(test|spec|features)/}) }
+                                        .reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"
   spec.executables   = spec.files
-    .grep(%r{^bin/}) { |f| File.basename(f) }
+                           .grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixture
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,9 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Handle validation, coercion, and attributes.
 test_files: []
-has_rdoc: