acts_as_amico 0.2.4 → 0.2.6

data/lib/acts_as_amico/amico_object.rb

@@ -27,7 +27,7 @@ module ActsAsAmico
         options = args.extract_options!
         options.assert_valid_keys(:amico_key)
         @amico_key = options[:amico_key]
-        include ActsAsAmico::AmicoObject::InstanceMethods
+        send :include, ActsAsAmico::AmicoObject::InstanceMethods
       end
     end
 
@@ -62,8 +62,8 @@ module ActsAsAmico
         scope = options[:scope] || Amico.default_scope_key
         meth = args[0]
         raise "Must be one of #{valid_params.to_s}" if not valid_params.include? meth
-        count = self.send("#{meth}_count".to_sym, scope)
-        self.send("#{meth}", :page_size => count, :scope => scope)
+        count = self.send("#{meth.to_s}_count".to_sym, scope)
+        count > 0 ? self.send("#{meth}", :page_size => count, :scope => scope) : []
       end
 
       # Lists
@@ -95,6 +95,9 @@ module ActsAsAmico
       end
       def unfollow! obj, options = {}
         scope = options[:scope] || Amico.default_scope_key
+        puts amico_key
+        puts obj.amico_key
+        puts scope
         Amico.unfollow(amico_key, obj.amico_key, scope)
       end
       def accept! obj, options = {}

data/lib/acts_as_amico/version.rb

@@ -1,3 +1,3 @@
 module ActsAsAmico
-  VERSION = '0.2.4'
+  VERSION = '0.2.6'
 end

data/lib/acts_as_amico.rb

@@ -6,8 +6,6 @@ require 'acts_as_amico/version'
 
 module ActsAsAmico
   autoload :AmicoObject,    'acts_as_amico/amico_object'
-
-  require 'acts_as_amico/railtie'
 end
 
 ActiveRecord::Base.send :include, ActsAsAmico::AmicoObject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_amico
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70186816397260 !ruby/object:Gem::Requirement
+  requirement: &70243674332640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186816397260
+  version_requirements: *70243674332640
 - !ruby/object:Gem::Dependency
   name: amico
-  requirement: &70186816395200 !ruby/object:Gem::Requirement
+  requirement: &70243674330200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186816395200
+  version_requirements: *70243674330200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70186816394620 !ruby/object:Gem::Requirement
+  requirement: &70243674341000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70186816394620
+  version_requirements: *70243674341000
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70186816393840 !ruby/object:Gem::Requirement
+  requirement: &70243674339360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186816393840
+  version_requirements: *70243674339360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70186816391700 !ruby/object:Gem::Requirement
+  requirement: &70243674337860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186816391700
+  version_requirements: *70243674337860
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70186816390440 !ruby/object:Gem::Requirement
+  requirement: &70243674335460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186816390440
+  version_requirements: *70243674335460
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70186816406200 !ruby/object:Gem::Requirement
+  requirement: &70243674350000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186816406200
+  version_requirements: *70243674350000
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70186816405520 !ruby/object:Gem::Requirement
+  requirement: &70243674348580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186816405520
+  version_requirements: *70243674348580
 description: Rails injectable Relationships (e.g. friendships) backed by Redis
 email:
 - mail@johnmetta.com
@@ -118,7 +118,6 @@ files:
 - acts_as_amico.gemspec
 - lib/acts_as_amico.rb
 - lib/acts_as_amico/amico_object.rb
-- lib/acts_as_amico/railtie.rb
 - lib/acts_as_amico/version.rb
 - spec/active_resource_spec.rb
 - spec/amico_object_spec.rb

data/lib/acts_as_amico/railtie.rb

@@ -1,20 +0,0 @@
-require 'acts_as_amico'
-require 'rails'
-
-module ActsAsAmico
-  class Railtie < Rails::Railtie
-
-    initializer "acts_as_amico.active_record" do |app|
-      ActiveSupport.on_load :active_record do
-        include ActsAsAmico::AmicoObject
-      end
-    end
-
-    initializer "acts_as_amico.active_resource" do |app|
-      ActiveSupport.on_load :active_resource do
-        include ActsAsAmico::AmicoObject
-      end
-    end
-
-  end
-end