clj 0.0.2 → 0.0.3

data/lib/clj.rb

@@ -16,9 +16,9 @@ class Clojure
 		Clojure::Parser.new(*args).parse
 	end
 
-	def self.dump (what)
+	def self.dump (what, options = {})
 		raise ArgumentError, 'cannot convert the passed value to clojure' unless what.respond_to? :to_clj
 
-		what.to_clj
+		what.to_clj(options)
 	end
 end

data/lib/clj/parser.rb

@@ -13,6 +13,23 @@ require 'strscan'
 class Clojure
 
 class Parser < StringScanner
+	UNPARSED = Object.new
+
+	IGNORE = %r(
+		(?:
+			//[^\n\r]*[\n\r]| # line comments
+			/\* # c-style comments
+			(?:
+				[^*/]| # normal chars
+				/[^*]| # slashes that do not start a nested comment
+				\*[^/]| # asterisks that do not end this comment
+				/(?=\*/) # single slash before this comment's end
+			)*
+			\*/ # the End of this comment
+			|[ \t\r\n,]+ # whitespaces: space, horicontal tab, lf, cr, and comma
+		)
+	)mx
+
 	STRING = /" ((?:[^\x0-\x1f"\\] |
 		# escaped special characters:
 		\\["\\\/bfnrt] |
@@ -38,6 +55,8 @@ class Parser < StringScanner
 
 	REGEXP = /#"((\\.|[^"])+)"/
 
+	INSTANT = /#inst#{IGNORE}*"(.*?)"/
+
 	VECTOR_OPEN  = /\[/
 	VECTOR_CLOSE = /\]/
 
@@ -54,23 +73,6 @@ class Parser < StringScanner
 	FALSE = /false/
 	NIL   = /nil/
 
-	IGNORE = %r(
-		(?:
-		 //[^\n\r]*[\n\r]| # line comments
-		 /\* # c-style comments
-		 (?:
-			[^*/]| # normal chars
-			/[^*]| # slashes that do not start a nested comment
-			\*[^/]| # asterisks that do not end this comment
-			/(?=\*/) # single slash before this comment's end
-		 )*
-			 \*/ # the End of this comment
-			 |[ \t\r\n,]+ # whitespaces: space, horicontal tab, lf, cr, and comma
-		)+
-	)mx
-
-	UNPARSED = Object.new
-
 	def initialize (source, options = {})
 		super(source)
 
@@ -115,6 +117,7 @@ class Parser < StringScanner
 			when scan(FLOAT)    then Float(self[1])
 			when scan(INTEGER)  then Integer(self[1])
 			when scan(REGEXP)   then /#{self[1]}/
+			when scan(INSTANT)  then DateTime.rfc3339(self[1])
 			when scan(STRING)   then parse_string
 			when scan(KEYWORD)  then self[1].to_sym
 			when scan(TRUE)     then true
@@ -165,7 +168,7 @@ class Parser < StringScanner
 				result << value
 			when scan(VECTOR_CLOSE)
 				break
-			when skip(IGNORE)
+			when skip(/#{IGNORE}+/)
 				;
 			else
 				raise SyntaxError, 'wat do'
@@ -184,7 +187,7 @@ class Parser < StringScanner
 				result << value
 			when scan(LIST_CLOSE)
 				break
-			when skip(IGNORE)
+			when skip(/#{IGNORE}+/)
 				;
 			else
 				raise SyntaxError, 'wat do'
@@ -203,7 +206,7 @@ class Parser < StringScanner
 				result << value
 			when scan(SET_CLOSE)
 				break
-			when skip(IGNORE)
+			when skip(/#{IGNORE}+/)
 				;
 			else
 				raise SyntaxError, 'wat do'
@@ -223,7 +226,7 @@ class Parser < StringScanner
 		until eos?
 			case
 			when (key = parse(false)) != UNPARSED
-				skip(IGNORE)
+				skip(/#{IGNORE}*/)
 
 				if (value = parse(false)) == UNPARSED
 					raise SyntaxError, 'no value for the hash'
@@ -232,7 +235,7 @@ class Parser < StringScanner
 				result[key] = value
 			when scan(HASH_CLOSE)
 				break
-			when skip(IGNORE)
+			when skip(/#{IGNORE}+/)
 				;
 			else
 				raise SyntaxError, 'wat do'

data/lib/clj/types.rb

@@ -8,50 +8,66 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
+require 'date'
+
 [String, Symbol, Numeric, TrueClass, FalseClass, NilClass].each {|klass|
 	klass.instance_eval {
-		alias_method :to_clj, :inspect
+		define_method :to_clj do |options = {}|
+			inspect
+		end
 	}
 }
 
 class Rational
-	alias to_clj to_s
+	def to_clj (options = {})
+		to_s
+	end
 end
 
 class Regexp
-	def to_clj
+	def to_clj (options = {})
 		'#"' + inspect[1 .. -2] + '"'
 	end
 end
 
+class DateTime
+	def to_clj (options = {})
+		if options[:alpha]
+			'#inst "' + rfc3339 + '"'
+		else
+			to_time.to_i.to_s
+		end
+	end
+end
+
 class Date
-	def to_clj
-		to_time.to_clj
+	def to_clj (options = {})
+		to_datetime.to_clj(options)
 	end
 end
 
 class Time
-	def to_clj
-		to_i.to_s
+	def to_clj (options = {})
+		to_datetime.to_clj(options)
 	end
 end
 
 if defined? BigDecimal
 	class BigDecimal
-		def to_clj
+		def to_clj (options = {})
 			inspect + 'M'
 		end
 	end
 end
 
 class Array
-	def to_clj
-		'[' + map { |o| o.to_clj }.join(' ') + ']'
+	def to_clj (options = {})
+		'[' + map { |o| o.to_clj(options) }.join(' ') + ']'
 	end
 end
 
 class Hash
-	def to_clj
-		'{' + map { |k, v| k.to_clj + ' ' + v.to_clj }.join(' ') + '}'
+	def to_clj (options = {})
+		'{' + map { |k, v| k.to_clj(options) + ' ' + v.to_clj(options) }.join(' ') + '}'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clj
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15905000 !ruby/object:Gem::Requirement
+  requirement: &20555460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15905000
+  version_requirements: *20555460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15889080 !ruby/object:Gem::Requirement
+  requirement: &20554680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15889080
+  version_requirements: *20554680
 description: 
 email: meh@paranoici.org
 executables: []
@@ -67,4 +67,3 @@ signing_key:
 specification_version: 3
 summary: Like json, but with clojure sexps.
 test_files: []
-has_rdoc: