acts_as_amico 0.2.0 → 0.2.2

data/README.md

@@ -191,7 +191,7 @@ this will cause a ```SystemStackError: stack level too deep``` because acts_as_a
 the Rails::Object#send method to get the key, and for some reason if the send method even
 *touches* the string/symbol "name" we get cascaded through the object graph.
 
-## Documentation 
+## Documentation
 
 Acts_as_amico is feature complete with the amico gem. [The Amico API usage page](https://github.com/mettadore/amico/blob/master/API.md)
 shows a more complete suite of methods. The source for the [Amico relationships module](https://github.com/agoragames/amico/blob/master/lib/amico/relationships.rb)

data/lib/acts_as_amico/amico_object.rb

@@ -6,28 +6,28 @@ module ActsAsAmico
     end
 
     module ClassMethods
-
       def amico_key
         @amico_key ||= :id
       end
-      def amico_key= value
-        @amico_key = value
-      end
 
       def acts_as_amico *args
         options = args.extract_options!
         options.assert_valid_keys(:amico_key)
-        @amico_key = options[:amico_key] ? options[:amico_key] : :id
+        @amico_key = options[:amico_key]
         include ActsAsAmico::AmicoObject::InstanceMethods
       end
     end
 
     module InstanceMethods
 
+      def amico_key
+        self.send(self.class.amico_key)
+      end
+
       def method_missing(sym, *args, &block)
         if Amico.respond_to? sym
-          args[0] = args[0].send(args[0].class.amico_key) if not args[0].nil? and args[0].respond_to?(:id)
-          args.unshift(self.send(self.class.amico_key))
+          args[0] = args[0].amico_key if not args[0].nil? and args[0].respond_to?(:amico_key)
+          args.unshift(amico_key)
           if sym.nil?
             Amico.send(*args, &block)
           else
@@ -42,21 +42,26 @@ module ActsAsAmico
         pass_sym_to_amico(sym) || super(sym)
       end
 
+      def followers options = {}
+        key = options[:scope] || Amico.default_scope_key
+        Amico.followers(amico_key, options, key)
+      end
+
       # Named destructive methods
       def follow! obj, *args
-        Amico.follow(self.send(self.class.amico_key), obj.send(obj.class.amico_key), *args)
+        Amico.follow(amico_key, obj.amico_key, *args)
       end
       def unfollow! obj, *args
-        Amico.unfollow(self.send(self.class.amico_key), obj.send(obj.class.amico_key), *args)
+        Amico.unfollow(amico_key, obj.amico_key, *args)
       end
       def accept! obj, *args
-        Amico.accept(self.send(self.class.amico_key), obj.send(obj.class.amico_key), *args)
+        Amico.accept(amico_key, obj.amico_key, *args)
       end
       def block! obj, *args
-        Amico.block(self.send(self.class.amico_key), obj.send(obj.class.amico_key), *args)
+        Amico.block(amico_key, obj.amico_key, *args)
       end
       def unblock! obj, *args
-        Amico.unblock(self.send(self.class.amico_key), obj.send(obj.class.amico_key), *args)
+        Amico.unblock(amico_key, obj.amico_key, *args)
       end
 
       private

data/lib/acts_as_amico/version.rb

@@ -1,3 +1,3 @@
 module ActsAsAmico
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

data/spec/active_resource_spec.rb

@@ -24,14 +24,26 @@ describe ActsAsAmico do
     @rest_object = RestObject.find(321)
   end
 
+  it "Should respond to amico_key on the class" do
+    RestObject.respond_to?(:amico_key).should be_true
+  end
+  it "should set the amico_key on the class" do
+    RestObject.amico_key.should be(:title)
+  end
+
   it "should hold an amico_key" do
-    @rest_object.class.amico_key.should eq(:title)
+    @rest_object.amico_key.should eq("Blah")
   end
 
+  it "should follow" do
+    @usera.follow! @admin, 'admin'
+    @usera.following?(@admin, 'admin').should be_true
+    @admin.followers(:scope => 'admin').include?(@usera.amico_key.to_s).should be_true
+  end
   it "should allow following an ActiveResource object" do
     @usera.follow! @rest_object, 'rest_object'
-#    @usera.following?(@rest_object).should be_true
+    @usera.following?(@rest_object, 'rest_object').should be_true
 
-#    @rest_object.followers.include?(@usera.id).should be_true
+    @rest_object.followers(:scope => 'rest_object').include?(@usera.amico_key.to_s).should be_true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_amico
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70359781092880 !ruby/object:Gem::Requirement
+  requirement: &70349693755600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359781092880
+  version_requirements: *70349693755600
 - !ruby/object:Gem::Dependency
   name: amico
-  requirement: &70359781091320 !ruby/object:Gem::Requirement
+  requirement: &70349693752680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359781091320
+  version_requirements: *70349693752680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70359781106060 !ruby/object:Gem::Requirement
+  requirement: &70349693763920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70359781106060
+  version_requirements: *70349693763920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70359781104940 !ruby/object:Gem::Requirement
+  requirement: &70349693762520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359781104940
+  version_requirements: *70349693762520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70359781103180 !ruby/object:Gem::Requirement
+  requirement: &70349693761600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359781103180
+  version_requirements: *70349693761600
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70359781101740 !ruby/object:Gem::Requirement
+  requirement: &70349693759660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359781101740
+  version_requirements: *70349693759660
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70359781098780 !ruby/object:Gem::Requirement
+  requirement: &70349693757560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359781098780
+  version_requirements: *70349693757560
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70359781114500 !ruby/object:Gem::Requirement
+  requirement: &70349693772320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359781114500
+  version_requirements: *70349693772320
 description: Rails injectable Relationships (e.g. friendships) backed by Redis
 email:
 - mail@johnmetta.com