memory_record 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c8dfcb893c88a45a5e788f4e1b190b9dcd9647b9
-  data.tar.gz: 808381a0ccdb75f0600e5e6618b7755c7466c995
+SHA256:
+  metadata.gz: e6a9d0e0253067464bc3fa778dab80bf47b635752094879aa4ad4f1a95ef6773
+  data.tar.gz: 2fd9222c966e16931cff928629e2d7a50237a6c39b7be2266f12eeb8fc80ea87
 SHA512:
-  metadata.gz: d598fd06e27533ce8aadd8531c2b944f592e16e4f9bdeb515af9f593d3a506062e9a0f0d3692f804d11e23fa3eaf8364fd98e3bf89d990831684e4baf9a0a1a5
-  data.tar.gz: 6848273b2c34f2ffb6c9914a135edc278954cd1989a7d54abee1d62ec55aea2be31c8ad1d348ec5d797ecf23bb4ee9227fd70ba6ad5e14eb49d18fa9133da2b3
+  metadata.gz: c02532cc3ad012939336002e2cdad14e7a7afd0ba9684d5c510117454c915b9766dc3305a5c4737f1619e4db4439df9c723e52132f753772f2aa7bc45be9d76c
+  data.tar.gz: 18cd2b7a7378fca5a9a0d511c8789e8ed7c021c21295fb4c21a7f4060bf453db04b7de819b91df66be6d8fafe4ba8d9399a7e0a3a3345f7f5837ef0868caea33

data/README.org

@@ -83,7 +83,7 @@ object.code # => 1
 
 *** =name= method is special?
 
-    If =name= is not defined, it defines a =name= method that returns a translation of =key=
+    If =name= is not defined, it defines a =name= method that returns =key.to_s=
 
 *** =to_s= method is defined?
 

data/examples/0190_super_usable.rb

@@ -17,4 +17,4 @@ class Foo
 end
 
 Foo.first.a                     # => 20
-Foo.first.name                  # => "(Key0)"
+Foo.first.name                  # => "(_key0)"

data/examples/0220_bad_design.rb

@@ -13,5 +13,5 @@ class Foo
   ]
 end
 
-Foo["01"] # => #<Foo:0x007f9db5ac1b10 @attributes={:key=>:"01", :name=>"left", :code=>0}>
-Foo["02"] # => #<Foo:0x007f9db5ac15e8 @attributes={:key=>:"02", :name=>"right", :code=>1}>
+Foo["01"] # => #<Foo:0x00007f9e519ba6d0 @attributes={:key=>:"01", :name=>"left", :code=>0}>
+Foo["02"] # => #<Foo:0x00007f9e519ba568 @attributes={:key=>:"02", :name=>"right", :code=>1}>

data/examples/0240_attr_reader_option.rb

@@ -10,9 +10,9 @@ class C1
   end
 end
 
-C1.first.x rescue $! # => #<NoMethodError: undefined method `x' for #<C1:0x007f93579027d8>>
-C1.first.y rescue $! # => #<NoMethodError: undefined method `y' for #<C1:0x007f93579027d8>>
-C1.first.z rescue $! # => #<NoMethodError: undefined method `z' for #<C1:0x007f93579027d8>>
+C1.first.x rescue $! # => #<NoMethodError: undefined method `x' for #<C1:0x00007f83bc8e7078>>
+C1.first.y rescue $! # => #<NoMethodError: undefined method `y' for #<C1:0x00007f83bc8e7078>>
+C1.first.z rescue $! # => #<NoMethodError: undefined method `z' for #<C1:0x00007f83bc8e7078>>
 
 class C2
   include MemoryRecord
@@ -23,9 +23,9 @@ class C2
   end
 end
 
-C2.first.x rescue $! # => #<NoMethodError: undefined method `x' for #<C2:0x007f93578e2550>>
+C2.first.x rescue $! # => #<NoMethodError: undefined method `x' for #<C2:0x00007f83bc9419d8>>
 C2.first.y rescue $! # => 1
-C2.first.z rescue $! # => #<NoMethodError: undefined method `z' for #<C2:0x007f93578e2550>>
+C2.first.z rescue $! # => #<NoMethodError: undefined method `z' for #<C2:0x00007f83bc9419d8>>
 
 class C3
   include MemoryRecord
@@ -37,5 +37,5 @@ class C3
 end
 
 C3.first.x rescue $! # => 1
-C3.first.y rescue $! # => #<NoMethodError: undefined method `y' for #<C3:0x007f93578c2278>>
+C3.first.y rescue $! # => #<NoMethodError: undefined method `y' for #<C3:0x00007f83bc948968>>
 C3.first.z rescue $! # => 1

data/examples/0250_lookup_super_call.rb

@@ -15,5 +15,5 @@ class C
   end
 end
 
-C.lookup(:alice)                # => #<C:0x007f92c2addf98 @attributes={:key=>:alice, :code=>0}>
-C[:alice]                       # => #<C:0x007f92c2addf98 @attributes={:key=>:alice, :code=>0}>
+C.lookup(:alice)                # => #<C:0x00007ffe599ba4d8 @attributes={:key=>:alice, :code=>0}>
+C[:alice]                       # => #<C:0x00007ffe599ba4d8 @attributes={:key=>:alice, :code=>0}>

data/examples/0270_instance_freeze.rb

@@ -17,6 +17,6 @@ class Foo
   end
 end
 
-v = Foo.first # => #<Foo:0x007fd0c09cfc50 @attributes={:key=>:a, :code=>0}, @var=1>
+v = Foo.first # => #<Foo:0x00007fdc05a532d0 @attributes={:key=>:a, :code=>0}, @var=1>
 v.frozen?     # => true
 v.a           # => 1

data/examples/0280_sortable.rb

@@ -0,0 +1,22 @@
+$LOAD_PATH.unshift '../lib'
+require 'memory_record'
+
+class A
+  include MemoryRecord
+  memory_record [
+    {key: :a},
+    {key: :b},
+  ]
+end
+
+[A[:b], A[:a]].sort.collect(&:key) # => [:a, :b]
+
+class B
+  include MemoryRecord
+  memory_record [
+    {key: :a},
+  ]
+end
+
+# class different
+[A[:a], B[:a]].sort.collect(&:key) rescue $! # => #<ArgumentError: comparison of A with B failed>

data/examples/0290_eql_behavior.rb

@@ -0,0 +1,21 @@
+$LOAD_PATH.unshift '../lib'
+require 'memory_record'
+
+class C
+  include MemoryRecord
+  memory_record [
+    {key: :a},
+  ]
+  def foo
+    @foo ||= Object.new
+  end
+end
+
+a = C[:a]
+b = C[:a]
+
+a.eql?(b)                       # => true
+b.foo
+a.eql?(b)                       # => true
+
+[a, b] - [a]                    # => []

data/lib/memory_record/memory_record.rb

@@ -3,7 +3,8 @@ require 'active_support/concern'
 require 'active_support/core_ext/module/concerning'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/array/wrap'
-require 'active_model'
+require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/module/delegation'
 
 module MemoryRecord
   extend ActiveSupport::Concern
@@ -32,7 +33,6 @@ module MemoryRecord
         records = block.call
       end
 
-      extend ActiveModel::Translation
       extend Enumerable
       include ::MemoryRecord::SingletonMethods
 
@@ -66,18 +66,20 @@ module MemoryRecord
       # Define it to an ancestor so that super method can be used.
       include Module.new.tap { |m|
         ([:key, :code] + attr_reader_args).uniq.each do |key|
-          m.class_eval do
+          m.module_eval do
             define_method(key) { @attributes[key.to_sym] }
           end
         end
 
         unless m.method_defined?(:name)
-          m.class_eval do
-            define_method(:name) do
-              if self.class.name
-                self.class.human_attribute_name(key)
-              end
-            end
+          m.module_eval do
+            define_method(:name) { key.to_s }
+          end
+        end
+
+        m.module_eval do
+          def <=>(other)
+            [self.class, code] <=> [other.class, other.code]
           end
         end
       }
@@ -115,7 +117,7 @@ module MemoryRecord
 
       def fetch(key, default = nil, &block)
         if block_given? && default
-          raise ArgumentError
+          raise ArgumentError, "Can't use default and block together"
         end
 
         v = lookup(key)

data/lib/memory_record/version.rb

@@ -1,3 +1,3 @@
 module MemoryRecord
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/memory_record.gemspec

@@ -22,5 +22,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit'
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'activemodel'
 end

data/spec/memory_record_spec.rb

@@ -24,8 +24,6 @@ RSpec.describe MemoryRecord do
     }
   end
 
-  let(:instance) { Model.first }
-
   context 'Useful Class Methods' do
     it 'each' do
       assert Model.each
@@ -60,22 +58,22 @@ RSpec.describe MemoryRecord do
 
   context 'Subscript access to instance' do
     it do
-      instance[:name].should == 'A'
-      instance[:xxxx].should == nil
+      Model.first[:name].should == 'A'
+      Model.first[:xxxx].should == nil
     end
   end
 
   context 'to_s' do
     it do
-      instance.to_s.should == 'A'
+      Model.first.to_s.should == 'A'
     end
   end
 
   context 'instance accessor' do
     it do
-      assert instance.attributes
-      assert instance.key
-      assert instance.code
+      assert Model.first.attributes
+      assert Model.first.key
+      assert Model.first.code
     end
   end
 
@@ -97,8 +95,9 @@ RSpec.describe MemoryRecord do
     end
 
     it 'Name method is automatically defined if it is not defined' do
-      model = class_new []
+      model = class_new [{key: :foo}]
       assert_equal true, model.instance_methods.include?(:name)
+      assert_equal "foo", model[:foo].name
     end
   end
 
@@ -154,14 +153,6 @@ RSpec.describe MemoryRecord do
     end
   end
 
-  describe 'Human_attribute_name can not be used in anonymous class' do
-    let(:model) { class_new [{foo: 1}] }
-
-    it 'It does not cause an error' do
-      model.first.name.should == nil
-    end
-  end
-
   describe 'attr_reader option' do
     def element(options)
       Class.new {
@@ -211,4 +202,22 @@ RSpec.describe MemoryRecord do
     end
     model[:a].should == :a
   end
+
+  it "minus" do
+    m = class_new [{key: :a}, {key: :b}]
+    ([m[:a], m[:b]] - [m[:a]]).should == [m[:b]]
+  end
+
+  describe "sort (<=> method)" do
+    it "same class" do
+      m = class_new [{key: :a}, {key: :b}]
+      [m[:b], m[:a]].sort.should == [m[:a], m[:b]]
+    end
+
+    it "different class" do
+      m1 = class_new [{key: :a}, {key: :b}]
+      m2 = class_new [{key: :a}, {key: :b}]
+      expect { [m1[:b], m2[:a]].sort }.to raise_error(ArgumentError)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memory_record
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - akicho8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A simple library that handles a few records easily
 email:
 - akicho8@gmail.com
@@ -112,6 +98,8 @@ files:
 - examples/0250_lookup_super_call.rb
 - examples/0260_also_refer_to_other_keys.rb
 - examples/0270_instance_freeze.rb
+- examples/0280_sortable.rb
+- examples/0290_eql_behavior.rb
 - lib/memory_record.rb
 - lib/memory_record/memory_record.rb
 - lib/memory_record/version.rb
@@ -138,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A simple library that handles a few records easily