one_touch 1.1.1 → 1.1.2

data/lib/one_touch/models/active_record_extension.rb

@@ -60,11 +60,13 @@ module OneTouch
           scope :host_as, lambda { |ahost| where(:host_id => ahost.id) }
         else
           scope :host_as, lambda { |ahost| where(:host_id => ahost.id, :host_type => ahost.class.name)}
+          scope :join_host, lambda { |type| joins("JOIN #{type.table_name} ON #{type.table_name}.id = #{table_name}.host_id AND #{table_name}.host_type = '#{type.to_s}'") }
         end
         if self.favorable_relation_type == :single
           scope :favorable_as, lambda { |target| where(:favorable_id => target.id) }
         else
           scope :favorable_as, lambda { |target| where(:favorable_id => target.id, :favorable_type => target.class.name) }
+          scope :join_favorable, lambda { |type| joins("JOIN #{type.table_name} ON #{type.table_name}.id = #{table_name}.favorable_id AND #{table_name}.favorable_type = '#{type.to_s}'") }
         end
 
         if opt[:include_host_relation_module]

data/lib/one_touch/models/as_favor_host.rb

@@ -18,7 +18,7 @@ module OneTouch
     module ClassMethods
 
       def favor_to(favorable,context=default_context_in_host)
-        host_context_as(context) & Favor.favorable_as(favorable)
+        host_context_as(context).merge(Favor.favorable_as favorable)
       end
 
       def after_load_acts_as_favor

data/lib/one_touch/version.rb

@@ -1,3 +1,3 @@
 module OneTouch
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/readme.md

@@ -4,7 +4,8 @@ In webapp, many data is generated by just one click like focus someone, dislike
 These one click data most are relation data and was managed in single model in this gem. So we can analyze the relation data easily.
 
 ## Dependency
-Rails > 3.0
+Rails > 3.0.
+Conflict with gem meta_where and squeel. Cause it changes some AR query syntax.
 
 ## Usage
     gem install one_touch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: one_touch
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000Z
+date: 2011-11-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &14408360 !ruby/object:Gem::Requirement
+  requirement: &16063180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14408360
+  version_requirements: *16063180
 description: ! ' Make one click operation simple '
 email:
 - raykincoldxiao@gmail.com