detagger 0.1.0 → 0.2.0

data/Gemfile

@@ -6,10 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.8.0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.8.3"
+  gem "rspec", ">= 2.8.0"
+  gem "rdoc", ">= 3.12"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.8.3"
   gem 'simplecov', :platforms => :mri_19
   gem 'rcov', :platforms => :mri_18
 end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/detagger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "detagger"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["christfo"]
-  s.date = "2012-03-13"
+  s.date = "2012-03-14"
   s.description = "This is intended to be used as a mixin, usualy with some kind of library that parses\n  optional command line arguments. The feature here is that the options may contain tags ('example_tag:') that\n  are not resolved until they are used. This means that one option may refer to another. An example might be:\n  --stage /tmp/fred --logfile stage:/my.log \n  which would later provide a method 'logfile' that would return '/tmp/fred/my.log' "
   s.email = "chris.fordy@gmail.com"
   s.extra_rdoc_files = [
@@ -40,27 +40,27 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<facets>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<facets>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<facets>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<rspec>, [">= 2.8.0"])
+    s.add_dependency(%q<rdoc>, [">= 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

data/lib/detagger.rb

@@ -7,51 +7,64 @@ require 'facets/string'
 module Detagger
     attr_accessor :tagex
 
-    def drill_down_ref(txt,target = self)
+    # create a chain of objects that will be used to discover the value behind the tags.
+    # This will be ordered, favouring the first item in preference to later ones.
+    def set_detag_chain(*args)
+        @detag_chain = args
+    end
+
+    def detag_chain
+        (@detag_chain || self)
+    end
+
+    def drill_down_ref(txt,targets = detag_chain)
         return  unless txt 
         parm = txt.chomp(":").to_sym
-        begin
-            new_txt = target.send(parm) 
-            raise "Self Reference" if new_txt == txt
-            new_txt
-        rescue NoMethodError
-            txt
+        [*targets].each do |target|
+            begin
+                new_txt = target.send(parm) 
+                raise "Self Reference" if new_txt == txt
+                return new_txt
+            rescue NoMethodError
+            end
         end
+        txt
     end
     
-    def detag( value, target = self, resolved = [] )
+    def detag( value, targets = detag_chain, resolved = [] )
         @tagex ||=  /([^\/:]+:)/
+        [*targets].each do |target|
+            if ( value.respond_to? :call )
+                # manipulates self so that it is called with 'this' and not he context of the proc when defined
+                value = target.instance_eval &value
+            end
 
-        if ( value.respond_to? :call )
-            # manipulates self so that it is called with 'this' and not he context of the proc when defined
-            value = target.instance_eval &value
-        end
-
-        if value && value.is_a?(String) 
-            value = value.shatter(@tagex).flatten.map do |mtch|
-                if mtch =~ @tagex
-                    raise "Circular Reference" if resolved.include? mtch
-                    new_value = drill_down_ref(mtch,target)
-                    mtch == new_value ? new_value : detag(new_value, target, resolved + [mtch] )
+            if value && value.is_a?(String) 
+                value = value.shatter(@tagex).flatten.map do |mtch|
+                    if mtch =~ @tagex
+                        raise "Circular Reference" if resolved.include? mtch
+                        new_value = drill_down_ref(mtch,targets)
+                        mtch == new_value ? new_value : detag(new_value, [target], resolved + [mtch] )
+                    else
+                        mtch
+                    end
+                end
+                if (value.uniq == [nil]) 
+                    value = nil
                 else
-                    mtch
+                    value = value.join
                 end
             end
-            if (value.uniq == [nil]) 
-                value = nil
-            else
-                value = value.join
-            end
         end
         value
     end
 
     def method_missing( method, *args, &blk )
         access, orig_method = *method.to_s.scan(/^(detag|raw)_(.+)$/).flatten
-        unless orig_method && self.respond_to?(orig_method.to_sym )
+        unless orig_method && target = [*detag_chain].find {|t| t.respond_to?( orig_method.to_sym )}
             super(method,*args,&blk)
         else
-            rawval = self.send( orig_method, *args, &blk ) 
+            rawval = target.send( orig_method, *args, &blk ) 
             (access == "detag") ? detag( rawval ) : rawval  
         end
     end

data/spec/detagger_spec.rb

@@ -1,9 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "ostruct"
 
 describe Detagger do 
     before( :each ) do
         @options = Class.new do
-            def bob;     "henry" end
+            def bob;     "henry:" end
             def sue;     "mary" end
             def alfy;    "sue:" end
             def jess;    "sue:/bob:some text/bob:text" end
@@ -36,7 +37,7 @@ describe Detagger do
     end
 
     it "will give a value for inputs" do
-        @options.bob.should  == "henry"
+        @options.bob.should  == "henry:"
         @options.sue.should  == "mary"
     end
 
@@ -55,7 +56,7 @@ describe Detagger do
     end
 
     it "will support multiple tags in a value" do
-        @options.detag_jess.should == "mary/henrysome text/henrytext"
+        @options.detag_jess.should == "mary/henry:some text/henry:text"
     end
 
     it "will pass through unrecognised tags a plain text" do
@@ -82,6 +83,31 @@ describe Detagger do
         @options.raw_soph.should   == nil
         @options.detag_soph.should == nil
         @options.detag_matt.should == nil
+    end
+
+    it "will absorbe nil values inside a string" do
         @options.detag_mike.should == "marymary"
     end
+
+    it "will search for tags down a cahin of objects" do
+        second      = OpenStruct.new
+        second.nick = "Found!"
+        @options.set_detag_chain( @options, second )
+        @options.detag_nick.should == "Found!"
+    end
+
+    it "will look for tags in strict chain order" do
+        second      = OpenStruct.new
+        second.sue  = "not this one"
+        @options.set_detag_chain( @options, second )
+        @options.detag_sue.should_not  == "not this one"
+        @options.detag_sue.should  == "mary"
+    end
+
+    it "will compose missing tags from both sources" do
+        second       = OpenStruct.new
+        second.henry = "correct"
+        @options.set_detag_chain( @options, second )
+        @options.detag_bob.should  == "correct"
+    end
 end

metadata

@@ -1,106 +1,137 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: detagger
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - christfo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: facets
-  requirement: &2152557820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2012-03-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id001
+  name: facets
   prerelease: false
-  version_requirements: *2152557820
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2152557020 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
-  type: :development
+  version_requirements: *id002
+  name: rspec
   prerelease: false
-  version_requirements: *2152557020
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &2152556340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 3
+        - 12
+        version: "3.12"
+  version_requirements: *id003
+  name: rdoc
   prerelease: false
-  version_requirements: *2152556340
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2152555680 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  version_requirements: *id004
+  name: bundler
   prerelease: false
-  version_requirements: *2152555680
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2152554980 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 1
+        - 8
+        - 3
         version: 1.8.3
-  type: :development
+  version_requirements: *id005
+  name: jeweler
   prerelease: false
-  version_requirements: *2152554980
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &2152554200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: *2152554200
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2152553520 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id006
+  name: simplecov
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id007
+  name: rcov
   prerelease: false
-  version_requirements: *2152553520
-description: ! "This is intended to be used as a mixin, usualy with some kind of library
-  that parses\n  optional command line arguments. The feature here is that the options
-  may contain tags ('example_tag:') that\n  are not resolved until they are used.
-  This means that one option may refer to another. An example might be:\n  --stage
-  /tmp/fred --logfile stage:/my.log \n  which would later provide a method 'logfile'
-  that would return '/tmp/fred/my.log' "
+description: "This is intended to be used as a mixin, usualy with some kind of library that parses\n  optional command line arguments. The feature here is that the options may contain tags ('example_tag:') that\n  are not resolved until they are used. This means that one option may refer to another. An example might be:\n  --stage /tmp/fred --logfile stage:/my.log \n  which would later provide a method 'logfile' that would return '/tmp/fred/my.log' "
 email: chris.fordy@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .rspec
 - Gemfile
@@ -113,31 +144,37 @@ files:
 - spec/detagger_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/christfo/detagger
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 130063977220471087
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: a library to 'detag' strings
 test_files: []
+