value 1.0.1 → 1.1.0

data/Rakefile

@@ -1,16 +1,13 @@
 # -*- coding: utf-8 -*-
 
-require 'inventory/rake/tasks-1.0'
-require 'lookout/rake/tasks-3.0'
+require 'inventory/rake-1.0'
+require 'lookout/rake-3.0'
 
-$:.unshift File.expand_path('../lib', __FILE__)
-require 'value/version'
+load File.expand_path('../lib/value/version.rb', __FILE__)
 
 Inventory::Rake::Tasks.define Value::Version, :gem => proc{ |_, s|
   s.author = 'Nikolai Weibull'
   s.email = 'now@bitwi.se'
   s.homepage = 'https://github.com/now/value'
 }
-
-# TODO: Silence warnings generated from YARD (remove this once we plug them)
-Lookout::Rake::Tasks::Test.new :options => []
+Lookout::Rake::Tasks::Test.new

data/lib/value/version.rb

@@ -3,10 +3,12 @@
 require 'inventory-1.0'
 
 module Value
-  Version = Inventory.new(1, 0, 1){
+  Version = Inventory.new(1, 1, 0){
     def dependencies
       super + Inventory::Dependencies.new{
+        development 'inventory-rake', 1, 2, 0
         development 'lookout', 3, 0, 0
+        development 'lookout-rake', 3, 0, 0
         development 'yard', 0, 7, 0
       }
     end
@@ -17,12 +19,5 @@ module Value
         value/values.rb
       '
     end
-
-    def additional_libs
-      super +
-        %w'
-          value/yard-1.0.rb
-        '
-    end
   }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: value
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inventory
-  requirement: &14299608 !ruby/object:Gem::Requirement
+  requirement: &15789612 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *14299608
+  version_requirements: *15789612
+- !ruby/object:Gem::Dependency
+  name: inventory-rake
+  requirement: &15788556 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: *15788556
 - !ruby/object:Gem::Dependency
   name: lookout
-  requirement: &14322900 !ruby/object:Gem::Requirement
+  requirement: &15787416 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: *15787416
+- !ruby/object:Gem::Dependency
+  name: lookout-rake
+  requirement: &15786384 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *14322900
+  version_requirements: *15786384
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &14321364 !ruby/object:Gem::Requirement
+  requirement: &15785652 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +65,7 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *14321364
+  version_requirements: *15785652
 description: ! "                                     Value\n\n  Value is a library
   for defining value objects in Ruby.\n"
 email: now@bitwi.se
@@ -55,12 +77,10 @@ files:
 - lib/value/values.rb
 - lib/value-1.0.rb
 - lib/value/version.rb
-- lib/value/yard-1.0.rb
 - test/unit/value/comparable.rb
 - test/unit/value/values.rb
 - test/unit/value-1.0.rb
 - test/unit/value/version.rb
-- test/unit/value/yard-1.0.rb
 - README
 - Rakefile
 homepage: https://github.com/now/value

data/lib/value/yard-1.0.rb

@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'yard'
-
-class YARD::Handlers::Ruby::ValuesHandler < YARD::Handlers::Ruby::Base
-  handles method_call('Value')
-  namespace_only
-
-  process do
-    parameters = statement.parameters(false)
-    if YARD::Parser::Ruby::AstNode === parameters[-1][0] and
-        parameters[-1][0].type == :assoc and
-        comparable = parameters[-1].find{ |e| e.jump(:ident).source == 'comparable' }
-      parameters.pop
-      comparables = (comparable[1].type == :array and comparable[1][0].map{ |e| e.jump(:ident).source })
-      ancestor 'Comparable'
-      ancestor 'Value::Comparable'
-    end
-    ancestor 'Value'
-    initialize = define('initialize', parameters.map{ |e| [e.jump(:ident).source, e.type == :array ? e[0][1].source : nil] })
-    initialize.docstring.tags(:param).select{ |e| e.text and not e.text.empty? }.each do |e|
-        define e.name.sub(/\A[&*]/, ''), [],
-               '@return [%s] %s' % [e.types ? e.types.join(', ') : '', e.text], :protected
-        e.text = ''
-      end
-    initialize.docstring.add_tag(YARD::Tags::Tag.new(:note, 'Comparisons between instances are made between %s.' % join(comparables))) if comparables
-  end
-
-  def ancestor(name)
-    modul = Proxy.new(:root, name).tap{ |m| m.type = :module }
-    namespace.mixins(scope).unshift(modul) unless namespace.mixins(scope).include? modul
-  end
-
-  def define(name, parameters, docstring = nil, visibility = :public)
-    YARD::CodeObjects::MethodObject.new(namespace, name).tap{ |m|
-      register(m)
-      m.signature = 'def %s%s' %
-        [name,
-         parameters.empty? ?
-           '' :
-           '(%s)' % parameters.map{ |n, d| d ? '%s = %s' % [n, d] : n }.join(', ')]
-      m.parameters = parameters
-      m.docstring = docstring if docstring
-      m.visibility = visibility
-    }
-  end
-
-  def join(items)
-    return items.join('') if items.size < 2
-    return items.join(' and ') if items.size < 3
-    return '%s, and %s' % [items[0..-2].join(', '), items[-1]]
-  end
-end
-
-YARD::Handlers::Ruby::MacroHandler::IGNORE_METHODS['Value'] = true

data/test/unit/value/yard-1.0.rb

@@ -1,166 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'value/yard-1.0'
-
-Expectations do
-  expect [YARD::CodeObjects::Proxy.new(:root, 'Value')] do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # @param [String] a
-  # @param [Integer] b The b
-  Value(:a, :b)
-end
-EOS
-    YARD::Registry.at('A').mixins(:instance)
-  end
-
-  expect 'Represents As.' do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # Represents As.
-  Value(:a, :b)
-end
-EOS
-    YARD::Registry.at('A#initialize').docstring
-  end
-
-  expect [['a', nil], ['b', '3']] do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  Value(:a, [:b, 3])
-end
-EOS
-    YARD::Registry.at('A#initialize').parameters
-  end
-
-  expect [:b, :initialize] do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # @param [String] a
-  # @param [Integer] b The b
-  Value(:a, :b)
-end
-EOS
-    YARD::Registry.all(:method).map(&:name).sort
-  end
-
-  expect [:b, :initialize] do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # @param [String] a
-  # @param [Integer] *b The b
-  Value(:a, :'*b')
-end
-EOS
-    YARD::Registry.all(:method).map(&:name).sort
-  end
-
-  expect [:b, :initialize] do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # @param [String] a
-  # @param [Integer] &b The b
-  Value(:a, :'&b')
-end
-EOS
-    YARD::Registry.all(:method).map(&:name).sort
-  end
-
-  expect nil do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # @param [String] a
-  # @param [Integer] b The b
-  Value(:a, :b)
-end
-EOS
-    YARD::Registry.at('A#a')
-  end
-
-  expect '@return [Integer] The b' do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # @param [String] a
-  # @param [Integer] b The b
-  Value(:a, :b)
-end
-EOS
-    YARD::Registry.at('A#b').docstring.to_raw
-  end
-
-  expect %w'Value Value::Comparable Comparable' do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # @param [String] a
-  Value(:a, :comparable => true)
-end
-EOS
-    YARD::Registry.at('A').inheritance_tree(true)[1..3].map(&:path)
-  end
-
-  expect %w'Value Value::Comparable Comparable' do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-module A
-  # @param [String] a
-  Value(:a, :comparable => true)
-end
-class B
-  include A
-  # @param [String] a
-  # @param [String] b
-  Value(:a, :b, :comparable => true)
-end
-EOS
-    YARD::Registry.at('B').inheritance_tree(true)[1..3].map(&:path)
-  end
-
-  expect 'Comparisons between instances are made between a.' do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # This is A.
-  # @param [String] a
-  # @param [String] b
-  Value(:a, :b, :other => true, :comparable => [:a])
-end
-EOS
-    YARD::Registry.at('A#initialize').docstring.tag(:note).text
-  end
-
-  expect 'Comparisons between instances are made between a and b.' do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # @param [String] a
-  # @param [String] b
-  # @param [String] c
-  Value(:a, :b, :c, :comparable => [:a, :b])
-end
-EOS
-    YARD::Registry.at('A#initialize').docstring.tag(:note).text
-  end
-
-  expect 'Comparisons between instances are made between a, b, and c.' do
-    YARD::Registry.clear
-    YARD::Parser::SourceParser.parse_string(<<EOS)
-class A
-  # @param [String] a
-  # @param [String] b
-  # @param [String] c
-  # @param [String] d
-  Value(:a, :b, :c, :d, :comparable => [:a, :b, :c])
-end
-EOS
-    YARD::Registry.at('A#initialize').docstring.tag(:note).text
-  end
-end