lightrdf 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.1 2011-11-24
+
+* Update to latest JSON parsing
+
 === 0.4.0 2011-07-08
 
 * SPARQL support in repository

data/lib/lightrdf.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module RDF
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end
 
 require 'rubygems'

data/lib/lightrdf/parser.rb

@@ -95,7 +95,7 @@ module RDF
         if level == base_level
           nodes << if line =~ /\A(".*")\Z/ # Literal
             i += 1
-            ActiveSupport::JSON.decode($1)
+            parse_string($1)
           elsif line =~ /\A(.+):\Z/ # Node with relations
             node = Node(ID($1, ns), graph)
             i, relations = parse_yarf_relations(lines, graph, ns, level+1, i+1)
@@ -122,7 +122,7 @@ module RDF
         if level == base_level
           relations += if line =~ /\A(.+):\s+(".+")\Z/ # Predicate and literal
             i += 1
-            [[Node(ID($1, ns), graph), ActiveSupport::JSON.decode($2)]]
+            [[Node(ID($1, ns), graph), parse_string($2)]]
           elsif line =~ /\A(.+):\s+(.+)\Z/ # Predicate and node
             i += 1
             [[Node(ID($1, ns), graph), Node(ID($2, ns), graph)]]
@@ -226,7 +226,7 @@ module RDF
         end
       when '_' then Node c
       when '"' then
-        ActiveSupport::JSON.decode(c.match(/\A(\".*\")(@\w+)?\Z/).captures.first)
+        parse_string(c.match(/\A(\".*\")(@\w+)?\Z/).captures.first)
       else
         raise Exception, "Parsing error: #{c}"
       end
@@ -243,5 +243,9 @@ module RDF
       @num_tempfile  += 1
       File.join(Dir.tmpdir, "lightrdf-#{@num_tempfile}-#{$$}#{Thread.current.object_id}")
     end
+    
+    def self.parse_string string
+      ActiveSupport::JSON.decode("[#{string}]").first
+    end
   end
 end

data/lightrdf.gemspec

@@ -1,32 +1,30 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{lightrdf}
-  s.version = "0.4.0"
+  s.name = "lightrdf"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Ignacio"]
-  s.date = %q{2011-07-08}
-  s.default_executable = %q{yarfp}
-  s.description = %q{RDF library}
-  s.email = %q{joseignacio.fernandez@gmail.com}
+  s.date = "2011-11-24"
+  s.description = "RDF library"
+  s.email = "joseignacio.fernandez@gmail.com"
   s.executables = ["yarfp"]
   s.extra_rdoc_files = ["README.rdoc", "bin/yarfp", "lib/lightrdf.rb", "lib/lightrdf/graph.rb", "lib/lightrdf/node.rb", "lib/lightrdf/node_proxy.rb", "lib/lightrdf/parser.rb", "lib/lightrdf/repository.rb", "lib/lightrdf/id.rb"]
   s.files = ["History.txt", "Manifest", "README.rdoc", "Rakefile", "bin/yarfp", "lib/lightrdf.rb", "lib/lightrdf/graph.rb", "lib/lightrdf/node.rb", "lib/lightrdf/node_proxy.rb", "lib/lightrdf/parser.rb", "lib/lightrdf/repository.rb", "lib/lightrdf/id.rb", "test/test_helper.rb", "test/test_lightrdf.rb", "lightrdf.gemspec"]
-  s.homepage = %q{http://github.com/josei/lighrdf}
-  s.post_install_message = %q{**Remember to install raptor RDF tools and (optionally for RDF PNG output) Graphviz**}
+  s.homepage = "http://github.com/josei/lighrdf"
+  s.post_install_message = "**Remember to install raptor RDF tools and (optionally for RDF PNG output) Graphviz**"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Lightrdf", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{lightrdf}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Light and easy library for managing RDF data and graphs}
+  s.rubyforge_project = "lightrdf"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Light and easy library for managing RDF data and graphs"
   s.test_files = ["test/test_lightrdf.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<rest-client>, [">= 1.6.1"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.1"])

metadata

@@ -1,71 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lightrdf
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.4.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jose Ignacio
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-08 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 2
+  requirement: &77839540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
+  version_requirements: *77839540
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &77839300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 1
+  version_requirements: *77839300
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &77839080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *77839080
 description: RDF library
 email: joseignacio.fernandez@gmail.com
-executables: 
+executables:
 - yarfp
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - bin/yarfp
 - lib/lightrdf.rb
@@ -75,7 +59,7 @@ extra_rdoc_files:
 - lib/lightrdf/parser.rb
 - lib/lightrdf/repository.rb
 - lib/lightrdf/id.rb
-files: 
+files:
 - History.txt
 - Manifest
 - README.rdoc
@@ -91,42 +75,37 @@ files:
 - test/test_helper.rb
 - test/test_lightrdf.rb
 - lightrdf.gemspec
-has_rdoc: true
 homepage: http://github.com/josei/lighrdf
 licenses: []
-
-post_install_message: "**Remember to install raptor RDF tools and (optionally for RDF PNG output) Graphviz**"
-rdoc_options: 
+post_install_message: ! '**Remember to install raptor RDF tools and (optionally for
+  RDF PNG output) Graphviz**'
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Lightrdf
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: lightrdf
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Light and easy library for managing RDF data and graphs
-test_files: 
+test_files:
 - test/test_lightrdf.rb
 - test/test_helper.rb