disposable 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53b71c61f518f6c2e11210f479cd37258c8bf1d8
-  data.tar.gz: 6527a70e2a954f8c490818a08c4fc2a1657f43d6
+  metadata.gz: be7cc7255ab188ade93c3a41b34fe3d3e7d3fcea
+  data.tar.gz: 392c14ff2c4a94645c1eac6367e4d22cb93e7350
 SHA512:
-  metadata.gz: f768a7a5e0ba34502a34e40f0a13db3c81af668ffb743afbf8fe9ad2dfdec8d72d8faa5950e2b7bca742a9a4fa2e00922954b2a9ebedfdb3994e366762328d84
-  data.tar.gz: b8efbe750912d51d9ef2ede971e4282db397fd4c3b82394d6257d23eed25f3c854f82b796ff3da8b3ad33442d7e54b23b3a68debdccfb5c3acbf174989ec58e0
+  metadata.gz: 00f77a8ce79c13ca5a55a4ca96d657b99c829d0f6f91d34f81c452d13c4a0fcf2306ca28e55bfb5390f74a5b52873f1ec49b425146f918923d5d09c80d47a253
+  data.tar.gz: dd590bae941a3fa7e3e1b7ef74899619fef2de23cf2e154d93948873d729c21732f79d040b76d7769baa4940512a675069b23c8efa18103484529ba2f3d7afc2

data/CHANGES.md

@@ -1,3 +1,10 @@
+# 0.1.7
+
+* Removed Setup#merge_options! and hash merge as this is already been done in #setup_properties.
+* Every property now gets set on the twin, even if `readable: false` is set.
+* `:default` and `:virtual` now work together.
+* Introduced `Setup#setup_property!`.
+
 # 0.1.6
 
 * Added `Default`.

data/README.md

@@ -224,6 +224,8 @@ end
 
 Default value is applied when the model's getter returns `nil`.
 
+Note that `:default` also works with `:virtual` and `readable: false`.
+
 
 ## Collections
 

data/lib/disposable/twin/setup.rb

@@ -5,14 +5,12 @@ module Disposable
     # This will result in all twin properties/collection items being twinned, and collections
     # being Collection to expose the desired public API.
     module Setup
-      # test is in incoming hash? is nil on incoming model?
-
       def initialize(model, options={})
         @fields = {}
         @model  = model
         @mapper = mapper_for(model) # mapper for model.
 
-        setup_properties!(model, options)
+        setup_properties!(options)
       end
 
     private
@@ -20,34 +18,34 @@ module Disposable
         model
       end
 
-      def setup_properties!(model, options)
-        schema.each do |dfn|
-          next if dfn[:readable] == false
+      def setup_properties!(options)
+        schema.each { |dfn| setup_property!(dfn, options) }
+      end
 
-          value = setup_value_for(dfn, options)
+      def setup_property!(dfn, options)
+        value =
+          if options.has_key?(name = dfn.name.to_sym)
+            options[dfn.name.to_sym]
+          else
+            setup_value_for(dfn, options)
+          end
 
-          setup_write!(dfn, value)
-        end
+        setup_write!(dfn, value) # note: even readable: false will be written to twin as nil.
+      end
 
-        merge_options!(options) # FIXME: call writer!!!!!!!!!!
-        # from_hash(options) # assigns known properties from options.
+      def setup_value_for(dfn, options) # overridden by Default.
+        return if dfn[:readable] == false
+        read_value_for(dfn, options)
       end
 
-      def setup_value_for(dfn, options)
-        name  = dfn.name
-        options[name.to_sym] || mapper.send(name) # model.title.
+      def read_value_for(dfn, options)
+        mapper.send(dfn.name) # model.title.
       end
 
       def setup_write!(dfn, value)
         send(dfn.setter, value)
       end
 
-      def merge_options!(options)
-        # TODO: ask charliesome if that is faster with return unless options.size.
-        options.each { |k, v| @fields[k.to_s] = v } # TODO: this merges every option, not only defined ones.
-      end
-
-
       # Including this will _not_ use the property's setter in Setup and allow you to override it.
       module SkipSetter
         def setup_write!(dfn, value)

data/lib/disposable/twin/struct.rb

@@ -4,8 +4,8 @@
     #
     #   Twin.new(id: 1)
     module Struct
-      def setup_properties!(model, options={})
-        hash_representer.new(self).from_hash(model.merge(options))
+      def setup_properties!(options={})
+        hash_representer.new(self).from_hash(@model.merge(options))
       end
 
       def hash_representer

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/test/twin/default_test.rb

@@ -34,6 +34,21 @@ class DefaultTest < Minitest::Spec
   end
 end
 
+class DefaultAndVirtualTest < Minitest::Spec
+  class Twin < Disposable::Twin
+    feature Default
+    feature Changed
+
+    property :title, default: "0", virtual: true
+  end
+
+  it do
+    twin = Twin.new(Object.new)
+    twin.title.must_equal "0"
+    # twin.changed.must_equal []
+  end
+end
+
 
 require "disposable/twin/struct"
 class DefaultWithStructTest < Minitest::Spec

data/test/twin/readable_test.rb

@@ -54,4 +54,10 @@ class ReadableTest < MiniTest::Spec
 
     hash.must_equal("password"=> "123", "credit_card"=>{"name"=>"Jonny", "number"=>"456"})
   }
+
+  # allow passing non-readable value as option.
+  it do
+    twin = PasswordForm.new(cred, password: "open sesame!")
+    twin.password.must_equal "open sesame!"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber