gorillib 0.4.0pre → 0.4.1pre

data/CHANGELOG.md

@@ -1,6 +1,41 @@
 ## Version 1.0
 
-### 2012-04 - Version 1.0.0: DSL Magic
+
+### 2012-06 - Version 1.0.1-pre: First wave of refactors
+
+**model**: 
+
+* `receive!` is now called from the initiailizer.
+
+* the initializer now takes `(*positional_args, attrs)`, assembles the `positional_args` into the attrs, and hands them to `receive!`.
+
+* the way you get a "magic get-set attribute" in builder is by saying `magic`, not `field` -- `field` means the same thing as it does in model.
+
+**collection**: 
+
+Gorillib::Collection has been broken up as follows:
+
+* A generic collection stores objects uniquely, in the order added. It responds to:
+  - receive!, values, to_a, each and each_value;
+  - length, size, empty?, blank?
+
+* `Gorillib::Collection` additionally lets you store and retrieve things by label:
+  - [], []=, include?, fetch, delete, each_pair, to_hash.
+
+* `Gorillib::ModelCollection` adds:
+  - `key_method`: called on objects to get their key; `to_key` by default.
+  - `factory`: generates new objects, converts received objects
+  - `<<`: adds object under its `key_method` key
+  - `receive!`s an array by auto-keying the elements, or a hash by trusting what you give it
+  - `update_or_create: if absent, creates object with given attributes and
+    `key_method => key`; if present, updates with given attributes.
+
+what this means for you:
+* `Collection` no longer has factory functionality -- that is now in `ModelCollection`. 
+* The signature of `ModelCollection#initialize` is `initialize(key_meth, factory)` -- the reverse of what was.
+
+
+### 2012-04 - Version 1.0.0-pre: DSL Magic
 
 #### New functionality
 

data/Gemfile

@@ -1,32 +1,36 @@
 source "http://rubygems.org"
 
-gem     'multi_json', '~> 1.1'
-gem     'json'
-gem     'configliere', '>= 0.4.13'
+gem   'multi_json',  ">= 1.1"
 
+# Only gems that you want listed as development dependencies in the gemspec
 group :development do
-  gem   'bundler',    '~> 1'
-  gem   'pry'
-  gem   'jeweler',    '~> 1.6'
+  gem 'bundler',     "~> 1.1"
+  gem 'rake'
+  gem 'oj',          ">= 1.2"
+  gem 'json',                  :platform => :jruby
+end
+
+# Gems you would use if hacking on this gem (rather than with it)
+group :support do
+  gem 'jeweler',     ">= 1.6"
+  gem 'pry'
 end
 
 group :docs do
-  gem   'yard',       '~> 0.7'
-  gem   'redcarpet',  '~> 2.1'
+  gem 'yard',        ">= 0.7"
+  gem 'redcarpet',   ">= 2.1"
 end
 
+# Gems for testing and coverage
 group :test do
-  gem   'rspec',      "~> 2.5"
+  gem 'rspec',       "~> 2.8"
+  gem 'simplecov',   ">= 0.5", :platform => :ruby_19
+  #
+  gem 'guard',       ">= 1.0"
+  gem 'guard-rspec', ">= 0.6"
+  gem 'guard-yard'
+  #
   if RUBY_PLATFORM.include?('darwin')
-    gem 'rb-fsevent', "~> 0.9"
-    # gem 'growl',      "~> 1"
-    # gem 'ruby_gntp'
+    gem 'rb-fsevent', ">= 0.9"
   end
-
-  gem   'guard',      "~> 1"
-  gem   'guard-rspec'
-  gem   'guard-yard'
-  gem   'guard-process'
-
-  # gem 'simplecov',  ">= 0.5",   :platform => :ruby_19
 end

data/Guardfile

@@ -8,7 +8,7 @@
 # '--format doc'     for more verbose, --format progress for less
 format  = "progress"
 # '--tag record_spec' to only run tests tagged :record_spec
-tags    = %w[ ]  # builder_spec model_spec example_spec
+tags    = %w[  ]  # builder_spec example_spec model_spec
 
 guard 'rspec', :version => 2, :cli => "--format #{format} #{ tags.map{|tag| "--tag #{tag}"}.join(" ")  }" do
   watch(%r{^spec/.+_spec\.rb$})

data/Rakefile

@@ -1,36 +1,35 @@
 require 'rubygems' unless defined?(Gem)
 require 'bundler'
 begin
-  Bundler.setup(:default, :development, :test)
+  Bundler.setup(:default, :development, :support, :test)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-
-Bundler::GemHelper.install_tasks
-
-# require 'jeweler'
-# Jeweler::Tasks.new do |gem|
-#   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-#   gem.name        = "gorillib"
-#   gem.homepage    = "http://infochimps.com/labs"
-#   gem.license     = "MIT"
-#   gem.summary     = %Q{include only what you need. No dependencies, no creep}
-#   gem.description = %Q{Gorillib: infochimps lightweight subset of ruby convenience methods}
-#   gem.email       = "coders@infochimps.org"
-#   gem.authors     = ["Infochimps"]
-
-#   ignores = File.readlines(".gitignore").grep(/^[^#]\S+/).map{|s| s.chomp }
-#   dotfiles = [".gemtest", ".gitignore", ".rspec", ".yardopts"]
-#   gem.files = dotfiles + Dir["**/*"].
-#     reject{|f| f =~ %r{^(vendor|coverage)/} }.
-#     reject{|f| File.directory?(f) }.
-#     reject{|f| ignores.any?{|i| File.fnmatch(i, f) || File.fnmatch(i+'/**/*', f) || File.fnmatch(i+'/*', f) } }
-#   gem.test_files = gem.files.grep(/^spec\//)
-#   gem.require_paths = ['lib']
-# end
-# Jeweler::RubygemsDotOrgTasks.new
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name        = "gorillib"
+  gem.homepage    = "http://infochimps.com/labs"
+  gem.license     = "MIT"
+  gem.summary     = %Q{include only what you need. No dependencies, no creep}
+  gem.description = %Q{Gorillib: infochimps lightweight subset of ruby convenience methods}
+  gem.email       = "coders@infochimps.org"
+  gem.authors     = ["Infochimps"]
+
+  ignores = File.readlines(".gitignore").grep(/^[^#]\S+/).map{|s| s.chomp }
+  dotfiles = [".gemtest", ".gitignore", ".rspec", ".yardopts"]
+  gem.files = dotfiles + Dir["**/*"].
+    reject{|f| f =~ %r{^(vendor|coverage)/} }.
+    reject{|f| File.directory?(f) }.
+    reject{|f| ignores.any?{|i| File.fnmatch(i, f) || File.fnmatch(i+'/**/*', f) || File.fnmatch(i+'/*', f) } }
+  gem.test_files = gem.files.grep(/^spec\//)
+  gem.require_paths = ['lib']
+end
+Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -39,12 +38,13 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-# RSpec::Core::RakeTask.new(:rcov) do |spec|
-#   Bundler.setup(:default, :development, :test)
-#   spec.pattern = 'spec/**/*_spec.rb'
-#   spec.rcov = true
-#   spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary]
-# end
+# if rcov shits the bed with ruby 1.9, see
+#   https://github.com/relevance/rcov/issues/31
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+  spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary]
+end
 
 require 'yard'
 YARD::Rake::YardocTask.new do

data/TODO.md

@@ -1,32 +1,4 @@
 
-We need a convention for detailed inspection
+* We need a convention for detailed inspection
 
-### Record
-
-FIXME: registry creation
-
-FIXME: field creation is kinda gnarly
-
-FIXME: number of things we have to import has grown large
-
-### Builder
-
-FIXME: read_attribute / write_attribute contract?
-FIXME: naming of collection members -- who does it?
-
-FIXME: collection factory stuff is all screwy
-
-
-tester for a collection item -- `has_facet?` not `facet?`
-
-### Collection
-
-FIXME: factory stuff is all screwy
-FIXME: conversion stuff screwy to some extent
-
-FIXME: Should a collection be enumerable, and how?
-
-
-repeated logic in has_collection and builder stuff ...
-should you be able to decorate anything with a decorator? 
-with a field?
+* Pathname.path_to should be absolute path, not relative

data/VERSION

@@ -1 +1 @@
-0.4.0pre
+0.4.1

data/examples/builder/ironfan.rb

@@ -7,7 +7,7 @@ module Gorillib::Test
 
   class IronfanBuilder
     include Gorillib::FancyBuilder
-    field           :name,        Symbol
+    magic           :name,        Symbol
 
   end
   class ComputeBuilder < IronfanBuilder; end
@@ -38,7 +38,7 @@ module Gorillib::Test
 
 
   class ComputeBuilder < IronfanBuilder
-    field         :environment, Symbol
+    magic         :environment, Symbol
     collection    :clouds,      Cloud
     collection    :volumes,    Volume
     collection    :components, Component
@@ -72,7 +72,7 @@ module Gorillib::Test
   class Facet          < ComputeBuilder
     belongs_to    :cluster,   Cluster
     collection    :servers,   Server
-    field         :instances, Integer, :doc => 'number of servers to instantiate for this machine'
+    magic         :instances, Integer, :doc => 'number of servers to instantiate for this machine'
   end
 
   class Server         < ComputeBuilder
@@ -89,7 +89,7 @@ module Gorillib::Test
   end
 
   class Component      < IronfanBuilder
-    field :discovers, Array, :of => :whatever, :doc => 'components this one discovers. Can be used to intelligently generate security groups, add client components, etc'
+    magic :discovers, Array, :of => :whatever, :doc => 'components this one discovers. Can be used to intelligently generate security groups, add client components, etc'
   end
 
   class SecurityGroup  < IronfanBuilder

data/gorillib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gorillib"
-  s.version = "0.4.0pre"
+  s.version = "0.4.1pre"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-08-16"
+  s.date = "2012-06-27"
   s.description = "Gorillib: infochimps lightweight subset of ruby convenience methods"
   s.email = "coders@infochimps.org"
   s.extra_rdoc_files = [
@@ -33,17 +33,22 @@ Gem::Specification.new do |s|
     "gorillib.gemspec",
     "lib/alt/kernel/call_stack.rb",
     "lib/gorillib.rb",
+    "lib/gorillib/array/average.rb",
     "lib/gorillib/array/compact_blank.rb",
     "lib/gorillib/array/deep_compact.rb",
     "lib/gorillib/array/extract_options.rb",
     "lib/gorillib/array/random.rb",
+    "lib/gorillib/array/sorted_median.rb",
+    "lib/gorillib/array/sorted_percentile.rb",
+    "lib/gorillib/array/sorted_sample.rb",
     "lib/gorillib/array/wrap.rb",
     "lib/gorillib/base.rb",
     "lib/gorillib/builder.rb",
     "lib/gorillib/builder/field.rb",
     "lib/gorillib/collection.rb",
     "lib/gorillib/collection/has_collection.rb",
-    "lib/gorillib/configurable.rb",
+    "lib/gorillib/collection/list_collection.rb",
+    "lib/gorillib/collection/model_collection.rb",
     "lib/gorillib/datetime/parse.rb",
     "lib/gorillib/datetime/to_flat.rb",
     "lib/gorillib/enumerable/sum.rb",
@@ -82,9 +87,11 @@ Gem::Specification.new do |s|
     "lib/gorillib/model/active_model_shim.rb",
     "lib/gorillib/model/base.rb",
     "lib/gorillib/model/defaults.rb",
+    "lib/gorillib/model/doc_string.rb",
     "lib/gorillib/model/errors.rb",
     "lib/gorillib/model/factories.rb",
     "lib/gorillib/model/field.rb",
+    "lib/gorillib/model/lint.rb",
     "lib/gorillib/model/named_schema.rb",
     "lib/gorillib/model/overlay.rb",
     "lib/gorillib/model/record_schema.rb",
@@ -104,10 +111,23 @@ Gem::Specification.new do |s|
     "lib/gorillib/string/simple_inflector.rb",
     "lib/gorillib/string/truncate.rb",
     "lib/gorillib/type/extended.rb",
+    "lib/gorillib/type/url.rb",
     "lib/gorillib/utils/capture_output.rb",
     "lib/gorillib/utils/console.rb",
     "lib/gorillib/utils/nuke_constants.rb",
     "lib/gorillib/utils/stub_module.rb",
+    "notes/HOWTO.md",
+    "notes/bucket.md",
+    "notes/builder.md",
+    "notes/collection.md",
+    "notes/factories.md",
+    "notes/model-overlay.md",
+    "notes/model.md",
+    "notes/structured-data-classes.md",
+    "spec/array/average_spec.rb",
+    "spec/array/sorted_median_spec.rb",
+    "spec/array/sorted_percentile_spec.rb",
+    "spec/array/sorted_sample_spec.rb",
     "spec/examples/builder/ironfan_spec.rb",
     "spec/extlib/hash_spec.rb",
     "spec/extlib/mash_spec.rb",
@@ -115,7 +135,6 @@ Gem::Specification.new do |s|
     "spec/gorillib/array/extract_options_spec.rb",
     "spec/gorillib/builder_spec.rb",
     "spec/gorillib/collection_spec.rb",
-    "spec/gorillib/configurable_spec.rb",
     "spec/gorillib/datetime/parse_spec.rb",
     "spec/gorillib/datetime/to_flat_spec.rb",
     "spec/gorillib/enumerable/sum_spec.rb",
@@ -137,6 +156,7 @@ Gem::Specification.new do |s|
     "spec/gorillib/metaprogramming/class_attribute_spec.rb",
     "spec/gorillib/metaprogramming/delegation_spec.rb",
     "spec/gorillib/metaprogramming/singleton_class_spec.rb",
+    "spec/gorillib/model/lint_spec.rb",
     "spec/gorillib/model/record/defaults_spec.rb",
     "spec/gorillib/model/record/factories_spec.rb",
     "spec/gorillib/model/record/overlay_spec.rb",
@@ -165,41 +185,36 @@ Gem::Specification.new do |s|
     "spec/support/matchers/be_hash_eql.rb",
     "spec/support/matchers/enumerate_method.rb",
     "spec/support/matchers/evaluate_to_true.rb",
-    "spec/support/model_test_helpers.rb",
-    "spec/support/shared_examples/included_module.rb"
+    "spec/support/model_test_helpers.rb"
   ]
   s.homepage = "http://infochimps.com/labs"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.11"
   s.summary = "include only what you need. No dependencies, no creep"
-  s.test_files = ["spec/examples/builder/ironfan_spec.rb", "spec/extlib/hash_spec.rb", "spec/extlib/mash_spec.rb", "spec/gorillib/array/compact_blank_spec.rb", "spec/gorillib/array/extract_options_spec.rb", "spec/gorillib/builder_spec.rb", "spec/gorillib/collection_spec.rb", "spec/gorillib/configurable_spec.rb", "spec/gorillib/datetime/parse_spec.rb", "spec/gorillib/datetime/to_flat_spec.rb", "spec/gorillib/enumerable/sum_spec.rb", "spec/gorillib/exception/raisers_spec.rb", "spec/gorillib/hash/compact_spec.rb", "spec/gorillib/hash/deep_compact_spec.rb", "spec/gorillib/hash/deep_merge_spec.rb", "spec/gorillib/hash/keys_spec.rb", "spec/gorillib/hash/reverse_merge_spec.rb", "spec/gorillib/hash/slice_spec.rb", "spec/gorillib/hash/zip_spec.rb", "spec/gorillib/hashlike/behave_same_as_hash_spec.rb", "spec/gorillib/hashlike/deep_hash_spec.rb", "spec/gorillib/hashlike/hashlike_behavior_spec.rb", "spec/gorillib/hashlike/hashlike_via_accessors_spec.rb", "spec/gorillib/hashlike_spec.rb", "spec/gorillib/logger/log_spec.rb", "spec/gorillib/metaprogramming/aliasing_spec.rb", "spec/gorillib/metaprogramming/class_attribute_spec.rb", "spec/gorillib/metaprogramming/delegation_spec.rb", "spec/gorillib/metaprogramming/singleton_class_spec.rb", "spec/gorillib/model/record/defaults_spec.rb", "spec/gorillib/model/record/factories_spec.rb", "spec/gorillib/model/record/overlay_spec.rb", "spec/gorillib/model/serialization_spec.rb", "spec/gorillib/model_spec.rb", "spec/gorillib/numeric/clamp_spec.rb", "spec/gorillib/object/blank_spec.rb", "spec/gorillib/object/try_dup_spec.rb", "spec/gorillib/object/try_spec.rb", "spec/gorillib/pathname_spec.rb", "spec/gorillib/string/constantize_spec.rb", "spec/gorillib/string/human_spec.rb", "spec/gorillib/string/inflections_spec.rb", "spec/gorillib/string/inflector_test_cases.rb", "spec/gorillib/string/truncate_spec.rb", "spec/gorillib/type/extended_spec.rb", "spec/gorillib/utils/capture_output_spec.rb", "spec/spec_helper.rb", "spec/support/gorillib_test_helpers.rb", "spec/support/hashlike_fuzzing_helper.rb", "spec/support/hashlike_helper.rb", "spec/support/hashlike_struct_helper.rb", "spec/support/hashlike_via_delegation.rb", "spec/support/kcode_test_helper.rb", "spec/support/matchers/be_array_eql.rb", "spec/support/matchers/be_hash_eql.rb", "spec/support/matchers/enumerate_method.rb", "spec/support/matchers/evaluate_to_true.rb", "spec/support/model_test_helpers.rb", "spec/support/shared_examples/included_module.rb"]
+  s.test_files = ["spec/array/average_spec.rb", "spec/array/sorted_median_spec.rb", "spec/array/sorted_percentile_spec.rb", "spec/array/sorted_sample_spec.rb", "spec/examples/builder/ironfan_spec.rb", "spec/extlib/hash_spec.rb", "spec/extlib/mash_spec.rb", "spec/gorillib/array/compact_blank_spec.rb", "spec/gorillib/array/extract_options_spec.rb", "spec/gorillib/builder_spec.rb", "spec/gorillib/collection_spec.rb", "spec/gorillib/datetime/parse_spec.rb", "spec/gorillib/datetime/to_flat_spec.rb", "spec/gorillib/enumerable/sum_spec.rb", "spec/gorillib/exception/raisers_spec.rb", "spec/gorillib/hash/compact_spec.rb", "spec/gorillib/hash/deep_compact_spec.rb", "spec/gorillib/hash/deep_merge_spec.rb", "spec/gorillib/hash/keys_spec.rb", "spec/gorillib/hash/reverse_merge_spec.rb", "spec/gorillib/hash/slice_spec.rb", "spec/gorillib/hash/zip_spec.rb", "spec/gorillib/hashlike/behave_same_as_hash_spec.rb", "spec/gorillib/hashlike/deep_hash_spec.rb", "spec/gorillib/hashlike/hashlike_behavior_spec.rb", "spec/gorillib/hashlike/hashlike_via_accessors_spec.rb", "spec/gorillib/hashlike_spec.rb", "spec/gorillib/logger/log_spec.rb", "spec/gorillib/metaprogramming/aliasing_spec.rb", "spec/gorillib/metaprogramming/class_attribute_spec.rb", "spec/gorillib/metaprogramming/delegation_spec.rb", "spec/gorillib/metaprogramming/singleton_class_spec.rb", "spec/gorillib/model/lint_spec.rb", "spec/gorillib/model/record/defaults_spec.rb", "spec/gorillib/model/record/factories_spec.rb", "spec/gorillib/model/record/overlay_spec.rb", "spec/gorillib/model/serialization_spec.rb", "spec/gorillib/model_spec.rb", "spec/gorillib/numeric/clamp_spec.rb", "spec/gorillib/object/blank_spec.rb", "spec/gorillib/object/try_dup_spec.rb", "spec/gorillib/object/try_spec.rb", "spec/gorillib/pathname_spec.rb", "spec/gorillib/string/constantize_spec.rb", "spec/gorillib/string/human_spec.rb", "spec/gorillib/string/inflections_spec.rb", "spec/gorillib/string/inflector_test_cases.rb", "spec/gorillib/string/truncate_spec.rb", "spec/gorillib/type/extended_spec.rb", "spec/gorillib/utils/capture_output_spec.rb", "spec/spec_helper.rb", "spec/support/gorillib_test_helpers.rb", "spec/support/hashlike_fuzzing_helper.rb", "spec/support/hashlike_helper.rb", "spec/support/hashlike_struct_helper.rb", "spec/support/hashlike_via_delegation.rb", "spec/support/kcode_test_helper.rb", "spec/support/matchers/be_array_eql.rb", "spec/support/matchers/be_hash_eql.rb", "spec/support/matchers/enumerate_method.rb", "spec/support/matchers/evaluate_to_true.rb", "spec/support/model_test_helpers.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<multi_json>, ["~> 1.1"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<configliere>, [">= 0.4.13"])
-      s.add_development_dependency(%q<bundler>, ["~> 1"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
+      s.add_runtime_dependency(%q<multi_json>, [">= 1.1"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<oj>, [">= 1.2"])
+      s.add_development_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<multi_json>, ["~> 1.1"])
+      s.add_dependency(%q<multi_json>, [">= 1.1"])
+      s.add_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<oj>, [">= 1.2"])
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<configliere>, [">= 0.4.13"])
-      s.add_dependency(%q<bundler>, ["~> 1"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6"])
     end
   else
-    s.add_dependency(%q<multi_json>, ["~> 1.1"])
+    s.add_dependency(%q<multi_json>, [">= 1.1"])
+    s.add_dependency(%q<bundler>, ["~> 1.1"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<oj>, [">= 1.2"])
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<configliere>, [">= 0.4.13"])
-    s.add_dependency(%q<bundler>, ["~> 1"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6"])
   end
 end
-

data/lib/gorillib/array/average.rb

@@ -0,0 +1,13 @@
+class Array
+  #
+  # Return the average of my elements.
+  #
+  # precondition: Each element must be convertible to a float.
+  #
+  def average
+    return nil if empty?
+    raise ArgumentError, "Couldn't convert all elements to float!" unless
+      all?{|e| e.methods.index :to_f}
+    return map(&:to_f).inject(:+) / size
+  end
+end

data/lib/gorillib/array/sorted_median.rb

@@ -0,0 +1,11 @@
+class Array
+  #
+  # Returns the middle element of odd-sized arrays. For even arrays,
+  # it will return one of the two middle elements. Precisely which is
+  # undefined, except that it will consistently return one or the
+  # other.
+  #
+  def sorted_median
+    return self[(size - 1) * 0.5]
+  end
+end

data/lib/gorillib/array/sorted_percentile.rb

@@ -0,0 +1,11 @@
+class Array
+  #
+  # Returns the element at the position closest to the given
+  # percentile. For example, sorted_percentile 0.0 will return the
+  # first element and sorted_percentile 100.0 will return the last
+  # element.
+  #
+  def sorted_percentile percentile
+    return self[(size - 1) * percentile / 100.0]
+  end
+end

data/lib/gorillib/array/sorted_sample.rb

@@ -0,0 +1,12 @@
+class Array
+  #
+  # Returns the middle element of odd-sized arrays. For even arrays,
+  # it will return one of the two middle elements. Precisely which is
+  # undefined, except that it will consistently return one or the
+  # other.
+  #
+  def sorted_sample num
+    return [] if empty?
+    (1..num).map{|i| self[(size - 1) * i / (num)]}.uniq
+  end
+end

data/lib/gorillib/builder.rb

@@ -1,15 +1,12 @@
 require 'gorillib/string/simple_inflector'
 require 'gorillib/model'
+require 'gorillib/collection/model_collection'
 
 module Gorillib
   module Builder
     extend  Gorillib::Concern
     include Gorillib::Model
 
-    def initialize(attrs={}, &block)
-      receive!(attrs, &block)
-    end
-
     def receive!(*args, &block)
       super(*args)
       if block_given?
@@ -103,20 +100,17 @@ module Gorillib
     module ClassMethods
       include Gorillib::Model::ClassMethods
 
-      def field(field_name, type, options={})
-        super(field_name, type, {:field_type => ::Gorillib::Builder::GetsetField}.merge(options))
+      def magic(field_name, type, options={})
+        field(field_name, type, {:field_type => ::Gorillib::Builder::GetsetField}.merge(options))
       end
       def member(field_name, type, options={})
         field(field_name, type, {:field_type => ::Gorillib::Builder::MemberField}.merge(options))
       end
       def collection(field_name, item_type, options={})
-        field(field_name, Gorillib::Collection, {
+        field(field_name, Gorillib::ModelCollection, {
             :item_type => item_type,
             :field_type => ::Gorillib::Builder::CollectionField}.merge(options))
       end
-      def simple_field(field_name, type, options={})
-        field(field_name, type, {:field_type => ::Gorillib::Model::Field}.merge(options))
-      end
 
     protected
 
@@ -178,14 +172,14 @@ module Gorillib
     include Gorillib::Builder
 
     included do |base|
-      base.field :name,  Symbol
+      base.magic :name,  Symbol
     end
 
     module ClassMethods
       include Gorillib::Builder::ClassMethods
 
       def belongs_to(field_name, type, options={})
-        field = field(field_name, type, {:field_type => ::Gorillib::Builder::MemberField }.merge(options))
+        field = member(field_name, type)
         define_meta_module_method "#{field.name}_name" do
           val = getset_member(field) or return nil
           val.name
@@ -195,7 +189,7 @@ module Gorillib
 
       def option(field_name, options={})
         type = options.delete(:type){ Whatever }
-        field(field_name, type, {:field_type => ::Gorillib::Builder::GetsetField }.merge(options))
+        magic(field_name, type)
       end
 
       def collects(type, clxn_name)
@@ -243,7 +237,7 @@ module Gorillib
 
       def inscribe_methods(model)
         item_type      = self.item_type
-        self.default   = ->{ Gorillib::Collection.new(item_type) }
+        self.default   = ->{ Gorillib::ModelCollection.new(nil, item_type) }
         raise "Plural and singular names must differ: #{self.plural_name}" if (singular_name == plural_name)
         #
         @visibilities[:writer] = false

data/lib/gorillib/collection/has_collection.rb

@@ -1,31 +1,31 @@
-module Gorillib
-  class Collection
-    module HasCollection
-
-      def has_collection(clxn_name, type, key_method=:name)
-        plural_name   = clxn_name
-        singular_name = Gorillib::Inflector.singularize(clxn_name.to_s).to_sym
-        
-        instance_variable_set("@#{plural_name}", Gorillib::Collection.new(type, key_method))
-
-        define_singleton_method(plural_name) do
-          instance_variable_get("@#{plural_name}") if instance_variable_defined?("@#{plural_name}")
-        end
-
-        define_singleton_method(singular_name) do |item_key, attrs={}, options={}, &block|
-          collection = instance_variable_get("@#{clxn_name}")
-          val = collection.fetch(item_key) do
-            attrs.merge!(key_method => item_key, :owner => self) if attrs.respond_to?(:merge!)
-            factory = options.fetch(:factory){ type }
-            new_val = factory.receive(attrs)
-            collection << new_val
-            new_val
-          end
-          val.instance_exec(&block) if block
-          val
-        end
-      end
-
-    end
-  end
-end
+# module Gorillib
+#   class Collection
+#     module HasCollection
+#
+#       def has_collection(clxn_name, type, key_method=:name)
+#         plural_name   = clxn_name
+#         singular_name = Gorillib::Inflector.singularize(clxn_name.to_s).to_sym
+#
+#         instance_variable_set("@#{plural_name}", Gorillib::Collection.new(type, key_method))
+#
+#         define_singleton_method(plural_name) do
+#           instance_variable_get("@#{plural_name}") if instance_variable_defined?("@#{plural_name}")
+#         end
+#
+#         define_singleton_method(singular_name) do |item_key, attrs={}, options={}, &block|
+#           collection = instance_variable_get("@#{clxn_name}")
+#           val = collection.fetch(item_key) do
+#             attrs.merge!(key_method => item_key, :owner => self) if attrs.respond_to?(:merge!)
+#             factory = options.fetch(:factory){ type }
+#             new_val = factory.receive(attrs)
+#             collection << new_val
+#             new_val
+#           end
+#           val.instance_exec(&block) if block
+#           val
+#         end
+#       end
+#
+#     end
+#   end
+# end