yamload 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdad07d3d1abe5cb0312334e634972c359902f3b
-  data.tar.gz: 30c31b88583c6c7de5e58dcefb5b129a2bd5ba5b
+  metadata.gz: b1408c57699fd2e66c43bb9b8bd8ca269ff8a2cd
+  data.tar.gz: 9328413c84beede3c64a92386033b00e8df036ad
 SHA512:
-  metadata.gz: 814cadeb568d29740f1755183141009df9f39cd580b56365b252c4c4b318d1f58860bc28e92b7cd3148cb93509775fe24b899916f174764e2f60d62d49570c68
-  data.tar.gz: ac31c23db46761243374967caf6f312d96df8ab717d75edea31a218bacfa63c229259623785c7f3cfe5b26d1d619073f10b7e3a637f78d1962a292a6a7399007
+  metadata.gz: cfcfb7e8493f4e59bc4657521e9dc46c36b4648c97715f787655019882ba319a7e496162c7fdf1b96e6ad8c87130abecb3cbbf9808ed05258f6c8db57b90e991
+  data.tar.gz: c494d7c4ca1b619f0955f3b2e2b81901e9a349d936aecb25e91340938c81fc1f57564bc945342bcb56a32c50acb3d10bb854cac01084e7d0f1e949b33b541420

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.4.0

data/.travis.yml

@@ -1,10 +1,13 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.1
   - 2.2
-script: "bundle exec rake coverage"
+  - 2.3.0
+script: "bundle exec rake spec"
 notifications:
   email:
     - support@travellink.com.au
-  flowdock: e69dcafad1fea15c6b8c76e9ced965af
+  flowdock:
+    secure: UInYCeoRfF7FEnNgW38nZDk3SXWfWN5rm+tKDWX/eWGIIUuynspe6A8776w+wG+9jSuzGt9J3WEIxxognkYiWmud96NYiKZIQDLx/6ql15A9jEvWwqnWbnaL4F368ujhwLo6V42Z6wRfTUqNeRQKki2WCw0NVmT6Y1bdTeNNy70=
+sudo: false
+cache: bundler

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [Unreleased]
+
+## 0.3.0 (2017-07-31)
+
+Removed:
+ - [TT-2967] Remove deprecated `Yamload::Loader#loaded_hash`
+ - [TT-2967] Remove schema validation
+
+Changed:
+ - [TT-1790] Update ClassyHash to version 0.2.0
+
 ## 0.2.0 (2015-02-20)
 
 Features:

data/README.md

@@ -8,7 +8,6 @@
 
 * YAML files loading
 * Recursive conversion to immutable objects
-* Schema validation
 * Default values
 
 ## Installation
@@ -50,20 +49,6 @@ loader.obj.attribute
 # => true
 ```
 
-Define a schema for the configuration
-```ruby
-# Load config/test.yml
-loader = Yamload::Loader.new(:test)
-loader.schema = { 'test' => String }
-loader.valid?
-# => true
-loader.validate!
-# => nil
-loader.error
-# => nil
-```
-See [Classy Hash](https://github.com/deseretbook/classy_hash) for documentation on schema definitions
-
 Define defaults
 ```ruby
 loader.defaults = { 'test' => true , 'coverage' => { 'minimum' => 0.95 } }

data/Rakefile

@@ -4,9 +4,3 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
-
-desc 'Generate SimpleCov test coverage and open in your browser'
-task :coverage do
-  ENV['COVERAGE'] = 'true'
-  Rake::Task['spec'].invoke
-end

data/lib/yamload/loader.rb

@@ -3,7 +3,6 @@ require 'ice_nine'
 require 'yamload/loading'
 require 'yamload/conversion'
 require 'yamload/defaults'
-require 'yamload/validation'
 
 module Yamload
   class Loader
@@ -15,12 +14,6 @@ module Yamload
       @loader.exist?
     end
 
-    # <b>DEPRECATED:</b> Please use <tt>content</tt> instead.
-    def loaded_hash
-      warn '[DEPRECATION] `loaded_hash` is deprecated.  Please use `content` instead.'
-      content
-    end
-
     def content
       @content ||= IceNine.deep_freeze(content_with_defaults)
     end
@@ -43,26 +36,6 @@ module Yamload
       defaults_merger.defaults
     end
 
-    def schema=(schema)
-      validator.schema = schema
-    end
-
-    def schema
-      validator.schema
-    end
-
-    def valid?
-      validation_result.valid?
-    end
-
-    def validate!
-      fail SchemaError, validation_result.error unless validation_result.valid?
-    end
-
-    def error
-      validation_result.error
-    end
-
     private
 
     def content_with_defaults
@@ -72,15 +45,5 @@ module Yamload
     def defaults_merger
       @defaults_merger ||= Defaults::Hash.new
     end
-
-    def validator
-      @validator ||= Validation::Hash.new
-    end
-
-    def validation_result
-      validator.validate(content)
-    end
   end
-
-  class SchemaError < StandardError; end
 end

data/lib/yamload/version.rb

@@ -1,3 +1,3 @@
 module Yamload
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/loader_spec.rb

@@ -53,15 +53,6 @@ describe Yamload::Loader do
           .to raise_error ArgumentError, "#{expected_content} is not a hash"
       }
     end
-
-    context 'when a schema is defined' do
-      let(:schema) { { test: true } }
-      before { loader.schema = schema }
-      specify {
-        expect { loader.valid? }
-          .to raise_error ArgumentError, "#{expected_content} is not a hash"
-      }
-    end
   end
 
   context 'with a file defining a string' do
@@ -79,15 +70,6 @@ describe Yamload::Loader do
           .to raise_error ArgumentError, "#{expected_content} is not a hash"
       }
     end
-
-    context 'when a schema is defined' do
-      let(:schema) { { test: true } }
-      before { loader.schema = schema }
-      specify {
-        expect { loader.valid? }
-          .to raise_error ArgumentError, "#{expected_content} is not a hash"
-      }
-    end
   end
 
   context 'with a file defining a hash' do
@@ -130,10 +112,6 @@ describe Yamload::Loader do
       }
     }
 
-    specify 'deprecated `loaded_hash` still works' do
-      expect(loader.loaded_hash).to eq loader.content
-    end
-
     specify { expect(content).to eq expected_content }
 
     let(:content_obj)  { loader.obj }
@@ -163,7 +141,7 @@ describe Yamload::Loader do
       let(:new_user) { double('new user') }
       specify 'the hash should be immutable' do
         expect { content['users'] << new_user }
-          .to raise_error RuntimeError, "can't modify frozen Array"
+          .to raise_error RuntimeError, /can't modify frozen Array/i
         expect(content['users']).not_to include new_user
       end
     end
@@ -172,81 +150,11 @@ describe Yamload::Loader do
       let(:new_user) { double('new user') }
       specify 'the object should be immutable' do
         expect { content_obj.users << new_user }
-          .to raise_error RuntimeError, "can't modify frozen Array"
+          .to raise_error RuntimeError, /can't modify frozen Array/i
         expect(content_obj.users).not_to include new_user
       end
     end
 
-    context 'when no schema is defined' do
-      specify { expect(loader).to be_valid }
-      specify { expect(loader.error).to be_nil }
-      specify { expect { loader.validate! }.not_to raise_error }
-    end
-
-    context 'when the schema is not a hash' do
-      let(:schema) { 'not a hash' }
-      specify {
-        expect { loader.schema = schema }
-          .to raise_error ArgumentError, "#{schema} is not a hash"
-      }
-    end
-
-    context 'when a schema is defined' do
-      let(:schema) {
-        {
-          'test'     => TrueClass,
-          'users'    => [
-            [
-              {
-                'first_name' => String,
-                'last_name'  => String,
-                'address'    => {
-                  'address_line_1' => String,
-                  'address_line_2' => [:optional, String, NilClass],
-                  'city'           => String,
-                  'state'          => String,
-                  'post_code'      => Integer,
-                  'country'        => String
-                },
-                'email'      => String
-              }
-            ]
-          ],
-          'settings' => {
-            'remote_access' => TrueClass
-          }
-        }
-      }
-
-      before do
-        loader.schema = schema
-      end
-
-      specify { expect(loader.schema).to eq schema }
-      specify { expect(loader).to be_valid }
-      specify { expect(loader.error).to be_nil }
-      specify { expect { loader.validate! }.not_to raise_error }
-
-      context 'when the schema is not matched' do
-        let(:schema) {
-          {
-            'users' => [
-              [
-                {
-                  'expected_attribute' => String
-                }
-              ]
-            ]
-          }
-        }
-
-        let(:expected_error) { '"users"[0]["expected_attribute"] is not present' }
-        specify { expect(loader).not_to be_valid }
-        specify { expect(loader.error).to eq expected_error }
-        specify { expect { loader.validate! }.to raise_error Yamload::SchemaError, expected_error }
-      end
-    end
-
     context 'when the defaults object is not a hash' do
       let(:defaults) { 'not a hash' }
       specify {

data/spec/spec_helper.rb

@@ -1,31 +1,6 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-MINIMUM_COVERAGE = 95
-
-if ENV['COVERAGE']
-  require 'simplecov'
-  require 'simplecov-rcov'
-  require 'coveralls'
-  Coveralls.wear!
-
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::RcovFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-  SimpleCov.start do
-    add_filter '/vendor/'
-    add_filter '/spec/'
-    add_group 'lib', 'lib'
-  end
-  SimpleCov.at_exit do
-    SimpleCov.result.format!
-    percent = SimpleCov.result.covered_percent
-    unless percent >= MINIMUM_COVERAGE
-      puts "Coverage must be above #{MINIMUM_COVERAGE}%. It is #{format('%.2f', percent)}%"
-      Kernel.exit(1)
-    end
-  end
-end
+require 'support/coverage_loader'
 
 require 'yamload'
 

data/spec/support/coverage_loader.rb

@@ -0,0 +1,4 @@
+require 'simplecov-rcov'
+require 'coveralls'
+require 'coverage/kit'
+Coverage::Kit.setup(minimum_coverage: 100)

data/yamload.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'anima', '~> 0.2'
   spec.add_dependency 'facets', '~> 3.0'
-  spec.add_dependency 'classy_hash', '~> 0.1'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'simplecov', '~> 0.9'
+  spec.add_development_dependency 'coverage-kit'
   spec.add_development_dependency 'simplecov-rcov', '~> 0.2'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'travis'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamload
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Alessandro Berardi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anima
@@ -39,20 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: classy_hash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,19 +82,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coverage-kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +137,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: YAML files loader with validation
 email:
 - berardialessandro@gmail.com
@@ -179,9 +179,6 @@ files:
 - lib/yamload/loader.rb
 - lib/yamload/loading.rb
 - lib/yamload/loading/yaml.rb
-- lib/yamload/validation.rb
-- lib/yamload/validation/hash.rb
-- lib/yamload/validation/result.rb
 - lib/yamload/version.rb
 - spec/conversion_spec.rb
 - spec/fixtures/array.yml
@@ -191,6 +188,7 @@ files:
 - spec/fixtures/test.yml
 - spec/loader_spec.rb
 - spec/spec_helper.rb
+- spec/support/coverage_loader.rb
 - yamload.gemspec
 homepage: ''
 licenses:
@@ -212,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: YAML files loader
@@ -225,3 +223,4 @@ test_files:
 - spec/fixtures/test.yml
 - spec/loader_spec.rb
 - spec/spec_helper.rb
+- spec/support/coverage_loader.rb

data/lib/yamload/validation.rb

@@ -1,7 +0,0 @@
-module Yamload
-  module Validation
-  end
-end
-
-require 'yamload/validation/hash'
-require 'yamload/validation/result'

data/lib/yamload/validation/hash.rb

@@ -1,28 +0,0 @@
-require 'classy_hash'
-
-module Yamload
-  module Validation
-    class Hash
-      attr_reader :schema
-
-      def initialize(schema = nil)
-        self.schema = schema
-      end
-
-      def schema=(schema)
-        unless schema.is_a?(::Hash) || schema.nil?
-          fail ArgumentError, "#{schema} is not a hash"
-        end
-        @schema = schema
-      end
-
-      def validate(hash)
-        fail ArgumentError, "#{hash} is not a hash" unless hash.is_a?(::Hash)
-        ClassyHash.validate(hash, @schema) unless @schema.nil?
-        Result.new(true)
-      rescue RuntimeError => e
-        Result.new(false, e.message)
-      end
-    end
-  end
-end

data/lib/yamload/validation/result.rb

@@ -1,16 +0,0 @@
-module Yamload
-  module Validation
-    class Result
-      attr_reader :error
-
-      def initialize(valid, error = nil)
-        @valid = valid
-        @error = error
-      end
-
-      def valid?
-        @valid
-      end
-    end
-  end
-end