passive_record 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb29f6bd483e22725152cee6b4d3002d9ee6ef67
-  data.tar.gz: 0a58e54140b5dd2a0d6adc19e446c6b10fe17a8a
+  metadata.gz: 1f29ddf4304ae896f01ee7455929a409966799df
+  data.tar.gz: cfa9db856459164c5864e4df1f2679cf2764a20f
 SHA512:
-  metadata.gz: e943664cc21b10ab366ac8860cb6b6604ecd3ac2db51012043effc5c6f8aa73c80ccacbba4baba7aafc0cfd427f7a8a66e9243370fa982cff9caea19bba988b4
-  data.tar.gz: 893747fcad8d5f3afab5fdb929a9f7015eabc82acbf28092badfc3b3057e5e4a48ad623e83c34bcea385890ba542c6d3cdf100a4ffd848bbb7dd1c4bf835f08a
+  metadata.gz: 0cb01f630b4bf056a4747a0f181afa3bd86859b663c831ef4f845d099d83078cc9fc20eef247ac3a08619fed9bc381996554409c113591cda491c9328817abbe
+  data.tar.gz: ae8db06335510ad6bb9213e4ce7c6024e85a02a979f0d4d718b1bea05de713a398488b74bd9d3dfdbe678857ad873c34d0c4b38397793c8347a9b98965300ff7

data/README.md

@@ -36,6 +36,7 @@ PassiveRecord may be right for you!
 
 ## Examples
 
+````ruby
     require 'passive_record'
 
     class Model
@@ -58,20 +59,29 @@ PassiveRecord may be right for you!
 
     # Let's create some models!
     parent = Parent.create
+    => Parent (id: 1)
 
     child = parent.create_child
+    => Child (id: 1)
+
     dog = child.create_dog
+    => Dog (id: 1)
 
     # inverse relationships
-    dog.child # ===> dog
+    dog.child
+    => Child (id: 1)
 
-    Dog.find_by(child: child) # ===> dog
+    Dog.find_by child: child
+    => Dog (id: 1)
 
     # has many thru
-    parent.dogs # ==> [dog]
+    parent.dogs
+    => [Dog (id: 1)]
 
     # nested queries
-    Dog.find_all_by(child: { parent: parent }) # => [dog]
+    Dog.find_all_by(child: { parent: parent })
+    => [Dog (id: 1)]
+````
 
 ## Requirements
 

data/lib/passive_record.rb

@@ -42,11 +42,15 @@ module PassiveRecord
 
     # from http://stackoverflow.com/a/8417341/90042
     def instance_variables_hash
-      Hash[instance_variables.map { |name| [name, instance_variable_get(name)] } ]
+      Hash[
+        instance_variables.
+          reject { |sym| sym.to_s.start_with?("@_") }.
+          map { |name| [name, instance_variable_get(name)] }
+      ]
     end
 
     def relata
-      @relata ||= self.class.associations.map do |assn|
+      @_relata ||= self.class.associations.map do |assn|
         assn.to_relation(self)
       end
     end
@@ -169,15 +173,15 @@ module PassiveRecord
     end
 
     protected
-    def find_by_id(id)
-      instances_by_id[id]
+    def find_by_id(_id)
+      key = instances_by_id.keys.detect { |id,_| id == _id }
+      instances_by_id[key] if key
     end
 
     def find_by_ids(ids)
       instances_by_id.select { |id,_| ids.include?(id) }.values
     end
 
-
     private
     def instances_by_id
       @instances ||= {}

data/lib/passive_record/associations.rb

@@ -23,7 +23,7 @@ module PassiveRecord
     end
 
     def has_many(collection_name_sym, opts={})
-      target_class_name = (collection_name_sym.to_s).split('_').map(&:capitalize).join
+      target_class_name = opts.delete(:class_name) { (collection_name_sym.to_s).split('_').map(&:capitalize).join }
 
       if opts.key?(:through)
         through_class_collection_name = opts.delete(:through)

data/lib/passive_record/associations/has_many_through.rb

@@ -7,29 +7,45 @@ module PassiveRecord
     end
 
     class HasManyThroughRelation < HasManyRelation
-      def lookup
-        intermediate_results = association.base_association.
-          to_relation(parent_model).
-          lookup
+      def intermediary_relation
+        association.base_association.to_relation(parent_model)
+      end
 
-        singular_target_sym = association.target_name_symbol.to_s.singularize.to_sym
-        plural_target_sym   = association.target_name_symbol.to_s.pluralize.to_sym
+      def results
+        intermediary_relation.lookup
+      end
 
-        if !intermediate_results.empty?
-          if intermediate_results.first.respond_to?(singular_target_sym)
-            intermediate_results.flat_map(&singular_target_sym)
-          elsif intermediate_results.first.respond_to?(plural_target_sym)
-            intermediate_results.flat_map(&plural_target_sym)
-          end
+      def lookup
+        if target_sym && results
+          results.flat_map(&target_sym)
         else
           []
         end
       end
 
+      def target_sym
+        name_str = association.target_name_symbol.to_s
+        singular_target_sym = name_str.singularize.to_sym
+        plural_target_sym   = name_str.pluralize.to_sym
+
+        singular_class_name_sym = association.child_class_name.underscore.singularize.to_sym
+        plural_class_name_sym = association.child_class_name.underscore.pluralize.to_sym
+
+        if !results.empty?
+          if results.first.respond_to?(singular_target_sym)
+            singular_target_sym
+          elsif results.first.respond_to?(plural_target_sym)
+            plural_target_sym
+          elsif results.first.respond_to?(singular_class_name_sym)
+            singular_class_name_sym
+          elsif results.first.respond_to?(plural_class_name_sym)
+            plural_class_name_sym
+          end
+        end
+      end
+
       def create(attrs={})
-        # binding.pry
-        raise "missing intermediate relational key #{association.through_class}" unless attrs.key?(association.through_class)
-        super(attrs)
+        child_class.create(attrs)
       end
     end
   end

data/lib/passive_record/associations/has_one.rb

@@ -33,6 +33,7 @@ module PassiveRecord
       end
 
       def child_class
+        # binding.pry
         Object.const_get(association.child_class_name.singularize)
       end
     end

data/lib/passive_record/core/identifier.rb

@@ -6,7 +6,7 @@ module PassiveRecord
     end
 
     def ==(other_id)
-      self.value == other_id.value
+      self.value == other_id.value rescue self.value == other_id
     end
 
     def inspect

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/passive_record_spec.rb

@@ -35,22 +35,42 @@ describe Model do
       end
     end
 
-    describe "#create" do 
+    describe "#create" do
       it 'should assign attributes' do
         expect(model.foo).to eq('foo_value')
       end
     end
 
     describe "#destroy_all" do
-      before { 
-        SimpleModel.create(foo: 'val')
-        SimpleModel.create(foo: 'val')
+      before {
+        SimpleModel.create(foo: 'val1')
+        SimpleModel.create(foo: 'val2')
       }
+
       it 'should remove all models' do
         expect { SimpleModel.destroy_all }.to change { SimpleModel.count }.by(-SimpleModel.count)
       end
     end
 
+    context 'querying by id' do
+      describe "#find" do
+        subject(:model) {  SimpleModel.create }
+        it 'should lookup a record based on an identifier' do
+          expect(SimpleModel.find(-1)).to eq(nil)
+          expect(SimpleModel.find(model.id)).to eq(model)
+        end
+
+        it 'should lookup records based on primary key value' do
+          expect(SimpleModel.find(model.id.value)).to eq(model)
+        end
+
+        it 'should lookup records based on ids' do
+          model_b = SimpleModel.create
+          expect(SimpleModel.find([model.id, model_b.id])).to eq([model, model_b])
+        end
+      end
+    end
+
     context 'querying by attributes' do
       describe "#find_by" do
         it 'should be retrievable by query' do
@@ -108,15 +128,15 @@ describe Model do
       let(:another_child) { Child.create }
 
       it 'should create children' do
-        expect { child.create_dog }.to change { Dog.count }.by(1)
-        expect(child.dogs.first).to eq(Dog.last)
+        expect { child.create_toy }.to change { Toy.count }.by(1)
+        expect(child.toy).to eq(Toy.last)
       end
 
       it 'should have inverse relationships' do
-        dog = child.create_dog
-        expect(dog.child).to eq(child)
-        another_dog = another_child.create_dog
-        expect(another_dog.child).to eq(another_child)
+        toy = child.create_toy
+        expect(toy.child).to eq(child)
+        another_toy = another_child.create_toy
+        expect(another_toy.child).to eq(another_child)
       end
     end
 
@@ -156,6 +176,26 @@ describe Model do
         expect(Dog.find_all_by(child: {parent: parent})).
           to eq(parent.dogs)
       end
+
+      it 'should work for has-one intermediary relationships' do
+        child.create_toy
+        expect(parent.toys).to all(be_a(Toy))
+        expect(parent.toys.count).to eq(1)
+        expect(parent.toys.first).to eq(child.toy)
+      end
+
+      it 'should attempt to construct intermediary relations' do
+        expect { parent.create_toy(child: child) }.to change {Toy.count}.by(1)
+        expect(Toy.last.child).to eq(child)
+        expect(Toy.last.child.parent).to eq(parent)
+      end
+
+      it 'should accept class name' do
+        post = Post.create
+        user = User.create
+        Comment.create(post: post, user: user)
+        expect(post.commenters).to eq([user])
+      end
     end
 
     context 'many-to-many' do

data/spec/spec_helper.rb

@@ -21,7 +21,14 @@ class Dog < Model
   after_create {@sound = 'bark'}
 end
 
+class Toy < Model
+  belongs_to :child
+  attr_reader :kind
+  after_create {@kind = %w[ stuffed_animal blocks cards ].sample}
+end
+
 class Child < Model
+  has_one :toy
   has_many :dogs
   belongs_to :parent
 
@@ -34,6 +41,7 @@ end
 class Parent < Model
   has_many :children
   has_many :dogs, :through => :children
+  has_many :toys, :through => :children
 end
 
 ###
@@ -71,6 +79,7 @@ end
 
 class Post < Model
   has_many :comments 
+  has_many :commenters, :through => :comments, :class_name => "User"
 end
 
 class User < Model

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passive_record
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Joseph Weissman