hypermicrodata 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 6aa222d1d9f2fd94e7eabda85a111de9b63b17ba
-  data.tar.gz: 624be0e7d6c825c69ed224508f6286da2911cd8e
-SHA512: 
-  metadata.gz: 094a2d0285349d16ff74308ce8756d5a2510f67c0ab564bd93112823c488bc0eeee030725feb87fa6b2f89e2ab4805407a2a536ded47262c3125f81ea1cd9901
-  data.tar.gz: 6753e62b18ea5b2e4b0550b5fcaaf2eeb5f3101efbb61c5af745901285a3d4621761e2b75a8201e670274350cab0a5a2f7bebac8570e4e87357a6e581626b700
+---
+SHA1:
+  metadata.gz: 31c2827d5ef761811004b563f135127def94a625
+  data.tar.gz: 229d52f8eee1e15347d72171d37f6ebda948df84
+SHA512:
+  metadata.gz: b1caaf52ab0fe4dc1c3285b04b9a1db8b3b1debe0d2966cc3c903d88a72e3900d3d2815521c95d5d98217e0c81cffe8f1d63fa9977e53d2ee1db361f8ea70de0
+  data.tar.gz: 3f2531028ea38dc3d082e84a14aa426406d7ebee8667e3459611ccfd05c7857eb965daf73715c5c390ef272989566b761386512955e940d4b6032bb821332dfb

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
   - jruby-19mode # JRuby in 1.9 mode
 # uncomment this line if your project needs to run something other than `rake`:
 script: rake test

data/lib/hypermicrodata/document.rb

@@ -3,10 +3,11 @@ module Hypermicrodata
 
     attr_reader :items, :doc
 
-    def initialize(content, page_url=nil, filter_xpath_attr=nil)
-      @doc = Nokogiri::HTML(content)
-      @page_url = page_url
-      @filter_xpath_attr = filter_xpath_attr
+    def initialize(content, options = {})
+      encoding = options[:force_encoding] || nil
+      @doc = Nokogiri::HTML(content, nil, encoding)
+      @page_url = options[:page_url]
+      @filter_xpath_attr = options[:filter_xpath_attr]
       @items = extract_items
     end
 

data/lib/hypermicrodata/extract.rb

@@ -5,7 +5,7 @@ module Hypermicrodata
       @location = options[:location]
       @profile_path = options[:profile_path]
       filter_xpath_attr = "@data-#{options[:data_attr_name] || default_data_attr_name}"
-      @document = Hypermicrodata::Document.new(html, @location, filter_xpath_attr)
+      @document = Hypermicrodata::Document.new(html, page_url: @location, filter_xpath_attr: filter_xpath_attr)
     end
 
     def to_json(format = :plain, options = {})

data/lib/hypermicrodata/version.rb

@@ -1,3 +1,3 @@
 module Hypermicrodata
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/hypermicrodata.rb

@@ -19,14 +19,16 @@ require 'uri'
 
 module Hypermicrodata
 
-  def self.get_items(location)
-    content = open(location)
+  def self.get_items(location, encoding = nil)
+    f = open(location)
     page_url = location
-    Hypermicrodata::Document.new(content, page_url).extract_items
+    Hypermicrodata::Document.new(f, page_url: location, force_encoding: encoding).extract_items
+  ensure
+    f.close
   end
 
-  def self.to_json(location)
-    items = get_items(location)
+  def self.to_json(location, encoding = nil)
+    items = get_items(location, encoding)
     hash = {}
     hash[:items] = items.map do |item|
       item.to_hash

data/test/test_itemref.rb

@@ -3,17 +3,17 @@ require 'test_helper'
 class TestItemref < Test::Unit::TestCase
 
   def setup
-    @items = Hypermicrodata.get_items('test/data/example_itemref.html')
+    @items = Hypermicrodata.get_items('test/data/example_itemref.html', 'utf-8')
   end
 
   def test_top_item_name
-    assert_equal ['Amanda'], @items.first.properties['name']
+    assert_equal ['Amanda'], @items.first.properties['name'].map(&:value)
   end
 
   def test_band_name_and_size
-    band = @items.first.properties['band'].first
-    assert_equal ['Jazz Band'], band.properties['name']
-    assert_equal ['12'], band.properties['size']
+    band = @items.first.properties['band'].first.item
+    assert_equal ['Jazz Band'], band.properties['name'].map(&:value)
+    assert_equal ['12'], band.properties['size'].map(&:value)
   end
 
-end
+end

data/test/test_json.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class TestJson < Test::Unit::TestCase
 
   def setup
-    json = Hypermicrodata.to_json('test/data/example_itemref.html')
+    json = Hypermicrodata.to_json('test/data/example_itemref.html', 'utf-8')
     @top_item = JSON.parse(json)['items'].first
   end
 

data/test/test_parse.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class TestParse < Test::Unit::TestCase
 
   def setup
-    @items = Hypermicrodata.get_items('test/data/example.html')
+    @items = Hypermicrodata.get_items('test/data/example.html', 'utf-8')
   end
 
   def test_top_item_type
@@ -16,21 +16,21 @@ class TestParse < Test::Unit::TestCase
 
   def test_top_item_properties
     properties = @items.first.properties
-    assert_equal ["Jason Ronallo"], properties['name']
-    assert_equal ["http://twitter.com/ronallo"], properties['url']
-    assert_equal ["Associate Head of Digital Library Initiatives"], properties['jobTitle']
+    assert_equal ["Jason Ronallo"], properties['name'].map(&:value)
+    assert_equal ["http://twitter.com/ronallo"], properties['url'].map(&:value)
+    assert_equal ["Associate Head of Digital Library Initiatives"], properties['jobTitle'].map(&:value)
   end 
 
   def test_nested_item
-    item = @items.first.properties['affiliation'][0]
+    item = @items.first.properties['affiliation'].first.item
     assert_equal ['http://schema.org/Library'], item.type
     assert_equal "http://lib.ncsu.edu", item.id
   end
 
   def test_nested_item_properties
-    properties = @items.first.properties['affiliation'][0].properties
-    assert_equal ['NCSU Libraries'], properties['name']
-    assert_equal ['http://www.lib.ncsu.edu'], properties['url']
+    properties = @items.first.properties['affiliation'].first.item.properties
+    assert_equal ['NCSU Libraries'], properties['name'].map(&:value)
+    assert_equal ['http://www.lib.ncsu.edu'], properties['url'].map(&:value)
   end
 
-end
+end

metadata

@@ -1,81 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hypermicrodata
-version: !ruby/object:Gem::Version 
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Jason Ronallo
 - Toru KAWAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-10-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-10-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mechanize
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: halibut
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: halibut
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: HTML5 Microdata extractor with Hypermedia
-email: 
+email:
 - jronallo@gmail.com
 - tkawa@4bit.net
-executables: 
+executables:
 - hypermicrodata.rb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -107,29 +135,30 @@ files:
 - test/test_json.rb
 - test/test_parse.rb
 homepage: https://github.com/tkawa/hypermicrodata
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Ruby library for extracting HTML5 Microdata with Hypermedia
-test_files: 
+test_files:
 - test/data/example.html
 - test/data/example_itemref.html
 - test/data/example_with_no_itemscope.html