RubyGems - cascading-configuration-array-sorted - Versions diffs - 2.0.3 → 2.1.0 - Mend

cascading-configuration-array-sorted 2.0.3 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/README.md CHANGED

@@ -203,7 +203,7 @@ end
   (The MIT License)
-  Copyright (c) 2011 Asher
+  Copyright (c) Asher
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the

data/README.rdoc CHANGED

@@ -36,7 +36,7 @@ See README.md
   (The MIT License)
-  Copyright (c) 2011 Asher
+  Copyright (c) Asher
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the

data/lib/cascading-configuration-array-sorted.rb CHANGED

@@ -1,30 +1,19 @@
+require 'compositing-array-sorted'
 if $__cascading_configuration__spec__development
-  require_relative '../../settings-array/lib/cascading-configuration-array.rb'
+  require_relative '../../variable/lib/cascading-configuration-variable.rb'
 else
-  require 'cascading-configuration-array'
+  require 'cascading-configuration-variable'
 end
 module ::CascadingConfiguration
   module Array
     module Sorted
-      class CompositingArray < ::CascadingConfiguration::Array::CompositingArray
-        module Interface
-        end
-      end
-      module ModuleSupportMethods
-      end
-      module Interface
-      end
     end
   end
 end
-require_relative 'cascading-configuration-array-sorted/_private_/CascadingConfiguration/Array/Sorted/CompositingArray/Interface.rb'
-require_relative 'cascading-configuration-array-sorted/_private_/CascadingConfiguration/Array/Sorted/CompositingArray.rb'
-require_relative 'cascading-configuration-array-sorted/_private_/CascadingConfiguration/Array/Sorted/ModuleSupportMethods.rb'
-require_relative 'cascading-configuration-array-sorted/CascadingConfiguration/Array/Sorted/Interface.rb'
 require_relative 'cascading-configuration-array-sorted/CascadingConfiguration/Array/Sorted.rb'

data/lib/cascading-configuration-array-sorted/CascadingConfiguration/Array/Sorted.rb CHANGED

@@ -2,11 +2,53 @@
 module ::CascadingConfiguration::Array::Sorted
   # Configuration modules for storage of settings arrays
-  include ::CascadingConfiguration::Variable
+  include ::CascadingConfiguration::Inheritance
+  ##############################################
+  #  attr_configuration_sorted_array           #
+  #  attr_module_configuration_sorted_array    #
+  #  attr_local_configuration_sorted_array     #
+  #  attr_object_configuration_sorted_array    #
+  #  attr_instance_configuration_sorted_array  #
+  ##############################################
+  def attr_configuration_sorted_array( *configuration_names, & define_block ) ;; end
+  def attr_module_configuration_sorted_array( *configuration_names, & define_block ) ;; end
+  def attr_class_configuration_sorted_array( *configuration_names, & define_block ) ;; end
+  def attr_local_configuration_sorted_array( *configuration_names, & define_block ) ;; end
+  def attr_object_configuration_sorted_array( *configuration_names, & define_block ) ;; end
+  def attr_instance_configuration_sorted_array( *configuration_names, & define_block ) ;; end
+  ccsa = self
+  cca = ::CascadingConfiguration::Array
+  ccv = ::CascadingConfiguration::Variable
+  ccm = ::CascadingConfiguration::Methods
+  setter_proc = ::Proc.new do |instance, configuration_name, value|
+    return instance.__send__( configuration_name ).replace( value )
-  # Interface to declare configuration settings arrays
-  include ::CascadingConfiguration::Array::Sorted::Interface
+  end
+  getter_proc = ::Proc.new do |instance, configuration_name|
+    composite_sorted_array = nil
+    if ccv.has_configuration_variable?( instance, configuration_name )
+      composite_sorted_array = ccv.get_configuration_variable( instance, configuration_name )
+    else
+      parent_composite_array = nil
+      if ancestor = ::CascadingConfiguration::Variable.ancestor( instance, configuration_name )
+        parent_composite_array = ancestor.__send__( configuration_name )
+      end
+      composite_sorted_array = ::CompositingArray::Sorted.new( parent_composite_array )
+      ccv.set_configuration_variable( instance, configuration_name, composite_sorted_array )
+    end
+    return composite_sorted_array
+  end
-  extend ::CascadingConfiguration::Array::Sorted::ModuleSupportMethods
+  ccm.declare_compositing_configuration_object( self, :sorted_array, setter_proc, getter_proc )
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cascading-configuration-array-sorted
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-03-04 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cascading-configuration-array
-  requirement: &70278173150760 !ruby/object:Gem::Requirement
+  requirement: &70197420283240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,20 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278173150760
+  version_requirements: *70197420283240
 description: Provides :attr_configuration_sorted_array.
 email: asher@ridiculouspower.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cascading-configuration-array-sorted/_private_/CascadingConfiguration/Array/Sorted/CompositingArray/Interface.rb
-- lib/cascading-configuration-array-sorted/_private_/CascadingConfiguration/Array/Sorted/CompositingArray.rb
-- lib/cascading-configuration-array-sorted/_private_/CascadingConfiguration/Array/Sorted/ModuleSupportMethods.rb
-- lib/cascading-configuration-array-sorted/CascadingConfiguration/Array/Sorted/Interface.rb
 - lib/cascading-configuration-array-sorted/CascadingConfiguration/Array/Sorted.rb
 - lib/cascading-configuration-array-sorted.rb
-- spec/_private_/CascadingConfiguration/Array/Sorted/CompositingArray_spec.rb
 - spec/CascadingConfiguration/Array/Sorted_spec.rb
 - README.md
 - README.rdoc
@@ -58,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cascading-configuration-array-sorted
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key:
 specification_version: 3
 summary: Support package for cascading-configuration.

data/lib/cascading-configuration-array-sorted/CascadingConfiguration/Array/Sorted/Interface.rb DELETED

@@ -1,111 +0,0 @@
-module ::CascadingConfiguration::Array::Sorted::Interface
-  ######################
-  #  self.setter_proc  #
-  ######################
-  def self.setter_proc( configuration_name )
-    return Proc.new do |array|
-      return ::CascadingConfiguration::Array::Sorted.set_composite_sorted_array( self,
-                                                                                 configuration_name,
-                                                                                 array )
-    end
-  end
-  ######################
-  #  self.getter_proc  #
-  ######################
-  def self.getter_proc( configuration_name )
-    return Proc.new do
-      return ::CascadingConfiguration::Array::Sorted.composite_sorted_array( self,
-                                                                             configuration_name )
-    end
-  end
-  #####################################
-  #  attr_configuration_sorted_array  #
-  #####################################
-  # defines configuration in class or module
-  # configuration cascades downward to instance including all classes or modules in-between
-  def attr_configuration_sorted_array( *configuration_names )
-    return ::CascadingConfiguration::Variable.
-             define_cascading_configuration( self,
-                                             ::CascadingConfiguration::Array::Sorted::Interface,
-                                             *configuration_names )
-  end
-  ############################################
-  #  attr_module_configuration_sorted_array  #
-  ############################################
-  # defines configuration in class or module
-  # configuration cascades downward to last class or module
-  def attr_module_configuration_sorted_array( *configuration_names )
-    return ::CascadingConfiguration::Variable.
-             define_module_configuration( self,
-                                          ::CascadingConfiguration::Array::Sorted::Interface,
-                                          *configuration_names )
-  end
-  alias_method :attr_class_configuration_sorted_array, :attr_module_configuration_sorted_array
-  ###########################################
-  #  attr_local_configuration_sorted_array  #
-  ###########################################
-  # defines configuration in present class or module context
-  # configuration does not cascade
-  def attr_local_configuration_sorted_array( *configuration_names )
-    return ::CascadingConfiguration::Variable.
-             define_local_configuration( self,
-                                         ::CascadingConfiguration::Array::Sorted::Interface,
-                                         *configuration_names )
-  end
-  ############################################
-  #  attr_object_configuration_sorted_array  #
-  ############################################
-  # defines configuration in present instance
-  # configuration does not cascade
-  def attr_object_configuration_sorted_array( *configuration_names )
-    return ::CascadingConfiguration::Variable.
-             define_object_configuration( self,
-                                          ::CascadingConfiguration::Array::Sorted::Interface,
-                                          *configuration_names )
-  end
-  ##############################################
-  #  attr_instance_configuration_sorted_array  #
-  ##############################################
-  # defines configuration in present class or module context
-  # configuration does not cascade
-  def attr_instance_configuration_sorted_array( *configuration_names )
-    return ::CascadingConfiguration::Variable.
-             define_instance_configuration( self,
-                                            ::CascadingConfiguration::Array::Sorted::Interface,
-                                            *configuration_names )
-  end
-end

data/lib/cascading-configuration-array-sorted/_private_/CascadingConfiguration/Array/Sorted/CompositingArray.rb DELETED

@@ -1,7 +0,0 @@
-class ::CascadingConfiguration::Array::Sorted::CompositingArray <
-      ::CascadingConfiguration::Array::CompositingArray
-  include ::CascadingConfiguration::Array::Sorted::CompositingArray::Interface
-end

data/lib/cascading-configuration-array-sorted/_private_/CascadingConfiguration/Array/Sorted/CompositingArray/Interface.rb DELETED

@@ -1,157 +0,0 @@
-module ::CascadingConfiguration::Array::Sorted::CompositingArray::Interface
-  ##############
-  #  reverse!  #
-  ##############
-  def reverse!
-    @sort_order_reversed = ! @sort_order_reversed
-    super
-    @sub_composite_arrays.each do |this_sub_array|
-      this_sub_array.reverse!
-    end
-  end
-  ##############
-  #  collect!  #
-  #  map!      #
-  ##############
-  def collect!
-    return to_enum unless block_given?
-    replacement_array = [ ]
-    self.each_with_index do |this_object, index|
-      replacement_object = yield( this_object )
-      replacement_array[ index ] = replacement_object
-    end
-    replace( replacement_array )
-    return self
-  end
-  alias_method :map!, :collect!
-  ###########
-  #  sort!  #
-  ###########
-  def sort!( & block )
-    if block_given?
-      self.each_with_index do |this_member, index|
-        unless index + 1 == count
-          yield( this_member, self[ index + 1 ] )
-        end
-      end
-    end
-    return self
-  end
-  ##############
-  #  sort_by!  #
-  ##############
-  def sort_by!( & block )
-    return to_enum unless block_given?
-    self.each do |this_member|
-      yield( this_member )
-    end
-    return self
-  end
-  ##################################################################################################
-      private ######################################################################################
-  ##################################################################################################
-  ###############
-  #  non_cascading_set  #
-  ###############
-  def non_cascading_set( index, object )
-    # we ignore the index and insert in sorted order
-    # if index matches an existing index we remove it and insert
-    # otherwise we simply insert
-    unless index >= count
-      delete_at( index )
-    end
-    @parent_and_interpolated_object_count += 1
-    non_cascading_insert( index, object )
-  end
-  ##################
-  #  non_cascading_insert  #
-  ##################
-  def non_cascading_insert( index, *objects )
-    # we ignore the index and insert in sorted order
-    # we have to have at least one member for comparison-based insert (to retain sorted order)
-    objects.each do |this_object|
-      insert_occurred = false
-      if this_object.nil?
-        if @sort_order_reversed
-          super( count, this_object )
-        else
-          super( 0, this_object )
-        end
-        next
-      end
-      self.each_with_index do |this_member, this_index|
-        if @sort_order_reversed
-          case this_object <=> this_member
-            when 0, 1
-              super( this_index, this_object )
-              insert_occurred = true
-              break
-          end
-        else
-          case this_object <=> this_member
-            when 0, -1
-              super( this_index, this_object )
-              insert_occurred = true
-              break
-          end
-        end
-      end
-      unless insert_occurred
-        super( count, this_object )
-      end
-    end
-  end
-end

data/lib/cascading-configuration-array-sorted/_private_/CascadingConfiguration/Array/Sorted/ModuleSupportMethods.rb DELETED

@@ -1,45 +0,0 @@
-module ::CascadingConfiguration::Array::Sorted::ModuleSupportMethods
-  ############################
-  #  composite_sorted_array  #
-  ############################
-  def composite_sorted_array( configuration_instance, configuration_name )
-    composite_sorted_array = nil
-    if ::CascadingConfiguration::Variable.has_configuration_variable?( configuration_instance,
-                                                                       configuration_name )
-      composite_sorted_array = ::CascadingConfiguration::Variable.
-                                 get_configuration_variable( configuration_instance,
-                                                             configuration_name )
-    else
-      composite_sorted_array = ::CascadingConfiguration::Array::Sorted::CompositingArray.
-                                 new( configuration_instance, configuration_name )
-    end
-    return composite_sorted_array
-  end
-  ################################
-  #  set_composite_sorted_array  #
-  ################################
-  def set_composite_sorted_array( configuration_instance, configuration_name, array )
-    composite_sorted_array = composite_sorted_array( configuration_instance, configuration_name )
-    # we want the array to supplant existing config
-    # clear the array (excludes everything explicitly)
-    composite_sorted_array.clear
-    # push array elements (removes anything excluded from exclude)
-    composite_sorted_array.push( *array )
-    return composite_sorted_array
-  end
-end