disposable 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759a5958374916be8a4af8610667ea30520d6b58
-  data.tar.gz: 894eaed202b55b5498b07cfd1861a459452c370a
+  metadata.gz: 671f773f835c6eba43f53ee846d24f4ac5b72d2b
+  data.tar.gz: 0742d9831fb0bcd7d5e66e7352f829d787250cb2
 SHA512:
-  metadata.gz: 72ee2805890c1af032667f713861eb10d8b5edd3066b02faffb2d55c1b1fdd69e3c2a8477691151b9532e7709a5fff2937421022acc23ec727ff2cb205631c9a
-  data.tar.gz: 090d0c2fa08690c152b80055d3e5449c7adee5e58703ed1b94cfe242838b0941031e1919aac56a06b472a5b6e71794e15c760f99412495252c4791c6719bdb5e
+  metadata.gz: fd89e067485d519c4cdd4ce66a3e02c6850bd78950c0854b11bdfa687d4847575cefad700b8a819fbd526279b3261c8e7c969124d43c31eb4d2d5e41c2e1aa9f
+  data.tar.gz: a1ebbb97af16dc427b484eaa311f47f0a4168cbfc27b77800f69384f4eae71124d6bf8b07829739efeb59352f76e3e07f8eef8a17b75b2818a474b273cda770e

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.2.6
+
+* Manual accessors are no longer overridden when inheriting twin classes.
+* The `:from` option is no longer ignored when inheriting.
+
 # 0.2.5
 
 * Fix loading order, you may now `require "disposable/twin"` without any further requires.

data/Gemfile

@@ -6,4 +6,4 @@ gem "representable", "2.4.0"
 # gem "representable", github: "apotonick/representable"
 # gem "declarative", path: "../declarative"
 # gem "declarative", github: "apotonick/declarative"
-gem "minitest-line"
+gem "minitest-line"

data/README.md

@@ -2,6 +2,12 @@
 
 _Decorators on top of your ORM layer._
 
+[![Gitter Chat](https://badges.gitter.im/trailblazer/chat.svg)](https://gitter.im/trailblazer/chat)
+[![TRB Newsletter](https://img.shields.io/badge/TRB-newsletter-lightgrey.svg)](http://trailblazer.to/newsletter/)
+[![Build
+Status](https://travis-ci.org/apotonick/disposable.svg)](https://travis-ci.org/apotonick/disposable)
+[![Gem Version](https://badge.fury.io/rb/disposable.svg)](http://badge.fury.io/rb/disposable)
+
 ## Introduction
 
 Disposable is the missing API of ActiveRecord*. The mission:

data/disposable.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "uber"
-  spec.add_dependency "declarative", "~> 0.0.4"
+  spec.add_dependency "declarative", "~> 0.0.6"
   spec.add_dependency "representable", ">= 2.4.0", "<= 3.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/disposable/twin.rb

@@ -14,6 +14,13 @@ module Disposable
       Definition
     end
 
+    def self.inherited(subclass)
+      # no super here!
+      heritage.(subclass) do |cfg|
+        cfg[:args].last.merge!(_inherited: true) if cfg[:method] == :property
+      end
+    end
+
     def schema
       self.class.definitions.extend(DefinitionsEach)
     end
@@ -25,7 +32,8 @@ module Disposable
 
       # TODO: move to Declarative, as in Representable and Reform.
       def property(name, options={}, &block)
-        options[:private_name] = options.delete(:from) || name
+        options[:private_name] ||= options.delete(:from) || name
+        is_inherited = options.delete(:_inherited)
 
         if options.delete(:virtual)
           options[:writeable] = options[:readable] = false
@@ -33,8 +41,8 @@ module Disposable
 
         options[:nested] = options.delete(:twin) if options[:twin]
 
-        super(name, options, &block).tap do |definition|
-          create_accessors(name, definition)
+        super(name, options, &block).tap do |definition| # super is Declarative::Schema::property.
+          create_accessors(name, definition) unless is_inherited
         end
       end
 

data/lib/disposable/twin/composition.rb

@@ -54,4 +54,4 @@ module Disposable
       end
     end
   end
-end
+end

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/twin/inherit_test.rb

@@ -54,4 +54,32 @@ class InheritTest < MiniTest::Spec
 
   # inherit inline twins when overriding.
   it { Twin::Compilation.new(album).artist.artist_id.must_equal 1 }
-end
+
+  describe "custom accessors get inherited" do
+    class Singer < Disposable::Twin
+      property :name
+
+      def name
+        super.reverse
+      end
+
+      def name=(val)
+        super(val.downcase)
+      end
+    end
+
+    class Star < Singer
+    end
+
+    let (:model) { Model::Artist.new("Helloween") }
+
+    it do
+      artist = Star.new(model)
+      artist.name.must_equal("neewolleh")
+
+      artist.name = "HELLOWEEN"
+      # artist.with_custom_setter = "this gets ignored"
+      artist.name.must_equal("neewolleh")
+    end
+  end
+end

data/test/twin/inheritance_test.rb

@@ -0,0 +1,73 @@
+require "test_helper"
+
+class InheritanceTest < Minitest::Spec
+  let (:song) { OpenStruct.new(id: 0) }
+
+  module Id
+    def id
+      super - 1
+    end
+
+    def id=(v)
+      super(v+1)
+    end
+  end
+
+  class Twin < Disposable::Twin
+    property :id
+    include Id
+  end
+
+  it do
+    twin = Twin.new(song)
+    twin.id.must_equal 0
+  end
+
+  class TwinComposition < Disposable::Twin
+    include Composition
+
+    property :id, on: :song
+    include Id
+  end
+
+  it do
+    twin = TwinComposition.new(song: song)
+    twin.id.must_equal 0
+    twin.id= 3
+    twin.id.must_equal 3
+  end
+
+
+  class TwinCompositionDefineMethod < Disposable::Twin
+    include Composition
+
+    property :id, on: :song
+
+    define_method :id do
+      super() + 9
+    end
+  end
+
+  it do
+    twin = TwinCompositionDefineMethod.new(song: song)
+    twin.id.must_equal 9
+  end
+
+
+  describe ":from" do
+    let (:song) { Struct.new(:ident).new(1) }
+
+    class TwinWithFrom < Disposable::Twin
+      include Expose
+      property :id, from: :ident
+    end
+
+    class InheritingFrom < TwinWithFrom
+    end
+
+    it do
+      TwinWithFrom.new(song).id.must_equal 1
+      InheritingFrom.new(song).id.must_equal 1
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,7 @@ files:
 - test/twin/from_collection_test.rb
 - test/twin/from_test.rb
 - test/twin/inherit_test.rb
+- test/twin/inheritance_test.rb
 - test/twin/option_test.rb
 - test/twin/parent_test.rb
 - test/twin/process_inline_test.rb
@@ -264,6 +265,7 @@ test_files:
 - test/twin/from_collection_test.rb
 - test/twin/from_test.rb
 - test/twin/inherit_test.rb
+- test/twin/inheritance_test.rb
 - test/twin/option_test.rb
 - test/twin/parent_test.rb
 - test/twin/process_inline_test.rb