json-schema_builder 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9d8f8342dec85f473fec720fefb55c0a584e6b7
-  data.tar.gz: 60d64252fd465336fda5a32b012860002e658c7b
+  metadata.gz: '095b7ab204946bf21d11560cfce5aded0284bcc2'
+  data.tar.gz: d36a58b116d0ab3677c76fb3235f5c138a76e0ef
 SHA512:
-  metadata.gz: 15c9cb066c9fc51ff075d9c77142e7a43c9f04f25cade97e4864d3672deb4e9b0da57bbb57856daa9766ad1e281766d75ec4a48a5a408a6cf9c4f2827fbef600
-  data.tar.gz: 302be39bebe17e01cc5b14af72c6e0ac3483ceb680f3ace8405ed36c14b734af538bfa2c9a020df8258e2f3c69bcc434389003ba442c744831ff8264af35ba6f
+  metadata.gz: '0883e8aff0dd4d1279f8290e9707bf2997a1b4c8510a1bc0b48164de7b402f9b2c79fab754ec9b3c7a3b935b77b8a536bff218319133ee6bc7a582e662ddefa0'
+  data.tar.gz: 9ea5f6d0668321cfb023acc96ee418a2b0ea22ede9d0811b8e71d50ae365d7637adec06d97f207cff54a23b0eecd4c237c7cdb192700b2965ef8af3002d64d51

data/.pryrc

@@ -0,0 +1,4 @@
+Pry.commands.alias_command 'c', 'continue'
+Pry.commands.alias_command 's', 'step'
+Pry.commands.alias_command 'n', 'next'
+Pry.commands.alias_command 'f', 'finish'

data/json-schema_builder.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'rspec-its'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_dependency 'activesupport', '>= 4.0'
   spec.add_dependency 'json-schema', '>= 2'
 end

data/lib/json/schema_builder/array.rb

@@ -11,8 +11,8 @@ module JSON
 
       def items(*args, &block)
         opts = args.extract_options!
-        schema.items = args.first
-        schema.items ||= items_entity(opts, &block).as_json
+        schema[:items] = args.first
+        schema[:items] ||= items_entity(opts, &block).as_json
       end
 
       protected

data/lib/json/schema_builder/entity.rb

@@ -52,7 +52,7 @@ module JSON
       end
 
       def as_json
-        schema.to_h.as_json
+        schema.as_json
       end
 
       def respond_to?(method_name, include_all = false)

data/lib/json/schema_builder/object.rb

@@ -22,12 +22,12 @@ module JSON
       def required(*values)
         case values
         when []
-          @schema.required
+          @schema[:required]
         when [true]
           @parent.required ||= []
           @parent.required << @name
         else
-          @schema.required = values.flatten
+          @schema[:required] = values.flatten
         end
       end
       alias_method :required=, :required

data/lib/json/schema_builder/schema.rb

@@ -1,14 +1,19 @@
-require 'ostruct'
-
 module JSON
   module SchemaBuilder
-    class Schema < OpenStruct
+    class Schema
+      attr_reader :data
+      delegate :[], :[]=, :to_h, :as_json, to: :data
+
+      def initialize(hash = {})
+        @data = hash.with_indifferent_access
+      end
+
       def merge(schema)
-        self.class.new to_h.deep_stringify_keys.deep_merge(schema.to_h.deep_stringify_keys)
+        self.class.new data.deep_merge(schema.data)
       end
 
       def merge!(schema)
-        @table = to_h.deep_stringify_keys.deep_merge schema.to_h.deep_stringify_keys
+        @data = data.deep_merge schema.data
         self
       end
     end

data/lib/json/schema_builder/version.rb

@@ -1,5 +1,5 @@
 module JSON
   module SchemaBuilder
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/spec/support/shared_contexts_for_entity.rb

@@ -18,7 +18,7 @@ RSpec.shared_context 'an entity with a parent' do
   let(:parent){ OpenStruct.new children: [], required: [] }
   subject do
     JSON::SchemaBuilder::Entity.new 'name', title: 'test', parent: parent do
-      schema.evaluated_block = true
+      schema[:evaluated_block] = true
     end
   end
 end

data/spec/unit/entity_spec.rb

@@ -23,13 +23,13 @@ RSpec.describe JSON::SchemaBuilder::Entity, type: :unit do
     end
 
     it 'should delegate the reader to the schema' do
-      subject.schema.test = 1
+      subject.schema[:test] = 1
       expect(subject.test).to eql 1
     end
 
     it 'should delegate the writer to the schema' do
-      subject.test = 1
-      expect(subject.schema.test).to eql 1
+      subject.schema[:test] = 1
+      expect(subject.schema[:test]).to eql 1
     end
 
     it 'should accept function-style writes' do
@@ -38,38 +38,38 @@ RSpec.describe JSON::SchemaBuilder::Entity, type: :unit do
     end
 
     it 'should snakeCase attribute reads' do
-      subject.schema.testName = 1
+      subject.schema[:testName] = 1
       expect(subject.test_name).to eql 1
     end
 
     it 'should snakeCase attribute writes' do
       subject.test_name = 1
-      expect(subject.schema.testName).to eql 1
+      expect(subject.schema[:testName]).to eql 1
     end
 
     it 'should handle array argument reads' do
-      subject.schema.testList = [1, 2, 3]
+      subject.schema[:testList] = [1, 2, 3]
       expect(subject.test_list).to eql [1, 2, 3]
     end
 
     it 'should handle array argument writes' do
       subject.test_list = [1, 2, 3]
-      expect(subject.schema.testList).to eql [1, 2, 3]
+      expect(subject.schema[:testList]).to eql [1, 2, 3]
     end
 
     it 'should handle array argument lists' do
       subject.test_list 1, 2, 3
-      expect(subject.schema.testList).to eql [1, 2, 3]
+      expect(subject.schema[:testList]).to eql [1, 2, 3]
     end
 
     it 'should handle arbitrary key writes' do
       subject.test_as 1
-      expect(subject.schema.testAs).to be_nil
-      expect(subject.schema.testOther).to eql 1
+      expect(subject.schema[:testAs]).to be_nil
+      expect(subject.schema[:testOther]).to eql 1
     end
 
     it 'should handle arbitrary key reads' do
-      subject.schema.testOther = 1
+      subject.schema[:testOther] = 1
       expect(subject.test_as).to eql 1
     end
   end
@@ -80,7 +80,7 @@ RSpec.describe JSON::SchemaBuilder::Entity, type: :unit do
     its(:name){ is_expected.to eql 'name' }
     its(:title){ is_expected.to eql 'test' }
     its(:parent){ is_expected.to eql parent }
-    its('schema.evaluated_block'){ is_expected.to be true }
+    its('schema.data'){ is_expected.to include evaluated_block: true }
     its('parent.children'){ is_expected.to include subject }
   end
 
@@ -136,7 +136,7 @@ RSpec.describe JSON::SchemaBuilder::Entity, type: :unit do
     include_context 'an entity'
 
     it 'should delegate to schema' do
-      expect(subject.schema).to receive_message_chain :'to_h.as_json'
+      expect(subject.schema).to receive(:as_json)
       subject.as_json
     end
   end

data/spec/unit/schema_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 RSpec.describe JSON::SchemaBuilder::Schema, type: :unit do
   let(:schema){ described_class.new a: 1, b: { c: 3 } }
   let(:other){ described_class.new a: 2, "b" => { d: 4 } }
-  it{ is_expected.to be_a OpenStruct }
+  its(:data){ is_expected.to be_a(HashWithIndifferentAccess) }
 
   describe '#merge' do
     it 'should deep merge' do
       merged = schema.merge other
       expect(merged).to be_a described_class
-      expect(merged.to_h).to eql a: 2, b: { "c" => 3, "d" => 4 }
+      expect(merged.to_h).to eql "a" => 2, "b" => { "c" => 3, "d" => 4 }
     end
 
     it 'should not modify the source schema' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".pryrc"
 - ".rspec"
 - ".travis.yml"
 - Gemfile