mongoid_listable 0.2.3 → 0.2.5

data/README.md

@@ -4,7 +4,7 @@
 [![Coverage Status](https://coveralls.io/repos/richardcalahan/mongoid_listable/badge.png?branch=master)](https://coveralls.io/r/richardcalahan/mongoid_listable?branch=master)
 [![Gem Version](https://badge.fury.io/rb/mongoid_listable.png)](http://badge.fury.io/rb/mongoid_listable)
 
-Mongoid Listable is a library for managing listable relations. It works great for isolated collections or for more complex `has_many` / `embeds_many` relationships.
+Mongoid Listable is a library for managing listable relations. It works great for non-relational collections or for more complex `has_many` / `embeds_many` relationships.
 
 There are two main macros:   
 
@@ -12,13 +12,14 @@ There are two main macros:
 * `lists`  for `has_many` / `embeds_many` relationships.
 
 
-## Basic Usage - Isolated
+## Basic Usage - Non-Relational
 
     class Photo
       include Mongoid::Document
       include Mongoid::Listable
       
       listed
+      ...
     end
     
 The `listed` macro will assign a `position` field and a `list` scope to the Photo class. All Photo instances that are
@@ -28,15 +29,18 @@ Non-relational lists can have as many listed contexts as needed. You'll need to
 `field` options in these cases.
 
     class Photo
-
       include Mongoid::Document
       include Mongoid::Listable
 
       listed :scope :list, field: :position
       listed :scope :slideshow, field: :slideshow_position
-
+      ...
     end
     
+    Photo.list      # orders by position field
+    Photo.slideshow # orders by slideshow_position
+    
+    
 ## Basic Usage - Has Many / Embeds Many
 
 
@@ -78,8 +82,7 @@ will trigger a reordering of all sibling instances. For example:
     
 
 Each photo that belongs to the user will automatically obtain a field called `user_position`. The field name
-is derived from the foreign key of the relation, replacing "\_id" with "_position". Having a unique position key
-for each 1-n relationship allows for more complex lists.  
+is derived from the foreign key of the relation, replacing "\_id" with "_position".   
 
 The `has_many` / `embeds_many` relationship of a user to their photos will automadtically be ordered by `user_position` unless otherwise specified
 via the standard `order` option to the `has_many` macro. 
@@ -103,7 +106,7 @@ via the standard `order` option to the `has_many` macro.
       foreign_key: :kodaked_by_user_id
       
       lists :featured_photos
-      lists :kodak_moments
+      lists :kodak_moments 
       ...
     end
     

data/lib/mongoid/listable.rb

@@ -41,8 +41,22 @@ module Mongoid
     #
     # @since 0.1.0
     def siblings field=:position
-      klass = embedded? ? _parent.send(metadata.key) : self.class
-      klass.exists(field => true).ne id: id
+      klass = if embedded_one?
+                _parent.send(metadata.key).class
+              elsif embedded_many?
+                _parent.send(metadata.key)
+              else                
+                self.class
+              end
+      klass.where(field.exists => true).ne id: id
+    end
+
+    def embedded_one?
+      embedded? && metadata[:relation] == Mongoid::Relations::Embedded::One
+    end
+
+    def embedded_many?
+      embedded? && metadata[:relation] == Mongoid::Relations::Embedded::Many
     end
 
     private

data/lib/mongoid/listable/callbacks.rb

@@ -98,7 +98,24 @@ module Mongoid
         end
 
         private
-
+        
+        # Registers a callback using name (either the position 
+        # field, or in the case of a has_many/embeds_many relationship, 
+        # the relation name) as a unique identifier for the generated 
+        # method name.
+        #
+        # If reflect_on_association(name) returns non-nil, we know 
+        # this is a has_many/embeds_many relationship, and we register 
+        # the callback on the inverse class of the relation. If the 
+        # return value is nil, register the callback on the class itself.
+        #
+        # @param [ Symbol ]        name  The name of the position field
+        # @param [ Symbol|String ] hook  The name of the Mongoid relation callback
+        # @param [ Proc ]          block The body of the callback method
+        #
+        # @return [ Object ] self
+        #
+        # @since 0.0.6
         def register_callback name, hook, &block
           meta     = reflect_on_association name
           callback = "#{hook}_#{name}" 

data/lib/mongoid/listable/extensions/object.rb

@@ -68,6 +68,3 @@ module Mongoid
 end
 
 ::Object.__send__ :include, Mongoid::Listable::Extensions::Object
-
-
-

data/lib/mongoid/listable/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Listable
-    VERSION = '0.2.3'
+    VERSION = '0.2.5'
   end
 end

data/lib/mongoid_listable.rb

@@ -1,4 +1 @@
 require 'mongoid/listable'
-
-
-

data/mongoid_listable.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = [ 'lib' ]
 
-  spec.add_dependency 'mongoid', '>= 3.1.0'
+  spec.add_dependency 'mongoid', '>= 3.1.5'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_listable
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
+  prerelease: 
 platform: ruby
 authors:
 - richardcalahan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -88,26 +95,27 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ''
 test_files:
 - spec/models/article.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWE5MDIwMmJjOWRhNTM2NzU2Yzg2OWYzYTI4YmM4NGQ3ODczYjg0Mw==
-  data.tar.gz: !binary |-
-    MDJmNTM5NzAyYjM4MGU2ZjEyZWFiYjY0NmY2YWYzMzEyMDVlYmRlYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    M2JhNWFhMjcwNjUxMTE5OGM1MzU1OTZlN2U3NDNiNzI2N2M5MjY5YmQxNWY1
-    MzBiMDkzZDliOTJjNTNkZmQyN2MwYjU3NDhiZGE3NmU3YTdhZmFiYWRmOGU2
-    YzBkNzM3Njg3MTA0ODg2ZTQ5MzY1YTc1YWM4Yzk1Y2NmNWQ5NjQ=
-  data.tar.gz: !binary |-
-    MGQwYTNkYzcyNjk2OGU3YWMzODliODEyMWY0MzQ4ZTE0MGIyOGRkOTc5MzUx
-    ZjU1OTA4ZGRkOWNiNTc0ZDNhNjYxMTBjNDUyZmRhMThkNzQ4NWY1NTc4Y2Ey
-    NTgwZTU4OTk2NDMwOGQyN2I4MTVmMGFkYzBjNmM5NTUxZjg2ZTg=