jsonapionify 0.9.0 → 0.9.1

data/lib/jsonapionify/types.rb

@@ -4,6 +4,10 @@ module JSONAPIonify::Types
   extend JSONAPIonify::Autoload
   autoload_all
 
+  DumpError    = Class.new(StandardError)
+  LoadError    = Class.new(StandardError)
+  NotNullError = Class.new(StandardError)
+
   def types
     DefinitionFinder
   end
@@ -20,6 +24,32 @@ module JSONAPIonify::Types
     include JSONAPIonify::Callbacks
     define_callbacks :initialize
 
+    def self.dumper(&block)
+      meth = instance_method define_method(:dump, &block)
+      define_method(:dump) do |value|
+        return nil if value.nil? && !not_null?
+        raise NotNullError if value.nil? && not_null?
+        meth.bind(self).call(value)
+      end
+    end
+
+    def self.loader(&block)
+      meth = instance_method define_method(:load, &block)
+      define_method(:load) do |value|
+        return nil if value.nil? && !not_null?
+        raise NotNullError if value.nil? && not_null?
+        meth.bind(self).call(value)
+      end
+    end
+
+    loader do |value|
+      value
+    end
+
+    dumper do |value|
+      JSON.load JSON.dump value
+    end
+
     def name
       self.class.name.split('::').last.chomp('Type')
     end
@@ -30,17 +60,25 @@ module JSONAPIonify::Types
       run_callbacks :initialize do
         @options = options
       end
-      freeze
     end
 
-    def load(non_ruby)
-      non_ruby
+    def to_s
+      name = self.class.name.split('::').last.chomp('Type')
+      name << "[#{options[:of].to_s}]" if options[:of]
+      name
     end
 
-    def dump(ruby)
-      JSON.load JSON.dump ruby
+    def not_null!
+      @not_null = true
+      self
     end
 
+    def not_null?
+      !!@not_null
+    end
+
+    private
+
     def verify(non_ruby)
       dump(load(non_ruby)) == non_ruby
     end

data/lib/jsonapionify/version.rb

@@ -1,3 +1,3 @@
 module JSONAPIonify
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/jsonapionify.rb

@@ -4,6 +4,7 @@ require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/hash/keys"
 require 'active_support/cache'
 require 'jsonapionify/autoload'
+require 'oj'
 
 module JSONAPIonify
   autoload :VERSION, 'jsonapi-objects/version'
@@ -23,7 +24,7 @@ module JSONAPIonify
   end
 
   def self.parse(hash)
-    hash = JSON.parse(hash) if hash.is_a? String
+    hash = Oj.load(hash) if hash.is_a? String
     Structure::Objects::TopLevel.from_hash(hash)
   end
 
@@ -41,10 +42,44 @@ module JSONAPIonify
     )
   end
 
+  def self.verbose_errors=(value)
+    self.show_backtrace = @verbose_errors = value
+  end
+
+  def self.verbose_errors
+    return @verbose_errors if instance_variable_defined?(:@verbose_errors)
+    self.verbose_errors = ENV['RACK_ENV'] != 'production'
+  end
+
+  def self.show_backtrace=(value)
+    @show_backtrace = value
+  end
+
+  def self.show_backtrace
+    return @show_backtrace if instance_variable_defined?(:@show_backtrace)
+    self.show_backtrace = ENV['RACK_ENV'] != 'production'
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.logger
+    @logger ||= defined?(Rails) ? Rails.logger : Logger.new('/dev/null')
+  end
+
   def self.cache_store=(store)
     @cache_store = store
   end
 
+  def self.disable_validation(bool)
+    @validation_disabled = bool
+  end
+
+  def self.validation_disabled?
+    !!@validation_disabled
+  end
+
   def self.cache_store
     @cache_store ||= ActiveSupport::Cache.lookup_store :null_store
   end