adamantium 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzMwMWQ3ODI1Y2FlYTlhNTFjZjhlYTM3NWMyOTgwZjk4NmI4ODFjYg==
-  data.tar.gz: !binary |-
-    M2RmNzViMTg3YjcxNDdmMDg4ZTBmZTAzMWY5MDYzMDg0Y2U4MGZjZg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjU3MDcxN2UzNzU1ZWZlYzEyY2VkMzgzNWJiNTFhNDc0MmMzNWZhNzJkOGYy
-    YTRkNjhkMTRiMmIyMzAwZjk0Yjk2NDJlMmZjODY3NTVhNTNlZDcwZDgwMjMx
-    ODRjYjZmOGE4OTZlODNmNTIwMDJiYzE0N2ViNmE2NmQ5YjFiNTM=
-  data.tar.gz: !binary |-
-    ODY0NDUyODM1YTg3OTMwMWJlMTU4YzFhNzUzZmY1NGE1NWE0ZTQzMmRiMDEz
-    ZWExY2RhY2Y4YWQ3MTI1MjBlODRhODlhNWE2Y2ZlYjMxMmI5YjgzYWNhM2Uy
-    YTY0NWMwYjNmYzc1ZjcxMWU1OThlMWQyNjgwYWE0NzM2YWZiZjk=
+SHA1:
+  metadata.gz: 4675912f9a7cb3eb823638436c1be23e6753d24b
+  data.tar.gz: cbf0680ce697e2da134bc86d83582a1928952d8e
+SHA512:
+  metadata.gz: 81ab12f754e252929d3074a9a85f53af07a3a93d8db946beac48124f6f03c7528741d1716e221fb07eac9daf95031e9e2847aa72509135fd017a71a1dcfbbb53
+  data.tar.gz: 5c7246f7aaab383bd952af49971a6046dc953f96a2553e8c2e7539191bb53408a9fb0ebb71e215714d5250aa8fef426d7330dded7c090b13ba38883e45b84fa0

data/.gitignore

@@ -1,4 +1,37 @@
-/Gemfile.lock
-/coverage
-/tmp
-/.rbx
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.sw[op]
+
+## Rubinius
+*.rbc
+.rbx
+
+## PROJECT::GENERAL
+*.gem
+coverage
+profiling
+turbulence
+rdoc
+pkg
+tmp
+doc
+log
+.yardoc
+measurements
+
+## BUNDLER
+.bundle
+Gemfile.lock
+
+## PROJECT::SPECIFIC

data/.rubocop.yml

@@ -0,0 +1,6 @@
+AllCops:
+  Includes:
+    - 'Gemfile'
+  Excludes:
+    - 'Gemfile.devtools'
+    - 'vendor/**'

data/.travis.yml

@@ -1,23 +1,26 @@
 language: ruby
 before_install: gem install bundler
 bundler_args: --without yard guard benchmarks
-script: "bundle exec rake ci"
+script: "bundle exec rake ci:metrics"
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
-  - rbx-19mode
+  - rbx
 matrix:
   include:
     - rvm: jruby-19mode
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
+    - rvm: jruby-20mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
+    - rvm: jruby-21mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
     - rvm: jruby-head
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
   allow_failures:
-    - rvm: 1.9.3       # mutant fails
-    - rvm: 2.0.0       # mutant fails
-    - rvm: ruby-head   # travis broken
-    - rvm: rbx-19mode  # mutant fails
+    - rvm: 2.1.0  # buggy runtime
+  fast_finish: true
 notifications:
   irc:
     channels:

data/Gemfile.devtools

@@ -4,21 +4,24 @@ group :development do
   gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.14.1'
   gem 'yard',  '~> 0.8.7'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.1.0'
+  gem 'kramdown', '~> 1.3.0'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.8.1'
-  gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 3.0.2'
-  gem 'guard-rubocop', '~> 0.2.0'
-#  gem 'guard-mutant',  '~> 0.0.1'
+  gem 'guard',         '~> 2.3.0'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rspec',   '~> 4.2.0'
+  gem 'guard-rubocop', '~> 1.0.0'
 
   # file system change event handling
-  gem 'listen',     '~> 1.3.0'
+  gem 'listen',     '~> 2.4.0'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.3', require: false
   gem 'rb-inotify', '~> 0.9.0', require: false
@@ -30,18 +33,29 @@ group :guard do
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.6.7'
+  gem 'coveralls', '~> 0.7.0'
   gem 'flay',      '~> 2.4.0'
-  gem 'flog',      '~> 4.1.1'
+  gem 'flog',      '~> 4.2.0'
   gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.11.0'
-  gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
+  gem 'rubocop',   '~> 0.16.0'
+  gem 'simplecov', '~> 0.8.2'
+  gem 'yardstick', '~> 0.9.9'
+
+  platforms :mri do
+    gem 'mutant', '~> 0.3.4'
+  end
 
   platforms :ruby_19, :ruby_20 do
-#    gem 'mutant', git: 'https://github.com/mbj/mutant.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
+
+  platform :rbx do
+    gem 'json',               '~> 1.8.1'
+    gem 'racc',               '~> 1.4'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.2'
+  end
 end
 
 group :benchmarks do

data/README.md

@@ -1,7 +1,7 @@
 adamantium
 ==========
 
-Create immutable objects
+Create immutable objects with ease.
 
 [![Gem Version](https://badge.fury.io/rb/adamantium.png)][gem]
 [![Build Status](https://secure.travis-ci.org/dkubb/adamantium.png?branch=master)][travis]
@@ -16,7 +16,7 @@ Create immutable objects
 [coveralls]: https://coveralls.io/r/dkubb/adamantium
 
 This is a small standalone gem featuring a module ripped out from [axiom](https://github.com/dkubb/axiom).
-It allows to make objects immutable in an unobtrusive way.
+It allows you to make objects immutable in a simple, unobtrusive way.
 
 Examples
 --------
@@ -70,7 +70,7 @@ class Example
   end
   memoize :buffer, freezer: :noop
 
-  # Memoized method with nondeeply frozen value
+  # Memoized method with shallow frozen value
   # Example:
   #
   # object = Example.new
@@ -86,12 +86,12 @@ class Example
 end
 
 class FlatExample
-  # Inclusion of Adamantium::Flat defaults do non deep frozen behavior
-  # for memoizer and constructor
+  # Inclusion of Adamantium::Flat defaults to shallow frozen
+  # behavior for memoizer and constructor
 
   include Adamantium::Flat
 
-  # Instace is frozen but attribute is not
+  # Instance is frozen but attribute is not
   # object = FlatExample.new
   # object.frozen?           # => true
   # object.attribute.frozen? # => false
@@ -100,7 +100,7 @@ class FlatExample
   end
   attr_reader :attribute
 
-  # Memoized method with flat frozen value (default)
+  # Memoized method with flat frozen value (default with Adamantium::Flat)
   # Example:
   #
   # object = Example.new

data/adamantium.gemspec

@@ -10,15 +10,15 @@ Gem::Specification.new do |gem|
   gem.description = 'Immutable extensions to objects'
   gem.summary     = gem.description
   gem.homepage    = 'https://github.com/dkubb/adamantium'
-  gem.licenses    = 'MIT'
+  gem.license     = 'MIT'
 
   gem.require_paths    = %w[lib]
   gem.files            = `git ls-files`.split("\n")
   gem.test_files       = `git ls-files -- spec/{unit,integration}`.split("\n")
   gem.extra_rdoc_files = %w[LICENSE README.md CONTRIBUTING.md TODO]
 
-  gem.add_runtime_dependency('ice_nine',    '~> 0.9')
-  gem.add_runtime_dependency('thread_safe', '~> 0.1.2')
+  gem.add_runtime_dependency('ice_nine',   '~> 0.11.0')
+  gem.add_runtime_dependency('memoizable', '~> 0.4.0')
 
-  gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
+  gem.add_development_dependency('bundler', '~> 1.5', '>= 1.5.2')
 end

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
-threshold: 7
-total_score: 54
+threshold: 4
+total_score: 28

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 17.5
+threshold: 15.0

data/config/reek.yml

@@ -10,7 +10,8 @@ ClassVariable:
   exclude: []
 ControlParameter:
   enabled: true
-  exclude: []
+  exclude:
+  - Adamantium#transform_unless
 DataClump:
   enabled: true
   exclude: []

data/config/rubocop.yml

@@ -1,10 +1,4 @@
-AllCops:
-  Includes:
-    - '**/*.rake'
-    - 'Gemfile'
-    - 'Gemfile.devtools'
-  Excludes:
-    - '**/vendor/**'
+inherit_from: ../.rubocop.yml
 
 # Avoid parameter lists longer than five parameters.
 ParameterLists:
@@ -29,7 +23,7 @@ CollectionMethods:
 # sections of code and visually separate them. When the keyword is at the same
 # level I think it sort of blends in with the def keywords and makes it harder
 # to scan the code and see where the sections are.
-AccessControl:
+AccessModifierIndentation:
   Enabled: false
 
 # Limit line length
@@ -55,3 +49,7 @@ ConstantName:
 # Not all trivial readers/writers can be defined with attr_* methods
 TrivialAccessors:
   Enabled: false
+
+# Allow empty lines around body
+EmptyLinesAroundBody:
+  Enabled: false

data/lib/adamantium.rb

@@ -1,14 +1,11 @@
 # encoding: utf-8
 
 require 'ice_nine'
-require 'thread_safe'
+require 'memoizable'
 
 # Allows objects to be made immutable
 module Adamantium
 
-  # Storage for memoized methods
-  Memory = Class.new(ThreadSafe::Hash)
-
   # Defaults to less strict defaults
   module Flat
 
@@ -17,7 +14,6 @@ module Adamantium
     # @return [Freezer::Flat]
     #
     # @api private
-    #
     def freezer
       Freezer::Flat
     end
@@ -31,8 +27,10 @@ module Adamantium
     # @api private
     def self.included(descendant)
       super
-      descendant.send(:include, Adamantium)
-      descendant.extend(self)
+      descendant.instance_exec(self) do |mod|
+        include Adamantium
+        extend mod
+      end
     end
     private_class_method :included
 
@@ -47,58 +45,22 @@ module Adamantium
   #
   # @api private
   def self.included(descendant)
-    descendant.extend ModuleMethods
-    descendant.extend ClassMethods  if descendant.kind_of?(Class)
-    self
-  end
-
-  # Freeze the object
-  #
-  # @example
-  #   object.freeze  # object is now frozen
-  #
-  # @return [Object]
-  #
-  # @api public
-  def freeze
-    memory  # initialize memory
     super
+    descendant.class_eval do
+      include Memoizable
+      extend ModuleMethods
+      extend ClassMethods if kind_of?(Class)
+    end
   end
+  private_class_method :included
 
-  # Get the memoized value for a method
-  #
-  # @example
-  #   hash = object.memoized(:hash)
-  #
-  # @param [Symbol] name
-  #   the method name
+  # Alias to the original dup method
   #
   # @return [Object]
   #
-  # @api public
-  def memoized(name)
-    memory[name]
-  end
-
-  # Sets a memoized value for a method
-  #
-  # @example
-  #   object.memoize(:hash, 12345)
-  #
-  # @param [Symbol] name
-  #   the method name
-  # @param [Object] value
-  #   the value to memoize
-  #
-  # @return [self]
-  #
-  # @api public
-  def memoize(name, value)
-    unless memory.key?(name)
-      store_memory(name, freeze_object(value))
-    end
-    self
-  end
+  # @api private
+  alias_method :__adamantium_dup__, :dup
+  private :__adamantium_dup__
 
   # A noop #dup for immutable objects
   #
@@ -112,57 +74,34 @@ module Adamantium
     self
   end
 
-private
-
-  # The memoized method results
-  #
-  # @return [Hash]
-  #
-  # @api private
-  def memory
-    @__memory ||= Memory.new
-  end
+protected
 
-  # Freeze object
-  #
-  # @param [Object] object
-  #   an object to be frozen
+  # Transform the object with the provided block
   #
   # @return [Object]
   #
-  # @api private
-  def freeze_object(object)
-    freezer.call(object)
-  end
-
-  # Return class level freezer
-  #
-  # @return [#call]
-  #
-  # @api private
-  def freezer
-    self.class.freezer
+  # @api public
+  def transform(&block)
+    copy = __adamantium_dup__
+    copy.instance_eval(&block)
+    self.class.freezer.freeze(copy)
   end
 
-  # Store the value in memory
+  # Transform the object with the provided block if the condition is false
   #
-  # @param [Symbol] name
-  #   the method name
-  # @param [Object] value
-  #   the value to memoize
+  # @param [Boolean] condition
   #
-  # @return [self]
-  #
-  # @return [value]
+  # @return [Object]
   #
-  # @api private
-  def store_memory(name, value)
-    memory[name] = value
+  # @api public
+  def transform_unless(condition, &block)
+    condition ? self : transform(&block)
   end
 
-end # module Adamantium
+end # Adamantium
 
 require 'adamantium/module_methods'
 require 'adamantium/class_methods'
 require 'adamantium/freezer'
 require 'adamantium/mutable'
+require 'adamantium/version'

data/lib/adamantium/class_methods.rb

@@ -17,5 +17,5 @@ module Adamantium
       freezer.freeze(super)
     end
 
-  end # module ClassMethods
-end # module Adamantium
+  end # ClassMethods
+end # Adamantium

data/lib/adamantium/freezer.rb

@@ -80,7 +80,7 @@ module Adamantium
       #
       # @api private
       def self.freeze(value)
-        IceNine.deep_freeze(value)
+        IceNine.deep_freeze!(value)
       end
 
       public_class_method :call
@@ -94,6 +94,12 @@ module Adamantium
     # Error raised when memoizer options contain unknown keys
     class OptionError < RuntimeError; end
 
+    @freezers = {
+      noop: Noop,
+      deep: Deep,
+      flat: Flat,
+    }.freeze
+
     # Return freezer for name
     #
     # @param [Symbol] name
@@ -103,12 +109,8 @@ module Adamantium
     #
     # @api private
     def self.get(name)
-      case name
-      when :noop then Noop
-      when :deep then Deep
-      when :flat then Flat
-      else
-        raise UnknownFreezerError, "Freezer with name #{name.inspect} is unknown"
+      @freezers.fetch(name) do
+        fail UnknownFreezerError, "Freezer with name #{name.inspect} is unknown"
       end
     end
 
@@ -128,7 +130,7 @@ module Adamantium
     def self.parse(options)
       keys = options.keys - [:freezer]
       unless keys.empty?
-        raise OptionError, "Unknown option key(s) for memoizer #{keys.inspect}"
+        fail OptionError, "Unknown option key(s) for memoizer #{keys.inspect}"
       end
       get(options.fetch(:freezer)) if options.key?(:freezer)
     end

data/lib/adamantium/module_methods.rb

@@ -5,25 +5,11 @@ module Adamantium
   # Methods mixed in to adamantium modules
   module ModuleMethods
 
-    # Hook called when module is included
-    #
-    # @param [Module] mod
-    #   the module including ModuleMethods
-    #
-    # @return [self]
-    #
-    # @api private
-    def included(mod)
-      Adamantium.included(mod)
-      self
-    end
-
     # Return default deep freezer
     #
     # @return [Freezer::Deep]
     #
     # @api private
-    #
     def freezer
       Freezer::Deep
     end
@@ -46,135 +32,35 @@ module Adamantium
       self
     end
 
-    # Test if an instance method is memoized
-    #
-    # @example
-    #   class Foo
-    #     include Adamantium
-    #
-    #     def bar
-    #     end
-    #     memoize :bar
-    #
-    #   end
-    #
-    #   Foo.memoized?(:bar) # true
-    #   Foo.memoized?(:baz) # false, does not care if method acutally exists
-    #
-    # @param [Symbol] name
-    #
-    # @return [true]
-    #   if method is memoized
-    #
-    # @return [false]
-    #   otherwise
-    #
-    # @api private
-    #
-    def memoized?(name)
-      memoized_methods.key?(name)
-    end
+  private
 
-    # Return original instance method
-    #
-    # @example
-    #
-    #   class Foo
-    #     include Adamantium
-    #
-    #     def bar
-    #     end
-    #     memoize :bar
-    #
-    #   end
-    #
-    #   Foo.original_instance_method(:bar) #=> UnboundMethod, where source_location still points to original!
-    #
-    # @param [Symbol] name
-    #
-    # @return [UnboundMethod]
-    #   if method was memoized before
+    # Hook called when module is included
     #
-    # @raise [ArgumentError]
-    #   otherwise
+    # @param [Module] descendant
+    #   the module including ModuleMethods
     #
-    # @api public
+    # @return [self]
     #
-    def original_instance_method(name)
-      memoized_methods[name]
+    # @api private
+    def included(descendant)
+      super
+      descendant.module_eval { include Adamantium }
     end
 
-  private
-
     # Memoize the named method
     #
-    # @param [#to_s] method_name
+    # @param [Symbol] method_name
     #   a method name to memoize
     # @param [#call] freezer
-    #   a freezer for memoized values
+    #   a callable object to freeze the value
     #
     # @return [undefined]
     #
     # @api private
     def memoize_method(method_name, freezer)
-      method = instance_method(method_name)
-      if method.arity.nonzero?
-        raise ArgumentError, 'Cannot memoize method with nonzero arity'
-      end
-      memoized_methods[method_name] = method
-      visibility = method_visibility(method_name)
-      define_memoize_method(method, freezer)
-      send(visibility, method_name)
-    end
-
-    # Return original method registry
-    #
-    # @return [Hash<Symbol, UnboundMethod>]
-    #
-    # @api private
-    #
-    def memoized_methods
-      @memoized_methods ||= ThreadSafe::Hash.new do |_, name|
-        raise ArgumentError, "No method #{name.inspect} was memoized"
-      end
-    end
-
-    # Define a memoized method that delegates to the original method
-    #
-    # @param [UnboundMethod] method
-    #   the method to memoize
-    # @param [#call] freezer
-    #   a freezer for memoized values
-    #
-    # @return [undefined]
-    #
-    # @api private
-    def define_memoize_method(method, freezer)
-      method_name = method.name.to_sym
-      undef_method(method_name)
-      define_method(method_name) do ||
-        memory.fetch(method_name) do
-          value  = method.bind(self).call
-          frozen = freezer.call(value)
-          store_memory(method_name, frozen)
-        end
-      end
-    end
-
-    # Return the method visibility of a method
-    #
-    # @param [String, Symbol] method
-    #   the name of the method
-    #
-    # @return [Symbol]
-    #
-    # @api private
-    def method_visibility(method)
-      if    private_method_defined?(method)   then :private
-      elsif protected_method_defined?(method) then :protected
-      else                                         :public
-      end
+      memoized_methods[method_name] = Memoizable::MethodBuilder
+        .new(self, method_name, freezer).call
     end
 
-  end # module ModuleMethods
-end # module Adamantium
+  end # ModuleMethods
+end # Adamantium

data/lib/adamantium/version.rb

@@ -3,6 +3,6 @@
 module Adamantium
 
   # Gem version
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 
-end # module Adamantium
+end # Adamantium

data/spec/spec_helper.rb

@@ -12,9 +12,12 @@ if ENV['COVERAGE'] == 'true'
   ]
 
   SimpleCov.start do
-    command_name     'spec:unit'
-    add_filter       'config'
-    add_filter       'spec'
+    command_name 'spec:unit'
+
+    add_filter 'config'
+    add_filter 'spec'
+    add_filter 'vendor'
+
     minimum_coverage 100
   end
 end

data/spec/unit/adamantium/fixtures/classes.rb

@@ -4,6 +4,8 @@ module AdamantiumSpecs
   class Object
     include Adamantium
 
+    public :transform, :transform_unless
+
     def argumented(foo)
     end
 
@@ -15,6 +17,10 @@ module AdamantiumSpecs
       caller
     end
 
+    def eql?(other)
+      kind_of?(other.class)
+    end
+
   protected
 
     def protected_method

data/spec/unit/adamantium/freeze_spec.rb

@@ -22,12 +22,6 @@ describe Adamantium, '#freeze' do
         .from(false)
         .to(true)
     end
-
-    it 'sets a memoization instance variable' do
-      expect(object).to_not be_instance_variable_defined(:@__memory)
-      subject
-      expect(object.instance_variable_get(:@__memory)).to be_instance_of(Adamantium::Memory)
-    end
   end
 
   context 'with a frozen object' do
@@ -38,14 +32,5 @@ describe Adamantium, '#freeze' do
     it 'does not change the frozen state of the object' do
       expect { subject }.to_not change(object, :frozen?)
     end
-
-    it 'does not change the memoization instance variable' do
-      expect { subject }.to_not change { object.instance_variable_get(:@__memory) }
-    end
-
-    it 'does not set an instance variable for memoization' do
-      expect(object.instance_variable_get(:@__memory)).to be_instance_of(Adamantium::Memory)
-      subject
-    end
   end
 end

data/spec/unit/adamantium/freezer/deep/class_methods/freeze_spec.rb

@@ -9,7 +9,7 @@ describe Adamantium::Freezer::Deep, '.freeze' do
   let(:value)  { double('Value') }
 
   it 'should deep freeze value' do
-    IceNine.should_receive(:deep_freeze).with(value).and_return(value)
+    IceNine.should_receive(:deep_freeze!).with(value).and_return(value)
     should be(value)
   end
 end

data/spec/unit/adamantium/memoize_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require File.expand_path('../fixtures/classes', __FILE__)
 
 describe Adamantium, '#memoize' do
-  subject { object.memoize(method, value) }
+  subject { object.memoize(method => value) }
 
   let(:described_class) { Class.new(AdamantiumSpecs::Object) }
   let(:object)          { described_class.new                }
@@ -14,33 +14,12 @@ describe Adamantium, '#memoize' do
     described_class.memoize(method)
   end
 
-  context 'when the value is frozen' do
-    let(:value) { String.new.freeze }
-
-    it 'sets the memoized value for the method to the value' do
-      subject
-      expect(object.send(method)).to be(value)
-    end
-
-    it 'creates a method that returns a frozen value' do
-      subject
-      expect(object.send(method)).to be_frozen
-    end
-
-    it_should_behave_like 'a command method'
-  end
-
-  context 'when the value is not frozen' do
+  context 'when the method is not memoized' do
     let(:value) { String.new }
 
     it 'sets the memoized value for the method to the value' do
       subject
-      expect(object.send(method)).to eql(value)
-    end
-
-    it 'creates a method that returns a frozen value' do
-      subject
-      expect(object.send(method)).to be_frozen
+      expect(object.send(method)).to be(value)
     end
 
     it_should_behave_like 'a command method'
@@ -51,13 +30,11 @@ describe Adamantium, '#memoize' do
     let(:original) { nil    }
 
     before do
-      object.memoize(method, original)
+      object.memoize(method => original)
     end
 
-    it 'does not change the value' do
-      expect { subject }.to_not change { object.send(method) }
+    it 'raises an exception' do
+      expect { subject }.to raise_error(ArgumentError)
     end
-
-    it_should_behave_like 'a command method'
   end
 end

data/spec/unit/adamantium/module_methods/included_spec.rb

@@ -1,16 +1,40 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe Adamantium::ModuleMethods, '#included' do
-  subject { object.included(object) }
+  subject { descendant.instance_exec(object) { |mod| include mod } }
 
-  let(:object) { AdamantiumSpecs::Object }
+  let(:object)     { Module.new.extend(described_class) }
+  let(:descendant) { Class.new                          }
+  let(:superclass) { Module                             }
 
   before do
-    Adamantium.should_receive(:included).with(object).and_return(Adamantium)
+    # Prevent Module.included from being called through inheritance
+    Adamantium.stub(:included)
   end
 
-  it_should_behave_like 'a command method'
+  around do |example|
+    # Restore included method after each example
+    superclass.class_eval do
+      alias_method :original_included, :included
+      example.call
+      undef_method :included
+      alias_method :included, :original_included
+    end
+  end
+
+  it 'delegates to the superclass #included method' do
+    # This is the most succinct approach I could think of to test whether the
+    # superclass#included method is called. All of the built-in rspec helpers
+    # did not seem to work for this.
+    included = false
+    superclass.class_eval { define_method(:included) { |_| included = true } }
+    expect { subject }.to change { included }.from(false).to(true)
+  end
+
+  it 'includes Adamantium into the descendant' do
+    subject
+    expect(descendant.included_modules).to include(Adamantium)
+  end
 end

data/spec/unit/adamantium/module_methods/memoize_spec.rb

@@ -9,19 +9,17 @@ shared_examples_for 'memoizes method' do
     instance = object.new
     expect(instance.send(method)).to be(instance.send(method))
   end
+end
 
-  it 'creates a method that returns a same value' do
-    subject
-    instance = object.new
-    expect(instance.send(method)).to be(instance.send(method))
-  end
-
+shared_examples_for 'wraps original method' do
   it 'creates a method with an arity of 0' do
     subject
     expect(object.new.method(method).arity).to be_zero
   end
 
   context 'when the initializer calls the memoized method' do
+    it_should_behave_like 'memoizes method'
+
     before do
       method = self.method
       object.send(:define_method, :initialize) { send(method) }
@@ -31,11 +29,6 @@ shared_examples_for 'memoizes method' do
       subject
       expect { object.new }.to_not raise_error
     end
-
-    it 'memoizes the methdod inside the initializer' do
-      subject
-      expect(object.new.memoized(method)).to_not be_nil
-    end
   end
 end
 
@@ -56,7 +49,7 @@ describe Adamantium::ModuleMethods, '#memoize' do
     let(:method) { :argumented }
 
     it 'should raise error' do
-      expect { subject }.to raise_error(ArgumentError, 'Cannot memoize method with nonzero arity')
+      expect { subject }.to raise_error(ArgumentError, "Cannot memoize #{object}#argumented, its arity is 1")
     end
   end
 
@@ -65,7 +58,7 @@ describe Adamantium::ModuleMethods, '#memoize' do
     let(:options) { { freezer: :noop } }
 
     it_should_behave_like 'a command method'
-    it_should_behave_like 'memoizes method'
+    it_should_behave_like 'wraps original method'
 
     it 'is still a public method' do
       should be_public_method_defined(method)
@@ -82,6 +75,7 @@ describe Adamantium::ModuleMethods, '#memoize' do
 
     it_should_behave_like 'a command method'
     it_should_behave_like 'memoizes method'
+    it_should_behave_like 'wraps original method'
 
     it 'creates a method that returns a frozen value' do
       subject
@@ -94,6 +88,7 @@ describe Adamantium::ModuleMethods, '#memoize' do
 
     it_should_behave_like 'a command method'
     it_should_behave_like 'memoizes method'
+    it_should_behave_like 'wraps original method'
 
     it 'is still a public method' do
       should be_public_method_defined(method)

data/spec/unit/adamantium/transform_spec.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require File.expand_path('../fixtures/classes', __FILE__)
+
+describe Adamantium, '#transform' do
+  let(:object)          { described_class.new     }
+  let(:described_class) { AdamantiumSpecs::Object }
+
+  it 'returns a copy of the object' do
+    transformed = object.transform {}
+    expect(transformed).to_not be(object)
+    expect(transformed).to eql(object)
+  end
+
+  it 'freezes the copy' do
+    expect(object.transform {}).to be_frozen
+  end
+
+  it 'yields the copy to the block' do
+    expect { |block| object.transform(&block) }
+      .to yield_with_args(described_class)
+  end
+
+  it 'evaluates the block within the context of the copy' do
+    copy = nil
+    expect(object.transform { copy = self }).to be(copy)
+  end
+
+  it 'evaluates the block with an unfrozen copy' do
+    frozen_in_block = nil
+    expect { object.transform { frozen_in_block = frozen? } }
+      .to change { frozen_in_block }.from(nil).to(false)
+  end
+end

data/spec/unit/adamantium/transform_unless_spec.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require File.expand_path('../fixtures/classes', __FILE__)
+
+describe Adamantium, '#transform_unless' do
+  let(:object)          { described_class.new     }
+  let(:described_class) { AdamantiumSpecs::Object }
+
+  context 'when the condition is true' do
+    let(:condition) { true }
+
+    it 'does not evaluate the block' do
+      expect { |block| object.transform_unless(condition, &block) }
+        .not_to yield_control
+    end
+
+    it 'returns the object' do
+      expect(object.transform_unless(condition) {}).to be(object)
+    end
+  end
+
+  context 'when the condition is false' do
+    let(:condition) { false }
+
+    it 'evaluates the block' do
+      expect { |block| object.transform_unless(condition, &block) }
+        .to yield_control
+    end
+
+    it 'returns a copy of the object' do
+      transformed = object.transform_unless(condition) {}
+      expect(transformed).to_not be(object)
+      expect(transformed).to eql(object)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adamantium
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Dan Kubb
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -17,48 +17,48 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: memoizable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ! '>='
+        version: '1.5'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ! '>='
+        version: '1.5'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.5.2
 description: Immutable extensions to objects
 email:
 - dan.kubb@gmail.com
@@ -73,6 +73,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .ruby-gemset
 - .travis.yml
 - CONTRIBUTING.md
@@ -103,7 +104,6 @@ files:
 - spec/rcov.opts
 - spec/spec_helper.rb
 - spec/support/config_alias.rb
-- spec/unit/adamantium/class_methods/included_spec.rb
 - spec/unit/adamantium/class_methods/new_spec.rb
 - spec/unit/adamantium/dup_spec.rb
 - spec/unit/adamantium/fixtures/classes.rb
@@ -117,14 +117,14 @@ files:
 - spec/unit/adamantium/freezer/flat/class_methods/call_spec.rb
 - spec/unit/adamantium/freezer/flat/class_methods/freeze_spec.rb
 - spec/unit/adamantium/memoize_spec.rb
-- spec/unit/adamantium/memoized_spec.rb
 - spec/unit/adamantium/module_methods/freezer_spec.rb
 - spec/unit/adamantium/module_methods/included_spec.rb
 - spec/unit/adamantium/module_methods/memoize_spec.rb
 - spec/unit/adamantium/module_methods/memoized_predicate_spec.rb
-- spec/unit/adamantium/module_methods/original_instance_method_spec.rb
 - spec/unit/adamantium/mutable/freeze_spec.rb
 - spec/unit/adamantium/mutable/frozen_predicate_spec.rb
+- spec/unit/adamantium/transform_spec.rb
+- spec/unit/adamantium/transform_unless_spec.rb
 homepage: https://github.com/dkubb/adamantium
 licenses:
 - MIT
@@ -135,23 +135,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Immutable extensions to objects
 test_files:
 - spec/integration/adamantium_spec.rb
-- spec/unit/adamantium/class_methods/included_spec.rb
 - spec/unit/adamantium/class_methods/new_spec.rb
 - spec/unit/adamantium/dup_spec.rb
 - spec/unit/adamantium/fixtures/classes.rb
@@ -165,12 +164,12 @@ test_files:
 - spec/unit/adamantium/freezer/flat/class_methods/call_spec.rb
 - spec/unit/adamantium/freezer/flat/class_methods/freeze_spec.rb
 - spec/unit/adamantium/memoize_spec.rb
-- spec/unit/adamantium/memoized_spec.rb
 - spec/unit/adamantium/module_methods/freezer_spec.rb
 - spec/unit/adamantium/module_methods/included_spec.rb
 - spec/unit/adamantium/module_methods/memoize_spec.rb
 - spec/unit/adamantium/module_methods/memoized_predicate_spec.rb
-- spec/unit/adamantium/module_methods/original_instance_method_spec.rb
 - spec/unit/adamantium/mutable/freeze_spec.rb
 - spec/unit/adamantium/mutable/frozen_predicate_spec.rb
+- spec/unit/adamantium/transform_spec.rb
+- spec/unit/adamantium/transform_unless_spec.rb
 has_rdoc: 

data/spec/unit/adamantium/class_methods/included_spec.rb

@@ -1,40 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-describe Adamantium, '.included' do
-  let(:object) { described_class }
-
-  subject { object.included(target) }
-
-  let(:included_modules) do
-    target.singleton_class.included_modules
-  end
-
-  before { subject }
-
-  context 'when target is a module' do
-    let(:target) { Module.new }
-
-    it_should_behave_like 'a command method'
-
-    it 'includes Adamantium::ModuleMethods' do
-      expect(included_modules).to include(Adamantium::ModuleMethods)
-    end
-
-    it 'does not include Adamantium::ClassMethods' do
-      expect(included_modules).to_not include(Adamantium::ClassMethods)
-    end
-  end
-
-  context 'when target is a class' do
-    let(:target) { Class.new }
-
-    it 'includes Adamantium::{Class,Module}Methods' do
-      expect(included_modules).to include(Adamantium::ModuleMethods)
-      expect(included_modules).to include(Adamantium::ClassMethods)
-    end
-
-    it_should_behave_like 'a command method'
-  end
-end

data/spec/unit/adamantium/memoized_spec.rb

@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-require File.expand_path('../fixtures/classes', __FILE__)
-
-describe Adamantium, '#memoized' do
-  subject { object.memoized(method) }
-
-  let(:described_class) { Class.new(AdamantiumSpecs::Object) }
-  let(:method)          { :test                              }
-  let(:value)           { String.new.freeze                  }
-  let(:object)          { described_class.new                }
-
-  before do
-    described_class.memoize(method)
-  end
-
-  context 'when a method is memoized' do
-    before do
-      object.memoize(method, value)
-    end
-
-    it { should equal(value) }
-  end
-
-  context 'when a method is not memoized' do
-    it { should be_nil }
-  end
-end

data/spec/unit/adamantium/module_methods/original_instance_method_spec.rb

@@ -1,36 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-describe Adamantium::ModuleMethods, '#original_instance_method' do
-  subject { object.original_instance_method(name).source_location }
-
-  let(:object) do
-    Class.new do
-      include Adamantium
-
-      def foo; end
-
-      const_set(:ORIGINAL, instance_method(:foo).source_location)
-
-      memoize :foo
-    end
-  end
-
-  context 'when the method was memoized' do
-    let(:name) { :foo }
-
-    it 'returns the original method' do
-      should eql(object::ORIGINAL)
-    end
-  end
-
-  context 'when the method was not memoized' do
-    let(:name) { :bar }
-
-    it 'raises an exception' do
-      expect { subject }
-        .to raise_error(ArgumentError, 'No method :bar was memoized')
-    end
-  end
-end