json-schematized 0.2.2 → 0.2.3

data/Gemfile

@@ -1,9 +1,12 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
 gem 'virtus', :git => 'https://github.com/solnic/virtus'
 
+# Gem activesupport ~> 4.0.0 requires Ruby ~> 1.9.3
+gem 'activesupport', '~> 3.2.0'
+
 # RUBY_VERSION ~> "1.9.0"
 # gem "debugger"
 

data/gemfiles/virtus-0_5_x.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'virtus', '~> 0.5.0'
+
+# Gem activesupport ~> 4.0.0 requires Ruby ~> 1.9.3
+gem 'activesupport', '~> 3.2.0'

data/gemfiles/virtus-edge.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'virtus', :git => 'https://github.com/solnic/virtus'
+
+# Gem activesupport ~> 4.0.0 requires Ruby ~> 1.9.3
+gem 'activesupport', '~> 3.2.0'

data/gemfiles/virtus-latest.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+# Gem activesupport ~> 4.0.0 requires Ruby ~> 1.9.3
+gem 'activesupport', '~> 3.2.0'

data/json-schematized.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name          = "json-schematized"
-  s.version       = "0.2.2"
+  s.version       = "0.2.3"
   s.platform      = Gem::Platform::RUBY
   s.summary       = "Object builder based on JSON-Schema"
   s.require_paths = ["lib"]
   s.files         = `git ls-files -- Gemfile README.md lib/ script/ *.gemspec`.split("\n")
-  s.test_files    = `git ls-files -- .rspec Gemfile spec/`.split("\n")
+  s.test_files    = `git ls-files -- .rspec Gemfile gemfiles/ spec/`.split("\n")
 
   s.description   = ""
   s.authors       = ["Marcelo Manzan"]
   s.email         = "manzan@gmail.com"
-  s.homepage      = "http://github.com/abril"
+  s.homepage      = "http://github.com/kawamanza"
 
   s.add_runtime_dependency "multi_json", "~> 1.0"
   s.add_runtime_dependency "activesupport"

data/lib/json/schematized/basic_wrapper.rb

@@ -36,8 +36,15 @@ module JSON
           def self.attribute_set
             unless defined?(@attribute_set)
               set = []
+              v1x = ::Virtus.respond_to?(:module)
               json_schema[:properties].each_pair do |field_name, meta|
-                set << Virtus::Attribute.build(field_name, BasicWrapper.meta_type(self, field_name, meta))
+                args = [field_name, BasicWrapper.meta_type(self, field_name, meta), {:name => field_name}]
+                if v1x
+                  args.shift
+                else
+                  args.pop
+                end
+                set << Virtus::Attribute.build(*args)
               end
               @attribute_set = Virtus::AttributeSet.new(nil, set)
             end

data/lib/json/schematized/virtus_0_5_x_wrapper.rb

@@ -0,0 +1,88 @@
+# encoding: UTF-8
+
+module JSON
+  module Schematized
+    module DSL
+      def virtus_module
+        VirtusWrapper.modularize(json_schema)
+      end
+    end
+
+    module VirtusWrapper
+      extend Wrapper
+
+      def self.included(base)
+        base.send(:include, modularize(base.json_schema))
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def json_schema_module
+          VirtusWrapper.modularize(json_schema)
+        end
+      end
+
+      def self.modularize(json_schema)
+        super(json_schema) do
+          include ::Virtus
+
+          VirtusWrapper.prepare_schema!(self, self.json_schema, :simple_types)
+          def self.included(base)
+            super
+            VirtusWrapper.prepare_schema!(base, json_schema, :complex_types)
+          end
+
+          def self.extend_object(base)
+            class_name = :ComplexTypes
+            (const_defined?(class_name) ?
+              const_get(class_name) :
+              const_set(class_name, Module.new)
+            ).tap do |klass|
+              klass.send(:include, self) unless klass.include?(self)
+              base.extend klass
+            end
+          end
+        end
+      end
+
+      def self.prepare_model(ref, field_name, model_class, json_schema)
+        model_class.send(:include, modularize(json_schema))
+      end
+
+      def self.add_attribute!(ref, field_name, meta, kind)
+        opts = {}
+        klass =  (kind.is_a?(Class) ? kind : kind.class)
+        if kind.is_a?(Class)
+          opts[:default] = klass.new if meta[:required] && kind.include?(::Virtus)
+        else
+          opts[:default] = kind.class.new
+        end
+        ref.attribute field_name, kind, opts
+      end
+
+      def self.collection_superclass
+        Array
+      end
+
+      class Array < ::Array
+      end
+
+      module Attribute
+        class Array < ::Virtus::Attribute::Array
+          primitive VirtusWrapper::Array
+          default primitive.new
+
+          def new_collection
+            (@primitive || self.class.primitive).new
+          end
+
+          def self.merge_options(type, options)
+            merged_options = super
+            klass = type.is_a?(Class) ? type : type.class
+            merged_options.merge(:primitive => klass)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/json/schematized/virtus_1_x_x_wrapper.rb

@@ -0,0 +1,78 @@
+# encoding: UTF-8
+
+module JSON
+  module Schematized
+    module DSL
+      def virtus_module
+        VirtusWrapper.modularize(json_schema)
+      end
+    end
+
+    module VirtusWrapper
+      extend Wrapper
+
+      def self.included(base)
+        base.send(:include, modularize(base.json_schema))
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def json_schema_module
+          VirtusWrapper.modularize(json_schema)
+        end
+      end
+
+      def self.modularize(json_schema)
+        super(json_schema) do
+          include ::Virtus.module
+
+          VirtusWrapper.prepare_schema!(self, self.json_schema, :simple_types)
+          def self.included(base)
+            super
+            VirtusWrapper.prepare_schema!(base, json_schema, :complex_types)
+          end
+
+          def self.extend_object(base)
+            class_name = :ComplexTypes
+            (const_defined?(class_name) ?
+              const_get(class_name) :
+              const_set(class_name, Module.new)
+            ).tap do |klass|
+              klass.send(:include, self) unless klass.include?(self)
+              base.extend klass
+            end
+          end
+        end
+      end
+
+      def self.prepare_model(ref, field_name, model_class, json_schema)
+        model_class.send(:include, modularize(json_schema))
+      end
+
+      def self.add_attribute!(ref, field_name, meta, kind)
+        opts = {}
+        klass =  (kind.is_a?(Class) ? kind : kind.class)
+        if kind.is_a?(Class)
+          opts[:default] = proc { klass.new } if meta[:required] && kind.include?(VirtusWrapper::Models)
+        else
+          opts[:default] = proc { kind.class.new }
+        end
+        ref.attribute field_name, kind, opts
+      end
+
+      def self.collection_superclass
+        Array
+      end
+
+      class Array < ::Array
+      end
+
+      module Attribute
+        class Array < ::Virtus::Attribute::Collection
+          primitive VirtusWrapper::Array
+          default Proc.new { |_, attribute| attribute.primitive.new }
+        end
+      end
+    end
+  end
+end

data/lib/json/schematized/virtus_wrapper.rb

@@ -2,89 +2,8 @@
 
 require "virtus"
 
-module JSON
-  module Schematized
-    module DSL
-      def virtus_module
-        VirtusWrapper.modularize(json_schema)
-      end
-    end
-
-    module VirtusWrapper
-      extend Wrapper
-
-      def self.included(base)
-        base.send(:include, modularize(base.json_schema))
-        base.extend ClassMethods
-      end
-
-      module ClassMethods
-        def json_schema_module
-          VirtusWrapper.modularize(json_schema)
-        end
-      end
-
-      def self.modularize(json_schema)
-        super(json_schema) do
-          include ::Virtus
-
-          VirtusWrapper.prepare_schema!(self, self.json_schema, :simple_types)
-          def self.included(base)
-            super
-            VirtusWrapper.prepare_schema!(base, json_schema, :complex_types)
-          end
-
-          def self.extend_object(base)
-            class_name = :ComplexTypes
-            (const_defined?(class_name) ?
-              const_get(class_name) :
-              const_set(class_name, Module.new)
-            ).tap do |klass|
-              klass.send(:include, self) unless klass.include?(self)
-              base.extend klass
-            end
-          end
-        end
-      end
-
-      def self.prepare_model(ref, field_name, model_class, json_schema)
-        model_class.send(:include, modularize(json_schema))
-      end
-
-      def self.add_attribute!(ref, field_name, meta, kind)
-        opts = {}
-        klass =  (kind.is_a?(Class) ? kind : kind.class)
-        if kind.is_a?(Class)
-          opts[:default] = klass.new if meta[:required] && kind.include?(::Virtus)
-        else
-          opts[:default] = kind.class.new
-        end
-        ref.attribute field_name, kind, opts
-      end
-
-      def self.collection_superclass
-        Array
-      end
-
-      class Array < ::Array
-      end
-
-      module Attribute
-        class Array < ::Virtus::Attribute::Array
-          primitive VirtusWrapper::Array
-          default primitive.new
-
-          def new_collection
-            (@primitive || self.class.primitive).new
-          end
-
-          def self.merge_options(type, options)
-            merged_options = super
-            klass = type.is_a?(Class) ? type : type.class
-            merged_options.merge(:primitive => klass)
-          end
-        end
-      end
-    end
-  end
+if ::Virtus.respond_to? :module
+  require File.expand_path '../virtus_1_x_x_wrapper.rb', __FILE__
+else
+  require File.expand_path '../virtus_0_5_x_wrapper.rb', __FILE__
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schematized
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -104,17 +104,22 @@ files:
 - lib/json/schematized/base.rb
 - lib/json/schematized/basic_wrapper.rb
 - lib/json/schematized/dsl.rb
+- lib/json/schematized/virtus_0_5_x_wrapper.rb
+- lib/json/schematized/virtus_1_x_x_wrapper.rb
 - lib/json/schematized/virtus_wrapper.rb
 - lib/json/schematized/wrapper.rb
 - script/console
 - .rspec
+- gemfiles/virtus-0_5_x.gemfile
+- gemfiles/virtus-edge.gemfile
+- gemfiles/virtus-latest.gemfile
 - spec/fixtures/person.yml
 - spec/lib/json/schematized/base_spec.rb
 - spec/lib/json/schematized/basic_wrapper_spec.rb
 - spec/lib/json/schematized/virtus_wrapper_spec.rb
 - spec/spec_helper.rb
 - spec/support/general_shared_excamples.rb
-homepage: http://github.com/abril
+homepage: http://github.com/kawamanza
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -134,13 +139,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Object builder based on JSON-Schema
 test_files:
 - .rspec
 - Gemfile
+- gemfiles/virtus-0_5_x.gemfile
+- gemfiles/virtus-edge.gemfile
+- gemfiles/virtus-latest.gemfile
 - spec/fixtures/person.yml
 - spec/lib/json/schematized/base_spec.rb
 - spec/lib/json/schematized/basic_wrapper_spec.rb