naming 0.0.2 → 0.1.0

data/.simplecov

@@ -0,0 +1,8 @@
+require 'coveralls'
+Coveralls.wear!
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.command_name 'bacon'
+SimpleCov.start {add_filter 'test'}

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+script: rake test

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in naming.gemspec
+# Specify your gem's dependencies in forwardablex.gemspec
 gemspec
+
+gem 'simplecov', :require => false, :group => :test
+gem 'coveralls', :require => false, :group => :test

data/README.md

@@ -1,8 +1,9 @@
 # naming
 
-naming is a ruby library for generating classes that consist from name and
-value. You can get naming class by sending class method +[]+ with the
-name.
+naming is a Ruby library for generating classes that consist from name and
+value. You can name objects and collect values by it.
+
+[![Gem Version](https://badge.fury.io/rb/naming.png)](http://badge.fury.io/rb/naming) [![Build Status](https://travis-ci.org/keita/naming.png?branch=master)](https://travis-ci.org/keita/naming) [![Coverage Status](https://coveralls.io/repos/keita/naming/badge.png?branch=master)](https://coveralls.io/r/keita/naming) [![Code Climate](https://codeclimate.com/github/keita/naming.png)](https://codeclimate.com/github/keita/naming)
 
 ## Installation
 
@@ -65,9 +66,29 @@ message(Naming.B(2)) #=> "This is case B: 2"
 message(true) #=> "This is case others: true"
 ```
 
-## Licence
+### Name Set
+
+```ruby
+#
+# collect objects by name set
+#
+list = [
+  Naming.A(1),
+  Naming.B(2),
+  "abc",
+  Naming.C(3),
+  123,
+  nil
+]
+# collect values of A and B
+Naming[:A, :B].values(list) #=> [1, 2]
+# collect others
+Naming[:A, :B].others(list) #=> ["abc", Naming.C(3), 123, nil]
+```
+
+## License
 
-naming is free software distributed under MIT licence.
+naming is free software distributed under MIT license.
 
 ## Contributing
 

data/Rakefile

@@ -2,15 +2,17 @@ require "bundler/gem_tasks"
 
 desc 'Test specs'
 task 'test' do
-  sh "bundle exec bacon -a"
+  sh "bundle exec bacon -r simplecov -a"
 end
 
 desc 'Generate API document'
 task 'html' do
-  sh "yard doc -o html --hide-void-return --no-api"
+  sh "bundle exec yard doc -o html --hide-void-return --no-api"
 end
 
 desc 'Show undocumented function list'
 task 'html:undoc' do
-  sh "yard stats --list-undoc --no-api"
+  sh "bundle exec yard stats --list-undoc --no-api --compact"
 end
+
+task :default => :test

data/lib/naming.rb

@@ -1,3 +1,12 @@
+require 'set'
+
+require 'forwardablex'
+require 'structx'
+
+require 'naming/version'
+require 'naming/meta'
+require 'naming/name-set'
+
 # Naming is a module for generating naming classes that consist by name and
 # value. Naming classes are generated dynamically when you refer it.
 #
@@ -45,105 +54,6 @@
 #   message(Naming.B(2)) #=> "This is case B: 2"
 #   message(true) #=> "This is case others: true"
 module Naming
-  # Meta is a container of name and value. This is super class of all naming
-  # classes.
-  class Meta
-    class << self
-      # Extract values which have the same name from the array.
-      #
-      # @param array [Array]
-      #   target of value extraction
-      #
-      # @example
-      #   Naming::A.values([
-      #     Naming.A(1),
-      #     Naming.B(2),
-      #     "abc",
-      #     Naming.A(3),
-      #     123,
-      #     nil
-      #   ]) #=> [1, 3]
-      def values(array)
-        array.select{|elt| elt.kind_of?(self)}.map{|elt| elt.value}
-      end
-
-      # Collect objects from the array excluding named objects which have the
-      # same name.
-      #
-      # @param array [Array]
-      #   target of value extraction
-      #
-      # @example
-      #   Naming::A.values([
-      #     Naming.A(1),
-      #     Naming.B(2),
-      #     "abc",
-      #     Naming.A(3),
-      #     123,
-      #     nil
-      #   ]) #=> [Naming.B(2), "abc", 123, nil]
-      def others(array)
-        array.select{|elt| not(elt.kind_of?(self))}
-      end
-
-      # Return the name as symbol. It is just name, doesn't include module path.
-      #
-      # @return [Symbol]
-      #   the name
-      #
-      # @example
-      #   Naming::A.name #=> :A
-      def name
-        self.to_s.split("::").last.to_sym
-      end
-
-      # Set the name.
-      #
-      # @param name [Symbol]
-      #   the name
-      # @return [void]
-      #
-      # @api private
-      def name=(name)
-        @name = name unless @name
-      end
-    end
-
-    # @param value [Object]
-    #   the value
-    def initialize(value)
-      @value = value
-    end
-
-    # Return the name.
-    #
-    # @return [Symbol]
-    #   the name
-    def name
-      self.class.name
-    end
-
-    # Return the value.
-    #
-    # @return [Object]
-    #   the value
-    def value
-      @value
-    end
-
-    # @api private
-    def ==(other)
-      return false unless other.kind_of?(self.class)
-      @value == other.value
-    end
-    alias :eql? :"=="
-
-    # @api private
-    def hash
-      @value.hash
-    end
-  end
-
   class << self
     # Generate a new naming class and call the constructor with value.
     #
@@ -183,5 +93,14 @@ module Naming
     def others(array)
       array.select{|elt| not(elt.kind_of?(Meta))}
     end
+
+    # Return the name set object.
+    #
+    # @param names [Array<Symbol>]
+    #   names
+    # @return [NameSet]
+    def [](*names)
+      NameSet.new(*names)
+    end
   end
 end

data/lib/naming/meta.rb

@@ -0,0 +1,58 @@
+module Naming
+  # Meta is a container of name and value. This is super class of all naming
+  # classes.
+  class Meta < StructX
+    class << self
+      # Extract values which have the same name from the array.
+      #
+      # @param array [Array]
+      #   target of value extraction
+      #
+      # @example
+      #   Naming::A.values([
+      #     Naming.A(1),
+      #     Naming.B(2),
+      #     "abc",
+      #     Naming.A(3),
+      #     123,
+      #     nil
+      #   ]) #=> [1, 3]
+      def values(array)
+        array.select{|elt| elt.kind_of?(self)}.map{|elt| elt.value}
+      end
+
+      # Collect objects from the array excluding named objects which have the
+      # same name.
+      #
+      # @param array [Array]
+      #   target of value extraction
+      #
+      # @example
+      #   Naming::A.values([
+      #     Naming.A(1),
+      #     Naming.B(2),
+      #     "abc",
+      #     Naming.A(3),
+      #     123,
+      #     nil
+      #   ]) #=> [Naming.B(2), "abc", 123, nil]
+      def others(array)
+        array.select{|elt| not(elt.kind_of?(self))}
+      end
+
+      # Return the name as symbol. It is just name, doesn't include module path.
+      #
+      # @return [Symbol]
+      #   the name
+      #
+      # @example
+      #   Naming::A.name #=> :A
+      def name
+        self.to_s.split("::").last.to_sym
+      end
+    end
+
+    forward :class, :name
+    member :value
+  end
+end

data/lib/naming/name-set.rb

@@ -0,0 +1,48 @@
+module Naming
+  # NameSet is a set for names. This class is used for getting values of multipule names.
+  class NameSet < Set
+    # @param names [Array<Symbol,Naming::Meta>]
+    #   element names of the set
+    def initialize(*names, &b)
+      elts = names.map {|name| name.kind_of?(Symbol) ? Naming.const_get(name) : name}
+      super(elts, &b)
+    end
+
+    # Extract values which have the same name from the array.
+    #
+    # @param array [Array]
+    #   target of value extraction
+    #
+    # @example
+    #   Naming::NameSet.new(:A, :B).values([
+    #     Naming.A(1),
+    #     Naming.B(2),
+    #     "abc",
+    #     Naming.A(3),
+    #     123,
+    #     nil
+    #   ]) #=> [1, 2, 3]
+    def values(array)
+      array.select{|elt| any?{|name| elt.kind_of?(name)}}.map{|elt| elt.value}
+    end
+
+      # Collect objects from the array excluding named objects which have the
+      # name in the set.
+      #
+      # @param array [Array]
+      #   target of value extraction
+      #
+      # @example
+      #   Naming::NameSet(:A, :B).values([
+      #     Naming.A(1),
+      #     Naming.B(2),
+      #     "abc",
+      #     Naming.A(3),
+      #     123,
+      #     nil
+      #   ]) #=> ["abc", 123, nil]
+    def others(array)
+      array.select{|elt| not(any?{|name| elt.kind_of?(name)})}
+    end
+  end
+end

data/lib/naming/version.rb

@@ -1,4 +1,4 @@
 module Naming
   # version of this library
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/naming.gemspec

@@ -17,5 +17,11 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_dependency "forwardablex", "~> 0.1.4"
+  gem.add_dependency "structx", "~> 0.1.0"
+
   gem.add_development_dependency "bacon"
+  gem.add_development_dependency "yard"
+  gem.add_development_dependency "redcarpet" unless RUBY_ENGINE == 'jruby'
 end

data/test/spec_naming.rb

@@ -1,5 +1,14 @@
 require 'naming'
 
+$list = [
+  Naming.A(1),
+  Naming.B(2),
+  "abc",
+  Naming.A(3),
+  123,
+  nil
+]
+
 describe 'Naming' do
   it 'should generate a class dynamically' do
     Naming::A.should.be.kind_of Class
@@ -17,28 +26,67 @@ describe 'Naming' do
   end
 
   it 'should filter by name' do
-    list = [
-      Naming.A(1),
-      Naming.B(2),
-      "abc",
-      Naming.A(3),
-      123,
-      nil
-    ]
-    Naming::A.values(list).should == [1, 3]
-    Naming::B.values(list).should == [2]
-    Naming.others(list).should == ["abc", 123, nil]
+    Naming::A.values($list).should == [1, 3]
+    Naming::B.values($list).should == [2]
+    Naming.others($list).should == ["abc", 123, nil]
   end
 
   it 'should equal when the names and values are same' do
     Naming.A(1).should == Naming.A(1)
   end
 
-  it 'should equal when names are different' do
+  it 'should not equal when names are different' do
     Naming.A(1).should.not == Naming.B(1)
   end
 
-  it 'should equal when values are different' do
+  it 'should not equal when values are different' do
     Naming.A(1).should.not == Naming.A(2)
   end
+
+  it 'should get the name set' do
+    Naming[:A, :B].should.kind_of(Naming::NameSet)
+    Naming[:A, :B].should.include(Naming::A)
+    Naming[:A, :B].should.include(Naming::B)
+  end
+end
+
+describe "Naming::Meta" do
+  it "should get values" do
+    Naming::A.values($list).should == [1, 3]
+  end
+
+  it "should get others" do
+    Naming::A.others($list).should == [Naming.B(2), "abc", 123, nil]
+  end
+
+  it "should get the name" do
+    Naming::A.name.should == :A
+  end
+end
+
+describe "Naming::NameSet" do
+  before do
+    @set = Naming::NameSet.new(:A, :B)
+  end
+
+  it 'should be a set' do
+    @set.should.kind_of(Set)
+  end
+
+  it 'should include element names' do
+    @set.should.include Naming::A
+    @set.should.include Naming::B
+  end
+
+  it "should not include other names" do
+    @set.should.not.include Naming::C
+  end
+
+  it 'should get the values' do
+    @set.values($list).should == [1, 2, 3]
+  end
+
+  it 'should get other values' do
+    @set.others($list).should == ["abc", 123, nil]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naming
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: forwardablex
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: structx
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -27,6 +59,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: naming provides name and value container with useful functions
 email:
 - keita.yamaguchi@gmail.com
@@ -35,11 +99,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .simplecov
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/naming.rb
+- lib/naming/meta.rb
+- lib/naming/name-set.rb
 - lib/naming/version.rb
 - naming.gemspec
 - test/spec_naming.rb
@@ -63,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: naming provides name and value container with useful functions