triad 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5c2803e0e4b1a381b1bf4b0dde05a3e75f459404
+  data.tar.gz: 5bf33b48f87d5a03eb3579181cc6fa3f3bf0c483
+SHA512:
+  metadata.gz: bd4f351d5d91f0133667918cade75192fbf1f46e45c33e78090d7d4a45a80a62a496eb1a9a17f6e1c46bac5a2afb85b8b37be02f18751b68f6cb3ef71e8b8de5
+  data.tar.gz: 3ad7881dc4182e9a8ecd7b16b5d5f6cfbadd9cbe7bf717149579f3b0dc0a703878f5a2381bca2c9dd6b24e90dfb7e8cf97b49d0a3f30fbd11343c72ff0a6c364

data/Gemfile

@@ -4,7 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem "rake"
   gem "simplecov"
   gem "minitest"
   gem "coveralls"

data/README.md

@@ -22,17 +22,17 @@ map << [:admin, 'Admin', user]
 map.keys('Admin') #=> [:admin]
 map.values('Admin') #=> [user]
 map.descriptors('Admin') #=> ['Admin']
-# or raise Triad::DescriptorNotPresent
+# or raise Triad::ItemNotPresent
 
 map.descriptors(user) #=> ['Admin']
 map.keys(user) #=> [:admin]
 map.values(user) #=> [user]
-# or raise Triad::ValueNotPresent
+# or raise Triad::ItemNotPresent
 
 map.values(:admin) #=> [user]
 map.descriptors(:admin) #=> ['Admin']
 map.keys(:admin) #=> [:admin]
-# or raise Triad::KeyNotPresent
+# or raise Triad::ItemNotPresent
 
 map.each do |key, descriptor, value|
   #...

data/lib/triad.rb

@@ -5,9 +5,7 @@ class Triad
   include Enumerable
 
   class InvalidAddition < StandardError; end
-  class ValueNotPresent < StandardError; end
-  class DescriptorNotPresent < StandardError; end
-  class KeyNotPresent < StandardError; end
+  class ItemNotPresent < StandardError; end
 
   # stored as {key => ['Descriptor', value]}
   def initialize(*args)
@@ -41,12 +39,12 @@ class Triad
   end
 
   def <<(array)
-    array_key = array.find{|item| item.is_a?(Symbol) }
+    array_key = array[0]
     raise InvalidAddition.new("your array length must be 3") if array.length != 3
     raise InvalidAddition.new("the provided key already exists") if key_exists?(array_key)
 
-    array_descriptor = array.find{|item| item.is_a?(String) }
-    array_value =      array.find{|item| !item.is_a?(String) && !item.is_a?(Symbol) }
+    array_descriptor = array[1]
+    array_value =      array[2]
 
     storage[array_key] = [array_descriptor, array_value]
     self
@@ -67,35 +65,29 @@ class Triad
   def key_exists?(key)
     storage.has_key?(key)
   end
-
-  def positions
-    [:key, :descriptor, :value]
-  end
-
-  def argument_type(arg)
-    case arg
-    when Symbol then :key
-    when String then :descriptor
-    else :value
-    end
+  
+  def descriptor_exists?(descriptor)
+    storage.values.map{|arr| arr[0] }.include?(descriptor)
   end
-
-  def raise_error(type)
-    error_name = type.to_s.gsub(/(?:^|_)([a-z])/) { $1.upcase }
-    error_class = Triad.const_get("#{error_name}NotPresent")
-    raise error_class.new
+  
+  def value_exists?(value)
+    storage.values.map{|arr| arr[1] }.include?(value)
   end
 
   def with_interest(interest)
-    type = argument_type(interest)
-    index = positions.index(type)
-
-    lookup = storage.select{|key, array|
+    index = case
+            when key_exists?(interest)
+              0
+            when descriptor_exists?(interest)
+              1
+            when value_exists?(interest)
+              2
+            else
+              raise ItemNotPresent.new
+            end
+
+    storage.select{|key, array|
       [key, *array][index] == interest
     }.map{|key, array| [key, *array] }
-
-    raise_error(type) if lookup.empty?
-
-    lookup
   end
 end

data/lib/triad/version.rb

@@ -1,3 +1,3 @@
 class Triad
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/test/triad_test.rb

@@ -26,26 +26,11 @@ describe Triad, '#<<' do
       triad << [:test, 'More', Object.new]
     }
   end
-
-  it 'assigns symbol as key' do
-    object = Object.new
-    triad << ['OutOfOrder', object, :surprise]
-    assert_equal [:surprise], triad.keys('OutOfOrder')
-    assert_equal [:surprise], triad.keys(object)
-  end
-
-  it 'assigns string as descriptor' do
-    object = Object.new
-    triad << ['OutOfOrder', object, :surprise]
-    assert_equal ['OutOfOrder'], triad.descriptors(:surprise)
-    assert_equal ['OutOfOrder'], triad.descriptors(object)
-  end
-
-  it 'assigns non-symbol, non-string objects as value' do
-    object = Object.new
-    triad << ['OutOfOrder', object, :surprise]
-    assert_equal [object], triad.values(:surprise)
-    assert_equal [object], triad.values('OutOfOrder')
+  
+  it 'accepts strings as values' do
+    object = "a string as an value"
+    triad << [:key, 'Descriptor', object]
+    assert_equal [object], triad.values(:key)
   end
 end
 
@@ -87,19 +72,19 @@ describe Triad, '#keys' do
   end
 
   it 'errors when the given key is not found' do
-    assert_raises(Triad::KeyNotPresent){
+    assert_raises(Triad::ItemNotPresent){
       triad.keys(:invalid_key)
     }
   end
 
   it 'errors when the given descriptor is not found' do
-    assert_raises(Triad::DescriptorNotPresent){
+    assert_raises(Triad::ItemNotPresent){
       triad.keys('Invalid Descriptor')
     }
   end
 
   it 'errors when the given value is not found' do
-    assert_raises(Triad::ValueNotPresent){
+    assert_raises(Triad::ItemNotPresent){
       triad.keys(Object.new)
     }
   end
@@ -131,19 +116,19 @@ describe Triad, '#descriptors' do
   end
 
   it 'errors when the given descriptor is not found' do
-    assert_raises(Triad::DescriptorNotPresent){
+    assert_raises(Triad::ItemNotPresent){
       triad.descriptors('Not Present')
     }
   end
 
   it 'errors when the given key is not found' do
-    assert_raises(Triad::KeyNotPresent){
+    assert_raises(Triad::ItemNotPresent){
       triad.descriptors(:invalid_key)
     }
   end
 
   it 'errors when the given value is not found' do
-    assert_raises(Triad::ValueNotPresent){
+    assert_raises(Triad::ItemNotPresent){
       triad.descriptors(Object.new)
     }
   end
@@ -172,13 +157,13 @@ describe Triad, '#values' do
 
 
   it 'errors when the given key is not found' do
-    assert_raises(Triad::KeyNotPresent){
+    assert_raises(Triad::ItemNotPresent){
       triad.values(:invalid_key)
     }
   end
 
   it 'errors when the given descriptor is not found' do
-    assert_raises(Triad::DescriptorNotPresent){
+    assert_raises(Triad::ItemNotPresent){
       triad.values('Invalid Descriptor')
     }
   end

data/triad.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thread_safe", "~> 0.1.3"
+  spec.add_dependency "thread_safe", "~> 0.3.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: triad
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
-- '''Jim Gay'''
+- "'Jim Gay'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: Triad allows you to access data from keys, descriptors, and values
@@ -66,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -80,29 +73,27 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.26
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage a collection with 3 data points
 test_files:
 - test/test_helper.rb
 - test/triad_test.rb
-has_rdoc: