RubyGems - mida - Versions diffs - 0.2.0 → 0.3.0 - Mend

mida 0.2.0 → 0.3.0

Files changed (35) hide show

data/CHANGELOG.rdoc +18 -2
data/README.rdoc +22 -11
data/Rakefile +2 -2
data/lib/mida.rb +1 -1
data/lib/mida/datatype.rb +15 -0
data/lib/mida/datatype/boolean.rb +18 -0
data/lib/mida/datatype/float.rb +15 -0
data/lib/mida/datatype/integer.rb +15 -0
data/lib/mida/datatype/iso8601date.rb +17 -0
data/lib/mida/datatype/number.rb +15 -0
data/lib/mida/datatype/text.rb +13 -0
data/lib/mida/document.rb +21 -19
data/lib/mida/genericvocabulary.rb +13 -0
data/lib/mida/item.rb +83 -71
data/lib/mida/itemprop.rb +55 -30
data/lib/mida/itemscope.rb +82 -0
data/lib/mida/propertydesc.rb +36 -0
data/lib/mida/vocabulary.rb +60 -6
data/spec/datatype/boolean_spec.rb +27 -0
data/spec/datatype/float_spec.rb +23 -0
data/spec/datatype/integer_spec.rb +23 -0
data/spec/datatype/iso8601date_spec.rb +20 -0
data/spec/datatype/number_spec.rb +23 -0
data/spec/datatype/text_spec.rb +14 -0
data/spec/document_spec.rb +31 -487
data/spec/item_spec.rb +163 -472
data/spec/itemprop_spec.rb +40 -45
data/spec/itemscope_spec.rb +287 -0
data/spec/propertydesc_spec.rb +56 -0
data/spec/spec_helper.rb +13 -36
data/spec/vocabulary_spec.rb +148 -0
metadata +22 -6
data/lib/mida/vocabulary/generic.rb +0 -15
data/lib/mida/vocabularydesc.rb +0 -57
data/spec/vocabularydesc_spec.rb +0 -106

data/spec/spec_helper.rb CHANGED Viewed

@@ -1,41 +1,18 @@
+require 'bundler/setup'
 require 'rspec'
-def element_add_attribute(element, attribute, value)
-  if value
-    attr = mock(Nokogiri::XML::Attr)
-    if value != true
-      attr.stub!(:value).and_return(value)
-    end
-  end
-  element.should_receive(:attribute).any_number_of_times.with(attribute).and_return(attr)
-  element
+def html_wrap(html)
+  "<!DOCTYPE html><html><body>#{html}</body></html>"
 end
-# Return a mock Nokogiri::XML::Element
-def mock_element(tag, attributes={}, inner_text=nil, search_return=[], id_searches={})
-  element = mock(Nokogiri::XML::Element)
-  ['id', 'itemid', 'itemprop', 'itemref', 'itemscope', 'itemtype'].each do |name|
-    attributes[name] = nil unless attributes.has_key?(name)
-  end
-  attributes.each do |name, value|
-    element_add_attribute(element, name, value)
-  end
-  element.stub!(:inner_text).and_return(inner_text)
-  element.stub!(:name).and_return(tag)
-  element.should_receive(:search).any_number_of_times.with('./*').and_return(search_return)
-  # Set a valid return element for each likely id
-  ('a'..'z').each do |id|
-    stub = element.should_receive(:search).any_number_of_times.with("//*[@id='#{id}']")
-    if id_searches.has_key?(id)
-      stub.and_return([id_searches[id]])
-    else
-      stub.and_return([])
-    end
-  end
-  element
+# Return the last error message on STDERR.
+# Prevents the message being output to STDERR.
+def last_stderr
+  orig_stderr = $stderr
+  $stderr = StringIO.new
+  yield
+  $stderr.rewind
+  message = $stderr.string.chomp
+  $stderr = orig_stderr
+  message
 end

data/spec/vocabulary_spec.rb ADDED Viewed

@@ -0,0 +1,148 @@
+require 'spec_helper'
+require 'mida'
+describe Mida::Vocabulary, 'when subclassed and given has statements with no blocks' do
+  before do
+    class Organization < Mida::Vocabulary
+      itemtype %r{http://example\.com.*?organization$}i
+      has_one 'name'
+      has_many 'tel', 'url'
+    end
+  end
+  it '#itemtype should return the correct regexp' do
+    Organization.itemtype.should == %r{http://example\.com.*?organization$}i
+  end
+  it 'should specify name to appear once' do
+    Organization.properties['name'][:num].should == :one
+  end
+  it 'should specify tel and url to appear many times' do
+    Organization.properties['tel'][:num].should == :many
+    Organization.properties['url'][:num].should == :many
+  end
+end
+describe Mida::Vocabulary, 'when subclassed and given has statements with blocks' do
+  before do
+    class Rating < Mida::Vocabulary
+      itemtype %r{http://example\.com.*?rating$}i
+      has_one 'best', 'value'
+    end
+    class Comment < Mida::Vocabulary
+      itemtype %r{http://example\.com.*?comment$}i
+      has_one 'commentor', 'comment'
+    end
+    class Review < Mida::Vocabulary
+      itemtype %r{http://example\.com.*?review$}i
+      has_one 'itemreviewed'
+      has_one 'rating' do
+        extract Rating, Mida::DataType::Text
+      end
+      has_many 'comments' do
+        extract Comment
+      end
+    end
+  end
+  it '#itemtype should return the correct regexp' do
+    Review.itemtype.should == %r{http://example\.com.*?review$}i
+  end
+  it 'should specify itemreviewed to appear once' do
+    Review.properties['itemreviewed'][:num].should == :one
+  end
+  it 'should specify that itemreviewed only have the type Mida::DataType::Text' do
+    Review.properties['itemreviewed'][:types].should == [Mida::DataType::Text]
+  end
+  it 'should specify rating to appear once' do
+    Review.properties['rating'][:num].should == :one
+  end
+  it 'should specify rating to only have the types: Rating, Mida::DataType::Text' do
+    Review.properties['rating'][:types].should == [Rating, Mida::DataType::Text]
+  end
+  it 'should specify comments to appear many times' do
+    Review.properties['comments'][:num].should == :many
+  end
+  it 'should specify that comments only have the type Comment' do
+    Review.properties['comments'][:types].should == [Comment]
+  end
+end
+describe Mida::Vocabulary, 'when subclassed and used with :any for properties and types' do
+  before do
+    class Person < Mida::Vocabulary
+      itemtype %r{http://example.com/vocab/person}
+      has_one 'name'
+      has_many :any do
+        extract :any
+      end
+    end
+  end
+  it '#itemtype should return the correct regexp' do
+    Person.itemtype.should == %r{http://example.com/vocab/person}
+  end
+  it 'should specify that name only appears once' do
+    Person.properties['name'][:num].should == :one
+  end
+  it 'should specify that any other property can appear many times' do
+    Person.properties[:any][:num].should == :many
+  end
+  it 'should specify that any other property can have any type' do
+    Person.properties[:any][:types].should == [:any]
+  end
+end
+describe Mida::Vocabulary, 'when subclassed' do
+  before do
+    # Make sure the class is redefined afresh to make sure that
+    # inherited() hook is called
+    Mida::Vocabulary.unregister(Person)
+    Object.send(:remove_const, :Person)
+    class Person < Mida::Vocabulary
+      itemtype %r{http://example.com/vocab/person}
+      has_one 'name'
+      has_many :any do
+        extract :any
+      end
+    end
+  end
+  it 'should register the vocabulary subclass' do
+    Mida::Vocabulary.vocabularies.should include(Person)
+  end
+end
+describe Mida::Vocabulary, 'when subclassed and has no properties' do
+  before do
+    class Empty < Mida::Vocabulary
+      itemtype %r{http://example.com/vocab/empty}
+    end
+  end
+  it 'should register the vocabulary subclass' do
+    Mida::Vocabulary.vocabularies.should include(Empty)
+  end
+  it '#properties should return an empty hash' do
+    Mida::Vocabulary.properties.should == {}
+  end
+end

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: mida
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Lawrence Woodman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-05-03 00:00:00 Z
+date: 2011-06-29 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -48,21 +48,37 @@ files:
 - lib/mida.rb
 - lib/mida/item.rb
 - lib/mida/document.rb
-- lib/mida/vocabulary/generic.rb
-- lib/mida/vocabularydesc.rb
+- lib/mida/datatype.rb
+- lib/mida/propertydesc.rb
 - lib/mida/itemprop.rb
+- lib/mida/datatype/float.rb
+- lib/mida/datatype/number.rb
+- lib/mida/datatype/iso8601date.rb
+- lib/mida/datatype/text.rb
+- lib/mida/datatype/boolean.rb
+- lib/mida/datatype/integer.rb
+- lib/mida/genericvocabulary.rb
 - lib/mida/vocabulary.rb
+- lib/mida/itemscope.rb
+- spec/propertydesc_spec.rb
+- spec/itemscope_spec.rb
 - spec/itemprop_spec.rb
 - spec/document_spec.rb
+- spec/vocabulary_spec.rb
 - spec/item_spec.rb
 - spec/spec_helper.rb
-- spec/vocabularydesc_spec.rb
+- spec/datatype/iso8601date_spec.rb
+- spec/datatype/integer_spec.rb
+- spec/datatype/float_spec.rb
+- spec/datatype/text_spec.rb
+- spec/datatype/boolean_spec.rb
+- spec/datatype/number_spec.rb
 - TODO.rdoc
 - CHANGELOG.rdoc
 - README.rdoc
 - LICENSE.rdoc
 - Rakefile
-homepage: http://github.com/LawrenceWoodman/mida
+homepage: http://lawrencewoodman.github.com/mida/
 licenses: []
 post_install_message:

data/lib/mida/vocabulary/generic.rb DELETED Viewed

@@ -1,15 +0,0 @@
-module Mida
-  module Vocabulary
-    # A Generic vocabulary that will match against anything
-    class Generic < Mida::VocabularyDesc
-      itemtype %r{}
-      has_many :any do
-        types :any
-      end
-    end
-    register(Generic)
-  end
-end

data/lib/mida/vocabularydesc.rb DELETED Viewed

@@ -1,57 +0,0 @@
-module Mida
-  # Class used to describe a vocabulary
-  #
-  # To specify a vocabulary use the following methods:
-  # +itemtype+, +has_one+, +has_many+, +types+
-  class VocabularyDesc
-    # Sets the regular expression to match against the +itemtype+
-    # or returns the current regular expression
-    def self.itemtype(regexp_arg=nil)
-      if regexp_arg
-        @itemtype = regexp_arg
-      else
-        @itemtype
-      end
-    end
-    # Getter to read the created propeties specification
-    def self.prop_spec
-      @prop_spec || {}
-    end
-    # The types a property can take. E.g. +String+, or another +Vocabulary+
-    # If you want to say any type, then use +:any+ as the class
-    # This should be used within a +has_one+ or +has_many+ block
-    def self.types(*type_classes)
-      {types: type_classes}
-    end
-    # Defines the properties as only containing one value
-    # If want to say any property name, then use +:any+ as a name
-    def self.has_one(*property_names, &block)
-      has(:one, *property_names, &block)
-    end
-    # Defines the properties as containing many values
-    # If want to say any property name, then use +:any+ as a name
-    def self.has_many(*property_names, &block)
-      has(:many, *property_names, &block)
-    end
-    def self.has(num, *property_names, &block)
-      @prop_spec ||= {}
-      property_names.each_with_object(@prop_spec) do |name, prop_spec|
-        prop_spec[name] = if block_given?
-          {num: num}.merge(yield)
-        else
-          {num: num, types: [String]}
-        end
-      end
-    end
-    private_class_method :has
-  end
-end

data/spec/vocabularydesc_spec.rb DELETED Viewed

@@ -1,106 +0,0 @@
-require_relative 'spec_helper'
-require_relative '../lib/mida'
-describe Mida::VocabularyDesc, 'when subclassed and given has statements with no blocks' do
-  before do
-    class Organization < Mida::VocabularyDesc
-      itemtype %r{http://example\.com.*?organization$}i
-      has_one 'name'
-      has_many 'tel', 'url'
-    end
-  end
-  it '#itemtype should return the correct regexp' do
-    Organization.itemtype.should == %r{http://example\.com.*?organization$}i
-  end
-  it 'should specify name to appear once' do
-    Organization.prop_spec['name'][:num].should == :one
-  end
-  it 'should specify tel and url to appear many times' do
-    Organization.prop_spec['tel'][:num].should == :many
-    Organization.prop_spec['url'][:num].should == :many
-  end
-end
-describe Mida::VocabularyDesc, 'when subclassed and given has statements with blocks' do
-  before do
-    class Rating < Mida::VocabularyDesc
-      itemtype %r{http://example\.com.*?rating$}i
-      has_one 'best', 'value'
-    end
-    class Comment < Mida::VocabularyDesc
-      itemtype %r{http://example\.com.*?comment$}i
-      has_one 'commentor', 'comment'
-    end
-    class Review < Mida::VocabularyDesc
-      itemtype %r{http://example\.com.*?review$}i
-      has_one 'itemreviewed'
-      has_one 'rating' do
-        types Rating, String
-      end
-      has_many 'comments' do
-        types Comment
-      end
-    end
-  end
-  it '#itemtype should return the correct regexp' do
-    Review.itemtype.should == %r{http://example\.com.*?review$}i
-  end
-  it 'should specify itemreviewed to appear once' do
-    Review.prop_spec['itemreviewed'][:num].should == :one
-  end
-  it 'should specify that itemreviewed only have the type String' do
-    Review.prop_spec['itemreviewed'][:types].should == [String]
-  end
-  it 'should specify rating to appear once' do
-    Review.prop_spec['rating'][:num].should == :one
-  end
-  it 'should specify rating to only have the types: Rating, String' do
-    Review.prop_spec['rating'][:types].should == [Rating, String]
-  end
-  it 'should specify comments to appear many times' do
-    Review.prop_spec['comments'][:num].should == :many
-  end
-  it 'should specify that comments only have the type Comment' do
-    Review.prop_spec['comments'][:types].should == [Comment]
-  end
-end
-describe Mida::VocabularyDesc, 'when subclassed and used with :any for properties and types' do
-  before do
-    class Person < Mida::VocabularyDesc
-      itemtype %r{}
-      has_one 'name'
-      has_many :any do
-        types :any
-      end
-    end
-  end
-  it '#itemtype should return the correct regexp' do
-    Person.itemtype.should == %r{}
-  end
-  it 'should specify that name only appears once' do
-    Person.prop_spec['name'][:num].should == :one
-  end
-  it 'should specify that any other property can appear many times' do
-    Person.prop_spec[:any][:num].should == :many
-  end
-  it 'should specify that any other property can have any type' do
-    Person.prop_spec[:any][:types].should == [:any]
-  end
-end