representable 2.4.0.rc3 → 2.4.0.rc4

data/test/skip_test.rb

@@ -2,14 +2,14 @@ require 'test_helper'
 
 class SkipParseTest < MiniTest::Spec
   representer! do
-    property :title, skip_parse: lambda { |fragment, opts| opts[:skip?] and fragment == "skip me" }
+    property :title, skip_parse: lambda { |options| options[:user_options][:skip?] and options[:fragment] == "skip me" }
     property :band,
-      skip_parse: lambda { |fragment, opts| opts[:skip?] and fragment["name"].nil? }, class: OpenStruct do
+      skip_parse: lambda { |options| options[:user_options][:skip?] and options[:fragment]["name"].nil? }, class: OpenStruct do
         property :name
     end
 
     collection :airplays,
-      skip_parse: lambda { |fragment, opts| opts[:skip?] and fragment["station"].nil? }, class: OpenStruct do
+      skip_parse: lambda { |options| options[:user_options][:skip?] and options[:fragment]["station"].nil? }, class: OpenStruct do
         property :station
     end
   end
@@ -22,7 +22,7 @@ class SkipParseTest < MiniTest::Spec
       "title"    => "Victim Of Fate",
       "band"     => {"name" => "Mute 98"},
       "airplays" => [{"station" => "JJJ"}]
-    }, skip?: true)
+    }, user_options: { skip?: true })
 
     song.title.must_equal "Victim Of Fate"
     song.band.name.must_equal "Mute 98"
@@ -37,7 +37,7 @@ class SkipParseTest < MiniTest::Spec
       "title"    => "skip me",
       "band"     => {},
       "airplays" => [{"station" => "JJJ"}, {}],
-    }, skip?: true)
+    }, user_options: { skip?: true })
 
     song.title.must_equal nil
     song.band.must_equal nil
@@ -49,12 +49,12 @@ class SkipRenderTest < MiniTest::Spec
   representer! do
     property :title
     property :band,
-      skip_render: lambda { |object, opts| opts[:skip?] and object.name == "Rancid" } do
+      skip_render: lambda { |options| options[:user_options][:skip?] and options[:input].name == "Rancid" } do
         property :name
     end
 
     collection :airplays,
-      skip_render: lambda { |object, opts| puts object.inspect; opts[:skip?] and object.station == "Radio Dreyeckland" } do
+      skip_render: lambda { |options| options[:user_options][:skip?] and options[:input].station == "Radio Dreyeckland" } do
         property :station
     end
   end
@@ -63,19 +63,19 @@ class SkipRenderTest < MiniTest::Spec
   let (:skip_song) { OpenStruct.new(title: "Time Bomb",   band: OpenStruct.new(name: "Rancid")).extend(representer) }
 
   # do render.
-  it { song.to_hash(skip?: true).must_equal({"title"=>"Black Night", "band"=>{"name"=>"Time Again"}}) }
+  it { song.to_hash(user_options: { skip?: true }).must_equal({"title"=>"Black Night", "band"=>{"name"=>"Time Again"}}) }
   # skip.
-  it { skip_song.to_hash(skip?: true).must_equal({"title"=>"Time Bomb"}) }
+  it { skip_song.to_hash(user_options: { skip?: true }).must_equal({"title"=>"Time Bomb"}) }
 
   # do render all collection items.
   it do
     song = OpenStruct.new(airplays: [OpenStruct.new(station: "JJJ"), OpenStruct.new(station: "ABC")]).extend(representer)
-    song.to_hash(skip?: true).must_equal({"airplays"=>[{"station"=>"JJJ"}, {"station"=>"ABC"}]})
+    song.to_hash(user_options: { skip?: true }).must_equal({"airplays"=>[{"station"=>"JJJ"}, {"station"=>"ABC"}]})
   end
 
   # skip middle item.
   it do
     song = OpenStruct.new(airplays: [OpenStruct.new(station: "JJJ"), OpenStruct.new(station: "Radio Dreyeckland"), OpenStruct.new(station: "ABC")]).extend(representer)
-    song.to_hash(skip?: true).must_equal({"airplays"=>[{"station"=>"JJJ"}, {"station"=>"ABC"}]})
+    song.to_hash(user_options: { skip?: true }).must_equal({"airplays"=>[{"station"=>"JJJ"}, {"station"=>"ABC"}]})
   end
 end

data/test/test_helper.rb

@@ -11,6 +11,8 @@ require 'test_xml/mini_test'
 
 require "representable/debug"
 
+Representable.deprecations = false
+
 class Album
   attr_accessor :songs, :best_song
   def initialize(songs=nil, best_song=nil)

data/test/uncategorized_test.rb

@@ -31,17 +31,17 @@ class RenderPipelineOptionTest < MiniTest::Spec
 
   representer!(decorator: true) do
     property :id, render_pipeline: ->(input, options) do
-      Representable::Pipeline[*render_functions.insert(2, options[:user_options][:function])]
+      Representable::Pipeline[*render_functions.insert(2, options[:options][:user_options][:function])]
     end
   end
 
-  it { representer.new(Album.new).to_hash(function: NilToNA).must_equal({"id"=>"n/a"}) }
-  it { representer.new(Album.new(1)).to_hash(function: NilToNA).must_equal({"id"=>1}) }
+  it { representer.new(Album.new).to_hash(user_options: {function: NilToNA}).must_equal({"id"=>"n/a"}) }
+  it { representer.new(Album.new(1)).to_hash(user_options: {function: NilToNA}).must_equal({"id"=>1}) }
 
   it "is cached" do
     decorator = representer.new(Album.new)
-    decorator.to_hash(function: NilToNA).must_equal({"id"=>"n/a"})
-    decorator.to_hash(function: nil).must_equal({"id"=>"n/a"}) # non-sense function is not applied.
+    decorator.to_hash(user_options: {function: NilToNA}).must_equal({"id"=>"n/a"})
+    decorator.to_hash(user_options: {function: nil}).must_equal({"id"=>"n/a"}) # non-sense function is not applied.
   end
 
 end
@@ -52,16 +52,16 @@ class ParsePipelineOptionTest < MiniTest::Spec
 
   representer!(decorator: true) do
     property :id, parse_pipeline: ->(input, options) do
-      Representable::Pipeline[*parse_functions.insert(3, options[:user_options][:function])].extend(Representable::Pipeline::Debug)
+      Representable::Pipeline[*parse_functions.insert(3, options[:options][:user_options][:function])].extend(Representable::Pipeline::Debug)
     end
   end
 
-  it { representer.new(Album.new).from_hash({"id"=>nil}, function: NilToNA).id.must_equal "n/a" }
-  it { representer.new(Album.new(1)).to_hash(function: NilToNA).must_equal({"id"=>1}) }
+  it { representer.new(Album.new).from_hash({"id"=>nil}, user_options: {function: NilToNA}).id.must_equal "n/a" }
+  it { representer.new(Album.new(1)).to_hash(user_options: {function: NilToNA}).must_equal({"id"=>1}) }
 
   it "is cached" do
     decorator = representer.new(Album.new)
-    decorator.from_hash({"id"=>nil}, function: NilToNA).id.must_equal "n/a"
-    decorator.from_hash({"id"=>nil}, function: "nonsense").id.must_equal "n/a" # non-sense function is not applied.
+    decorator.from_hash({"id"=>nil}, user_options: {function: NilToNA}).id.must_equal "n/a"
+    decorator.from_hash({"id"=>nil}, user_options: {function: "nonsense"}).id.must_equal "n/a" # non-sense function is not applied.
   end
 end

data/test/user_options_test.rb

@@ -0,0 +1,15 @@
+require "test_helper"
+
+class UserOptionsTest < Minitest::Spec
+  Song = Struct.new(:title)
+
+  representer! do
+    property :title, if: ->(options) { options[:user_options][:visible] }
+  end
+
+  it { Song.new("Run With It").extend(representer).to_hash.must_equal({}) }
+  it { Song.new("Run With It").extend(representer).to_hash(user_options: {visible: true}).must_equal({"title"=>"Run With It"}) }
+  it { Song.new("Run With It").extend(representer).from_hash("title"=>"Business Conduct").title.must_equal "Run With It" }
+  it { Song.new("Run With It").extend(representer).from_hash({"title"=>"Business Conduct"}, user_options: {visible: true}).title.must_equal "Business Conduct" }
+end
+# Representable.deprecations=false

data/test/wrap_test.rb

@@ -92,7 +92,7 @@ class HashDisableWrapTest < MiniTest::Spec
 
   let (:album) { AlbumDecorator.prepare(Album.new(Band.new("Social Distortion", Label.new("Epitaph")))) }
 
-  # band has wrap turned of per property definition, however, label still has wrap.
+  # band has wrap turned off per property definition, however, label still has wrap.
   it "renders" do
     album.to_hash.must_equal({"albums" => {"band" => {"name"=>"Social Distortion", "label"=>{"important"=>{"name"=>"Epitaph"}}}}})
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: representable
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc3
+  version: 2.4.0.rc4
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -190,7 +190,66 @@ files:
 - lib/representable/yaml.rb
 - lib/representable/yaml/binding.rb
 - representable.gemspec
-- test/---deserialize-pipeline_test.rb
+- test-with-deprecations/as_test.rb
+- test-with-deprecations/benchmarking.rb
+- test-with-deprecations/binding_test.rb
+- test-with-deprecations/blaaaaaaaa_test.rb
+- test-with-deprecations/cached_test.rb
+- test-with-deprecations/class_test.rb
+- test-with-deprecations/coercion_test.rb
+- test-with-deprecations/config/inherit_test.rb
+- test-with-deprecations/config_test.rb
+- test-with-deprecations/decorator_scope_test.rb
+- test-with-deprecations/decorator_test.rb
+- test-with-deprecations/default_test.rb
+- test-with-deprecations/defaults_options_test.rb
+- test-with-deprecations/definition_test.rb
+- test-with-deprecations/example.rb
+- test-with-deprecations/examples/object.rb
+- test-with-deprecations/exec_context_test.rb
+- test-with-deprecations/features_test.rb
+- test-with-deprecations/filter_test.rb
+- test-with-deprecations/for_collection_test.rb
+- test-with-deprecations/generic_test.rb
+- test-with-deprecations/getter_setter_test.rb
+- test-with-deprecations/hash_bindings_test.rb
+- test-with-deprecations/hash_test.rb
+- test-with-deprecations/heritage_test.rb
+- test-with-deprecations/if_test.rb
+- test-with-deprecations/include_exclude_test.rb
+- test-with-deprecations/inherit_test.rb
+- test-with-deprecations/inline_test.rb
+- test-with-deprecations/instance_test.rb
+- test-with-deprecations/is_representable_test.rb
+- test-with-deprecations/json_test.rb
+- test-with-deprecations/lonely_test.rb
+- test-with-deprecations/mongoid_test.rb
+- test-with-deprecations/nested_test.rb
+- test-with-deprecations/object_test.rb
+- test-with-deprecations/parse_pipeline_test.rb
+- test-with-deprecations/parse_strategy_test.rb
+- test-with-deprecations/pass_options_test.rb
+- test-with-deprecations/pipeline_test.rb
+- test-with-deprecations/populator_test.rb
+- test-with-deprecations/prepare_test.rb
+- test-with-deprecations/private_options_test.rb
+- test-with-deprecations/reader_writer_test.rb
+- test-with-deprecations/realistic_benchmark.rb
+- test-with-deprecations/render_nil_test.rb
+- test-with-deprecations/represent_test.rb
+- test-with-deprecations/representable_test.rb
+- test-with-deprecations/schema_test.rb
+- test-with-deprecations/serialize_deserialize_test.rb
+- test-with-deprecations/skip_test.rb
+- test-with-deprecations/stringify_hash_test.rb
+- test-with-deprecations/test_helper.rb
+- test-with-deprecations/test_helper_test.rb
+- test-with-deprecations/uncategorized_test.rb
+- test-with-deprecations/user_options_test.rb
+- test-with-deprecations/wrap_test.rb
+- test-with-deprecations/xml_bindings_test.rb
+- test-with-deprecations/xml_test.rb
+- test-with-deprecations/yaml_test.rb
 - test/as_test.rb
 - test/benchmarking.rb
 - test/binding_test.rb
@@ -216,6 +275,7 @@ files:
 - test/hash_test.rb
 - test/heritage_test.rb
 - test/if_test.rb
+- test/include_exclude_test.rb
 - test/inherit_test.rb
 - test/inline_test.rb
 - test/instance_test.rb
@@ -225,8 +285,8 @@ files:
 - test/mongoid_test.rb
 - test/nested_test.rb
 - test/object_test.rb
+- test/parse_pipeline_test.rb
 - test/parse_strategy_test.rb
-- test/pass_options_test.rb
 - test/pipeline_test.rb
 - test/populator_test.rb
 - test/prepare_test.rb
@@ -243,6 +303,7 @@ files:
 - test/test_helper.rb
 - test/test_helper_test.rb
 - test/uncategorized_test.rb
+- test/user_options_test.rb
 - test/wrap_test.rb
 - test/xml_bindings_test.rb
 - test/xml_test.rb