passive_record 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e925955215f05a8a105989c34bbd462e730676b9
-  data.tar.gz: cdc707806939051ec202a2962bef24f88ef4921b
+  metadata.gz: 028f8b542632306cf8fffbcb2cf7140e98220ffe
+  data.tar.gz: b3634261a2df5095b0663d79386a07fb2947c5ff
 SHA512:
-  metadata.gz: 1da3e90a67086a5b536549d46663c6afeb50791f334ddaee2edaf4a4670980fa25ffe10dd49183d4d037dcb261cf0872fa157651c7e2a77c99e15830625d14c3
-  data.tar.gz: 0559e101eff6e7e1dde11ae84bcdedc4f75096889670ce2d1e388afab1a5c63405f8a5b9c685f3e71c28de957b33662b94464c8b9b29a9a171dded3a0208bbe3
+  metadata.gz: 8d69bf45706fab2747b712c27b24d7189e6440cfafc1c3dc8b17fed3204213cbfb033f1fedd1efbb7e6754e1371cf4025c9c7b10335b037be666eec9554e9fc6
+  data.tar.gz: fe63859955c044abba1e8ecd06d8affe86162a6f6e4fd83e1e7e258743b9da51542f25b359b8ae8c6fdf04716039ea44612b1e8489150432b4e76a52b2d62ff5

data/Gemfile

@@ -4,6 +4,8 @@ gemspec
 
 gem 'activesupport'
 
+gem "codeclimate-test-reporter", group: :test, require: nil
+
 group :development do
   gem 'pry'
   gem 'kramdown'

data/README.md

@@ -4,7 +4,10 @@
 * [Documentation](http://rubydoc.info/gems/passive_record/frames)
 * [Email](mailto:jweissman1986 at gmail.com)
 
-[![Code Climate GPA](https://codeclimate.com/github//passive_record/badges/gpa.svg)](https://codeclimate.com/github//passive_record)
+[![Code Climate GPA](https://codeclimate.com/github/deepcerulean/passive_record/badges/gpa.svg)](https://codeclimate.com/github/deepcerulean/passive_record)
+[![Codeship Status for deepcerulean/passive_record](https://www.codeship.io/projects/66bb2d90-ba61-0133-af95-025ac38368ea/status)](https://codeship.com/projects/128700)
+[![Test Coverage](https://codeclimate.com/github/deepcerulean/passive_record/badges/coverage.svg)](https://codeclimate.com/github/deepcerulean/passive_record/coverage)
+
 
 ## Description
 
@@ -19,7 +22,7 @@ or look them up based on attributes,
 or even utilize some relational semantics,
 but have no real need for persistence?
 
-PassiveRecord may be right for you.
+PassiveRecord may be right for you!
 
 
 ## Features
@@ -62,11 +65,14 @@ PassiveRecord may be right for you.
     # inverse relationships
     dog.child # ===> dog
 
-    Child.find_by(child_id: dog.child_id) # ===> dog
+    Dog.find_by(child: child) # ===> dog
 
     # has many thru
     parent.dogs # ==> [dog]
 
+    # nested queries
+    Dog.find_all_by(child: { parent: parent }) # => [dog]
+
 ## Requirements
 
 ## Install

data/lib/passive_record.rb

@@ -5,24 +5,35 @@ require 'passive_record/version'
 require 'passive_record/core/identifier'
 require 'passive_record/core/query'
 
+require 'passive_record/class_inheritable_attrs'
+
 require 'passive_record/associations'
 require 'passive_record/hooks'
 
 module PassiveRecord
   def self.included(base)
     base.send :include, InstanceMethods
+    base.send :include, ClassLevelInheritableAttributes
+
+    base.class_eval do
+      inheritable_attrs :hooks, :associations
+    end
+
     base.extend(ClassMethods)
   end
 
   module InstanceMethods
-    def relationships
+    def inspect
+      self.class.name + "(#{id.inspect})"
+    end
+    def relata
       @relata ||= self.class.associations.map do |assn|
         assn.to_relation(self)
       end
     end
 
-    def method_missing(meth, *args, &blk)
-      matching_relation = relationships.detect do |relation|  # matching relation...
+    def find_relation_by_target_name_symbol(meth)
+      relata.detect do |relation|  # matching relation...
         meth == relation.association.target_name_symbol ||
           meth.to_s == relation.association.target_name_symbol.to_s + "=" ||
           meth.to_s == relation.association.target_name_symbol.to_s + "_id" ||
@@ -30,9 +41,21 @@ module PassiveRecord
           meth.to_s == "create_" + relation.association.target_name_symbol.to_s ||
           meth.to_s == "create_" + (relation.association.target_name_symbol.to_s).singularize
       end
+    end
+
+    def respond_to?(meth,*args,&blk)
+      if find_relation_by_target_name_symbol(meth)
+        true
+      else
+        super(meth,*args,&blk)
+      end
+    end
+
+    def method_missing(meth, *args, &blk)
+      matching_relation = find_relation_by_target_name_symbol(meth)
 
       if matching_relation
-        if meth.to_s.end_with?("_id")
+        if meth.to_s == matching_relation.association.target_name_symbol.to_s + "_id"
           matching_relation.parent_model_id
         elsif meth.to_s.end_with?("_id=")
           matching_relation.parent_model_id = args.first
@@ -55,6 +78,7 @@ module PassiveRecord
     include PassiveRecord::Associations
     include PassiveRecord::Hooks
 
+
     include Enumerable
     extend Forwardable
 
@@ -63,6 +87,10 @@ module PassiveRecord
     end
     def_delegators :all, :each
 
+    def last
+      all.last
+    end
+
     def find_by(conditions)
       if conditions.is_a?(Identifier)
         find_by_id(conditions)
@@ -73,6 +101,14 @@ module PassiveRecord
       end
     end
 
+    def find_all_by(conditions)
+      if conditions.is_a?(Array) && conditions.all? { |c| c.is_a?(Identifier) }
+        find_by_ids(conditions)
+      else
+        where(conditions).all
+      end
+    end
+
     def where(conditions)
       Query.new(self, conditions)
     end
@@ -82,6 +118,7 @@ module PassiveRecord
 
       instance.singleton_class.class_eval { attr_accessor :id }
       instance.send(:"id=", Identifier.generate)
+
       register(instance)
 
       attrs.each do |(k,v)|
@@ -104,6 +141,7 @@ module PassiveRecord
       instances_by_id.select { |id,_| ids.include?(id) }.values
     end
 
+
     private
     def instances_by_id
       @instances ||= {}

data/lib/passive_record/associations.rb

@@ -5,20 +5,21 @@ require 'passive_record/associations/has_many_through'
 
 module PassiveRecord
   module Associations
-    def associations
+    def associate!(assn)
       @associations ||= []
+      @associations += [assn]
     end
 
     def belongs_to(parent_name_sym, opts={})
       target_class_name = opts.delete(:class_name) { (parent_name_sym.to_s).split('_').map(&:capitalize).join }
       association = BelongsToAssociation.new(self, target_class_name, parent_name_sym)
-      associations.push(association)
+      associate!(association)
     end
 
     def has_one(child_name_sym)
       child_class_name = (child_name_sym.to_s).split('_').map(&:capitalize).join
       association = HasOneAssociation.new(self, child_class_name, child_name_sym)
-      associations.push(association)
+      associate!(association)
     end
 
     def has_many(collection_name_sym, opts={})
@@ -32,10 +33,10 @@ module PassiveRecord
 
         association = HasManyThroughAssociation.new(self, target_class_name, collection_name_sym, through_class_collection_name, base_association)
 
-        associations.push(association)
-      else # simple has-many
+        associate!(association)
+      else
         association = HasManyAssociation.new(self, target_class_name, collection_name_sym)
-        associations.push(association)
+        associate!(association)
       end
     end
   end

data/lib/passive_record/associations/has_many_through.rb

@@ -8,10 +8,22 @@ module PassiveRecord
 
     class HasManyThroughRelation < HasManyRelation
       def lookup
-        association.base_association.
+        intermediate_results = association.base_association.
           to_relation(parent_model).
-          lookup.
-          flat_map(&association.target_name_symbol.to_s.singularize.to_sym)
+          lookup
+
+        singular_target_sym = association.target_name_symbol.to_s.singularize.to_sym
+        plural_target_sym   = association.target_name_symbol.to_s.pluralize.to_sym
+
+        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
+        else
+          []
+        end
       end
 
       def create(attrs={})

data/lib/passive_record/associations/has_one.rb

@@ -16,10 +16,12 @@ module PassiveRecord
         child_class.find_by(parent_model_id_field => parent_model.id)
       end
 
-      def create(*args)
-        model = child_class.create(*args)
-        model.send(parent_model_id_field + "=", parent_model.id)
-        model
+      def create(attrs={})
+        child_class.create(
+          attrs.merge(
+            parent_model_id_field => parent_model.id
+          )
+        )
       end
 
       def parent_model_id_field

data/lib/passive_record/class_inheritable_attrs.rb

@@ -0,0 +1,28 @@
+# taken directly from http://stackoverflow.com/a/10729812/90042
+module ClassLevelInheritableAttributes
+  def self.included(base)
+    base.extend(ClassMethods)    
+  end
+
+  module ClassMethods
+    def inheritable_attrs(*args)
+      @inheritable_attributes ||= [:inheritable_attributes]
+      @inheritable_attributes += args
+      args.each do |arg|
+        class_eval %(
+          class << self; attr_accessor :#{arg} end
+        )
+      end
+
+      # binding.pry
+      @inheritable_attributes
+    end
+
+    def inherited(subclass)
+      @inheritable_attributes.each do |inheritable_attribute|
+        instance_var = "@#{inheritable_attribute}"
+        subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+      end
+    end
+  end
+end

data/lib/passive_record/core/identifier.rb

@@ -3,5 +3,13 @@ module PassiveRecord
     def self.generate
       new(SecureRandom.uuid)
     end
+
+    def ==(other_id)
+      self.value == other_id.value
+    end
+
+    def inspect
+      value
+    end
   end
 end

data/lib/passive_record/core/query.rb

@@ -2,9 +2,25 @@ module PassiveRecord
   module Core
     class Query < Struct.new(:klass, :conditions)
       def all
+        return [] unless conditions
         klass.all.select do |instance|
           conditions.all? do |(field,value)|
-            instance.send(field) == value
+            if value.is_a?(Hash)
+              assn = instance.send(field)
+              matched = assn && value.all? do |(assn_field,val)|
+                if assn.is_a?(Array)
+                  assn.any? do |assc_model|
+                    assc_model.send(assn_field) == val
+                  end
+                else
+                  assn.send(assn_field) == val
+                end
+              end
+
+              matched
+            else
+              instance.send(field) == value
+            end
           end
         end
       end

data/lib/passive_record/hooks.rb

@@ -1,7 +1,10 @@
 module PassiveRecord
   module Hooks
     class Hook
-      def initialize(*meth_syms,&blk)
+      attr_reader :kind
+
+      def initialize(kind,*meth_syms,&blk)
+        @kind = kind
         @methods_to_call = meth_syms
         @block_to_invoke = blk
       end
@@ -17,21 +20,16 @@ module PassiveRecord
       end
     end
 
-    def hooks
-      @hooks ||= {}
-    end
-
-    def after_hooks
-      hooks[:after] ||= {}
-    end
-
     def after_create_hooks
-      after_hooks[:create] ||= []
+      @hooks ||= []
+      @hooks.select { |hook| hook.kind == :after_create }
     end
 
     def after_create(*meth_syms, &blk)
-      hook = Hook.new(*meth_syms,&blk)
-      after_create_hooks.push(hook)
+      hook = Hook.new(:after_create,*meth_syms,&blk)
+      @hooks ||= []
+      @hooks += [ hook ]
+      self
     end
   end
 end

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/spec/passive_record_spec.rb

@@ -24,10 +24,34 @@ describe Model do
         it 'should be retrievable by query' do
           expect(SimpleModel.find_by(foo: 'foo_value')).to eq(model)
         end
+
+        context 'nested queries' do
+          let(:post) { Post.create }
+          let(:user) { User.create }
+
+          subject(:posts_with_comments_by_user) do
+            Post.find_by comments: { user: user }
+          end
+
+          before do
+            post.create_comment(user: user)
+          end
+
+          it 'should find a single record through a nested query' do
+            post = Post.find_by comments: { user: user }
+            expect(post).to eq(post)
+          end
+
+          it 'should find multiple records through a nested query' do
+            another_post = Post.create
+            another_post.create_comment(user: user)
+
+            posts = Post.find_all_by comments: { user: user }
+            expect(posts).to eq([post,another_post])
+          end
+        end
       end
     end
-
-    xcontext 'querying by associations'
   end
 
   context 'hooks' do
@@ -37,6 +61,10 @@ describe Model do
       end
 
       it 'should use a block' do
+        expect(Dog.create.sound).to eq("bark")
+      end
+
+      it 'should use an inherited block' do
         expect(Parent.create.created_at).to be_a(Time)
       end
     end
@@ -49,7 +77,7 @@ describe Model do
 
       it 'should create children' do
         expect { child.create_dog }.to change { Dog.count }.by(1)
-        expect(child.dog).to eq(Dog.first)
+        expect(child.dogs.first).to eq(Dog.last)
       end
 
       it 'should have inverse relationships' do
@@ -83,12 +111,18 @@ describe Model do
     context 'one-to-many through relationships' do
       let(:parent) { Parent.create }
       let(:child) { parent.create_child }
-      subject(:dogs) { parent.dogs }
 
       it 'should collect children of children' do
         child.create_dog
-        expect(dogs).to all(be_a(Dog))
-        expect(dogs.first).to eq(child.dog)
+        expect(parent.dogs).to all(be_a(Dog))
+        expect(parent.dogs.count).to eq(1)
+        expect(parent.dogs.first).to eq(child.dogs.first)
+      end
+
+      it 'should do the nested query example from the readme' do
+        child.create_dog
+        expect(Dog.find_all_by(child: {parent: parent})).
+          to eq(parent.dogs)
       end
     end
 

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'rspec'
 require 'pry'
 require 'passive_record'
 
 class Model
   include PassiveRecord
+  attr_reader :created_at
+  after_create { @created_at = Time.now }
 end
 
 class SimpleModel < Struct.new(:foo)
@@ -11,25 +16,24 @@ class SimpleModel < Struct.new(:foo)
 end
 
 class Dog < Model
+  attr_reader :sound
   belongs_to :child
+  after_create {@sound = 'bark'}
 end
 
 class Child < Model
-  has_one :dog
+  has_many :dogs
   belongs_to :parent
 
+  attr_reader :name
   after_create :give_name
 
-  attr_reader :name
   def give_name; @name = "Alice" end
 end
 
 class Parent < Model
   has_many :children
   has_many :dogs, :through => :children
-
-  attr_reader :created_at
-  after_create { @created_at = Time.now }
 end
 
 ###
@@ -62,3 +66,18 @@ class User < Model
   has_many :friendships
   has_many :friends, :through => :friendships
 end
+
+### 
+
+class Post < Model
+  has_many :comments 
+end
+
+class User < Model
+  has_many :comments
+end
+
+class Comment < Model
+  belongs_to :post
+  belongs_to :user
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_record
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,10 +139,10 @@ files:
 - lib/passive_record/associations/has_many.rb
 - lib/passive_record/associations/has_many_through.rb
 - lib/passive_record/associations/has_one.rb
+- lib/passive_record/class_inheritable_attrs.rb
 - lib/passive_record/core/identifier.rb
 - lib/passive_record/core/query.rb
 - lib/passive_record/hooks.rb
-- lib/passive_record/hstruct.rb
 - lib/passive_record/version.rb
 - passive_record.gemspec
 - spec/passive_record_spec.rb

data/lib/passive_record/hstruct.rb

@@ -1,38 +0,0 @@
-#
-# build a hash-initialized 'record' class
-#
-# singleton_class pattern taken from http://stackoverflow.com/questions/15256940/in-ruby-how-do-i-implement-a-class-whose-new-method-creates-subclasses-of-itsel
-#
-class HStruct
-  singleton_class.class_eval { alias :old_new :new }
-
-  def initialize(attributes={})
-    attributes.each do |k,v|
-      send("#{k}=",v)
-    end
-  end
-
-  def fetch_values(*args)
-    to_h.fetch_values(*args)
-  end
-
-  def to_h
-    attribute_names.inject({}) do |hsh,k|
-      hsh[k] = send("#{k}"); hsh
-    end
-  end
-
-  def self.new(*attribute_names)
-    Class.new(self){
-      singleton_class.class_eval {
-        alias :new :old_new
-      }
-
-      attribute_names.each do |k|
-        attr_accessor k.to_sym
-      end
-
-      define_method(:attribute_names) { attribute_names }
-    }
-  end
-end