jsondoc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d31ab6bc50e452d8df5d5ffe3eec2517671353b
-  data.tar.gz: 6ef7c6ae540f56e4ad608e7e1952ed1d5185d43d
+  metadata.gz: a67112a09bdcadf7b01a4da9f764afcc2b997718
+  data.tar.gz: c16488cb845e829d9d40b1bce7ebc7ee136219dc
 SHA512:
-  metadata.gz: 594bb9c373b34df5a94df646882a41b197e4f3b5b62e4df0c8164aefff6833e1da0f3c14a73608dadfa43a3ce15b56e6c7d11f2bc0aebbdfd03bb5d1d2e8f146
-  data.tar.gz: 5f3ff7c0a942cf38d6cb258fc39ca98c515e588dcf8bb65b571a5450c66e8df2fe11a6fee4e0fbb1f357ecd0f453ca44b1836171bc98b63bd527424ff606f74c
+  metadata.gz: 8f81b7d01dd4ae7d0b9eb27913fcd726ef1ed09b1283673dccda60858a348e5caa60fdee3cb9a960f6cda8755f4f47246f31b84815d76399986b721111f2cb67
+  data.tar.gz: 5a6fef198638b13bfedceb507f33459aed78353179763f928f171be7429358f8625b058d03a08d5ea11ca9ac6a6ca868d35569cd48b4b11af8647dcce64da8a2

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+CHANGELOG
+---------
+- **2014-03-16**: 0.0.4
+  - Changed Attr methods to Prop methods to represent JSON schema property
+  - Added Attr methods as aliases
+  - Added ability to load initial values hash
+  - Added key validation for #getProp() in strict mode
+  - Added attr_accessor for bIsStrict
+  - #push(Prop\Attr) will now only act on arrays
+
+- **2014-02-12**: 0.0.3
+  - Added cpAttr() method
+
+- **2014-01-31**: 0.0.2
+  - README bugfix
+
+- **2014-01-28**: 0.0.1
+  - Initial release

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/jsondoc.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name        = 'jsondoc'
-  s.version     = '0.0.3'
-  s.date        = '2014-02-12'
+  s.version     = '0.0.4'
+  s.date        = '2014-03-16'
   s.summary     = 'JsonDoc'
   s.description = 'A base document object'
   s.authors     = ['John Wang']
   s.email       = 'john@johnwang.com'
   s.files       = [
-    'CHANGELOG',
-    'MIT-LICENSE',
+    'CHANGELOG.md',
+    'LICENSE',
     'README.rdoc',
     'Rakefile',
     'VERSION',
@@ -19,4 +19,4 @@ Gem::Specification.new do |s|
   ]
   s.homepage    = 'http://johnwang.com/'
   s.license     = 'MIT'
-end
+end

data/lib/jsondoc/document.rb

@@ -3,11 +3,14 @@ require 'json'
 module JsonDoc
   class Document
 
-    def initialize(dSchema=nil,bDefaultifyDoc=false,bIsStrict=true)
+    attr_accessor :bIsStrict
+
+    def initialize(dValues=nil,dSchema=nil,bDefaultifyDoc=false,bIsStrict=true)
       @dSchema        = dSchema || self.getDefaultSchema()
       @bDefaultifyDoc = bDefaultifyDoc ? true : false
       @bIsStrict      = bIsStrict      ? true : false
       @dDocument      = self.getDefaultDocument()
+      self.loadInitialValues(dValues)
     end
 
     def getDefaultSchema()
@@ -32,9 +35,26 @@ module JsonDoc
       return dDocument
     end
 
-    def getAttr(yKey=nil)
+    def loadInitialValues(dValues=nil)
+      if dValues.nil?
+        return
+      elsif ! dValues.is_a?(Hash)
+        raise ArgumentError, 'E_INITIAL_VALUES_IS_NOT_A_HASH'
+      end
+      dValues.each do |yKey,xxVal|
+        self.setProp(yKey,xxVal)
+      end
+    end
+
+    def getProp(yKey=nil)
+      if yKey.nil?
+        raise ArgumentError, 'E_BAD_KEY__IS_NIL'
+      end
       yKey  = yKey.to_sym if yKey.kind_of?(String)
       xxVal = @dDocument.has_key?(yKey) ? @dDocument[yKey] : nil
+      if xxVal.nil? && @bIsStrict
+        self.validateKey(yKey)
+      end
       return xxVal
     end
 
@@ -43,16 +63,18 @@ module JsonDoc
         raise ArgumentError, "E_BAD_KEY__IS_NIL [#{yKey.to_s}]"
       end
 
+      return true unless @bIsStrict
+
       bKeyExists = @dSchema.has_key?(:properties) && @dSchema[:properties].has_key?(yKey) ? true : false
 
-      if @bIsStrict && ! bKeyExists
+      unless bKeyExists
         raise ArgumentError, "E_UNKNOWN_KEY__STRICT #{yKey.to_s}"
       end
 
       return true
     end
 
-    def setAttr(yKey=nil,xxVal=nil)
+    def setProp(yKey=nil,xxVal=nil)
       yKey = yKey.to_sym if yKey.kind_of?(String)
 
       self.validateKey(yKey)
@@ -60,25 +82,23 @@ module JsonDoc
       @dDocument[yKey] = xxVal
     end
 
-    def pushAttr(yKey=nil,xxVal=nil)
+    def pushProp(yKey=nil,xxVal=nil)
       yKey = yKey.to_sym if yKey.kind_of?(String)
 
       self.validateKey(yKey)
 
-      sType = @dSchema[:properties][yKey].has_key?(:type) ? @dSchema[:properties][yKey][:type] : nil
-
-      if sType == 'array'
-        if @dDocument.has_key?(yKey)
+      if @dDocument.has_key?(yKey)
+        if @dDocument[yKey].kind_of?(Array)
           @dDocument[yKey].push(xxVal)
         else
-          @dDocument[yKey] = [xxVal]
+          raise RuntimeError, 'E_PROPERTY_IS_NOT_ARRAY'
         end
       else
-        @dDocument[yKey] = xxVal
+        @dDocument[yKey] = [xxVal]
       end
     end
 
-    def cpAttr(yKeySrc=nil,yKeyDest=nil)
+    def cpProp(yKeySrc=nil,yKeyDest=nil)
       yKeySrc  = yKeySrc.to_sym  if yKeySrc.kind_of?(String)
       yKeyDest = yKeyDest.to_sym if yKeyDest.kind_of?(String)
       self.setAttr(yKeyDest, self.getAttr(yKeySrc))
@@ -86,9 +106,6 @@ module JsonDoc
 
     def sortKeys()
       @dDocument.keys.sort!
-      #dProperties = @dDocument[:properties]
-      #dProperties = dProperties.sort
-      #@dDocument[:properties] = dProperties
     end
 
     def fromJson(jDocument=nil)
@@ -110,11 +127,10 @@ module JsonDoc
       return JSON.dump( self.asHash() )
     end
 
-    def getValStringForProperties(aCols=nil,sDelimiter=nil)
+    def getValStringForProperties(aCols=nil,sDelimiter="\t")
       sDelimiter = "\t" unless sDelimiter.kind_of?(String) && sDelimiter.length>0
       aVals = self.getValArrayForProperties(aCols)
       sVals = aVals.join(sDelimiter)
-      #sVals = aVals.join("\t")
       return sVals
     end
 
@@ -131,11 +147,10 @@ module JsonDoc
       return aVals
     end
 
-    def getDescStringForProperties(aCols=nil,sDelimiter=nil)
+    def getDescStringForProperties(aCols=nil,sDelimiter="\t")
       sDelimiter = "\t" unless sDelimiter.kind_of?(String) && sDelimiter.length>0
       aVals = self.getDescArrayForProperties(aCols)
       sVals = aVals.join(sDelimiter)
-      #sVals = aVals.join("\t")
       return sVals
     end
 
@@ -153,5 +168,10 @@ module JsonDoc
       return aVals
     end
 
+    alias_method :setAttr , :setProp
+    alias_method :getAttr , :getProp
+    alias_method :pushAttr, :pushProp
+    alias_method :cpAttr  , :cpProp
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsondoc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - John Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies: []
 description: A base document object
 email: john@johnwang.com
@@ -16,8 +16,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG
-- MIT-LICENSE
+- CHANGELOG.md
+- LICENSE
 - README.rdoc
 - Rakefile
 - VERSION

data/CHANGELOG

@@ -1,8 +0,0 @@
-= 0.0.3
-- Added cpAttr() method
-
-= 0.0.2
-- README bugfix
-
-= 0.0.1
-- Initial release