lazy_record 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86fc7c8a4fc3d5cb68c30d8967dccc32e41a300a
-  data.tar.gz: 4a3d473eef29dda64e62689394103992a46a1750
+  metadata.gz: 6e001b11d0607098306b11994a55436e0f1ee6a9
+  data.tar.gz: a38d5dc0d58a33665aaea2b3bedd7c7b22018f8a
 SHA512:
-  metadata.gz: 2192b9b391256c80b27c2bbc0e8dabe0f617793c8ad502d092c8e88f8fcd75dabbab0313c442386469c4378cead5509b4bb9b4c62b7e09a2b341792b975ebc87
-  data.tar.gz: 121c6dc8b06a5a11b7c6bc8895e380156d332c98385ddc0c8685041ed3d2c60e43f9de807ff2fadc6b6befd95e38408497665102fc2f893e46862fe97a4880ed
+  metadata.gz: aeadbadcb0ffe05bd58a86996734aebfe9f9e0cccdc89e428874857e1d2b51e83c3e9de4813956e69ae8886ca9bdb95427b87f5a9a3683f8dde8366f43e8cf23
+  data.tar.gz: 262e1db0468746deb5c76300f5297159cca1aeea6e98b54d0e6a680e155ef6a49b768835a770e71fe2296d1059c4c62909210fa086af59e21e4ddae299a92577

data/README.md

@@ -29,7 +29,7 @@ end
 
 thing = Thing.new { |t| puts t.class.superclass }
 # LazyRecord::Base
-# => #<Thing id: 1>
+# => #<Thing>
 ```
 
 Alternatively, if you want to inherit from another class, you can mix in the `LazyRecord::BaseModule` and get all the same results.
@@ -41,7 +41,7 @@ end
 
 thing = Thing.new { |t| puts t.class.superclass }
 # Object
-# => #<Thing id: 1>
+# => #<Thing>
 ```
 Every LazyRecord object is assigned an auto-incrementing ID after initialization. IDs reset when the program is terminated.
 
@@ -60,7 +60,7 @@ end
 thing = Thing.new stuff: 'stuff' do |t|
   t.junk = 'junk'
 end
-# => #<Thing id: 1, stuff: "stuff", junk: "junk", hmm: nil>
+# => #<Thing stuff: "stuff", junk: "junk", hmm: nil>
 thing.something
 # => "something"
 ```
@@ -95,7 +95,7 @@ end
 thing = Thing.new junk: 'junk'
 ArgumentError
 stuff must be given
-#<Thing id: nil, stuff: nil, junk: "junk">
+#<Thing stuff: nil, junk: "junk">
 # => false
 ```
 Use `lr_has_many` to set up associated collections of another class. `lr_belongs_to` will be added in a future update.
@@ -111,16 +111,16 @@ class Thing < LazyRecord::Base
 end
 
 whatever = Whatever.new
-# => #<Whatever id: 1>
+# => #<Whatever>
 
 thing = Thing.new do |t|
   t.stuff = 'stuff'
   t.whatevers << whatever
 end
-# => #<Thing id: 1, stuff: "stuff", junk: nil>
+# => #<Thing stuff: "stuff", junk: nil>
 
 thing.whatevers
-# => #<WhateverRelation [#<Whatever id: 1>]>
+# => #<WhateverRelation [#<Whatever>]>
 ```
 
 Use `lr_scope` and `#where` to create class scope methods and query objects. Works just like ActiveRecord scopes, including scope chaining. Only since it is all Ruby and no SQL, use `==` as the comparison operator.
@@ -146,39 +146,39 @@ thing = Thing.new do |t|
   t.stuff = 'stuff'
   t.whatevers = Whatever.all
 end
-# => #<Thing id: 1, stuff: "stuff", junk: nil>
+# => #<Thing stuff: "stuff", junk: nil>
 
 thing.whatevers.big_party
-# => #<WhateverRelation [#<Whatever id: 1, party_value: 12, sleepy_value: 12>, #<Whatever id: 2, party_value: 13, sleepy_value: 3>]>
+# => #<WhateverRelation [#<Whatever party_value: 12, sleepy_value: 12>, #<Whatever party_value: 13, sleepy_value: 3>]>
 
 thing.whatevers.low_sleepy
-# => #<WhateverRelation [#<Whatever id: 2, party_value: 13, sleepy_value: 3>, #<Whatever id: 4, party_value: 3, sleepy_value: 5>]>
+# => #<WhateverRelation [#<Whatever party_value: 13, sleepy_value: 3>, #<Whatever party_value: 3, sleepy_value: 5>]>
 
 thing.whatevers.big_party.low_sleepy
-# => #<WhateverRelation [#<Whatever id: 2, party_value: 13, sleepy_value: 3>]>
+# => #<WhateverRelation [#<Whatever party_value: 13, sleepy_value: 3>]>
 
 Whatever.low_sleepy
-# => #<WhateverRelation [#<Whatever id: 2, party_value: 13, sleepy_value: 3>, #<Whatever id: 4, party_value: 3, sleepy_value: 5>]>
+# => #<WhateverRelation [#<Whatever party_value: 13, sleepy_value: 3>, #<Whatever id: 4, party_value: 3, sleepy_value: 5>]>
 
-Whatever.where('id == 1')
-# => #<WhateverRelation [#<Whatever id: 1, party_value: 12, sleepy_value: 12>
+Whatever.where('party_value == 12')
+# => #<WhateverRelation [#<Whatever party_value: 12, sleepy_value: 12>
 ```
 You can also use hash syntax and block syntax with `.where`. Block syntax will yield each object in the collection to the block for evaluation.
 ```ruby
 Whatever.where { |w| w.sleepy_value > 5 }
-# => #<WhateverRelation [#<Whatever id: 1, party_value: 12, sleepy_value: 12>, #<Whatever id: 3, party_value: 4, sleepy_value: 11>]>
+# => #<WhateverRelation [#<Whatever party_value: 12, sleepy_value: 12>, #<Whatever id: 3, party_value: 4, sleepy_value: 11>]>
 Whatever.where { |w| w.sleepy_value == w.party_value }
-# => #<WhateverRelation [#<Whatever id: 1, party_value: 12, sleepy_value: 12>]>
+# => #<WhateverRelation [#<Whatever party_value: 12, sleepy_value: 12>]>
 ```
-When using hash syntax can be a value, an expression, or a Proc object.
+When using hash syntax the value can be an object, an expression, or a Proc.
 ```ruby
 Whatever.where party_value: 12
-# => #<WhateverRelation [#<Whatever id: 1, party_value: 12, sleepy_value: 12>]>
+# => #<WhateverRelation [#<Whatever party_value: 12, sleepy_value: 12>]>
 Whatever.where party_value: 7 + 6, sleepy_value: 3
-# => #<WhateverRelation [#<Whatever id: 2, party_value: 13, sleepy_value: 3>]>
+# => #<WhateverRelation [#<Whatever party_value: 13, sleepy_value: 3>]>
 num = 6
 Whatever.where party_value: -> { num * 2 }
-# => #<WhateverRelation [#<Whatever id: 1, party_value: 12, sleepy_value: 12>]>
+# => #<WhateverRelation [#<Whatever party_value: 12, sleepy_value: 12>]>
 ```
 Use `lr_method` for an alternative API for defining short instance methods. Can use lambda syntax or string syntax. Best for quick one-liners. If the method references `self` of the instance, either explicitly or implicitly, it needs to use the string syntax, since anything passed into the lambda will be evaluated in the context of the Class level scope.
 
@@ -203,10 +203,10 @@ thing.speak "I'm a thing"
 # => nil
 
 thing.add_whatever(true)
-# => [#<Whatever id: 1, party_value: nil, sleepy_value: nil, right: true>]
+# => [#<Whatever party_value: nil, sleepy_value: nil, right: true>]
 
 thing.whatevers
-# => #<WhateverRelation [#<Whatever id: 1, party_value: nil, sleepy_value: nil, right: true>]>
+# => #<WhateverRelation [#<Whatever party_value: nil, sleepy_value: nil, right: true>]>
 ```
 
 ## Development

data/lib/lazy_record/base_module.rb

@@ -18,8 +18,6 @@ module LazyRecord
       base.extend DynamicModules
     end
 
-    attr_writer :id
-
     # Use options hash to set attributes, and/or operate on object in a block.
     # Checks each options key for a matching attribute setter method.
     def initialize(opts = {})
@@ -46,20 +44,19 @@ module LazyRecord
     end
 
     def inspect
-      format('#<%s id: %s%s%s%s>',
+      format('#<%s%s>',
              self.class,
-             display_id_even_if_nil,
-             public_attr_readers_to_s.dup.unshift('').join(', '),
-             associations_to_s.unshift('').join(', '),
-             collection_counts_to_s.unshift('').join(', '))
-    end
-
-    def display_id_even_if_nil
-      id ? id.to_s : 'nil'
+             displayable_attributes.join(', '))
     end
 
-    def id
-      @id.freeze
+    def displayable_attributes
+      attributes = [
+        public_attr_readers_to_s.dup,
+        associations_to_s.dup,
+        collection_counts_to_s.dup
+      ].flatten
+      return attributes if attributes.empty?
+      attributes.unshift(' ' + attributes.shift)
     end
 
     def stringify_value(value)
@@ -72,9 +69,7 @@ module LazyRecord
       end
     end
 
-    private :id=,
-            :display_id_even_if_nil,
-            :stringify_value,
+    private :stringify_value,
             :public_attr_readers_to_s,
             :collection_counts_to_s
 

data/lib/lazy_record/callbacks.rb

@@ -11,17 +11,7 @@ module LazyRecord
       if instance.respond_to?(:validation)
         instance = instance.validation(*@validations)
       end
-      add_id(instance)
+      instance.tap { |inst| all << inst if inst }
     end
-
-    def add_id(instance)
-      if instance
-        all << instance
-        instance.send(:id=, count)
-      end
-      instance
-    end
-
-    private :add_id
   end
 end

data/lib/lazy_record/collections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lazy_record/nesting'
 
 module LazyRecord
@@ -88,4 +90,4 @@ module LazyRecord
       end
     end
   end
-end
+end

data/lib/lazy_record/nesting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LazyRecord
   # Apply the same namespace nesting as self to another object.
   module Nesting
@@ -5,4 +7,4 @@ module LazyRecord
       "#{to_s.split('::')[0..-3].join('::')}::#{class_name}"
     end
   end
-end
+end

data/lib/lazy_record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazy_record
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - M. Simon Borg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport