mongo_followable 0.2.2 → 0.2.3

data/.idea/workspace.xml

@@ -4,10 +4,10 @@
     <list default="true" id="46dc3a6d-3a97-49f8-becd-2ccba8c07e42" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.rdoc" afterPath="$PROJECT_DIR$/README.rdoc" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/mongo_followable/followable.rb" afterPath="$PROJECT_DIR$/lib/mongo_followable/followable.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/mongo_followable/follower.rb" afterPath="$PROJECT_DIR$/lib/mongo_followable/follower.rb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/mongo_followable/version.rb" afterPath="$PROJECT_DIR$/lib/mongo_followable/version.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/mongo_followable.gemspec" afterPath="$PROJECT_DIR$/mongo_followable.gemspec" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/spec/mongo/followable_spec.rb" afterPath="$PROJECT_DIR$/spec/mongo/followable_spec.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/spec/spec_helper.rb" afterPath="$PROJECT_DIR$/spec/spec_helper.rb" />
     </list>
     <ignored path="mongo_followable.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -31,10 +31,37 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="version.rb" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/mongo_followable/version.rb">
+      <file leaf-file-name="followable.rb" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/mongo_followable/followable.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="1" column="18" selection-start="41" selection-end="41" vertical-scroll-proportion="0.02173913">
+            <state line="127" column="36" selection-start="3865" selection-end="3865" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="README.rdoc" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.rdoc">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="53" column="83" selection-start="1649" selection-end="1649" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="follower.rb" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/mongo_followable/follower.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="160" column="34" selection-start="4901" selection-end="4901" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="followable_spec.rb" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/spec/mongo/followable_spec.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="216" column="9" selection-start="4887" selection-end="4887" vertical-scroll-proportion="0.7826087">
               <folding />
             </state>
           </provider>
@@ -60,13 +87,13 @@
         <option value="$PROJECT_DIR$/spec/mongoid/group.rb" />
         <option value="$PROJECT_DIR$/spec/mongoid/user.rb" />
         <option value="$PROJECT_DIR$/lib/mongo_followable.rb" />
-        <option value="$PROJECT_DIR$/lib/mongo_followable/follower.rb" />
-        <option value="$PROJECT_DIR$/spec/mongo/followable_spec.rb" />
         <option value="$PROJECT_DIR$/mongo_followable.gemspec" />
         <option value="$PROJECT_DIR$/spec/spec_helper.rb" />
-        <option value="$PROJECT_DIR$/README.rdoc" />
-        <option value="$PROJECT_DIR$/lib/mongo_followable/followable.rb" />
         <option value="$PROJECT_DIR$/lib/mongo_followable/version.rb" />
+        <option value="$PROJECT_DIR$/lib/mongo_followable/follower.rb" />
+        <option value="$PROJECT_DIR$/lib/mongo_followable/followable.rb" />
+        <option value="$PROJECT_DIR$/README.rdoc" />
+        <option value="$PROJECT_DIR$/spec/mongo/followable_spec.rb" />
       </list>
     </option>
   </component>
@@ -96,7 +123,7 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="Favorites" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -147,6 +174,24 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="mongo_followable" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="mongo_followable" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="spec" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="mongo_mapper" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="mongo_followable" />
@@ -199,7 +244,7 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Favorites" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="RecentsManager">
@@ -208,6 +253,24 @@
     </key>
   </component>
   <component name="RunManager">
+    <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby">
+      <module name="" />
+      <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+      <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="" />
+      <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+      <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
+      <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+      <envs />
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
+      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov">
+        <COVERAGE_PATTERN ENABLED="true">
+          <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+        </COVERAGE_PATTERN>
+      </EXTENSION>
+      <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" />
+      <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
+      <method />
+    </configuration>
     <list size="0" />
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
@@ -333,51 +396,49 @@
         <state line="6" column="48" selection-start="301" selection-end="301" vertical-scroll-proportion="0.13043478" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spec/mongo/followable_spec.rb">
+    <entry file="file://$PROJECT_DIR$/spec/spec_helper.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="156" column="25" selection-start="3888" selection-end="3888" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="24" column="42" selection-start="786" selection-end="786" vertical-scroll-proportion="0.5217391" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.rdoc">
+    <entry file="file://$PROJECT_DIR$/mongo_followable.gemspec">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="32" column="20" selection-start="965" selection-end="965" vertical-scroll-proportion="0.02173913">
-          <folding />
-        </state>
+        <state line="10" column="48" selection-start="408" selection-end="408" vertical-scroll-proportion="0.2173913" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spec/spec_helper.rb">
+    <entry file="file://$PROJECT_DIR$/lib/mongo_followable/version.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="42" selection-start="786" selection-end="786" vertical-scroll-proportion="0.5217391">
+        <state line="1" column="18" selection-start="41" selection-end="41" vertical-scroll-proportion="0.02173913">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mongo_followable.gemspec">
+    <entry file="file://$PROJECT_DIR$/lib/mongo_followable/follower.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="48" selection-start="408" selection-end="408" vertical-scroll-proportion="0.2173913">
+        <state line="160" column="34" selection-start="4901" selection-end="4901" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/mongo_followable/follower.rb">
+    <entry file="file://$PROJECT_DIR$/lib/mongo_followable/followable.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="152" column="34" selection-start="4717" selection-end="4717" vertical-scroll-proportion="-0.5096012">
+        <state line="127" column="36" selection-start="3865" selection-end="3865" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/mongo_followable/followable.rb">
+    <entry file="file://$PROJECT_DIR$/README.rdoc">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="81" column="0" selection-start="2647" selection-end="2662" vertical-scroll-proportion="0.044313148">
+        <state line="53" column="83" selection-start="1649" selection-end="1649" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/mongo_followable/version.rb">
+    <entry file="file://$PROJECT_DIR$/spec/mongo/followable_spec.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="18" selection-start="41" selection-end="41" vertical-scroll-proportion="0.02173913" />
+        <state line="216" column="9" selection-start="4887" selection-end="4887" vertical-scroll-proportion="0.7826087">
+          <folding />
+        </state>
       </provider>
     </entry>
   </component>

data/README.rdoc

@@ -2,6 +2,8 @@
 
 Now works for both Mongoid and Mongo_Mapper!
 
+see http://www.thesika.info/articles/mongo_followable_update for details
+
 == Installation
 
 In console:
@@ -27,7 +29,7 @@ Now you can set authorization:
     current_user.set_authorization('user', 'game') # now current_user cannot follow User and Game model
     current_user.unset_authorization('User', 'Game')
 
-And then you can follow a model:
+And then you can follow and unfollow:
 
     @group = Group.new
     @group.save
@@ -36,11 +38,21 @@ And then you can follow a model:
     current_user.unfollow(@group)
     current_user.unfollow_all
 
+    current_user.follow(*array_of_objects_to_follow) # follow an array of objects
+    current_user.unfollow(*array_of_objects_to_follow) # unfollow
+
 or,
 
     @group.unfollowed(current_user)
     @group.unfollowed_all
 
+It's also possible to pass a block:
+
+    current_user.follow(u1, u2, u3, u4...) { |user| user.name == 'Jeremy Lin' }
+    current_user.unfollow(u1, u2, u3, u4...) { |user| user.followee_of? 'Kobe Bryant' }
+
+    @group.unfollowed(u1, u2, u3...) { |user| user.ever_follow.include @some_user }
+
 You can also judge whether a model is a follower of another model or a model is a followee of another model:
 
     current_user.follower_of?(@group)

data/lib/mongo_followable/followable.rb

@@ -109,7 +109,11 @@ module Mongo
       rebuild_instances(self.followers)
     end
 
-    def unfollowed(*models)
+    def unfollowed(*models, &block)
+      if block_given?
+        models.delete_if { |model| !yield(model) }
+      end
+
       models.each do |model|
         unless model == self or !self.followee_of?(model) or !model.follower_of?(self) or self.cannot_followed.include?(model.class.name) or model.cannot_follow.include?(self.class.name)
           model.followees.by_model(self).first.destroy

data/lib/mongo_followable/follower.rb

@@ -123,7 +123,11 @@ module Mongo
 
     # follow some model
 
-    def follow(*models)
+    def follow(*models, &block)
+      if block_given?
+        models.delete_if { |model| !yield(model) }
+      end
+
       models.each do |model|
         unless model == self or self.follower_of?(model) or model.followee_of?(self) or self.cannot_follow.include?(model.class.name) or model.cannot_followed.include?(self.class.name)
           model.followers.create!(:f_type => self.class.name, :f_id => self.id.to_s)
@@ -138,7 +142,11 @@ module Mongo
 
     # unfollow some model
 
-    def unfollow(*models)
+    def unfollow(*models, &block)
+      if block_given?
+        models.delete_if { |model| !yield(model) }
+      end
+
       models.each do |model|
         unless model == self or !self.follower_of?(model) or !model.followee_of?(self) or self.cannot_follow.include?(model.class.name) or model.cannot_followed.include?(self.class.name)
           model.followers.by_model(self).first.destroy

data/lib/mongo_followable/version.rb

@@ -1,3 +1,3 @@
 module MongoFollowable
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/mongo/followable_spec.rb

@@ -183,4 +183,38 @@ describe Mongo::Followable do
 
     end
   end
+
+  describe User do
+
+    context "begins" do
+
+      before do
+        @u = User.new
+        @u.save
+
+        @v = User.new
+        @v.save
+
+        @w = User.new
+        @w.save
+
+        @g = Group.new
+        @g.save
+      end
+
+
+      it "block test" do
+        @u.follow(@v, @w, @g) {|m| m.class == User}
+
+        @u.all_followees.should =~ [@v, @w]
+
+      end
+
+      it "block test unfollow" do
+        @u.unfollow(@v, @w, @g) {|m| m.followee_of? @u}
+
+        @u.all_followees.should == []
+      end
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jie Fan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 -05:00
+date: 2012-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency