spectifly 0.0.10 → 0.0.11

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjRjMmEzZWVjMjgwZmI5ZGYxNzZhZWZjMzljOGViZWIxMDY0ZmE0Yg==
+  data.tar.gz: !binary |-
+    NWI0OTcxMGVkZjM4N2UxMzE1MTdjMDc3NzhlZWY2ZGI1MDAwNmYwMA==
+SHA512:
+  metadata.gz: !binary |-
+    NGQ4MWFjZTUwNzkxYzlmYjhhZGE1N2Q5ZGZjNTI2MjEwMzdjZDBjYjE0N2I0
+    NDhiMThjYjZmOThhYzg0Mzc1MGRmMzAwZmJmMWVlZWQxNTg2MTEyYTUzY2M1
+    ZWI4ZjQ5ZDM3OWFhNmJmNjk4ZjY2YTEzNGQ2ZmFiMGZmN2Y3NmI=
+  data.tar.gz: !binary |-
+    NWY5OGI1OWUzOWJmODZlZTUzYzQ3MTYxOWU4NjkzNWUxNGE0Y2JlZTA4MmMy
+    OGM1NmViNGE4OTA5MzA4OGQwZTA4Y2ViMmYxNzYxMWI1MTJkMDRjZTRmY2U5
+    YmI4OWQ0YzU0MTQ2MGJhYzczMDY2YzE4M2VhNGU0YjBkYzE2ODI=

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require 'spec_helper'

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+1.9.3-p484

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+  - "1.9.3"

data/lib/spectifly/configuration.rb

@@ -1,17 +1,22 @@
 module Spectifly
   class Configuration
-    attr_accessor :entity_path
+    class InvalidPresenterPath < StandardError; end
+    attr_accessor :entity_path, :presenter_path
+
     def initialize(config = {})
       @entity_path = config.fetch('entity_path')
-      @presenter_path = config['presenter_path']
+      set_presenter_path(config['presenter_path'])
     end
 
-    def presenter_path
-      @presenter_path ||= begin
-        proposed_path = File.join(@entity_path, 'presenters')
-        if Dir.exists?(proposed_path)
-          @presenter_path = proposed_path
-        end
+    private
+
+    def set_presenter_path(path = nil)
+      path = 'presenters' if path.nil?
+      proposed_path = File.join(@entity_path, path)
+      if Dir.exists?(proposed_path)
+        @presenter_path = proposed_path
+      else
+        raise InvalidPresenterPath, "#{proposed_path} does not exist"
       end
     end
   end

data/lib/spectifly/tasks.rb

@@ -7,21 +7,26 @@ module Spectifly
   class Task < ::Rake::TaskLib
     attr_accessor :configuration
 
-    def configure!
-      config_path = File.join(Rake.original_dir, 'config', 'spectifly.yml')
-      config_hash = File.exist?(config_path) ? YAML.load_file(config_path) : {}
-      @configuration = Spectifly::Configuration.new(config_hash)
-    end
-
     def initialize(task_name, *args, &block)
-      configure!
       task task_name, *args do |task_name, task_args|
+        configure!(task_args)
         block.call(configuration, task_args) if block
       end
     end
+
+    private
+
+    def configure!(options = {})
+      config_path = File.join(Rake.original_dir, 'config', 'spectifly.yml')
+      config_hash = File.exist?(config_path) ? YAML.load_file(config_path) : {}
+
+      # Stringify the options hash and merge it in to the config_hash
+      config_hash.merge!(Hash[options.map{ |k, v| [k.to_s, v] }])
+      @configuration = Spectifly::Configuration.new(config_hash)
+    end
   end
 end
 
 Dir[File.join(File.dirname(__FILE__), '..', 'tasks', '*.rake')].each do |path|
   load path
-end
+end

data/lib/spectifly/version.rb

@@ -1,3 +1,3 @@
 module Spectifly
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/tasks/spectifly.rake

@@ -8,9 +8,8 @@ namespace :spectifly do
       end
     end
 
-    Spectifly::Task.new('generate_from_entities', [:destination_path]) do |spectifly, args|
+    Spectifly::Task.new('generate_from_entities', [:destination_path, :presenter_path]) do |spectifly, args|
       options = File.exist?(spectifly.presenter_path) ? { :presenter_path => spectifly.presenter_path } : {}
-
       Spectifly::Entity.from_directory(spectifly.entity_path, options).each do |name, entity|
         if entity.is_a? Spectifly::Entity
           write_entity(entity, args[:destination_path])
@@ -24,7 +23,7 @@ namespace :spectifly do
       end
     end
 
-    Spectifly::Task.new('generate_extended_types', [:destination_path]) do |spectifly, args|
+    Spectifly::Task.new('generate_extended_types', [:destination_path, :presenter_path]) do |spectifly, args|
       extended = File.join(args[:destination_path], 'extended.xsd')
       File.open(extended, 'w') do |f|
         f.write Spectifly::Xsd::Types.build_extended
@@ -36,6 +35,6 @@ namespace :spectifly do
     end
 
     desc 'Generate all XSDs for the configured entity directory, including extended type definitions'
-    task :generate_all, [:destination_path] => [:generate_from_entities, :generate_extended_types]
+    task :generate_all, [:destination_path, :presenter_path] => [:generate_from_entities, :generate_extended_types]
   end
 end

data/spec/spectifly/base/builder_spec.rb

@@ -1,11 +1,10 @@
-require 'spec_helper'
 require 'json'
 
 describe Spectifly::Base::Builder do
   describe '.from_path' do
     it 'generates builder from entity at given path' do
       path_builder = described_class.from_path(fixture_path('individual'))
-      path_builder.root.should == 'Individual'
+      expect(path_builder.root).to eq('Individual')
     end
   end
 
@@ -21,9 +20,7 @@ describe Spectifly::Base::Builder do
   describe '#custom_types' do
     it 'return an array of all non-built-in types in result' do
       entity = Spectifly::Entity.parse(fixture_path('group'))
-      described_class.new(entity).custom_types.should =~ [
-        'individual'
-      ]
+      expect(described_class.new(entity).custom_types).to match_array(['individual'])
     end
   end
-end
+end

data/spec/spectifly/base/entity_node_spec.rb

@@ -1,29 +1,27 @@
-require 'spec_helper'
-
 describe Spectifly::Base::EntityNode do
   describe 'uniqueness restriction' do
     it 'unique should be false by default and there should be no unique restriction' do
       field = described_class.new("Mini me")
-      field.should_not be_unique
-      field.restrictions.keys.should_not be_include('unique')
+      expect(field).to_not be_unique
+      expect(field.restrictions.keys.include?('unique')).to be_falsey
     end
 
     it 'adds a restriction and returns true for unique? if there is a uniqueness validation' do
       field = described_class.new("Little Snowflake", {"Validations" => "must be unique"})
-      field.should be_unique
-      field.restrictions.keys.include?('unique').should be_true
+      expect(field).to be_unique
+      expect(field.restrictions.keys.include?('unique')).to be_truthy
     end
 
     it 'adds a restriction and returns true for unique? if there is an attribute Unique set to true' do
       field = described_class.new("Little Snowflake", {"Unique" => "true"})
-      field.should be_unique
-      field.restrictions.keys.include?('unique').should be_true
+      expect(field).to be_unique
+      expect(field.restrictions.keys.include?('unique')).to be_truthy
     end
 
     it 'throws an error if the two ways of setting uniqueness contradict each other' do
-      lambda {
+      expect{
       field = described_class.new("Little Snowflake?", {"Validations" => "must be unique", "Unique" => false})
-      }.should raise_error
+      }.to raise_error
     end
   end
-end
+end

data/spec/spectifly/base/field_spec.rb

@@ -1,10 +1,8 @@
-require 'spec_helper'
-
 describe Spectifly::Base::Field do
   describe '#name' do
     it 'returns tokenized version of field name' do
       field = described_class.new('A really cool hat')
-      field.name.should == 'a_really_cool_hat'
+      expect(field.name).to eq('a_really_cool_hat')
     end
   end
 
@@ -19,17 +17,17 @@ describe Spectifly::Base::Field do
   describe '#type' do
     it 'defaults to string if no type specified' do
       field = described_class.new('A really cool hat')
-      field.type.should == 'string'
+      expect(field.type).to eq('string')
     end
 
     it 'returns boolean if field name has "?" token' do
       field = described_class.new('A really cool hat?')
-      field.type.should == 'boolean'
+      expect(field.type).to eq('boolean')
     end
 
     it 'returns type if specified' do
       field = described_class.new('some field', 'Type' => 'Rhubarb')
-      field.type.should == 'rhubarb'
+      expect(field.type).to eq('rhubarb')
     end
   end
 
@@ -38,63 +36,63 @@ describe Spectifly::Base::Field do
       field = described_class.new('some field', {
         'Minimum Value' => 3, 'Maximum Value' => 145
       })
-      field.restrictions.should == {
+      expect(field.restrictions).to eq({
         'minimum_value' => 3,
         'maximum_value' => 145
-      }
+      })
     end
 
     it 'sets up enumerations' do
       field = described_class.new('some field', {
         'Valid Values' => [34, 52, 100, 4]
       })
-      field.restrictions.should == {
+      expect(field.restrictions).to eq({
         'valid_values' => [34, 52, 100, 4]
-      }
+      })
     end
 
     it 'pulls regex restriction from validations' do
       field = described_class.new('some field', {
         'Validations' => 'Must match regex "^[0-9]{4}"'
       })
-      field.validations.should be_empty
-      field.restrictions.should == {
+      expect(field.validations).to be_empty
+      expect(field.restrictions).to eq({
         'regex' => /^[0-9]{4}/
-      }
+      })
     end
 
     it 'sets restrictions to empty hash if none exist' do
       field = described_class.new('some field')
-      field.restrictions.should be_empty
+      expect(field.restrictions).to be_empty
     end
   end
 
   describe '#multiple?' do
     it 'returns true if multiple set to true' do
       field = described_class.new('some field', 'Multiple' => true)
-      field.should be_multiple
+      expect(field).to be_multiple
     end
 
     it 'returns false if multiple set to anything but true' do
       field = described_class.new('some field', 'Multiple' => 'Whatever')
-      field.should_not be_multiple
+      expect(field).not_to be_multiple
     end
 
     it 'returns false if multiple not set' do
       field = described_class.new('some field')
-      field.should_not be_multiple
+      expect(field).not_to be_multiple
     end
   end
 
   describe '#required?' do
     it 'returns true if field name has "*" token' do
       field = described_class.new('some field*')
-      field.should be_required
+      expect(field).to be_required
     end
 
     it 'returns false if field name does not have "*" token' do
       field = described_class.new('some field')
-      field.should_not be_required
+      expect(field).not_to be_required
     end
   end
-end
+end

data/spec/spectifly/configuration_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spectifly::Configuration do
   let(:configuration_args) {
     {
@@ -18,25 +16,30 @@ describe Spectifly::Configuration do
   end
 
   describe '#presenter_path' do
-    it 'returns configured value if set' do
-      configuration = described_class.new(
+    it 'raises an exception if configured value is set but does not exist' do
+      expect{described_class.new(
         configuration_args.merge('presenter_path' => 'goose')
-      )
-      configuration.presenter_path.should == 'goose'
+      )}.to raise_error(Spectifly::Configuration::InvalidPresenterPath)
     end
 
-    it 'returns nil if no presenter path exists at entity path' do
-      configuration = described_class.new(
+    it 'raises an exception if no default presenter path exists' do
+      expect{described_class.new(
         configuration_args.merge('entity_path' => spec_path)
+      )}.to raise_error(Spectifly::Configuration::InvalidPresenterPath)
+    end
+
+    it 'returns presenter path when passed in' do
+      configuration = described_class.new(
+        configuration_args.merge('presenter_path' => 'presenters/masterless_group')
       )
-      configuration.presenter_path.should be_nil
+      expect(configuration.presenter_path).to eq(base_presenter_path + "/masterless_group")
     end
 
     it 'returns {entity_path}/presenters if exists' do
       configuration = described_class.new(
         configuration_args
       )
-      configuration.presenter_path.should == base_presenter_path
+      expect(configuration.presenter_path).to eq(base_presenter_path)
     end
   end
 end

data/spec/spectifly/entity_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spectifly::Entity do
   before :each do
     @entity = Spectifly::Entity.parse(fixture_path('individual'))
@@ -8,9 +6,9 @@ describe Spectifly::Entity do
   describe '.from_directory' do
     it 'returns entities generated from files at given path' do
       entities = Spectifly::Entity.from_directory(fixture_path)
-      entities.keys.should =~ ['individual', 'group']
-      entities.values.map(&:class).uniq.should == [Spectifly::Entity]
-      entities.values.map(&:name).should =~ ['individual', 'group']
+      expect(entities.keys).to match_array(['individual', 'group'])
+      expect(entities.values.map(&:class).uniq).to eq([Spectifly::Entity])
+      expect(entities.values.map(&:name)).to match_array(['individual', 'group'])
     end
 
     it 'includes presenters if option passed' do
@@ -18,20 +16,20 @@ describe Spectifly::Entity do
         fixture_path, :presenter_path => base_presenter_path
       )
 
-      entities.keys.should =~ ['individual', 'group', 'positionless_individual', 'masterless_group']
-      entities['positionless_individual'].keys.should == ['individual']
-      entities['positionless_individual'].values.map(&:name).should == ['individual']
-      entities['masterless_group'].keys.should == ['group']
-      entities['masterless_group'].values.map(&:name).should == ['group']
+      expect(entities.keys).to match_array(['individual', 'group', 'positionless_individual', 'masterless_group'])
+      expect(entities['positionless_individual'].keys).to eq(['individual'])
+      expect(entities['positionless_individual'].values.map(&:name)).to eq(['individual'])
+      expect(entities['masterless_group'].keys).to eq(['group'])
+      expect(entities['masterless_group'].values.map(&:name)).to eq(['group'])
       ['positionless_individual', 'masterless_group'].each do |presenter|
-        entities[presenter].values.map(&:class).uniq.should == [Spectifly::Entity]
+        expect(entities[presenter].values.map(&:class).uniq).to eq([Spectifly::Entity])
       end
     end
   end
 
   describe '.parse' do
     it 'delegates to initializer' do
-      Spectifly::Entity.should_receive(:new).with(:arguments)
+      expect(Spectifly::Entity).to receive(:new).with(:arguments)
       Spectifly::Entity.parse(:arguments)
     end
   end
@@ -58,7 +56,7 @@ describe Spectifly::Entity do
 
   describe '#root' do
     it 'returns root element of parsed yaml' do
-      @entity.root.should == 'Individual'
+      expect(@entity.root).to eq('Individual')
     end
   end
 
@@ -70,39 +68,39 @@ describe Spectifly::Entity do
     end
 
     it 'returns name from entity file' do
-      @entity.name.should == 'individual'
-      @presenter_entity.name.should == 'individual'
+      expect(@entity.name).to eq('individual')
+      expect(@presenter_entity.name).to eq('individual')
     end
 
     it 'returns presenter name when presented' do
-      @entity.present_as(@presenter_entity).name.should == 'individual'
+      expect(@entity.present_as(@presenter_entity).name).to eq('individual')
     end
   end
 
   describe '#presented_as' do
     it 'returns nil if not presented' do
-      @entity.presented_as.should be_nil
+      expect(@entity.presented_as).to be_nil
     end
 
     it 'returns presenter if presented' do
       @presenter_entity = Spectifly::Entity.parse(
         fixture_path('presenters/positionless_individual/individual.entity')
       )
-      @entity.present_as(@presenter_entity).presented_as.should == @presenter_entity
+      expect(@entity.present_as(@presenter_entity).presented_as).to eq(@presenter_entity)
     end
   end
 
   describe '#metadata' do
     it 'returns metadata from parsed yaml' do
-      @entity.metadata.should == {
+      expect(@entity.metadata).to eq({
         "Description" => "An Individual"
-      }
+      })
     end
   end
 
   describe '#fields' do
     it 'returns fields from parsed yaml' do
-      @entity.fields.should == {
+      expect(@entity.fields).to eq({
         "Name*" => {
           "Description" => "The individual's name",
           "Example" => "Randy McTougherson",
@@ -129,7 +127,7 @@ describe Spectifly::Entity do
         "Pickled?*" => {
           "Description" => "Whether or not this individual is pickled"
         }
-      }
+      })
     end
   end
 
@@ -147,7 +145,7 @@ describe Spectifly::Entity do
 
     it 'uses presenter fields only, but merges metadata and field attributes' do
       @merged_entity = @entity.present_as(@presenter_entity)
-      @merged_entity.fields.should == {
+      expect(@merged_entity.fields).to eq({
         "Name*" => {
           "Description" => "The individual's name",
           "Example" => "Wussy O'Weakling",
@@ -166,17 +164,17 @@ describe Spectifly::Entity do
         "Pickled?" => {
           "Description" => "Whether or not this individual is pickled"
         }
-      }
-      @merged_entity.metadata.should == {
+      })
+      expect(@merged_entity.metadata).to eq({
         "Description" => "A Positionless Individual"
-      }
+      })
     end
   end
 
   describe '#relationships' do
     it 'returns relationships from parsed yaml' do
       @group_entity = Spectifly::Entity.parse(fixture_path('group'))
-      @group_entity.relationships.should == {
+      expect(@group_entity.relationships).to eq({
         "Has Many" => {
           "Peeps" => {
             "Description" => "Who is in the group",
@@ -189,7 +187,7 @@ describe Spectifly::Entity do
             "Type" => "Individual"
           }
         }
-      }
+      })
     end
   end
 end

data/spec/spectifly/json/builder_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'json'
 
 describe Spectifly::Json::Builder do
@@ -7,14 +6,14 @@ describe Spectifly::Json::Builder do
       entity = Spectifly::Entity.parse(fixture_path('individual'))
       json_path = expectation_path('individual', 'json')
       hash = described_class.new(entity).build
-      JSON.pretty_generate(hash).strip.should == File.read(json_path).strip
+      expect(JSON.pretty_generate(hash).strip).to eq(File.read(json_path).strip)
     end
 
     it 'works with containing relationships' do
       entity = Spectifly::Entity.parse(fixture_path('group'))
       json_path = expectation_path('group', 'json')
       hash = described_class.new(entity).build
-      JSON.pretty_generate(hash).should == File.read(json_path)
+      expect(JSON.pretty_generate(hash)).to eq(File.read(json_path))
     end
   end
 
@@ -24,9 +23,9 @@ describe Spectifly::Json::Builder do
       presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/positionless_individual/individual'))
       json_path = expectation_path('presented/positionless_individual', 'json')
       builder = described_class.new(entity)
-      builder.present_as(presenter_entity).should == builder
+      expect(builder.present_as(presenter_entity)).to eq(builder)
       hash = builder.build
-      JSON.pretty_generate(hash).strip.should == File.read(json_path).strip
+      expect(JSON.pretty_generate(hash).strip).to eq(File.read(json_path).strip)
     end
 
     it 'works with overriding relationships' do
@@ -34,9 +33,9 @@ describe Spectifly::Json::Builder do
       presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/masterless_group/group'))
       json_path = expectation_path('presented/masterless_group', 'json')
       builder = described_class.new(entity)
-      builder.present_as(presenter_entity).should == builder
+      expect(builder.present_as(presenter_entity)).to eq(builder)
       hash = builder.build
-      JSON.pretty_generate(hash).should == File.read(json_path)
+      expect(JSON.pretty_generate(hash)).to eq(File.read(json_path))
     end
   end
 end

data/spec/spectifly/json/field_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spectifly::Json::Field do
   describe '#to_h' do
     it 'returns hash format of field' do
@@ -20,7 +18,7 @@ describe Spectifly::Json::Field do
         'Example' => 'children',
         'Validations' => ['Must be young', 'Must love eating mud']
       })
-      field.to_h.should == expected
+      expect(field.to_h).to eq(expected)
     end
   end
-end
+end

data/spec/spectifly/support_spec.rb

@@ -1,53 +1,51 @@
-require 'spec_helper'
-
 describe Spectifly::Support do
 
   describe '.camelize' do
     it 'removes underscores and spaces and capitalizes the first' do
-      Spectifly::Support.camelize('foo_bar One two 3').should == 'FooBarOneTwo3'
+      expect(Spectifly::Support.camelize('foo_bar One two 3')).to eq('FooBarOneTwo3')
     end
 
     it 'deals with nested classes' do
-      Spectifly::Support.camelize('foo_bar/bar_foo').should == 'FooBar::BarFoo'
+      expect(Spectifly::Support.camelize('foo_bar/bar_foo')).to eq('FooBar::BarFoo')
     end
   end
 
   describe '.lower_camelize' do
     it 'camelizes but with lowercase first character' do
-      Spectifly::Support.lower_camelize('we Are the_toasty').should == 'weAreTheToasty'
-      Spectifly::Support.lower_camelize('PleaseChange me').should == 'pleaseChangeMe'
+      expect(Spectifly::Support.lower_camelize('we Are the_toasty')).to eq('weAreTheToasty')
+      expect(Spectifly::Support.lower_camelize('PleaseChange me')).to eq('pleaseChangeMe')
     end
   end
 
   describe '.tokenize' do
     it 'creates snake_case version of string' do
-      Spectifly::Support.tokenize('Albus Dumbledore & his_friend').should == 'albus_dumbledore_and_his_friend'
+      expect(Spectifly::Support.tokenize('Albus Dumbledore & his_friend')).to eq('albus_dumbledore_and_his_friend')
     end
 
     it 'uncamelizes' do
-      Spectifly::Support.tokenize('thisStrangeJavalikeWord').should == 'this_strange_javalike_word'
+      expect(Spectifly::Support.tokenize('thisStrangeJavalikeWord')).to eq('this_strange_javalike_word')
     end
 
     it 'returns nil if given nil' do
-      Spectifly::Support.tokenize(nil).should be_nil
+      expect(Spectifly::Support.tokenize(nil)).to be_nil
     end
   end
 
   describe '.get_module' do
     it 'returns module from constant' do
-      Spectifly::Support.get_module(Spectifly::Support).should == 'Spectifly'
+      expect(Spectifly::Support.get_module(Spectifly::Support)).to eq('Spectifly')
     end
 
     it 'works with strings' do
-      Spectifly::Support.get_module('Spectifly::Support').should == 'Spectifly'
+      expect(Spectifly::Support.get_module('Spectifly::Support')).to eq('Spectifly')
     end
 
     it 'works with multiple parent modules' do
-      Spectifly::Support.get_module('The::Way::It::Is').should == 'The::Way::It'
+      expect(Spectifly::Support.get_module('The::Way::It::Is')).to eq('The::Way::It')
     end
 
     it 'returns nil if no module' do
-      Spectifly::Support.get_module('LonelyConstant').should be_nil
+      expect(Spectifly::Support.get_module('LonelyConstant')).to be_nil
     end
   end
-end
+end

data/spec/spectifly/xsd/builder_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'json'
 
 describe Spectifly::Xsd::Builder do
@@ -7,7 +6,7 @@ describe Spectifly::Xsd::Builder do
       path_builder = Spectifly::Xsd::Builder.from_path(fixture_path('individual'))
       xsd_path = expectation_path('individual', 'xsd')
       xsd = path_builder.build
-      xsd.should == File.read(xsd_path)
+      expect(xsd).to eq(File.read(xsd_path))
     end
   end
 
@@ -16,14 +15,14 @@ describe Spectifly::Xsd::Builder do
       entity = Spectifly::Entity.parse(fixture_path('individual'))
       xsd_path = expectation_path('individual', 'xsd')
       xsd = Spectifly::Xsd::Builder.new(entity).build
-      xsd.should == File.read(xsd_path)
+      expect(xsd).to eq(File.read(xsd_path))
     end
 
     it 'includes import directives for custom field types' do
       entity = Spectifly::Entity.parse(fixture_path('group'))
       xsd_path = expectation_path('group', 'xsd')
       xsd = Spectifly::Xsd::Builder.new(entity).build
-      xsd.should == File.read(xsd_path)
+      expect(xsd).to eq(File.read(xsd_path))
     end
   end
 
@@ -33,9 +32,9 @@ describe Spectifly::Xsd::Builder do
       presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/positionless_individual/individual'))
       xsd_path = expectation_path('presented/positionless_individual', 'xsd')
       builder = Spectifly::Xsd::Builder.new(entity)
-      builder.present_as(presenter_entity).should == builder
+      expect(builder.present_as(presenter_entity)).to eq(builder)
       xsd = builder.build
-      xsd.should == File.read(xsd_path)
+      expect(xsd).to eq(File.read(xsd_path))
     end
 
     it 'works with presented relationship-having entities' do
@@ -43,9 +42,9 @@ describe Spectifly::Xsd::Builder do
       presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/masterless_group/group'))
       xsd_path = expectation_path('presented/masterless_group', 'xsd')
       builder = Spectifly::Xsd::Builder.new(entity)
-      builder.present_as(presenter_entity).should == builder
+      expect(builder.present_as(presenter_entity)).to eq(builder)
       xsd = builder.build
-      xsd.should == File.read(xsd_path)
+      expect(xsd).to eq(File.read(xsd_path))
     end
   end
 end

data/spec/spectifly/xsd/field_spec.rb

@@ -1,12 +1,10 @@
-require 'spec_helper'
-
 describe Spectifly::Xsd::Field do
   describe '#regex' do
     it 'formats regex to xsd-compatible pattern restriction' do
       field = Spectifly::Xsd::Field.new('some field', {
         'Validations' => 'Must match regex "^[0-9]{4}"'
       })
-      field.regex.should == '[0-9]{4}[\s\S]*'
+      expect(field.regex).to eq('[0-9]{4}[\s\S]*')
     end
   end
-end
+end

data/spec/spectifly/xsd/types_spec.rb

@@ -1,11 +1,9 @@
-require 'spec_helper'
-
 describe Spectifly::Xsd::Types do
   describe '.build_extended' do
     it 'builds xsd for extended types' do
       expected_path = expectation_path('extended', 'xsd')
       expected = File.read(expected_path)
-      Spectifly::Xsd::Types.build_extended.should == expected
+      expect(Spectifly::Xsd::Types.build_extended).to eq(expected)
     end
   end
-end
+end

data/spectifly.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rake"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: spectifly
 version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+  version: 0.0.11
 platform: ruby
 authors:
 - Ravi Gadad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,31 +62,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,7 +103,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -197,33 +170,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -190850164299161101
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -190850164299161101
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate schema files from business entity YAML specs.
 test_files:
 - spec/expectations/extended.xsd