one_touch 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34cb00212443af916d927fa834c4cd6e6b67fd46
-  data.tar.gz: 98a3670dd6b8fb6e2a617f4e4c9efdf254d6407a
+  metadata.gz: ce1e9c970fe307783c8cc7e941ed54907e77389f
+  data.tar.gz: dea7b43a6d018a3dfc74accef7921a57093aadb2
 SHA512:
-  metadata.gz: e1f6abd1563021cdb01749dbef9cbcc19c0670e3c2113510d61755e8a2ff93d94ef72569f98d654ffe6f1a30eb8a2970ad13177708fbac3931e9a4e44349d5d8
-  data.tar.gz: da50c4fc6e74136788fca80ff866aac68c5fc7034f2d23b86f4313686252ed9419787f155a1b54386145d3fe2d325346f58be5da3c836562b4ed5e5542fe1f60
+  metadata.gz: 3fc4641a2881f681b586054b219207b16531849bdfcb15a899d990d84dcbb33f2f5f53e3c0fd50d1e6d4e7e45c5301b6733d3d1275917d5c271bd2c7a3c42ed1
+  data.tar.gz: edc97ca57f82d8934fea42388001adb9d76add63951b72caaf878f5bb933a7eba344c24d4eaa3a9b2240f3992caa904b2f4b8e00ed157b8052ba6c4aece6f77e

data/lib/one_touch/models/active_record_extension.rb

@@ -59,13 +59,17 @@ module OneTouch
       #
       def as_favor_host(opt={})
         include ::OneTouch::PortBuild
-        opt.reverse_merge!(bridge_klass: "Favor", no_default_relations: false, portname: :host)
+        opt.reverse_merge!(bridge_klass: "Favor", no_default_relations: false, portname: :host, polymorphic: false)
         append_relation(opt)
         # Programmer Doc
         # The Name of has_many is stick to favors, to make it changable would cause some query problem
         # :as => :host can not be configured too, cause in act_as_favor the relation name was sticked
         unless opt[:no_default_relations]
-          has_many :favors, :class_name => opt[:bridge_klass], :as => :host
+          if opt[:polymorphic] == true
+            has_many :favors, :class_name => opt[:bridge_klass], :as => :host
+          else
+            has_many :favors, :class_name => opt[:bridge_klass]
+          end
         end
         include AsFavorHost
       end
@@ -73,10 +77,14 @@ module OneTouch
       # Used in favorable class, so self is a class
       def as_favorable(opt={})
         include ::OneTouch::PortBuild
-        opt.reverse_merge!(bridge_klass: "Favor", no_default_relations: false, portname: :favorable)
+        opt.reverse_merge!(bridge_klass: "Favor", no_default_relations: false, portname: :favorable, polymorphic: true)
         append_relation(opt)
         unless opt[:no_default_relations]
-          has_many :be_favors, :class_name => opt[:bridge_klass], :as => :favorable
+          if opt[:polymorphic] == true
+            has_many :be_favors, :class_name => opt[:bridge_klass], :as => :favorable
+          else
+            has_many :be_favors, :class_name => opt[:bridge_klass]
+          end
         end
         include AsFavorable
         include HostRelation if favor_class.respond_to? :include_host_relation_module and favor_class.include_host_relation_module

data/lib/one_touch/version.rb

@@ -1,3 +1,3 @@
 module OneTouch
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/readme.md

@@ -1,5 +1,6 @@
 ### Upgrade warnning
-There is a bug in 2.0.0 which happened on special loading sequence.I am fixing on it. So dont upgrade it to 2.0 right now.
+The loading sequence bug in 2.0.0 was fixed in 2.1.0. Please upgrade to 2.1.0 or stay on ~> 1
+
 ### Intro
 In webapp, many data is generated by just one click like focus someone, dislike some post.This gem make it easy.
 
@@ -23,7 +24,7 @@ Then we define:
     class Favor
       CONTEXT = Set.new(%w[focus favorite follow agree oppose buy subscribe])
       CONTEXT_MATCH = { :focus => [:Tag, :Post], :follow => [:User] }
-      acts_as_favor
+      acts_as_favor host_class_name: :User
     end
 
 Make sure Favor has defined constants CONTEXT and CONTEXT_MATCH before acts_as_favor.
@@ -120,6 +121,8 @@ This means @user1 is more close to @user2 than @user3.Maybe the answers that @us
   Because We create or delete data in one click. No Form Needed.
 
 ### TODO
+  Improve README 
+
   Add cache to favored_by, favor_to.
 
   Add a generator to make install faster.

data/spec/models/as_favorable_spec.rb

@@ -38,8 +38,7 @@ describe OneTouch::AsFavorable do
     context Favor do
       it "build relations should return a hash of relation between favorable and host" do
         Favor.build_relations.instance_of?(Hash).should be_true
-        # Favor.build_relations.first.first.should eq(["favorite", Tag.first]) # means first key
-        Favor.build_relations.keys.should include(["favorite", Tag.first]) # means first key
+        Favor.build_relations.keys.should include(["favorite", Tag.first])
       end
 
     end

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ def loading_sequence
     puts_marks
     puts "Loading Sequence 0: favorable -> host -> favor"
     Tag.as_favorable
-    User.as_favor_host
+    User.as_favor_host polymorphic: true
     User.as_favorable
     Favor.acts_as_favor :host_class_name => nil
   when 1
@@ -28,19 +28,19 @@ def loading_sequence
     puts "Loading Sequence 1: favorable -> favor -> host"
     Tag.as_favorable
     Favor.acts_as_favor :host_class_name => nil
-    User.as_favor_host
+    User.as_favor_host polymorphic: true
     User.as_favorable
   when 2
     puts_marks
     puts "Loading Sequence 2: host -> favorable -> favor"
-    User.as_favor_host
+    User.as_favor_host polymorphic: true
     Tag.as_favorable
     Favor.acts_as_favor :host_class_name => nil
     User.as_favorable
   when 3
     puts_marks
     puts "Loading Sequence 3: host -> favor -> favorable"
-    User.as_favor_host
+    User.as_favor_host polymorphic: true
     Favor.acts_as_favor :host_class_name => nil
     Tag.as_favorable
     User.as_favorable
@@ -48,7 +48,7 @@ def loading_sequence
     puts_marks
     puts "Loading Sequence 4: favor -> host -> favorable"
     Favor.acts_as_favor :host_class_name => nil
-    User.as_favor_host
+    User.as_favor_host polymorphic: true
     User.as_favorable
     Tag.as_favorable
   when 5
@@ -56,7 +56,7 @@ def loading_sequence
     puts "Loading Sequence 5: favor -> favorable -> host"
     Favor.acts_as_favor :host_class_name => nil
     User.as_favorable
-    User.as_favor_host
+    User.as_favor_host polymorphic: true
     Tag.as_favorable
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: one_touch
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - raykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails