gorillib 0.4.1pre → 0.4.2pre

data/.gitignore

@@ -1,9 +1,11 @@
 ## OS
 .DS_Store
-Icon?
+Icon
 nohup.out
 .bak
 
+*.pem
+
 ## EDITORS
 \#*
 .\#*
@@ -31,6 +33,11 @@ a.out
 .svn
 
 ## PROJECT::GENERAL
+
+log/*
+tmp/*
+pkg/*
+
 coverage
 rdoc
 doc
@@ -38,17 +45,13 @@ pkg
 .rake_test_cache
 .bundle
 .yardoc
-*_private.*
-*.pem
 
-log/*
-tmp/*
-pkg/*
+.vendor
 
 ## PROJECT::SPECIFIC
-*.rdb
 
-.vendor
-.bundle
 Gemfile.lock
-old/*
+.rvmrc
+.rbenv-version
+
+.rbx

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--format documentation

data/.yardopts

@@ -1,5 +1,6 @@
 --readme   README.md
 --markup   markdown
+--verbose
 -
 VERSION
 CHANGELOG.md

data/CHANGELOG.md

@@ -1,6 +1,53 @@
+# Gorillib Changelog
+
 ## Version 1.0
 
 
+### 2012-08 - Version 1.0.3-pre
+
+#### Deprecations
+
+The following have been relocated to `gorillib/deprecated/{old name}`. So, if you were using `gorillib/array/random` and can't stand to migrate yet, just include `gorillib/deprecated/array/random` instead.
+
+* deprecated `Array#random_element` -- `Array#sample` exists.
+* combined `array/average`, `array/sorted_median` and `array/sorted_percentile` under `array/simple_statistics`. Just include that instead.
+  - `Array#average`, `Array#sorted_median` and `Array#sorted_percentile` are not deprecated, just moved.
+  - `Array#sorted_sample` is now `Array#sorted_nths`. There is a `sample` method on array with a non-similar purpose. Also modified it to land on the half-stride: `[1,2,3,4,5].sorted_nths(2)` is `[2,4]` not `[3,5]`.
+  - metaprogramming/aliasing.rb
+
+
+#### Organized files in `gorillib/model`
+
+* `gorillib/model/factories` is now `gorillib/factories.rb`
+* `gorillib/builder/field` was empty, removed it
+
+#### Questions
+
+* move `compact_blank`, `deep_compact` to `enumerable/compact`? 
+
+#### Other
+
+* stripping back the gem dependencies.
+  - `json` & `OJ` alongside bundler and rake in the `:development` group
+
+
+### 2012-06 - Version 1.0.2-pre: First wave of refactors
+
+**positional args**:
+
+* You must explicitly declare the field to be positional in its definition: 
+
+      class Smurf
+        include Gorillib::Model
+        field :smurfiness, Integer, :position => 0
+        field :weapon, String, :position => 1
+      end
+    
+    Positions must be non-conflicting and in minimal order: if a subclass would bomb out if it declared `field :foo, Whatever, :position => 1` (or any position besides `2`).
+
+* Builder's `receive!` method returns the *block*'s return value, not `self`.
+
+
 ### 2012-06 - Version 1.0.1-pre: First wave of refactors
 
 **model**: 

data/Gemfile

@@ -1,36 +1,39 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gem   'multi_json',  ">= 1.1"
 
 # Only gems that you want listed as development dependencies in the gemspec
 group :development do
   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'
+  gem 'rake',                    :require => false
+  gem 'yard',        ">= 0.7",   :require => false
+  gem 'rspec',       ">= 2.8",   :require => false
+  gem 'jeweler',     ">= 1.6",   :require => false
 end
 
 group :docs do
-  gem 'yard',        ">= 0.7"
-  gem 'redcarpet',   ">= 2.1"
+  gem 'redcarpet',   ">= 2.1",   :platform => [:ruby]
+  gem 'kramdown',                :platform => [:jruby]
 end
 
 # Gems for testing and coverage
 group :test do
-  gem 'rspec',       "~> 2.8"
-  gem 'simplecov',   ">= 0.5", :platform => :ruby_19
-  #
-  gem 'guard',       ">= 1.0"
-  gem 'guard-rspec', ">= 0.6"
-  gem 'guard-yard'
+  gem 'simplecov',   ">= 0.5",   :platform => [:ruby_19],   :require => false
+  gem 'json'
+end
+
+# Gems you would use if hacking on this gem (rather than with it)
+group :support do
+  gem 'pry'
+  # gem 'perftools.rb',            :platform => [:mri]
   #
+  gem 'guard',       ">= 1.0",   :platform => [:ruby_19]
+  gem 'guard-rspec', ">= 0.6",   :platform => [:ruby_19]
+  gem 'guard-yard',              :platform => [:ruby_19]
   if RUBY_PLATFORM.include?('darwin')
-    gem 'rb-fsevent', ">= 0.9"
+    gem 'rb-fsevent', ">= 0.9",  :platform => [:ruby_19]
+  end
+  if ENV['GORILLIB_YARD']
+    gem 'guard-livereload', ">= 1.0"
   end
 end

data/Guardfile

@@ -1,19 +1,33 @@
 # -*- ruby -*-
 
-# guard 'yard', :stdout => '/dev/null' do
-#   watch(%r{lib/.+\.rb})
-#   watch(%r{notes/.+\.(md|txt)}) { "notes" }
-# end
+# require 'guard/notifiers/emacs'
+# ::Guard::Notifier::DEFAULTS.merge!(
+#   :success => '#e7fde4',
+#   :failed  => '#faeedc',
+#   :default => '#eee8d6',
+#   )
+# p ['emacs notifier:', ::Guard::Notifier::DEFAULTS]
 
-# '--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 example_spec model_spec
+format  = "progress"         # '--format doc'     for more verbose, --format progress for less
+tags    = %w[   ]         # '--tag record_spec' to only run tests tagged :record_spec
 
-guard 'rspec', :version => 2, :cli => "--format #{format} #{ tags.map{|tag| "--tag #{tag}"}.join(" ")  }" do
+guard('rspec', version: 2, all_after_pass: false, all_on_start: false,
+  cli: "--format #{format} #{ tags.map{|tag| "--tag #{tag}"}.join(" ")  }") do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^(examples/.+)\.rb}){|m|      "spec/#{m[1]}_spec.rb" }
   watch(%r{^lib/gorillib/(.+)\.rb$}){|m| ["spec/gorillib/#{m[1]}_spec.rb", "spec/examples/builder/ironfan_spec.rb"] }
   watch('spec/spec_helper.rb'){           "spec" }
   watch(/spec\/support\/(.+)\.rb/){       "spec" }
 end
+
+if ENV['GORILLIB_YARD']
+
+  guard 'yard', use_cache: true, server: false, stdout: '/dev/null' do
+    watch(%r{lib/.+\.rb})
+    watch(%r{notes/.+\.(md|txt)}){ "notes" }
+  end
+
+  guard 'livereload' do
+    watch(/^doc\/(.*\.html)/) # {|match| [ match[1], "frames.html" ] }
+  end
+end

data/README.md

@@ -9,27 +9,27 @@ What gorillib gives you is clarity over what features are brought in. If you wan
 * Upwards compatible with `active_record` and `extlib`
   - the `active_support` components have significantly more robust internationalization, and some functions have rich option sets in `active_support` vs. basic functionality in `gorillib`.  So the rule is if you were happy with `gorillib` you'll be happy with `active_support`, but not vice-versa.
 
-### require 'gorillib/receiver'
+### require 'gorillib/model
 
-Gorillib has at least one powerful addition to the canon: the receiver mixin.
+Gorillib has at least one powerful addition to the canon: the `Gorillib::Model` mixin.
+
+Think of it like 'An ORM for JSON'. It's designed for data that spends as much time on the wire as it does in action -- things like API handlers or clients, data processing scripts, wukong jobs.
 
 * lightweight
-* gives you weak type safety but doesn't jack around with setters/getters.
-* object/hash semantics
+* serializes to/from JSON, TSV or plain hashes
+* type converts when you need it, but doesn't complicate normal accessors
+* upward compatible with ActiveModel
 
 ### require 'gorillib'
 
-* `require 'gorrillib/base'`
-
-### require 'gorillib/base'
-
-requires the following libraries:
+Requires only the following minimal set of libraries:
 
-* `gorillib/object/blank`
-* `gorillib/hash/reverse_merge`
+* `gorillib/object/blank`          -- fluent boolean methods `foo.blank?` & `foo.present?`
+* `gorillib/array/extract_options` -- get optional keyword args from a `*args` signature
+* `gorillib/hash/reverse_merge`    -- 
 * `gorillib/hash/compact`
 * `gorillib/array/compact_blank`
-* `gorillib/object/try`
+* `gorillib/exception/raisers`     -- DRY exceptions: `ArgumentError.check_arity!`, `TypeMismatchError`, 
 
 ### require 'gorillib/some'
 

data/Rakefile

@@ -1,57 +1,46 @@
 require 'rubygems' unless defined?(Gem)
-require 'bundler'
-begin
-  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
+require 'bundler/setup'
+Bundler.setup(:default, :development)
 require 'rake'
 
+task :default => :rspec
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:rspec) do |spec|
+  Bundler.setup(:default, :development, :test)
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+desc "Run RSpec with code coverage"
+task :cov do
+  ENV['GORILLIB_COV'] = "yep"
+  Rake::Task[:rspec].execute
+end
+
+require 'yard'
+YARD::Rake::YardocTask.new do
+  Bundler.setup(:default, :development, :docs)
+end
+
 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"
+  Bundler.setup(:default, :development, :test)
+  gem.name        = 'gorillib'
+  gem.homepage    = 'https://github.com/infochimps-labs/gorillib'
+  gem.license     = 'Apache 2.0'
+  gem.email       = 'coders@infochimps.org'
+  gem.authors     = ['Infochimps']
+
   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| f =~ %r{^(vendor|coverage|old|away)/} }.
     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'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  Bundler.setup(:default, :development, :test)
-  spec.pattern = FileList['spec/**/*_spec.rb']
-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
-  Bundler.setup(:default, :development, :docs)
-end
-
-# App-specific tasks
-Dir[File.dirname(__FILE__)+'/lib/tasks/**/*.rake'].sort.each{|f| load f }
-
-task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2pre

data/examples/benchmark/factories_benchmark.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+
+require 'benchmark'
+require 'benchmark/ips'  # https://github.com/evanphx/benchmark-ips and benchmark_suite
+
+require 'gorillib'
+require 'gorillib/model'
+# load(File.expand_path("../gorillib/lib/gorillib/model/factories.rb"))
+
+module Gorillib::Factory
+
+  NUMERIC_FACTORIES = {
+    :int          => IntegerFactory.new(),     # uses Integer() -- strict (will not convert a float-y string)
+    :flt          => FloatFactory.new(),       # uses Float() -- strict
+    :gr_int       => GraciousIntegerFactory.new(),
+    :gr_float     => GraciousFloatFactory.new(),
+
+    # indiscriminately Integer or to_i anything you see
+    :gri_to_i     => GraciousIntegerFactory.new(convert: ->(obj){ obj.to_i     }),
+    :gri_dirct    => GraciousIntegerFactory.new(convert: ->(obj){ Integer(obj) }),
+
+    # same as basic GraciousIntegerFactory, but strangely defining a block here
+    # is *way* faster, so for fair conversion to :gr_int_direct and :gr_int_to_i
+    # I've duplicated it here
+    :gri_blk      => IntegerFactory.new(convert: ->(obj){
+        if String === obj       then
+          obj = obj.to_s.tr(FLT_CRUFT_CHARS, '') ;
+          obj = Float(obj) if FLT_NOT_INT_RE === obj ;
+        end
+        Integer(obj) } ),
+  }
+
+  NUMERIC_OBJECTS = [
+    "1_234.5e4f",
+    "1_234_567.1234e+40",
+    "1_234",
+    "123456789_123456789_123456789_123456789_123456789",
+    "1234L",
+    "1,234,567",
+    "1_234.5e4",
+    1234, 1234.5,
+    Time.now,
+    "0x11", '0x1.999999999999ap4'
+  ]
+
+  class FactoryBencher
+    include Gorillib::Model
+    field :step_duration, Integer, position: 0, default: 2.0, doc: "Target duration of each benchmarking step"
+    field :warm_duration, Integer, position: 0, default: 0.1, doc: "Target duration of warmup step"
+
+    def benchmark_factory(factories)
+      NUMERIC_OBJECTS.each do |obj|
+        puts "=== Converting +%-20s+: %s" % [
+          obj.inspect, factories.map{|fn, fact| "#{fn}: #{fact.receive(obj) rescue '(err)'}" }.join(" | ")]
+      end
+      NUMERIC_OBJECTS.each do |obj|
+        ips do |bench|
+          factories.each do |factory_name, factory|
+            msg = "%-15s%10s" % [obj.inspect[0..14], factory_name]
+            bench.report(msg){ factory.receive(obj) }
+          end
+          bench.report('to_i baseline' ){ obj.to_i }
+          bench.report('to_f baseline' ){ obj.to_f }
+        end
+      end
+    end
+
+    def benchmark_baseline
+      objs = NUMERIC_OBJECTS
+      ips do |bench|
+        objs.each{|obj| bench.report("#{obj.inspect[0..9]} #to_i"     ){ obj.to_i            } }
+        objs.each{|obj| bench.report("#{obj.inspect[0..9]} #to_f"     ){ obj.to_f            } }
+        objs.each{|obj| bench.report("#{obj.inspect[0..9]} Integer()" ){ Integer(obj)        } }
+        objs.each{|obj| bench.report("#{obj.inspect[0..9]} Float())"  ){ Float(obj)          } }
+        objs.each{|obj| bench.report("#{obj.inspect[0..9]} Int(Fl())" ){ Integer(Float(obj)) } }
+      end
+    end
+
+    def ips(&block)
+      Benchmark.ips(step_duration, warm_duration, &block)
+    end
+  end
+
+  bencher = FactoryBencher.new
+  bencher.benchmark_factory(NUMERIC_FACTORIES)
+  bencher.benchmark_baseline
+end

data/examples/builder/ironfan.rb

@@ -24,8 +24,6 @@ module Gorillib::Test
   class Aspect         < IronfanBuilder ; end
   class Machine        < IronfanBuilder ; end
   class ChefNode       < IronfanBuilder ; def save() ; end ; end
-  class ChefClient     < IronfanBuilder ; def save() ; end ; end
-  class ChefRole       < IronfanBuilder ; def save() ; end ; end
 
   module Ironfan
     class << self
@@ -39,7 +37,7 @@ module Gorillib::Test
 
   class ComputeBuilder < IronfanBuilder
     magic         :environment, Symbol
-    collection    :clouds,      Cloud
+    collection    :clouds,     Cloud
     collection    :volumes,    Volume
     collection    :components, Component
 
@@ -53,22 +51,6 @@ module Gorillib::Test
     def servers() organization.servers.where(:cluster_name => self.name) ; end
   end
 
-  module ComputeBuilder::Deprecated
-    def bogosity() ; end
-    def bogus?()   ; end
-    def raid_group() ; end
-    def root_volume() ; end
-    def role() ; end
-    def recipe() ; end
-    def role_implication() ; end
-  end
-  module Cluster::Deprecated
-    attr_accessor :chef_roles
-    def find_facet(facet_name)
-      facets.fetch(facet_name){ raise("Facet '#{facet_name}' is not defined in cluster '#{self.name}'") }
-    end
-  end
-
   class Facet          < ComputeBuilder
     belongs_to    :cluster,   Cluster
     collection    :servers,   Server