lazy_record 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fcd565fc270b0c3ecb5278894e3f6eb1c3287d4
-  data.tar.gz: b647814ace73eda6f34300868e852cdbe5eb6724
+  metadata.gz: 98460eb0778d6a59b63f876bb77db1eb5459b050
+  data.tar.gz: de124a0a25a87792a7d8b993a39d3b9c193d35e8
 SHA512:
-  metadata.gz: 0ccfaad3e66cd2c7c516f1a791d12dd0d5fab7c5ff0dd5b9c5f1ed01bd09ecde2c584aa78ed1a47e76421fd4a682a55d4c19ca70cab25dc1efe7c5612e80db09
-  data.tar.gz: cc8e35116bb835526f000f498e71f79e3d7a3d6d3101b0d9921cf5a789c1020f4b0bdf38f39b8e7395ef39f30afcd541360d814b6a0f6f059929d2b783c29d39
+  metadata.gz: 51f6e7ca2e8bbd54aa2b7a2526a85aa28b1cd6fa64fe1595f0a70cf9453ec2b85edef0d30c4cf39af0d50e5e1af36a720b4eacc3ddbc0a7b5ff38c216e53f832
+  data.tar.gz: bb8d95aa73395c01ead3ad6285e3c86f9ef416e5b84fd77c4166e8a78f1a082daddf6b7d699929d267ef00cf99a3bd17d0f4406702ad00abd5f086804388b454

data/example/dog.rb

@@ -4,7 +4,7 @@ class Dog < LazyRecord::Base
   lr_attr_accessor :name, :breed, :weight
   lr_has_many :friends
 
-  def initialize(opts = {}, &block)
+  def initialize(opts = {})
     super
     friends << Friend.new(opts) if opts[:friend] == true
     self.name = name + 'y' if opts[:cute] == true

data/example/person.rb

@@ -19,16 +19,16 @@ class Person < LazyRecord::Base
 
   lr_validates :name, :age, presence: true
 
-  def self.new(opts = {}, &block)
+  def self.new(opts = {})
     puts 'hi'
-    super opts, &block
+    super
   end
 
-  def self.make_people(*args, &block)
+  def self.make_people(*args)
     opts = args.extract_options!
 
     people = args.map do |arg|
-      Person.new { |p| p.name = arg }
+      Person.new { |p| p.name = arg; p.age = 30 }
     end
 
     if opts[:count] == true
@@ -43,16 +43,16 @@ class Person < LazyRecord::Base
       end
     end
 
-    people.each { |person| block.call(person) } if block
+    people.each { |person| yield person } if block_given?
 
     people
   end
 
-  def times(num, &block)
-    if block
+  def times(num)
+    if block_given?
       i = 0
       while i < num
-        block.call
+        yield
         i += 1
       end
       i
@@ -61,9 +61,9 @@ class Person < LazyRecord::Base
     end
   end
 
-  def adopt_a_dog(opts = {}, &block)
+  def adopt_a_dog(opts = {})
     dog = Dog.new(opts)
-    block.call(dog) if block
+    yield dog if block_given?
     self.dogs << dog
     dog
   end

data/lib/lazy_record/attributes.rb

@@ -19,17 +19,6 @@ module LazyRecord
       end
     end
 
-    def define_initialize
-      define_method(:initialize) do |opts = {}, &block|
-        opts.each do |k, v|
-          send("#{k}=", v) if respond_to?("#{k}=")
-        end
-
-        block&.call self
-        self
-      end
-    end
-
     def define_instance_attrs_to_s
       define_method(:instance_attrs_to_s) do
         instance_attr_accessors.map do |attr|
@@ -53,7 +42,6 @@ module LazyRecord
       mod.module_eval do
         names.each { |name| define_setters_and_getters(name) }
         define_instance_attr_accessors(*names)
-        define_initialize
         define_instance_attrs_to_s
       end
     end

data/lib/lazy_record/base_module.rb

@@ -19,7 +19,10 @@ module LazyRecord
 
     attr_writer :id
 
-    def initialize(_opts = {})
+    def initialize(opts = {})
+      opts.each do |k, v|
+        send("#{k}=", v) if respond_to?("#{k}=")
+      end
       yield self if block_given?
     end
 

data/lib/lazy_record/callbacks.rb

@@ -5,9 +5,9 @@ require 'lazy_record/dynamic_modules'
 module LazyRecord
   # After #initialize callbacks for validations and setting object id.
   module Callbacks
-    def new(opts = {}, &block)
+    def new(opts = {})
       @all ||= Relation.new(model: self)
-      instance = super(opts, &block)
+      instance = super(opts)
       if instance.respond_to?(:validation)
         instance = instance.validation(*@validations)
       end

data/lib/lazy_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LazyRecord
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_record
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - M. Simon Borg