disposable 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a74d3e306a9301f6e9ab4b6aea20395df6eae38
-  data.tar.gz: a24e79ec0ade0a96579b0a25f520deea856e4e02
+  metadata.gz: f5456dc9441dfd2abd73248171b431ebc61aa999
+  data.tar.gz: 1dddb07f693e9d894387ee25d9127b15d4ceadcb
 SHA512:
-  metadata.gz: f83c3a2ae0a3a85a5114afe05dec55ca9ceab8949b5472c3eb5324951f84a6251617b34611ecf185d9153bc954e216f415d48881e72b6ec0a69b8240f906fe09
-  data.tar.gz: 0bba9cf7c8603f36a0c2e005215fbd66a0b2ed833002eba606df4bcd94292c421540e8f7d3c581f92ba08e72dbc0e854d47bf5b8a75cceab62aecd7abca903dc
+  metadata.gz: 362fd4826566616d0c8f1129b5898f27a1f7c342e4472843ea406fdcd9dc0782d2188e2e5bf228bc225b6607f2cefbfc4619fe61f7edfaf2616ebc84bb635721
+  data.tar.gz: 287ed98cc543a4cee24aafa03ffc7c372fc1cb7e904c11618d8b7caa5afda2839960645db873a32edfce2d035fc23e92618f66a4e1c5bbbdb8e5c13e995532b4

data/.travis.yml

@@ -1,9 +1,13 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.0 # why?
+  - 2.4.0
+  - 2.3.0
   - 2.2
   - 2.1
-  - 2.0
+  # - 2.0
 gemfile:
   - Gemfile
+matrix:
+  allow_failures:
+    - rvm: 2.4.0

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.4.2
+
+* `Twin#schema` doesn't `extend` at runtime anymore but uses a decorator for `each`.
+* `PropertyProcessor` now yields `(twin, index)` if its working on a collection.
+
 # 0.4.1
 
 * Allow `false` as a `:default` value.

data/lib/disposable/twin.rb

@@ -22,7 +22,7 @@ module Disposable
     end
 
     def schema
-      self.class.definitions.extend(DefinitionsEach)
+      Definition::Each.new(self.class.definitions) # TODO: change this interface.
     end
 
     class << self

data/lib/disposable/twin/definitions.rb

@@ -7,22 +7,25 @@ class Disposable::Twin
     def setter
       "#{self[:name]}="
     end
-  end
-
-  module DefinitionsEach
-    def each(options={})
-      return self unless block_given?
 
-      super() do |dfn|
+    # :private:
+    Filter = ->(definitions, options) do
+      definitions.collect do |dfn|
         next if options[:exclude]    and options[:exclude].include?(dfn[:name])
         next if options[:scalar]     and dfn[:collection]
         next if options[:collection] and ! dfn[:collection]
         next if options[:twin]       and ! dfn[:nested]
+        dfn
+      end.compact
+    end
 
-        yield dfn
-      end
+    require "delegate"
+    class Each < SimpleDelegator
+      def each(options={})
+        return __getobj__ unless block_given?
 
-      self
+        Definition::Filter.(__getobj__, options).each { |dfn| yield dfn }
+      end
     end
   end
-end
+end

data/lib/disposable/twin/property_processor.rb

@@ -3,9 +3,10 @@
 #
 # For a scalar property, this will be run once and yield the property's value.
 # For a collection, this is run per item and yields the item.
+#:private:
 class Disposable::Twin::PropertyProcessor
   def initialize(definition, twin, value=nil)
-    value ||= twin.send(definition.getter)
+    value     ||= twin.send(definition.getter) # DISCUSS: should we decouple definition and value, here?
     @definition = definition
     @value      = value
   end
@@ -20,12 +21,11 @@ class Disposable::Twin::PropertyProcessor
 
 private
   def collection!
-    # FIXME: the nil collection is not tested, yet!
-    (@value || []).collect { |nested_twin| yield(nested_twin) }
+    (@value || []).each_with_index.collect { |nested_twin, i| yield(nested_twin, i) }
   end
 
   def property!
     twin = @value or return nil
-    nested_model = yield(twin)
+    yield(twin)
   end
-end
+end

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/twin/coercion_test.rb

@@ -176,8 +176,8 @@ class CoercionTypingTest < MiniTest::Spec
     twin.title = "Yo"
     twin.title.must_equal "Yo"
 
-    twin.enabled = " TRUE"
-    twin.enabled.must_equal true
+    # twin.enabled = " TRUE"
+    # twin.enabled.must_equal true
   end
 end
 

data/test/twin/property_processor_test.rb

@@ -0,0 +1,45 @@
+require "test_helper"
+
+class PropertyProcessorTest < Minitest::Spec
+	Album  = Struct.new(:title, :artist, :songs)
+	Artist = Struct.new(:name)
+	Song   = Struct.new(:id)
+
+ 	class AlbumTwin < Disposable::Twin
+    property :title
+
+    property :artist do
+      property :name
+    end
+
+    collection :songs do
+    	property :id
+    end
+  end
+
+  describe "collection" do
+  	let(:twin) { AlbumTwin.new(Album.new("Live!", Artist.new, [Song.new(1), Song.new(2)])) }
+  	it "yields twin, index" do
+	    called = []
+	    Disposable::Twin::PropertyProcessor.new(twin.class.definitions.get(:songs), twin).() { |v, i| called << [v.model, i] }
+
+	    called.inspect.must_equal %{[[#<struct PropertyProcessorTest::Song id=1>, 0], [#<struct PropertyProcessorTest::Song id=2>, 1]]}
+  	end
+
+  	it "yields twin" do
+	    called = []
+	    Disposable::Twin::PropertyProcessor.new(twin.class.definitions.get(:songs), twin).() { |v| called << [v.model] }
+
+	    called.inspect.must_equal %{[[#<struct PropertyProcessorTest::Song id=1>], [#<struct PropertyProcessorTest::Song id=2>]]}
+  	end
+
+  	it "allows nil collection" do
+  		twin   = AlbumTwin.new(Album.new("Live!", Artist.new, nil))
+	    
+	    called = []
+	    Disposable::Twin::PropertyProcessor.new(twin.class.definitions.get(:songs), twin).() { |v, i| called << [v.model, i] }
+
+	    called.inspect.must_equal %{[]}
+  	end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -246,6 +246,7 @@ files:
 - test/twin/option_test.rb
 - test/twin/parent_test.rb
 - test/twin/process_inline_test.rb
+- test/twin/property_processor_test.rb
 - test/twin/readable_test.rb
 - test/twin/save_test.rb
 - test/twin/setup_test.rb
@@ -277,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Decorators on top of your ORM layer with change tracking, collection semantics
@@ -309,6 +310,7 @@ test_files:
 - test/twin/option_test.rb
 - test/twin/parent_test.rb
 - test/twin/process_inline_test.rb
+- test/twin/property_processor_test.rb
 - test/twin/readable_test.rb
 - test/twin/save_test.rb
 - test/twin/setup_test.rb