representable 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c06c246f8a877ca22b35b7e5f409be0f5b1d6922
-  data.tar.gz: 57183b1d4597321d6ed84278407032b04ac3eb8a
+  metadata.gz: c2acf392fadc7e81f961fa72ccee559b56bbac22
+  data.tar.gz: 8c27f1a11cb756c4d906d751231a26574e06bc87
 SHA512:
-  metadata.gz: ed0821431bd7bee01cf48dc470211a78cdaa80a6de27df4961bf9028f6824a5914bf16bf86ffd59ca4698f60c56362226421aa2ea011933de82aa3072c28d081
-  data.tar.gz: df87389a3a4b6e7841915dbf9b5ae999942f2640e70c27d199cc1ded97f1d2d1f9d6df3c400a3c76110176b5cdc55acdb5c73bb97da6b0a6986321e41a8dfb0a
+  metadata.gz: 482ed2034b6a2a09783be9b0aae1ee39ddb70f33cbdf5c60a459e90c6074c93ebf54f419535129f79804a7d524b690028ac308e8edcefc5eccb132032e6920a3
+  data.tar.gz: 1e3b78b78639a4c1c3955cb191f98a8b5e63002c76b274b6fa44b2d2179a76e26f685193f1d23e7dfc1bba6108e46510052e89e10667149eea8611ce36b67320

data/CHANGES.md

@@ -5,10 +5,10 @@
 * Removed class methods `::from_json`, `::from_hash`, `::from_yaml` and `::from_xml`. Please build the instance yourself and use something along `Song.new.from_json`.
 * Inline representers in `Decorator` do *no longer inherit from `self`*. When defining an inline representer, they are always derived from `Representable::Decorator`. The base class can be changed by overriding `Decorator::default_inline_class` in the decorator class that defines an inline representer block.
 If you need to inherit common methods to all inline decorators, include the module using `::feature`: `Representer.feature(BetterProperty)`.
+* You can now define methods in inline representers! The block is now `module_eval`ed and not `instance_exec`ed anymore. Same goes for Decorators, note that you need to `exec_context: :decorator`, though. Here, the block is `class_eval`ed.
 * Removed behaviour for `instance: lambda { |*| nil }` which used to return `binding.get`. Simply do it yourself: `instance: lambda { |fragment, options| options.binding.get }` if you need this behaviour. If you use `:instance` and it returns `nil` it throws a `DeserializeError` now, which is way more understandable than `NoMethodError: undefined method `title=' for {"title"=>"Perpetual"}:Hash`.
 * Remove behaviour for `class: lambda { nil }` which used to return the fragment. This now throws a `DeserializeError`. Do it yourself with class: lambda { |fragment,*| fragment }.
-* Coercion now happens inside `:render_filter` and `:parse_filter` (new!) and doesn't block `:getter` and `:setter` anymore.
-    We require virtus >=1.0 now.
+* Coercion now happens inside `:render_filter` and `:parse_filter` (new!) and doesn't block `:getter` and `:setter` anymore. Also, we require virtus >=1.0 now.
 * `::representation_wrap=` in now properly inherited.
 * Including modules with representable `property .., inherit: true` into a `Decorator` crashed. This works fine now.
 

data/README.md

@@ -405,9 +405,9 @@ class AlbumRepresentation < Representable::Decorator
 end
 ```
 
-### Helpers In Decorators
+### Methods In Modules
 
-In module representers you can add methods for properties.
+You can define methods in representers in case they aren't defined on the represented object.
 
 ```ruby
 module SongRepresenter
@@ -418,7 +418,23 @@ module SongRepresenter
   end
 ```
 
-That works as the method is mixed into the represented object. When adding a helper method to a decorator, representable will still invoke accessors on the represented instance - unless you tell it the scope.
+That works as the method is mixed into the represented object.
+
+Note that this also goes for inline representers.
+
+```ruby
+  property :song do
+    property :title
+
+    def title
+      "Static titles are better"
+    end
+  end
+```
+
+### Methods In Decorators
+
+When adding a method to a decorator, representable will still invoke accessors on the represented instance - unless you tell it the scope.
 
 ```ruby
 class SongRepresenter < Representable::Decorator

data/lib/representable/coercion.rb

@@ -3,10 +3,14 @@ require "virtus"
 module Representable
   module Coercion
     class Coercer
+      def initialize(type)
+        @type = type
+      end
+
       # This gets called when the :render_filter or :parse_filter option is evaluated.
       # Usually the Coercer instance is an element in a Pipeline to allow >1 filters per property.
       def call(value, doc, options)
-        Virtus::Attribute.build(options.binding[:type]).coerce(value)
+        Virtus::Attribute.build(@type).coerce(value)
       end
     end
 
@@ -23,9 +27,7 @@ module Representable
       def build_definition(name, options, &block) # Representable::Declarative
         return super unless type = options[:type]
 
-        options[:pass_options]  = true # TODO: remove, standard.
-
-        options[:render_filter] << coercer = Coercer.new
+        options[:render_filter] << coercer = Coercer.new(type)
         options[:parse_filter]  << coercer
 
         super

data/lib/representable/declarative.rb

@@ -44,7 +44,7 @@ module Representable
         feature *features # Representable::JSON or similar.
         include base if base # base when :inherit, or in decorator.
 
-        instance_exec &block
+        module_eval &block
       end
     end
 

data/lib/representable/decorator.rb

@@ -51,7 +51,7 @@ module Representable
       Class.new(base || default_inline_class).tap do |decorator|
         decorator.class_eval do # Ruby 1.8.7 wouldn't properly execute the block passed to Class.new!
           feature *features
-          instance_exec &block
+          class_eval &block
         end
       end
     end

data/lib/representable/version.rb

@@ -1,3 +1,3 @@
 module Representable
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/test/inline_test.rb

@@ -226,4 +226,47 @@ class InlineTest < MiniTest::Spec
       must_equal({"song"=>{"artist"=>"Strung Out", "title"=>"The Fever And The Sound"}})
     end
   end
+
+
+  # define method in inline representer
+  describe "define method in inline representer" do
+    Mod = Module.new do
+      include Representable::Hash
+
+      def song
+        "Object.new"
+      end
+
+      property :song do
+        property :duration
+
+        def duration
+          "6:53"
+        end
+      end
+    end
+
+    it { Object.new.extend(Mod).to_hash.must_equal("song"=>{"duration"=>"6:53"}) }
+  end
+
+  # define method inline with Decorator
+  describe "define method inline with Decorator" do
+    dec = Class.new(Representable::Decorator) do
+      include Representable::Hash
+
+      def song
+        "Object.new"
+      end
+
+      property :song, :exec_context => :decorator do
+        property :duration, :exec_context => :decorator
+
+        def duration
+          "6:53"
+        end
+      end
+    end
+
+    it { dec.new(Object.new).to_hash.must_equal("song"=>{"duration"=>"6:53"}) }
+  end
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: representable
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: rake
   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: test_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   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: virtus
   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: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.7
 description: Renders and parses JSON/XML/YAML documents from and to Ruby objects.
@@ -158,8 +158,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -250,12 +250,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
@@ -265,4 +265,46 @@ signing_key:
 specification_version: 4
 summary: Renders and parses JSON/XML/YAML documents from and to Ruby objects. Includes
   plain properties, collections, nesting, coercion and more.
-test_files: []
+test_files:
+- test/as_test.rb
+- test/class_test.rb
+- test/coercion_test.rb
+- test/config/inherit_test.rb
+- test/config_test.rb
+- test/decorator_scope_test.rb
+- test/decorator_test.rb
+- test/definition_test.rb
+- test/example.rb
+- test/exec_context_test.rb
+- test/features_test.rb
+- test/filter_test.rb
+- test/for_collection_test.rb
+- test/generic_test.rb
+- test/getter_setter_test.rb
+- test/hash_bindings_test.rb
+- test/hash_test.rb
+- test/if_test.rb
+- test/inherit_test.rb
+- test/inheritable_test.rb
+- test/inline_test.rb
+- test/instance_test.rb
+- test/is_representable_test.rb
+- test/json_test.rb
+- test/lonely_test.rb
+- test/mongoid_test.rb
+- test/nested_test.rb
+- test/parse_strategy_test.rb
+- test/pass_options_test.rb
+- test/prepare_test.rb
+- test/reader_writer_test.rb
+- test/represent_test.rb
+- test/representable_test.rb
+- test/schema_test.rb
+- test/serialize_deserialize_test.rb
+- test/stringify_hash_test.rb
+- test/test_helper.rb
+- test/test_helper_test.rb
+- test/wrap_test.rb
+- test/xml_bindings_test.rb
+- test/xml_test.rb
+- test/yaml_test.rb