representable 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac8f58fd73f1e9aa9e35f3298490086dfb93d54
-  data.tar.gz: 054dcc8fdcf9cc7ce6f223747af5914457d19e90
+  metadata.gz: c7190988a0107b8fdf04b353f9e4ce2839edbc63
+  data.tar.gz: 4822a18cbbccd0b1953d24223dba3adcbfc7bd43
 SHA512:
-  metadata.gz: af903f251a75b3d57899b4a0b428a84ff5436885939a8b59b6fb42b9fa4f517efca96ccb9b01bee969d9602a542b2b58a81171be8f4175204090a0e6c8f292c2
-  data.tar.gz: 58b9716576c0d790d1b4584ac480760c9539ca61cea4618574fec0e7cb9f415fe2b35d156839f1b2d1c531433fa652160faea4bb14b6d2299341e62c094ec426
+  metadata.gz: 6f58b1085876a04fc2ebeb076d94323b1ad45039cfb987693ebc9ddd957bdb367c02b5b64792e570981fe549eafae4c5390886613992187f5106b1d380c079ab
+  data.tar.gz: db17d2feb4dfe80e37c2a3934218ef6101478fa1c4ab167cd9876710de4a9a30c8798a8914f9f9ff95cdf6642c7fbe8b650ae8d46855f642e364c1badeb88bf4

data/.travis.yml

@@ -2,9 +2,13 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - 2.3.1
-before_install:
-  - gem install bundler
+  - 1.9.3-p551
+  - 2.0.0-p648
+  - 2.1.9
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+matrix:
+  include:
+  - rvm: jruby-9.1.5.0
+    env: JRUBY_OPTS="--profile.api"

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 3.0.3
+
+* Replace `Uber::Option` with the new [`Declarative::Option`](https://github.com/apotonick/declarative-option). This should result in a significant performance boost.
+
 # 3.0.2
 
 * Initialize `Config@wrap` to avoid Ruby's warning.

data/Gemfile

@@ -3,10 +3,12 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem "nokogiri", require: false
+  gem 'nokogiri', '~> 1.6.8', require: false
   gem "multi_json", require: false
   gem "minitest-line"
 end
 
 # gem "declarative", path: "../declarative"
 # gem "declarative", github: "apotonick/declarative"
+
+# gem "uber","0.0.15" #, path: "../uber"

data/lib/representable.rb

@@ -1,5 +1,6 @@
 require "uber/delegates"
-
+require "uber/callable"
+require "declarative/option"
 require "declarative/schema"
 
 require "representable/config"

data/lib/representable/config.rb

@@ -20,14 +20,14 @@ module Representable
 
     def wrap=(value)
       value = value.to_s if value.is_a?(Symbol)
-      @wrap = Uber::Options::Value.new(value)
+      @wrap = ::Declarative::Option(value, instance_exec: true, callable: Uber::Callable)
     end
 
     # Computes the wrap string or returns false.
     def wrap_for(represented, *args, &block)
       return unless @wrap
 
-      value = @wrap.evaluate(represented, *args)
+      value = @wrap.(represented, *args)
 
       return value if value != true
       infer_name_for(represented.class.name)

data/lib/representable/definition.rb

@@ -1,4 +1,3 @@
-require "uber/options"
 require "representable/populator"
 
 module Representable
@@ -102,7 +101,7 @@ module Representable
       @runtime_options = {}
 
       for name, value in options
-        value = Uber::Options::Value.new(value) if dynamic_options.include?(name)
+        value = ::Declarative::Option(value, instance_exec: true, callable: Uber::Callable) if dynamic_options.include?(name)
         @runtime_options[name] = value
       end
     end

data/lib/representable/version.rb

@@ -1,3 +1,3 @@
 module Representable
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/lib/representable/yaml.rb

@@ -1,3 +1,4 @@
+require 'psych'
 require 'representable/hash'
 require 'representable/yaml/binding'
 

data/representable.gemspec

@@ -21,12 +21,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency "uber", ">= 0.0.15", "< 0.2.0"
-  spec.add_dependency "declarative", "~> 0.0.5"
+  spec.add_dependency "uber",               "< 0.2.0"
+  spec.add_dependency "declarative",        "< 0.1.0"
+  spec.add_dependency "declarative-option", "< 0.2.0"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test_xml", "0.1.6"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "virtus"
-  spec.add_development_dependency "ruby-prof"
+  spec.add_development_dependency "multi_json"
+  spec.add_development_dependency "ruby-prof" if RUBY_ENGINE == "ruby" # mri
 end

data/test/as_test.rb

@@ -62,4 +62,4 @@ class AsXmlTest < MiniTest::Spec
     skip
     representer.new(Album.new(Band.new("Offspring"))).to_xml.must_equal ""
   end
-end
+end

data/test/cached_test.rb

@@ -1,5 +1,28 @@
 require "test_helper"
-require 'ruby-prof'
+
+class Profiler
+  def self.profile(&block)
+    case RUBY_ENGINE
+    when "ruby"
+      require 'ruby-prof'
+
+      output = StringIO.new
+      profile_result = RubyProf.profile(&block)
+      printer = RubyProf::FlatPrinter.new(profile_result)
+      printer.print(output)
+      output.string
+    when "jruby"
+      require 'jruby/profiler'
+
+      output_stream  = java.io.ByteArrayOutputStream.new
+      print_stream   = java.io.PrintStream.new(output_stream)
+      profile_result = JRuby::Profiler.profile(&block)
+      printer = JRuby::Profiler::FlatProfilePrinter.new(profile_result)
+      printer.printProfile(print_stream)
+      output_stream.toString
+    end
+  end
+end
 
 class CachedTest < MiniTest::Spec
   # TODO: also test with feature(Cached)
@@ -55,28 +78,23 @@ class CachedTest < MiniTest::Spec
     it do
       representer.to_hash
 
-     RubyProf.start
-        representer.to_hash
-      res = RubyProf.stop
-
-      printer = RubyProf::FlatPrinter.new(res)
-
-      data = StringIO.new
-      printer.print(data)
-      data = data.string
-
-      printer.print(STDOUT)
+      data = Profiler.profile { representer.to_hash }
 
       # 3 songs get decorated.
-      data.must_match "3   Representable::Function::Decorate#call"
+      data.must_match /3\s*Representable::Function::Decorate#call/m
+      # These weird Regexp bellow are a quick workaround to accomodate
+      # the different profiler result formats.
+      #   - "3   <Class::Representable::Decorator>#prepare" -> At MRI Ruby
+      #   - "3  Representable::Decorator.prepare"           -> At JRuby
+
       # 3 nested decorator is instantiated for 3 Songs, though.
-      data.must_match "3   <Class::Representable::Decorator>#prepare"
+      data.must_match /3\s*(<Class::)?Representable::Decorator\>?[\#.]prepare/m
       # no Binding is instantiated at runtime.
       data.wont_match "Representable::Binding#initialize"
       # 2 mappers for Album, Song
       # data.must_match "2   Representable::Mapper::Methods#initialize"
       # title, songs, 3x title, composer
-      data.must_match "8   Representable::Binding#render_pipeline"
+      data.must_match /8\s*Representable::Binding[#\.]render_pipeline/m
       data.wont_match "render_functions"
       data.wont_match "Representable::Binding::Factories#render_functions"
     end
@@ -116,25 +134,17 @@ class CachedTest < MiniTest::Spec
       representer = AlbumRepresenter.new(Model::Album.new)
       representer.from_hash(album_hash)
 
-      RubyProf.start
-        # puts "#{representer.class.representable_attrs.get(:songs).representer_module.representable_attrs.inspect}"
-        representer.from_hash(album_hash)
-      res = RubyProf.stop
-
-      printer = RubyProf::FlatPrinter.new(res)
-
-      data = StringIO.new
-      printer.print(data)
-      data = data.string
+      data = Profiler.profile { representer.from_hash(album_hash) }
 
       # only 2 nested decorators are instantiated, Song, and Artist.
-      data.must_match "5   <Class::Representable::Decorator>#prepare"
+      # Didn't like the regexp?
+      # MRI and JRuby has different output formats. See note above.
+      data.must_match /5\s*(<Class::)?Representable::Decorator>?[#\.]prepare/
       # a total of 5 properties in the object graph.
       data.wont_match "Representable::Binding#initialize"
 
-
       data.wont_match "parse_functions" # no pipeline creation.
-      data.must_match "10   Representable::Binding#parse_pipeline"
+      data.must_match /10\s*Representable::Binding[#\.]parse_pipeline/
       # three mappers for Album, Song, composer
       # data.must_match "3   Representable::Mapper::Methods#initialize"
       # # 6 deserializers as the songs collection uses 2.

data/test/definition_test.rb

@@ -87,7 +87,7 @@ class DefinitionTest < MiniTest::Spec
   describe "#delete!" do
     let (:definition) { Definition.new(:song, serialize: "remove me!") }
 
-    before { definition[:serialize].evaluate(nil).must_equal "remove me!" }
+    before { definition[:serialize].(nil).must_equal "remove me!" }
 
     it { definition.delete!(:serialize)[:serialize].must_equal nil }
   end
@@ -158,10 +158,10 @@ class DefinitionTest < MiniTest::Spec
 
 
     describe "#clone" do
-      subject { Representable::Definition.new(:title, :volume => 9, :clonable => Uber::Options::Value.new(1)) }
+      subject { Representable::Definition.new(:title, :volume => 9, :clonable => Declarative::Option(1)) }
 
       it { subject.clone.must_be_kind_of Representable::Definition }
-      it { subject.clone[:clonable].evaluate(nil).must_equal 1 }
+      it { subject.clone[:clonable].(nil).must_equal 1 }
 
       it "clones @options" do
         @def.merge!(:volume => 9)

data/test/json_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'json'
 
 module JsonTest
 class JSONPublicMethodsTest < Minitest::Spec

data/test/test_helper.rb

@@ -1,7 +1,5 @@
 require 'representable'
 
-require "psych"
-
 require 'minitest/autorun'
 require 'test_xml/mini_test'
 

metadata

@@ -1,22 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: representable
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-03 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.15
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.2.0
@@ -24,9 +21,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.15
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.2.0
@@ -34,16 +28,30 @@ dependencies:
   name: declarative
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: declarative-option
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  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'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement