textutils 0.9.10 → 0.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 68baf8d24b589a21d4394a6b18760b349e93d13d
+  data.tar.gz: d8c9a466924b62c4ffa53b88641f7a3e81844ef3
+SHA512:
+  metadata.gz: 66214b48ee18a369ccef2b369702aa481350ce58eb8f3174fee473fa642c15238af5cad0a5e0e53250bdd7ffc78dfff06e62e3e738e24fa3178a1f8fbda6a751
+  data.tar.gz: 4e590abefa048fbc971391bd65681dc230a254caacb7b728daded53bb756192e6e43aec34432e8c7beb319a1ebab4d9b4128299fea264594926ed668b05ff9db

data/Manifest.txt

@@ -25,11 +25,8 @@ lib/textutils/patterns.rb
 lib/textutils/reader/code_reader.rb
 lib/textutils/reader/fixture_reader.rb
 lib/textutils/reader/hash_reader.rb
-lib/textutils/reader/hash_reader_v2.rb
 lib/textutils/reader/line_reader.rb
-lib/textutils/reader/line_reader_v2.rb
 lib/textutils/reader/values_reader.rb
-lib/textutils/reader/values_reader_v2.rb
 lib/textutils/sanitizier.rb
 lib/textutils/title.rb
 lib/textutils/title_mapper.rb

data/Rakefile

@@ -18,17 +18,17 @@ Hoe.spec 'textutils' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['props'],
-    ['logutils'],
+    ['props',    '>=1.1.2'],
+    ['logutils', '>=0.6.1'],
     ### 3rd party gems
     ['rubyzip'],   ## todo/check: make optional -why? why not??
-    ['activesupport']
+    ['activesupport']    ## todo/check:  really needed? document what methods get used
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+    required_ruby_version: '>= 1.9.2'
   }
 
 end

data/lib/textutils/version.rb

@@ -1,9 +1,10 @@
+# encoding: utf-8
 
 module TextUtils
 
   MAJOR = 0 ## todo: namespace inside version or something - why? why not??
-  MINOR = 9
-  PATCH = 10
+  MINOR = 10
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/textutils.rb

@@ -1,32 +1,29 @@
 # encoding: utf-8
 
-
 # core and stlibs
 
+require 'json'
 require 'yaml'
+require 'erb'
 require 'pp'
-require 'logger'
-require 'optparse'
 require 'fileutils'
-require 'erb'
-
-# 3rd party gems / libs
 
-require 'zip'
 
+# 3rd party gems / libs
+require 'zip'       ### used for .from_zip for readers
 
-# fix: remove version from activerecord in deps
+### todo/check - document active_support methods that get used
 require 'active_support/all'   # String.starts_with?, Object.blank?, etc.
 
+
 require 'props'
-require 'props/db'   ## for Prop model --> move create_from fixtures to textutils!!
 require 'logutils'
 
+
 # our own code
 
 require 'textutils/version'      ## let version always go first
 
-
 require 'textutils/patterns'   # regex patterns for reuse
 require 'textutils/sanitizier'
 
@@ -54,11 +51,8 @@ require 'textutils/parser/name_parser'
 
 require 'textutils/reader/code_reader'
 require 'textutils/reader/hash_reader'
-require 'textutils/reader/hash_reader_v2'
 require 'textutils/reader/line_reader'
-require 'textutils/reader/line_reader_v2'
 require 'textutils/reader/values_reader'
-require 'textutils/reader/values_reader_v2'
 require 'textutils/reader/fixture_reader'
 
 require 'textutils/classifier'
@@ -69,5 +63,5 @@ require 'textutils/page'   # for book pages and page templates
 
 
 
-
-puts TextUtils.banner   if $DEBUG    # say hello
+# say hello
+puts TextUtils.banner   if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)

data/test/helper.rb

@@ -3,7 +3,6 @@
 
 ## minitest setup
 
-# require 'minitest/unit'
 require 'minitest/autorun'
 
 
@@ -12,10 +11,6 @@ require 'minitest/autorun'
 # require 'active_support/all'  # -- now included in textutils itself
 
 
-### note: do avoid version conflict require prop n prop/db first
-require 'props'
-require 'props/db'
-
 ## our own code
 
 require 'textutils'

metadata

@@ -1,82 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 0.9.10
-  prerelease: 
+  version: 0.10.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &78561960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *78561960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &78561710 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *78561710
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &78561390 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78561390
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &78561100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78561100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78560650 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *78560650
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &78560350 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *78560350
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: textutils - Text Filters, Helpers, Readers and More
 email: ruby-talk@ruby-lang.org
 executables: []
@@ -86,6 +103,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
+- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
@@ -113,11 +131,8 @@ files:
 - lib/textutils/reader/code_reader.rb
 - lib/textutils/reader/fixture_reader.rb
 - lib/textutils/reader/hash_reader.rb
-- lib/textutils/reader/hash_reader_v2.rb
 - lib/textutils/reader/line_reader.rb
-- lib/textutils/reader/line_reader_v2.rb
 - lib/textutils/reader/values_reader.rb
-- lib/textutils/reader/values_reader_v2.rb
 - lib/textutils/sanitizier.rb
 - lib/textutils/title.rb
 - lib/textutils/title_mapper.rb
@@ -136,33 +151,31 @@ files:
 - test/test_title_mapper.rb
 - test/test_unicode_helper.rb
 - test/test_values_reader.rb
-- .gemtest
 homepage: https://github.com/rubylibs/textutils
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: textutils - Text Filters, Helpers, Readers and More
 test_files:
 - test/test_title_finder.rb

data/lib/textutils/reader/hash_reader_v2.rb

@@ -1,61 +0,0 @@
-# encoding: utf-8
-
-# fix: move into TextUtils namespace/module!!
-
-## todo/fix: find a better name than HashReaderV2 (HashReaderPlus?) ??
-
-class HashReaderV2
-  include LogUtils::Logging
-
-  def initialize( name, include_path )
-    @name          = name
-    @include_path  = include_path
-
-    # map name to name_real_path
-    #   name might include !/ for virtual path (gets cut off)
-    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
-
-    pos = @name.index( '!/')
-    if pos.nil?
-      @name_real_path = @name   # not found; real path is the same as name
-    else
-      # cut off everything until !/ e.g.
-      #   at-austria!/w-wien/beers becomes
-      #   w-wien/beers
-      @name_real_path = @name[ (pos+2)..-1 ]
-    end
-  end
-
-  attr_reader :name
-  attr_reader :name_real_path
-  attr_reader :include_path
-
-  def each
-    path          = "#{include_path}/#{name_real_path}.yml"
-    reader        = HashReader.from_file( path )
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader.each do |key, value|
-      yield( key, value )
-    end
-
-    ConfDb::Model::Prop.create_from_fixture!( name, path )
-  end
-
-
-  def each_typed
-    path          = "#{include_path}/#{name_real_path}.yml"
-    reader        = HashReader.from_file( path )
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader.each_typed do |key, value|
-      yield( key, value )
-    end
-
-    ConfDb::Model::Prop.create_from_fixture!( name, path )
-  end
-
-
-end # class HashReaderV2

data/lib/textutils/reader/line_reader_v2.rb

@@ -1,47 +0,0 @@
-# encoding: utf-8
-
-
-# fix: move into TextUtils namespace/module!!
-
-
-class LineReaderV2
-  include LogUtils::Logging
-
-  def initialize( name, include_path )
-    @name          = name
-    @include_path  = include_path
-    
-    # map name to name_real_path
-    #   name might include !/ for virtual path (gets cut off)
-    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
-
-    pos = @name.index( '!/')
-    if pos.nil?
-      @name_real_path = @name   # not found; real path is the same as name
-    else
-      # cut off everything until !/ e.g.
-      #   at-austria!/w-wien/beers becomes
-      #   w-wien/beers
-      @name_real_path = @name[ (pos+2)..-1 ]
-    end
-  end
-
-  attr_reader :name
-  attr_reader :name_real_path
-  attr_reader :include_path
-
-  def each_line
-    path          = "#{include_path}/#{name_real_path}.txt"
-    reader        = LineReader.from_file( path )
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader.each_line do |line|
-      yield( line )
-    end
-
-    ConfDb::Model::Prop.create_from_fixture!( name, path )
-  end
-
-end # class LineReaderV2
-

data/lib/textutils/reader/values_reader_v2.rb

@@ -1,49 +0,0 @@
-# encoding: utf-8
-
-# fix: move into TextUtils namespace/module!!
-
-## todo/fix: find a better name than HashReaderV2 (HashReaderPlus?) ??
-
-class ValuesReaderV2
-  include LogUtils::Logging
-
-  def initialize( name, include_path, more_attribs={} )
-    @name          = name
-    @include_path  = include_path
-    @more_attribs  = more_attribs
-    
-    # map name to name_real_path
-    #   name might include !/ for virtual path (gets cut off)
-    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
-
-    pos = @name.index( '!/')
-    if pos.nil?
-      @name_real_path = @name   # not found; real path is the same as name
-    else
-      # cut off everything until !/ e.g.
-      #   at-austria!/w-wien/beers becomes
-      #   w-wien/beers
-      @name_real_path = @name[ (pos+2)..-1 ]
-    end
-  end
-
-  attr_reader :name
-  attr_reader :name_real_path
-  attr_reader :include_path
-  attr_reader :more_attribs
-
-  def each_line
-    path          = "#{include_path}/#{name_real_path}.txt"
-    reader        = ValuesReader.new( path, more_attribs )
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader.each_line do |attribs, values|
-      yield( attribs, values )
-    end
-
-    ConfDb::Model::Prop.create_from_fixture!( name, path )
-  end
-
-end # class ValuesReaderV2
-