mini_object 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d51df89f964c18a9186c9cb8782dd16e2c32100
-  data.tar.gz: fb72060694d07d1def66092a17ee838267dbb7e3
+  metadata.gz: 641197eea3b92f92e1cfccd6622181bbadf32559
+  data.tar.gz: 7aa21aa227c67909a99509b048511cd7b09868f6
 SHA512:
-  metadata.gz: e724032d3ba98db3e6fa2b3826aa883edad0e09e7a9636eb273de543243e5c43e2e0fb0c0f470e412bb21d31c2567e279370ce0975d8f48f5a54ba9cac0549f5
-  data.tar.gz: c2e3267038033ca58ad204a225fd831bdbaa2ccd4a18be9dda98b95bae1876fcca7ebbf7563fefdda7067dde4418fce0b534a05ed0eadd27c8e2f11e9727fdb7
+  metadata.gz: 5f052d7fbc726f3aa84dd495214dd227167525515eb6c95c1482b2b8b11e6d5aec1ec9a7a0b01ca1842b87dca78318af87aef9f14add60e8fe26337b8c6d924a
+  data.tar.gz: 9a084406d0481a2ccc7fbc77679724dadbeeeb96f6cb3a7d37f7ff80b6f3a24a4f9bb8fafe65295be48f15dee2f4b8dfac8edbdbb9200e96f62ae1f9e37aad07

data/.gitignore

@@ -3,3 +3,5 @@ pkg
 Gemfile.lock
 vendor
 .bundle
+.yardoc
+doc

data/README.md

@@ -40,11 +40,24 @@ class UsersRepository
 end
 
 users_repo = UsersRepository.new
+
+# Regular assignment:
+users_repo.store = Redis.new
+
+# Lambda assignment: The given block will be
+# evaluated each time you call users_repo.store
 users_repo.store{ app.stores.redis }
-```
 
-In the example, if `app.stores.persistent` changes, the repository
-will inmediately see the new store.
+# Mass assignent
+users_repo.attributes = store: Redis.new
+
+# Default blocks: Will also be executed each time
+class UsersRepository
+  include Injectable
+  attr_injectable(:store) { Redis.new }
+end
+
+```
 
 
 ## RemarkableInspect

data/lib/mini_object/injectable.rb

@@ -11,66 +11,73 @@ module MiniObject
       klass.extend self
     end
 
-    def self.getsetter_definition_for name
+    def self.getsetter_definition_for name, default_block
       lambda do |value = NULL, &block|
-        if block
-          if value == NULL || value == nil
-            instance_variable_set("@#{name}_proc", block)
-          else
-            send("#{name}=", value)
-          end
-        else
-          if value == NULL
-            p = instance_variable_get("@#{name}_proc") ||
-              self.class.instance_variable_get("@#{name}_default_proc") ||
-              raise("No #{name} defined yet for #{inspect}")
-            p.call
-          else
-            send("#{name}=", value)
-          end
-        end
+      if value == NULL && block == nil
+        get_attribute name, default_block
+      else
+        set_attribute name, value, block
+      end
       end
     end
 
     def self.setter_definition_for name
       lambda do |value|
-        instance_variable_set("@#{name}_proc", lambda{ value })
-        value
+        set_attribute name, value
       end
     end
 
     def cattr_injectable name, &block
-      define_singleton_method name, &Injectable.getsetter_definition_for(name)
+      define_singleton_method name, &Injectable.getsetter_definition_for(name, block)
       define_singleton_method "#{name}=", &Injectable.setter_definition_for(name)
+      define_method name, -> { self.class.name }
       send(name, &block) if block
     end
 
     def attr_injectable name, &block
-      define_method name, &Injectable.getsetter_definition_for(name)
+      define_method name, &Injectable.getsetter_definition_for(name, block)
       define_method "#{name}=", &Injectable.setter_definition_for(name)
       instance_variable_set("@#{name}_default_proc", block) if block
     end
 
-    def let name, &block
-      var_name = :"@#{name}"
-
-      define_singleton_method "#{name}=" do |value|
-        instance_variable_set var_name, value
+    def attributes= attrs
+      attrs.each do |k,v|
+        public_send "#{k}=", v
       end
+    end
 
-      define_singleton_method name do
-        if instance_variable_defined? var_name
-          instance_variable_get var_name
-        else
-          instance_variable_set var_name, block.call(self)
-        end
+    private
+
+    def get_attribute name, default_block
+      if eval "defined? @#{name}"
+        # Get via variable
+        instance_variable_get :"@#{name}"
+      elsif eval "defined? @#{name}_proc"
+        # Get via proc
+        instance_variable_get(:"@#{name}_proc").call
+      elsif default_block
+        default_block.call
+      else
+        raise "Dependency #{name} not defined yet"
       end
     end
 
-    def attributes= attrs
-      attrs.each do |k,v|
-        public_send "#{k}=", v
+    def set_attribute name, value = NULL, block = nil
+      if value == NULL
+        # Set via proc
+        instance_variable_set :"@#{name}_proc", block
+        remove_instance_variable :"@#{name}" if eval "defined? @#{name}"
+      elsif value == nil && block
+        # Set via proc
+        instance_variable_set :"@#{name}_proc", block
+        remove_instance_variable :"@#{name}" if eval "defined? @#{name}"
+      else
+        # Set via variable
+        instance_variable_set :"@#{name}", value
+        remove_instance_variable :"@#{name}_proc" if eval "defined? @#{name}_proc"
       end
+
+      block || value
     end
   end
 end

data/lib/mini_object/version.rb

@@ -1,3 +1,3 @@
 module MiniObject
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/spec/mini_object/injectable_spec.rb

@@ -50,6 +50,15 @@ RSpec.describe 'Injectable' do
 
     subject { subject_class.new }
     it_behaves_like 'having an injectable name'
+
+    it 'allows giving a default' do
+      subject_class.class_eval do
+        a_surname = 'Smith'
+        attr_injectable(:surname) { a_surname }
+      end
+
+      expect(subject.surname).to eq 'Smith'
+    end
   end
 
   context 'cattr_accessor within a class' do
@@ -62,6 +71,11 @@ RSpec.describe 'Injectable' do
 
     subject { subject_class }
     it_behaves_like 'having an injectable name'
+
+    it 'delegates getter to the class' do
+      subject_class.name = 'John'
+      expect(subject_class.new.name).to eq 'John'
+    end
   end
 
   describe '#attributes=' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_object
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Manuel Morales
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwarding_dsl
@@ -76,10 +76,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- ".yardoc/checksums"
-- ".yardoc/object_types"
-- ".yardoc/objects/root.dat"
-- ".yardoc/proxy_types"
 - Gemfile
 - LICENSE.txt
 - README.md

data/.yardoc/checksums

@@ -1,7 +0,0 @@
-lib/lazy.rb 7e4d5fabe9a99f5a2751823cd1ea4e67f446ee2e
-lib/inline.rb df7b92b051d5e5072ad5b486576a801fb3a336a7
-lib/section.rb b05f398196140a836f5e125c20f9988f7a7ef000
-lib/version.rb 2b03a00fee65075ba6f4715792ec212a3b47d654
-lib/resolver.rb c4cf365fd98c2d454e2d11404be070b3d46690f6
-lib/injectable.rb c95a2ea2a7500684d293be0c89196887c72ee68a
-lib/mini_object.rb c4541e47c74f1d904221f2067ad9c0fc0e551ea9