lurker 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59974fdb662a2fbadcb01539d0fe9a1b919da2c
-  data.tar.gz: 476c5cad93b78d96f397fae62ed32ae19ad30c21
+  metadata.gz: 6f19d765a42825a49246ece3cfe310a71ef07026
+  data.tar.gz: 04db573bb51da7ac28f3f55c5a85990e6bb6768b
 SHA512:
-  metadata.gz: a2a7af02fa6d092a639b79f5f903c373c33b40cc3b8ad621aa69eb6ebdd056998b66cfdb57d93be644dff1c0dd2e3cf554aec85a30fd61bc65038b6060a1ace9
-  data.tar.gz: d2afae3c32e2adce210fb74144e0078ea8db8241b7aebeb0afeb474ec67dcf16083ad8153fc405fde8924af7d4986602575078d836be4c5b2c1e5d7a20f28fd3
+  metadata.gz: 4d203a0847bda1f56a2b8b39eda067d0d40f1ddde7bd27c5e800ae61f3000c7cae600c076d619bfc634c087c9f9e4480e6982c745c1f267c3689ec46d77671e7
+  data.tar.gz: 98af7ab781606392252390b6f7f74a844b56d1d61910acd2b6b2c180fbb06dc03ed43b03b6b2d34f59dec7c5cdcc681a0bc188d6235d662335d54f1aa75638d9

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-�ƴs���:�vsT�\�k���Ȑj<Dk�9�s:d�������L��{o�z���W�_�W���aA�za�G��q#Mz^)8K㊥����r_~����%��Մ��H���'�0���51rÝRy�NW��ݧm�FZ��#��a൥� I9�g��b�:Kj��,i|�g\C�}��F
��Ѥs��A�;��*���P�iM7�
5aܶ��/ ����U���7A�>/K���Sh�Ņm; 5;��P�oX�3��
+aR)�&���L�PS���!D����E�'���H��\�]_�km��n 
zԎ�"����B���j����w
+r2��;#��D�d#KO�򰼒H����eqr���Q����SV[6��y�\ھ�	.���$�^��0��_ D�`)�0b�>)lp��o6�&��-�
+-r�sb����X���\:�6���W�v=��N�Li���l��?��c/�3|Ff

data/lib/lurker/json/concerns/validatable.rb

@@ -2,12 +2,6 @@ module Lurker
   module Json
     module Concerns
       module Validatable
-        ID = 'id'.freeze
-        TYPE = 'type'.freeze
-        OBJECT = 'object'.freeze
-        PROPERTIES = 'properties'.freeze
-        ADDITIONAL_PROPERTIES = 'additionalProperties'.freeze
-
         def validate(data)
           Lurker::Validator.new(to_validation_schema, data,
             record_errors: true).validate.map { |error| "- #{error}" }
@@ -15,7 +9,7 @@ module Lurker
 
         def to_validation_schema
           set_additional_properties_false_on(to_hash).tap do |schema|
-            schema[ID] = "file://#{uri}"
+            schema[Json::ID] = "file://#{uri}"
           end
         end
 
@@ -26,12 +20,12 @@ module Lurker
           when Hash
             copy = object.dup
 
-            if object[TYPE] == OBJECT || object.key?(PROPERTIES)
-              copy[ADDITIONAL_PROPERTIES] ||= false
+            if object[Json::TYPE] == Json::OBJECT || object.key?(Json::PROPERTIES)
+              copy[Json::ADDITIONAL_PROPERTIES] ||= false
             end
 
             object.each do |key, value|
-              next if key == ADDITIONAL_PROPERTIES
+              next if key == Json::ADDITIONAL_PROPERTIES
               copy[key] = set_additional_properties_false_on(value)
             end
 

data/lib/lurker/json/parser/expertise.rb

@@ -2,27 +2,20 @@ module Lurker
   module Json
     class Parser
       module Expertise
-        REF = '$ref'.freeze
-        TYPE = 'type'.freeze
-        ANYOF = 'anyOf'.freeze
-        ALLOF = 'allOf'.freeze
-        ONEOF = 'oneOf'.freeze
-        ITEMS = 'items'.freeze
-        PROPERTIES = 'properties'.freeze
-
         module_function
 
         def type_defined?(hash)
           return false unless hash.is_a?(Hash)
 
-          hash.key? TYPE
+          hash.key?(Json::TYPE) && Json::PRIMITIVES.include?(hash[Json::TYPE])
         end
 
         def type_supposed?(hash)
           return false unless hash.is_a?(Hash)
 
-          hash.key?(ANYOF) || hash.key?(ALLOF) || hash.key?(ONEOF) ||
-          hash.key?(ITEMS) || hash.key?(PROPERTIES) || hash.key?(REF)
+          hash.key?(Json::ANYOF) || hash.key?(Json::ALLOF) || hash.key?(Json::ONEOF) ||
+          hash.key?(Json::ITEMS) || hash.key?(Json::PROPERTIES) ||
+          hash.key?(Json::REF)
         end
       end
     end

data/lib/lurker/json/parser/typed_strategy.rb

@@ -4,15 +4,6 @@ module Lurker
       class TypedStrategy
         include Lurker::Json::Parser::Expertise
 
-        ANYOF = 'anyOf'.freeze
-        ALLOF = 'allOf'.freeze
-        ONEOF = 'oneOf'.freeze
-        ITEMS = 'items'.freeze
-        TYPE  = 'type'.freeze
-        ARRAY = 'array'.freeze
-        OBJECT = 'object'.freeze
-        PROPERTIES = 'properties'.freeze
-
         attr_reader :schema_options
 
         def initialize(options)
@@ -38,17 +29,17 @@ module Lurker
         private
 
         def create_by_supposition(payload)
-          if payload.key?(ITEMS)
+          if payload.key?(Json::ITEMS)
             Lurker::Json::List.new(payload, schema_options)
-          elsif payload.key?(PROPERTIES)
+          elsif payload.key?(Json::PROPERTIES)
             Lurker::Json::Object.new(payload, schema_options)
-          elsif payload.key?(ANYOF)
+          elsif payload.key?(Json::ANYOF)
             Lurker::Json::Tuple::AnyOf.new(payload, schema_options)
-          elsif payload.key?(ALLOF)
+          elsif payload.key?(Json::ALLOF)
             Lurker::Json::Tuple::AllOf.new(payload, schema_options)
-          elsif payload.key?(ONEOF)
+          elsif payload.key?(Json::ONEOF)
             Lurker::Json::Tuple::OneOf.new(payload, schema_options)
-          elsif payload.key?(REF)
+          elsif payload.key?(Json::REF)
             Lurker::Json::Reference.new(payload, schema_options)
           else
             raise "Unknown type supposition for #{payload}"
@@ -56,10 +47,10 @@ module Lurker
         end
 
         def create_by_type(payload)
-          case payload[TYPE]
-          when OBJECT
+          case payload[Json::TYPE]
+          when Json::OBJECT
             Lurker::Json::Object.new(payload, schema_options)
-          when ARRAY
+          when Json::ARRAY
             Lurker::Json::List.new(payload, schema_options)
           else
             Lurker::Json::Attribute.new(payload, schema_options)

data/lib/lurker/json/schema/attribute.rb

@@ -4,26 +4,23 @@ module Lurker
   module Json
     class Attribute < Schema
       URI = 'uri'.freeze
-      TYPE = 'type'.freeze
       COLOR = 'color'.freeze
       FORMAT = 'format'.freeze
-      EXAMPLE = 'example'.freeze
       DATE_TIME = 'date-time'.freeze
-      DESCRIPTION = 'description'.freeze
 
       TYPE_MAP = {
-        'Time' => 'string',
-        'Hash' => 'object',
-        'Float' => 'number',
-        'Fixnum' => 'integer',
-        'NilClass' => 'null',
-        'TrueClass' => 'boolean',
-        'FalseClass' => 'boolean',
-        'ActionDispatch::Http::UploadedFile' => 'string'
+        'Time' => Json::STRING,
+        'Hash' => Json::OBJECT,
+        'Float' => Json::NUMBER,
+        'Fixnum' => Json::INTEGER,
+        'NilClass' => Json::NULL,
+        'TrueClass' => Json::BOOLEAN,
+        'FalseClass' => Json::BOOLEAN,
+        'ActionDispatch::Http::UploadedFile' => Json::STRING
       }.freeze
 
       def merge!(schema)
-        return replace!(schema) if @schema[TYPE].blank?
+        return replace!(schema) if @schema[Json::TYPE].blank?
 
         schema = attributify(schema)
         return if eql?(schema)
@@ -42,7 +39,7 @@ module Lurker
       end
 
       def eql?(schema)
-        @schema[TYPE] == attributify(schema)[TYPE]
+        @schema[Json::TYPE] == attributify(schema)[Json::TYPE]
       end
 
       private
@@ -62,9 +59,9 @@ module Lurker
         return schema if schema.is_a?(Hash) || schema.is_a?(Lurker::Json::Schema)
 
         attribute = {
-          DESCRIPTION => '',
-          TYPE => guess_type(schema),
-          EXAMPLE => serialize_example(schema)
+          Json::DESCRIPTION => '',
+          Json::TYPE => guess_type(schema),
+          Json::EXAMPLE => serialize_example(schema)
         }
 
         if format = guess_format(schema)
@@ -75,9 +72,9 @@ module Lurker
       end
 
       def initialize_properties
-        @schema[DESCRIPTION] ||= ''
-        @schema[TYPE] ||= ''
-        @schema[EXAMPLE] ||= ''
+        @schema[Json::DESCRIPTION] ||= ''
+        @schema[Json::TYPE] ||= ''
+        @schema[Json::EXAMPLE] ||= ''
       end
 
       def serialize_example(data)

data/lib/lurker/json/schema/list.rb

@@ -1,23 +1,19 @@
 module Lurker
   module Json
     class List < Schema
-      TYPE = 'type'.freeze
-      ARRAY = 'array'.freeze
-      ITEMS = 'items'.freeze
-
       def merge!(schema)
         if schema.is_a?(Array)
-          schema.each { |payload| @schema[ITEMS].merge!(payload) }
+          schema.each { |payload| @schema[Json::ITEMS].merge!(payload) }
         else
-          @schema[ITEMS].merge!(schema)
+          @schema[Json::ITEMS].merge!(schema)
         end
       end
 
       def replace!(property, schema)
-        if @schema[ITEMS].is_a?(Lurker::Json::Attribute)
-          @schema[ITEMS] = schema
+        if @schema[Json::ITEMS].is_a?(Lurker::Json::Attribute)
+          @schema[Json::ITEMS] = schema
         else
-          @schema[ITEMS].replace!(property, schema)
+          @schema[Json::ITEMS].replace!(property, schema)
         end
       end
 
@@ -31,11 +27,11 @@ module Lurker
 
         schema = schema.dup
         if schema.is_a?(Array)
-          @schema[ITEMS] = @parser.typed.parse(schema.shift)
+          @schema[Json::ITEMS] = @parser.typed.parse(schema.shift)
 
-          schema.each { |payload| @schema[ITEMS].merge!(payload) }
+          schema.each { |payload| @schema[Json::ITEMS].merge!(payload) }
         else
-          @schema[ITEMS] = @parser.typed.parse(schema.delete ITEMS) if schema.key?(ITEMS)
+          @schema[Json::ITEMS] = @parser.typed.parse(schema.delete Json::ITEMS) if schema.key?(Json::ITEMS)
           @schema.merge!(schema)
         end
 
@@ -43,8 +39,8 @@ module Lurker
       end
 
       def initialize_properties
-        @schema[TYPE] ||= ARRAY
-        @schema[ITEMS] ||= []
+        @schema[Json::TYPE] ||= Json::ARRAY
+        @schema[Json::ITEMS] ||= []
       end
     end
   end

data/lib/lurker/json/schema/object.rb

@@ -1,23 +1,16 @@
 module Lurker
   module Json
     class Object < Schema
-      TYPE = 'type'.freeze
-      OBJECT = 'object'.freeze
-      REQUIRED = 'required'.freeze
-      PROPERTIES = 'properties'.freeze
-      DESCRIPTION = 'description'.freeze
-      ADDITIONAL_PROPERTIES = 'additionalProperties'.freeze
-
       def merge!(schema)
         unless schema.is_a?(Hash)
-          return replace_with_new_type(schema) if @schema[PROPERTIES].blank?
+          return replace_with_new_type(schema) if @schema[Json::PROPERTIES].blank?
 
           raise TypeError, "Unable to merge #{schema.class} into JSON object"
         end
 
         schema.each do |property, property_schema|
-          if @schema[PROPERTIES].key?(property)
-            @schema[PROPERTIES][property].merge!(property_schema)
+          if @schema[Json::PROPERTIES].key?(property)
+            @schema[Json::PROPERTIES][property].merge!(property_schema)
             next
           end
 
@@ -26,7 +19,7 @@ module Lurker
       end
 
       def replace!(property, property_schema)
-        @schema[PROPERTIES][property] = Lurker::Json::Parser.typed(subschema_options)
+        @schema[Json::PROPERTIES][property] = Lurker::Json::Parser.typed(subschema_options)
           .parse_property(property, property_schema)
       end
 
@@ -37,10 +30,10 @@ module Lurker
         initialize_properties
 
         schema = schema.dup
-        merge_required = schema.key?(PROPERTIES)
+        merge_required = schema.key?(Json::PROPERTIES)
 
-        (schema.delete(PROPERTIES) || schema).each do |property, property_schema|
-          @schema[PROPERTIES][property] = @parser.typed.parse_property(
+        (schema.delete(Json::PROPERTIES) || schema).each do |property, property_schema|
+          @schema[Json::PROPERTIES][property] = @parser.typed.parse_property(
             property, property_schema)
         end
 
@@ -56,11 +49,11 @@ module Lurker
       end
 
       def initialize_properties
-        @schema[DESCRIPTION] ||= ''
-        @schema[TYPE] ||= OBJECT
-        @schema[ADDITIONAL_PROPERTIES] = !!@schema[ADDITIONAL_PROPERTIES]
-        @schema[REQUIRED] ||= []
-        @schema[PROPERTIES] ||= {}
+        @schema[Json::DESCRIPTION] ||= ''
+        @schema[Json::TYPE] ||= Json::OBJECT
+        @schema[Json::ADDITIONAL_PROPERTIES] = !!@schema[Json::ADDITIONAL_PROPERTIES]
+        @schema[Json::REQUIRED] ||= []
+        @schema[Json::PROPERTIES] ||= {}
       end
     end
   end

data/lib/lurker/json/schema/reference.rb

@@ -1,8 +1,6 @@
 module Lurker
   module Json
     class Reference < Schema
-      REF = '$ref'.freeze
-
       attr_reader :original_uri
 
       delegate :merge!, :replace!, :reorder!, to: :@schema
@@ -18,7 +16,7 @@ module Lurker
 
         # NOTE : We decide that reference is relative, so we are using merge
         # We use first read for correct relative path resolving
-        reader = Lurker::Json::Reader.new(@uri.merge(schema[REF]).path)
+        reader = Lurker::Json::Reader.new(@uri.merge(schema[Json::REF]).path)
         payload = reader.payload
 
         @original_uri = parse_uri(reader.path)

data/lib/lurker/json/schema/response_codes.rb

@@ -3,7 +3,6 @@ module Lurker
     class ResponseCodes < Schema
       STATUS = 'status'.freeze
       SUCCESSFUL = 'successful'.freeze
-      DESCRIPTION = 'description'.freeze
 
       def initialize(schema, options = {})
         @parent_property = 'responseCodes'
@@ -14,7 +13,7 @@ module Lurker
       def merge!(status_code, successful)
         return if exists?(status_code, successful)
 
-        payload = {STATUS => status_code, SUCCESSFUL => successful, DESCRIPTION => ''}
+        payload = {STATUS => status_code, SUCCESSFUL => successful, Json::DESCRIPTION => ''}
         @schema << Lurker::Json::Parser.plain(root_schema: root_schema).parse(payload)
       end
 

data/lib/lurker/json/schema/tuple/all_of.rb

@@ -4,12 +4,10 @@ module Lurker
       class AllOf < Json::Schema
         include Tuple::InstanceMethods
 
-        ALLOF = 'allOf'.freeze
-
         private
 
         def tuple_key
-          ALLOF
+          Json::ALLOF
         end
       end
     end

data/lib/lurker/json/schema/tuple/any_of.rb

@@ -4,12 +4,10 @@ module Lurker
       class AnyOf < Json::Schema
         include Tuple::InstanceMethods
 
-        ANYOF = 'anyOf'.freeze
-
         private
 
         def tuple_key
-          ANYOF
+          Json::ANYOF
         end
       end
     end

data/lib/lurker/json/schema/tuple/one_of.rb

@@ -4,12 +4,10 @@ module Lurker
       class OneOf < Json::Schema
         include Tuple::InstanceMethods
 
-        ONEOF = 'oneOf'.freeze
-
         private
 
         def tuple_key
-          ONEOF
+          Json::ONEOF
         end
       end
     end

data/lib/lurker/json.rb

@@ -0,0 +1,27 @@
+module Lurker
+  module Json
+    NULL = 'null'.freeze
+    ARRAY = 'array'.freeze
+    STRING = 'string'.freeze
+    OBJECT = 'object'.freeze
+    NUMBER = 'number'.freeze
+    BOOLEAN = 'boolean'.freeze
+    INTEGER = 'integer'.freeze
+
+    PRIMITIVES = [NULL, BOOLEAN, INTEGER, NUMBER, STRING, ARRAY, OBJECT].freeze
+
+    ID = 'id'.freeze
+    REF = '$ref'.freeze
+    TYPE = 'type'.freeze
+    ITEMS = 'items'.freeze
+    EXAMPLE = 'example'.freeze
+    REQUIRED = 'required'.freeze
+    PROPERTIES = 'properties'.freeze
+    DESCRIPTION = 'description'.freeze
+    ADDITIONAL_PROPERTIES = 'additionalProperties'.freeze
+
+    ANYOF = 'anyOf'.freeze
+    ALLOF = 'allOf'.freeze
+    ONEOF = 'oneOf'.freeze
+  end
+end

data/lib/lurker/version.rb

@@ -1,3 +1,3 @@
 module Lurker
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/lurker.rb

@@ -63,6 +63,7 @@ require 'lurker/presenters/service_presenter'
 require 'lurker/presenters/endpoint_presenter'
 require 'lurker/presenters/schema_presenter'
 require 'lurker/presenters/response_code_presenter'
+require 'lurker/json'
 require 'lurker/json/reader'
 require 'lurker/json/writter'
 require 'lurker/json/orderer'

data/spec/lurker/json/object_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Lurker::Json::Object do
+  let(:klass) { described_class }
+
+  describe '#merge!' do
+    context 'when merge a hash with keywords' do
+      let(:object) { klass.new('name' => 'razum2um') }
+      let(:expected) do
+        {
+          'description' => '',
+          'type' => 'object',
+          'additionalProperties' => false,
+          'required' => [],
+          'properties' => {
+            'name' => {
+              'description' => '',
+              'type' => 'string',
+              'example' => 'razum2um'
+            },
+            'achievement' => {
+              'description' => '',
+              'type' => 'object',
+              'additionalProperties' => false,
+              'required' => [],
+              'properties' => {
+                'type' => {
+                  'description' => '',
+                  'type' => 'string',
+                  'example' => 'unlocked'
+                }
+              }
+            }
+          }
+        }
+      end
+
+      before { object.merge!('achievement' => {'type' => 'unlocked'}) }
+
+      it { expect(object.to_hash).to eq expected }
+    end
+  end
+end

data.tar.gz.sig

@@ -1,2 +1,3 @@
-����=��@r]0Z�P+-Y:�s�~UR�6���.dM�Ւ��ȼ�A������
-��ƙ|��
+';��,��6�G�m2�n=����� Cmu�p���R¶���f
+M|3�:��}6�k�W��J‘��N1���
�a���yV/DK���#���6	y�~9�+��z�w:7�;�t����6[�����[����X��'N�l۪x=/Eoe�����J��%�/�Q�m�CI~1`c����q|��G��!���Qȵu���j�pl��཯��&^I��
+ٌ.8`h

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lurker
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Vlad Bokov
@@ -30,7 +30,7 @@ cert_chain:
   vzKbYclpJ7gENr/xiTjGqA/Md3zJMzmsFrzUXt4RVmo5SaCyZjC6gFfhSr+PODc7
   ZaSbckvH/+m4boAsg0JkGGFcS3j5fgNmdwgA1A==
   -----END CERTIFICATE-----
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -487,6 +487,7 @@ files:
 - lib/lurker/erb_schema_context.rb
 - lib/lurker/form_builder.rb
 - lib/lurker/jaml_descriptor.rb
+- lib/lurker/json.rb
 - lib/lurker/json/concerns/validatable.rb
 - lib/lurker/json/orderer.rb
 - lib/lurker/json/parser.rb
@@ -506,7 +507,6 @@ files:
 - lib/lurker/json/schema/tuple/any_of.rb
 - lib/lurker/json/schema/tuple/one_of.rb
 - lib/lurker/json/writter.rb
-- lib/lurker/json_schema_hash.rb
 - lib/lurker/presenters/base_presenter.rb
 - lib/lurker/presenters/endpoint_presenter.rb
 - lib/lurker/presenters/json_presenter.rb
@@ -575,6 +575,7 @@ files:
 - lurker.gemspec
 - spec/lurker/endpoint_spec.rb
 - spec/lurker/json/list_spec.rb
+- spec/lurker/json/object_spec.rb
 - spec/lurker/json/schema_spec.rb
 - spec/lurker/yaml_spec.rb
 - spec/spec_helper.rb
@@ -631,6 +632,7 @@ test_files:
 - features/test_endpoint.feature
 - spec/lurker/endpoint_spec.rb
 - spec/lurker/json/list_spec.rb
+- spec/lurker/json/object_spec.rb
 - spec/lurker/json/schema_spec.rb
 - spec/lurker/yaml_spec.rb
 - spec/spec_helper.rb

metadata.gz.sig

@@ -1 +1,5 @@
-�O�=���U�Bw:2�F�P�
+�2I��4*ҍ���������ط��Z
+oR>o`��5�=PhjC��
$�ȴZ���j��9_�$��p5���]$��'���{k���
+Z^��e�~�
+�
+n�NC��t&�0�Z� ����)����1o6ӣ>i���;̫Z�.�c-vOyUH�U�FBi5�ʎ>����
�@>O�>����@*��!iē6>$D!l#_��׳�OYeu�F����S�g�id]

data/lib/lurker/json_schema_hash.rb

@@ -1,48 +0,0 @@
-module Lurker
-  class JsonSchemaHash
-    attr_accessor :schema_hash
-    include JamlDescriptor::Rescue
-
-    def initialize(schema_hash, uri)
-      @to_s = uri
-      @uri = URI.parse(uri)
-      @uri = URI.parse("file://#{uri}") if @uri.relative?
-
-      @schema_hash = Hash[schema_hash.map do |k, v|
-        if k == '$ref' && v.is_a?(String)
-          uri = @uri.merge(v)
-          schema_hash = JSON.parse(open(uri.to_s).read)
-          [k, JsonSchemaHash.new(schema_hash, uri.to_s)]
-        elsif v.is_a?(Hash)
-          [k, JsonSchemaHash.new(v, @to_s)]
-        else
-          [k, v]
-        end
-      end]
-    end
-
-    def respond_to_missing?(method, include_private = false)
-      @schema_hash.send(:respond_to_missing?, method, include_private)
-    end
-
-    def method_missing(method, *args, &block)
-      @schema_hash.send method, *args, &block
-    end
-
-    def is_a?(*args)
-      @schema_hash.is_a?(*args)
-    end
-
-    def to_h
-      Hash[@schema_hash.map do |k, v|
-        if JsonSchemaHash === v
-          [k, v.to_h]
-        elsif v.is_a?(Array)
-          [k, v.map { |i| JsonSchemaHash === i ? i.to_h : i }]
-        else
-          [k, v]
-        end
-      end]
-    end
-  end
-end