values 1.5.0 → 1.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5e79f1d3f84ef3b06bad7cecd279e9ba4893e94c
+  data.tar.gz: 60279f29f52d792e06305225595e2aecd5cbfd3a
+SHA512:
+  metadata.gz: 1232889fc845d9323e338985b3d4843ab272c191e67a772835ca437b389dfc159eb3acc8cda775920af3d5f6b21718e7f3b921d913259294adf21fe733525395
+  data.tar.gz: 014cda4383ee1aed4f78d1105ad24e7b58b7837dd172f22b5271ff9e651ee602619ac64e4c0b421c3d2dd5eae838e1a1400b4f9c3fd6759b1163cd5ad6da5e8a

data/Gemfile

@@ -9,5 +9,5 @@ group :development do
   gem "rspec", "~> 2.11.0"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 1.8.4"
-  gem "rcov", ">= 0"
+  gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    docile (1.1.5)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -9,8 +10,8 @@ GEM
       rake
       rdoc
     json (1.7.5)
+    multi_json (1.10.1)
     rake (0.9.2.2)
-    rcov (0.9.9)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.11.0)
@@ -21,6 +22,11 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
 
 PLATFORMS
   ruby
@@ -28,5 +34,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 1.8.4)
-  rcov
   rspec (~> 2.11.0)
+  simplecov

data/README.md

@@ -45,4 +45,18 @@ p.x
 # => 3
 ```
 
+Values also supports customization of value classes inheriting from `Value.new`:
+
+```ruby
+class Point < Value.new(:x, :y)
+  def to_s
+    "<Point at (#{x}, #{y})>"
+  end
+end
+
+p = Point.new(1, 2)
+p.to_s
+# => "<Point at (1, 2)>"
+```
+
 Values does NOT have all the features of Struct (nor is it meant to).

data/Rakefile

@@ -1,59 +1,7 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+require "bundler/gem_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 = "values"
-  gem.homepage = "http://github.com/tcrayford/values"
-  gem.license = "MIT"
-  gem.summary = %Q{Simple immutable value objects for ruby}
-  gem.description = %Q{Simple immutable value objects for ruby.
-
-    Make a new value class: Point = Value.new(:x, :y)
-    And use it:
-    p = Point.new(1,0)
-    p.x
-    => 1
-    p.y
-    => 0
-    }
-  gem.email = "tcrayford@googlemail.com"
-  gem.authors = ["Tom Crayford"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "values #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/values.rb

@@ -1,7 +1,7 @@
 class Value
-  def self.new(*fields)
+  def self.new(*fields, &block)
     Class.new do
-      attr_reader *fields
+      attr_reader(:hash, *fields)
 
       define_method(:initialize) do |*values|
         raise ArgumentError.new("wrong number of arguments, #{values.size} for #{fields.size}") if fields.size != values.size
@@ -10,6 +10,8 @@ class Value
           instance_variable_set(:"@#{field}", value)
         end
 
+        @hash = self.class.hash ^ values.hash
+
         freeze
       end
 
@@ -21,6 +23,11 @@ class Value
           raise ArgumentError.new("Unexpected hash keys: #{unexpected_keys}")
         end
 
+        missing_keys = self::VALUE_ATTRS - hash.keys
+        if missing_keys.any?
+          raise ArgumentError.new("Missing hash keys: #{missing_keys} (got keys #{hash.keys})")
+        end
+
         new(*hash.values_at(*self::VALUE_ATTRS))
       end
 
@@ -32,13 +39,11 @@ class Value
         self.class == other.class && values == other.values
       end
 
-      def hash
-        values.map(&:hash).inject(0, :+) + self.class.hash
-      end
-
       def values
         self.class::VALUE_ATTRS.map { |field| send(field) }
       end
+
+      class_eval &block if block
     end
   end
 end

data/spec/values_spec.rb

@@ -30,6 +30,17 @@ describe 'values' do
     c.inspect.should == 'GraphPoint at 0,0'
   end
 
+  Line = Value.new(:slope, :y_intercept) do
+    def inspect
+      "<Line: y=#{slope}x+#{y_intercept}>"
+    end
+  end
+
+  it 'can be customized with a block' do
+    l = Line.new(2, 3)
+    l.inspect.should == '<Line: y=2x+3>'
+  end
+
   it 'cannot be mutated' do
     p = Point.new(0,1)
     expect { p.x = 1 }.to raise_error
@@ -67,8 +78,8 @@ describe 'values' do
 
   it 'errors if you instantiate it from a hash with missing fields' do
     expect do
-      Money.with
-    end.to raise_error
+      Money.with({})
+    end.to raise_error(ArgumentError)
   end
 
   it 'does not error when fields are explicitly nil' do

data/values.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: values 1.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "values"
-  s.version = "1.5.0"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Tom Crayford"]
-  s.date = "2013-02-22"
+  s.date = "2015-03-01"
   s.description = "Simple immutable value objects for ruby.\n\n    Make a new value class: Point = Value.new(:x, :y)\n    And use it:\n    p = Point.new(1,0)\n    p.x\n    => 1\n    p.y\n    => 0\n    "
   s.email = "tcrayford@googlemail.com"
   s.extra_rdoc_files = [
@@ -32,29 +34,28 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/tcrayford/values"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "2.2.2"
   s.summary = "Simple immutable value objects for ruby"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

metadata

@@ -1,95 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: values
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 0
-  version: 1.5.0
+version: !ruby/object:Gem::Version
+  version: 1.6.0
 platform: ruby
-authors: 
+authors:
 - Tom Crayford
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
+date: 2015-03-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.11.0
-  prerelease: false
   type: :development
-  requirement: *id001
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
   prerelease: false
-  type: :development
-  requirement: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
   name: bundler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 1
-        - 8
-        - 4
-        version: 1.8.4
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  requirement: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-  name: rcov
-description: "Simple immutable value objects for ruby.\n\n    Make a new value class: Point = Value.new(:x, :y)\n    And use it:\n    p = Point.new(1,0)\n    p.x\n    => 1\n    p.y\n    => 0\n    "
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "Simple immutable value objects for ruby.\n\n    Make a new value class:
+  Point = Value.new(:x, :y)\n    And use it:\n    p = Point.new(1,0)\n    p.x\n    =>
+  1\n    p.y\n    => 0\n    "
 email: tcrayford@googlemail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
-- .document
-- .rspec
+files:
+- ".document"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -101,37 +89,27 @@ files:
 - spec/values_spec.rb
 - values.gemspec
 homepage: http://github.com/tcrayford/values
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple immutable value objects for ruby
 test_files: []
-