mida 0.3.9 → 0.4.0

data/spec/propertydesc_spec.rb

@@ -7,11 +7,11 @@ describe Mida::PropertyDesc, 'when initialized without a block' do
   end
 
   it '#to_h[:num] should equal num passed' do
-    @propertyDesc.to_h[:num].should == 3
+    expect(@propertyDesc.to_h[:num]).to eq(3)
   end
 
   it '#to_h[:types] should equal DataType::Text' do
-    @propertyDesc.to_h[:types].should == [Mida::DataType::Text]
+    expect(@propertyDesc.to_h[:types]).to eq([Mida::DataType::Text])
   end
 end
 
@@ -21,7 +21,7 @@ describe Mida::PropertyDesc, 'when initialized with a block with no specified ty
   end
 
   it '#to_h[:types] should equal DataType::Text' do
-    @propertyDesc.to_h[:types].should == [Mida::DataType::Text]
+    expect(@propertyDesc.to_h[:types]).to eq([Mida::DataType::Text])
   end
 end
 
@@ -31,7 +31,7 @@ describe Mida::PropertyDesc, 'when initialized with a block that specifies types
   end
 
   it '#to_h[:types] should equal [String, Array]' do
-    @propertyDesc.to_h[:types].should == [String, Array]
+    expect(@propertyDesc.to_h[:types]).to eq([String, Array])
   end
 end
 
@@ -44,13 +44,13 @@ describe Mida::PropertyDesc, 'when initialized with a block that specifies types
   end
 
   it 'should warn on initialization if types() is used in the block' do
-    @error.should eq("[DEPRECATION] Mida::PropertyDesc#types is deprecated.  "+
+    expect(@error).to eq("[DEPRECATION] Mida::PropertyDesc#types is deprecated.  "+
       "Please use Mida::PropertyDesc#extract instead."
     )
   end
 
   it '#to_h[:types] should equal [String, Array]' do
-    @propertyDesc.to_h[:types].should == [String, Array]
+    expect(@propertyDesc.to_h[:types]).to eq([String, Array])
   end
 
 end

data/spec/vocabulary_spec.rb

@@ -11,16 +11,16 @@ describe Mida::Vocabulary, 'when subclassed and given has statements with no blo
   end
 
   it '#itemtype should return the correct regexp' do
-    Organization.itemtype.should == %r{http://example\.com.*?organization$}i
+    expect(Organization.itemtype).to eq(%r{http://example\.com.*?organization$}i)
   end
 
   it 'should specify name to appear once' do
-    Organization.properties['name'][:num].should == :one
+    expect(Organization.properties['name'][:num]).to eq(: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
+    expect(Organization.properties['tel'][:num]).to eq(:many)
+    expect(Organization.properties['url'][:num]).to eq(:many)
   end
 end
 
@@ -49,31 +49,31 @@ describe Mida::Vocabulary, 'when subclassed and given has statements with blocks
   end
 
   it '#itemtype should return the correct regexp' do
-    Review.itemtype.should == %r{http://example\.com.*?review$}i
+    expect(Review.itemtype).to eq(%r{http://example\.com.*?review$}i)
   end
 
   it 'should specify itemreviewed to appear once' do
-    Review.properties['itemreviewed'][:num].should == :one
+    expect(Review.properties['itemreviewed'][:num]).to eq(:one)
   end
 
   it 'should specify that itemreviewed only have the type Mida::DataType::Text' do
-    Review.properties['itemreviewed'][:types].should == [Mida::DataType::Text]
+    expect(Review.properties['itemreviewed'][:types]).to eq([Mida::DataType::Text])
   end
 
   it 'should specify rating to appear once' do
-    Review.properties['rating'][:num].should == :one
+    expect(Review.properties['rating'][:num]).to eq(: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]
+    expect(Review.properties['rating'][:types]).to eq([Rating, Mida::DataType::Text])
   end
 
   it 'should specify comments to appear many times' do
-    Review.properties['comments'][:num].should == :many
+    expect(Review.properties['comments'][:num]).to eq(:many)
   end
 
   it 'should specify that comments only have the type Comment' do
-    Review.properties['comments'][:types].should == [Comment]
+    expect(Review.properties['comments'][:types]).to eq([Comment])
   end
 end
 
@@ -89,19 +89,19 @@ describe Mida::Vocabulary, 'when subclassed and used with :any for properties an
   end
 
   it '#itemtype should return the correct regexp' do
-    Person.itemtype.should == %r{http://example.com/vocab/person}
+    expect(Person.itemtype).to eq(%r{http://example.com/vocab/person})
   end
 
   it 'should specify that name only appears once' do
-    Person.properties['name'][:num].should == :one
+    expect(Person.properties['name'][:num]).to eq(:one)
   end
 
   it 'should specify that any other property can appear many times' do
-    Person.properties[:any][:num].should == :many
+    expect(Person.properties[:any][:num]).to eq(:many)
   end
   
   it 'should specify that any other property can have any type' do
-    Person.properties[:any][:types].should == [:any]
+    expect(Person.properties[:any][:types]).to eq([:any])
   end
 end
 
@@ -123,11 +123,11 @@ describe Mida::Vocabulary, 'when subclassed' do
   end
 
   it 'should register the vocabulary subclass' do
-    Mida::Vocabulary.vocabularies.should include(Person)
+    expect(Mida::Vocabulary.vocabularies).to include(Person)
   end
 
   it '#included_vocabularies should be empty' do
-    Person.included_vocabularies.empty?.should be_true
+    expect(Person.included_vocabularies.empty?).to be_truthy
   end
 
 end
@@ -142,11 +142,11 @@ describe Mida::Vocabulary, 'when subclassed and has no properties' do
   end
 
   it 'should register the vocabulary subclass' do
-    Mida::Vocabulary.vocabularies.should include(Empty)
+    expect(Mida::Vocabulary.vocabularies).to include(Empty)
   end
 
   it '#properties should return an empty hash' do
-    Mida::Vocabulary.properties.should == {}
+    expect(Mida::Vocabulary.properties).to eq({})
   end
 
 end
@@ -180,42 +180,42 @@ describe Mida::Vocabulary, 'when subclassed and using #include_vocabulary' do
   end
 
   it '#itemtype should return the new regexp' do
-    Car.itemtype.should == %r{http://example\.com.*?car$}i
+    expect(Car.itemtype).to eq(%r{http://example\.com.*?car$}i)
   end
 
   it "should contain included vocabularies' properties" do
     ['description', 'make','model', 'colour'].each do
-      |prop| Car.properties[prop][:num].should == :one
+      |prop| expect(Car.properties[prop][:num]).to eq(:one)
     end
-    Car.properties['addons'][:num].should == :many
+    expect(Car.properties['addons'][:num]).to eq(:many)
   end
 
   it "should contain new properties" do
-    Car.properties['engine'][:num].should == :one
-    Car.properties['stickers'][:num].should == :many
+    expect(Car.properties['engine'][:num]).to eq(:one)
+    expect(Car.properties['stickers'][:num]).to eq(:many)
   end
 
   it '#included_vocabularies should return the included vocabularies' do
     [Thing, Product, Vehicle].each do |vocab|
-      Car.included_vocabularies.should include(vocab)
+      expect(Car.included_vocabularies).to include(vocab)
     end
   end
 
   it '.kind_of? should still work with plain Vocabulary' do
-    Car.kind_of?(Mida::Vocabulary).should be_true
+    expect(Car.kind_of?(Mida::Vocabulary)).to be_truthy
   end
 
   it '.kind_of? should recognize included vocabularies' do
-    Car.kind_of?(Car).should be_true
-    Car.kind_of?(Vehicle).should be_true
-    Vehicle.kind_of?(Product).should be_true
-    Car.kind_of?(Product).should be_true
-    Car.kind_of?(Thing).should be_true
+    expect(Car.kind_of?(Car)).to be_truthy
+    expect(Car.kind_of?(Vehicle)).to be_truthy
+    expect(Vehicle.kind_of?(Product)).to be_truthy
+    expect(Car.kind_of?(Product)).to be_truthy
+    expect(Car.kind_of?(Thing)).to be_truthy
   end
 
   it '.kind_of? should recognize vocabularies without a relationship' do
-    Vehicle.kind_of?(Car).should be_false
-    Thing.kind_of?(Product).should be_false
+    expect(Vehicle.kind_of?(Car)).to be_falsey
+    expect(Thing.kind_of?(Product)).to be_falsey
   end
 end
 
@@ -265,7 +265,7 @@ describe Mida::Vocabulary, 'when subclassed with circular dependancies' do
       'use_with' => {types: [Medicine], num: :many},
       'similar_to' => {types: [Potion], num: :many}
     }
-    Medicine.properties.should == expected_properties
-    Potion.properties.should == expected_properties
+    expect(Medicine.properties).to eq(expected_properties)
+    expect(Potion.properties).to eq(expected_properties)
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mida
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Lawrence Woodman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: blankslate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '3.1'
 description: A Microdata parser and extractor library which includes support for the
   schema.org vocabularies
 email: lwoodman@vlifesystems.com
@@ -110,7 +96,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
-- Gemfile.lock
 - LICENCE.rdoc
 - README.rdoc
 - Rakefile
@@ -465,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Microdata parser/extractor library

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mida (0.3.8)
-      addressable (~> 2.3.8)
-      blankslate (= 3.1.3)
-      nokogiri (>= 1.6)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.8)
-    blankslate (3.1.3)
-    diff-lcs (1.1.3)
-    mini_portile (0.6.2)
-    nokogiri (1.6.6.3)
-      mini_portile (~> 0.6.0)
-    rake (10.1.0)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.6)
-  mida!
-  rake
-  rspec (~> 2.10.0)
-
-BUNDLED WITH
-   1.10.6