tagutils 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e34415c99adfedcb4bd078a328b52a7c9f418931
+  data.tar.gz: ba4d539d363122e793a0b8fac7609025520623cc
+SHA512:
+  metadata.gz: c2ae676b1df654904a593519c0bfbb1874ebaaebf299977809b7c6ff007baef78be882d7ae00ffa1e1a662427b002131d7bc50c517f3a5946a5a1c5e7ffdef53
+  data.tar.gz: f262dc809c38d893e7020be236bbfa5c9cbcceac3f49a38d6fc746862f43f268ba69739d578b84c1ec84cd9dec892ae5ba63026e2c18e05abdcad2d071be86fa

data/Rakefile

@@ -19,13 +19,15 @@ Hoe.spec 'tagutils' do
 
   self.extra_deps = [
     ['activerecord' ],
-    ['logutils', '>= 0.6']
+    ['props', '>=1.1.2'],
+    ['logutils', '>= 0.6.1'],
+    ['textutils', '>=0.10.0']
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+   required_ruby_version: '>= 1.9.2'
   }
 
 

data/lib/tagutils.rb

@@ -4,15 +4,9 @@
 require 'active_record'   ## todo: add sqlite3? etc.
 
 require 'props'
-require 'props/db'  # note: also use ConfDb (ConfDb::Model::Prop etc.)
 require 'logutils'
 require 'textutils'
 
-#########
-# fix/todo:
-#   move props/db  - Props.create_from_fixture! to textutils/db
-#    require 'textutils/db'
-
 
 # our own code
 
@@ -43,4 +37,5 @@ module TagUtils
 end  # module TagUtils
 
 
-puts TagUtils.banner    # say hello
+# say hello
+puts TagUtils.banner    if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)

data/lib/tagutils/tags/readers/tag.rb

@@ -16,20 +16,46 @@ class TagReader
   include TextUtils::ValueHelper
 
 
-  attr_reader :include_path
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## get text content from zip
+    entry = zip_file.find_entry( entry_path )
 
+    text = entry.get_input_stream().read()
+    text = text.force_encoding( Encoding::UTF_8 )
+
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_file( path, more_attribs={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_string( text, more_attribs={} )
+    TagReader.new( text, more_attribs )
+  end  
+
+
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
+  end
+
+  ## fix: for now no way to pass in opts hash
   def strict?()      @strict == true;     end
 
-  def initialize( include_path, opts = {} )
-    
+  def initialize_old_removeeeee( include_path, opts = {} )
     @include_path = include_path
     
     ## option: for now issue warning on update, that is, if key/record (country,region,city) already exists
     @strict    =  opts[:strict].present? ? true : false
   end
 
-
-  def read( name )
+  def read_old_removeeee( name )
     ## check for grade in name e.g. tag.1, tag.2 etc.
 
     if name =~ /^tag.*\.(\d)$/
@@ -40,14 +66,13 @@ class TagReader
   end
 
 
-  def read_worker( name, more_attribs={} )
-
-      reader = HashReaderV2.new( name, include_path )
+  def read()
+      reader = HashReader.from_string( @text )  # NOTE: for now HashReader does NOT accept 2nd more_attributes para - check back later
 
       grade = 1
     
-      if more_attribs[:grade].present?
-        grade = more_attribs[:grade].to_i
+      if @more_attribs[:grade].present?
+        grade = @more_attribs[:grade].to_i
       end
 
       reader.each do |key, value|
@@ -93,7 +118,7 @@ class TagReader
         end
     end # each key,value
 
-  end # method read_worker
+  end # method read
 
 
 end # class TagReader

data/lib/tagutils/version.rb

@@ -1,5 +1,5 @@
 
 module TagUtils
-   VERSION = '0.2.2'
+   VERSION = '0.3.0'
 end
 

data/test/helper.rb

@@ -3,28 +3,15 @@
 
 ## minitest setup
 
-# require 'minitest/unit'
 require 'minitest/autorun'
 
-# include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
-
-
-# ruby stdlibs
-
-require 'json'
-require 'uri'
-require 'pp'
-require 'logger'
-
-# ruby gems
-
-require 'active_record'
-
 
 # our own code
 
 require 'tagutils'
-require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
+
+require 'logutils/activerecord'   # NB: explict require required for LogDb (not automatic) 
+require 'props/activerecord'      # NB: explict require required for ConfDb (not automatic) 
 
 
 

data/test/test_models.rb

@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestModels < MiniTest::Unit::TestCase
+class TestModels < MiniTest::Test
 
   def setup
     TagDb.delete!

data/test/test_tag_reader.rb

@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestTagReader < MiniTest::Unit::TestCase
+class TestTagReader < MiniTest::Test
 
   def setup
     TagDb.delete!
@@ -13,10 +13,12 @@ class TestTagReader < MiniTest::Unit::TestCase
 
   def test_read
     include_path = "#{TagUtils.root}/test"
-    puts "[TestTagReader.test_read] include_path: #{include_path}"
-    
-    reader = TagDb::TagReader.new( include_path )
-    reader.read( 'tags.1' )
+
+    path = "#{include_path}/tags.1.yml"
+    puts "[TestTagReader.test_read] path: #{path}"
+
+    reader = TagDb::TagReader.from_file( path )
+    reader.read()
   end
 
 

metadata

@@ -1,60 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: tagutils
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &75986000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75986000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: props
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &75985420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: textutils
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *75985420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75984750 !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: *75984750
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &75984290 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *75984290
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: tagutils - tag utilities (tag, taggings, tag list, etc.)
 email: openmundi@googlegroups.com
 executables: []
@@ -64,6 +103,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
+- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
@@ -88,33 +128,31 @@ files:
 - test/tags.1.yml
 - test/test_models.rb
 - test/test_tag_reader.rb
-- .gemtest
 homepage: https://github.com/rubylibs/tagutils
 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: tagutils - tag utilities (tag, taggings, tag list, etc.)
 test_files:
 - test/test_models.rb