one_touch 1.2.0 → 1.3.0

data/Gemfile

@@ -8,6 +8,7 @@ gem 'rake'
 gem 'rspec'
 gem 'rspec-rails'
 gem 'ruby-debug19'
-gem 'rails'
+# gem 'rails', '3.1.0'
+gem 'rails', '3.0.11'
 gem 'squeel'
 gem 'sqlite3', '~> 1.3.0', :group => :test

data/lib/one_touch/models/active_record_extension.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__),'acts_as_favor')
+require File.join(File.dirname(__FILE__),'after_as_favor')
 require File.join(File.dirname(__FILE__),'as_favor_host')
 require File.join(File.dirname(__FILE__),'as_favorable')
 require File.join(File.dirname(__FILE__),'relations')
@@ -50,24 +51,14 @@ module OneTouch
           end
         end
 
+        include AfterAsFavor
+
         # TODO:
         # I should add more files to make here more clear
         # Some methods should be include first
         # And others should be include later
         # This code should be in another file
         #
-        if self.host_relation_type == :single
-          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]
           class_attribute :include_host_relation_module, :instance_writer => false
@@ -134,7 +125,7 @@ module OneTouch
 
       # Programmer Doc
       #   To maintain the connection betwwen host, favorable and favor class,
-      #   I defined class_attribute in there super class AR::Base
+      #   defined class_attribute in their super class AR::Base
       #   I don't know if there is any good solution to not disturb AR::Base
       def assign_cattr_in_favor_class(cattr_name,opt)
         class_attribute :favor_klass, :favor_class, :instance_writer => false

data/lib/one_touch/models/acts_as_favor.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 module OneTouch
   module ActsAsFavor
     extend ActiveSupport::Concern
@@ -72,12 +71,29 @@ module OneTouch
       #   just the user click one button or touch one link, then a favor was created
       def generate_add_methods(name)
         method_name = "add_#{name}".to_sym
-        define_singleton_method method_name do |operator,resource,other_field_option={}|
+        define_singleton_method method_name do | operator, resource, other_field_option={} |
           build_hash = other_field_option.merge(context: name)
           favor = operator.favors.build build_hash
           favor.favorable = resource
           yield favor if block_given?
-          favor.save ? true : favor # check rails create method to make this ok
+          if favor.save
+            favor_to_key = "#{resource.class.name}_favor_to_#{resource.class.name}_#{resource.id}_#{name}"
+            ::Rails.cache.delete favor_to_key
+          end
+          favor # return saved favor, favor.error should not be blank when save is false
+        end
+        method_name = "add_#{name}!".to_sym
+        define_singleton_method method_name do | operator, resource, other_field_option={} |
+          if block_given?
+            result = send "add_#{name}", operator, resource, other_field_option, &block
+          else
+            result = send "add_#{name}", operator, resource, other_field_option
+          end
+          if result.errors.present?
+            raise(ActiveRecord::RecordInvalid.new(result))
+          else
+            result
+          end
         end
       end
 
@@ -90,6 +106,8 @@ module OneTouch
           query_hash = other_field_option.merge(context: name)
           favor = ope.favors.where(query_hash).favorable_as(res)
           if favor.present?
+            favor_to_key = "#{res.class.name}_favor_to_#{res.class.name}_#{res.id}_#{name}"
+            ::Rails.cache.delete favor_to_key
             favor.first.destroy
           else
             false
@@ -116,6 +134,11 @@ module OneTouch
       def media_to_host
         :host
       end
+
+      def build_by_three_elements(h, f, context)
+        new(:host => h, :favorable => f, :context => context)
+      end
+
     end # end ClassMethods
 
     private

data/lib/one_touch/models/after_as_favor.rb

@@ -0,0 +1,31 @@
+module OneTouch
+  module AfterAsFavor
+    extend ActiveSupport::Concern
+
+    included do
+
+      if host_relation_type == :single
+        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 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
+
+    end
+
+    module ClassMethods
+
+      def find_by_three_elements(h,f,c)
+        host_as(h).favorable_as(f).context_as(c).first
+      end
+
+    end
+
+  end # End AfterAsFavor
+end

data/lib/one_touch/models/as_favor_host.rb

@@ -21,6 +21,13 @@ module OneTouch
         host_context_as(context).merge(Favor.favorable_as favorable)
       end
 
+      def cached_favor_to(favorable,context=default_context_in_host)
+        key = "#{self.name}_favor_to_#{favorable.class.name}_#{favorable.id}_#{context}"
+        Rails.cache.fetch key do
+          favor_to(favorable, context)
+        end
+      end
+
       def after_load_acts_as_favor
         build_context_klass_methods
       end
@@ -41,7 +48,7 @@ module OneTouch
     # find the favor to target with specific context
     # return ARelation object
     def find_favor(target,context)
-      favors & Favor.context_as(context).favorable_as(target)
+      favors.scoped.merge(Favor.context_as(context).favorable_as(target))
     end
 
     # check favor exist or not

data/lib/one_touch/models/as_favorable.rb

@@ -18,7 +18,7 @@ module OneTouch
       end
 
       def favored_by(user,context = default_context_in_favorable)
-        favorable_context_as(context) & Favor.host_as(user)
+        favorable_context_as(context).merge(Favor.host_as(user))
       end
 
       def unfavored_by(user,context = default_context_in_favorable)
@@ -39,7 +39,7 @@ module OneTouch
     end
 
     def favored_by?(ahost, context= default_context_in_favorable)
-      (be_favors & Favor.host_as(ahost).context_as(context)).present?
+      (be_favors.scoped.merge(Favor.host_as(ahost).context_as(context))).present?
     end
 
     private

data/lib/one_touch/version.rb

@@ -1,3 +1,3 @@
 module OneTouch
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/one_touch.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "one_touch"
 
-  s.add_runtime_dependency 'rails', '~> 3.0'
-  #s.add_development_dependency 'rails', '~> 3.0'
+  s.add_runtime_dependency 'rails', '> 3.0'
+  s.add_development_dependency 'rails', '> 3.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/readme.md

@@ -60,11 +60,16 @@ And if you change the Favor model name, make sure it consists in all application
 
     # add a record that @host focus on @favorable
     Favor.add_focus(@host, @favorable)
-    #=> success return true, fail return error @favor object
-    #=> could also
+    #=> return @favor object, @favor.errors returns error msg if add favor was failed, you can use @favor.errors.blank? to check if favor was added successfully
+
+####In version 1.3.0, add_focus change a little. And a new method add_focus! has added.
+
+    Favor.add_focus!(@host, @favorable)
+    #=> raise exception when add was failed
 
     # remove a record. @host remove focus on @favorable
     Favor.del_focus(@host, @favorable)
+    #=> false if favor not found
 
 ### Query Methods
 The most useful methods would be: favor_to, favored_by, allstars. They are all class methods.

data/spec/fake_app.rb

@@ -23,7 +23,7 @@ class Favor < ActiveRecord::Base
   # CONTEXT is an array of string and do not change the string to symbol
   #   CONTEXT_MATCH is all symbols, do not change it
   CONTEXT = Set.new(%w[dig focus favorite follow dislike])
-  CONTEXT_MATCH = { :focus => [:Tag],:favorite => [:Tag],
+  CONTEXT_MATCH = { :focus => [:Tag], :favorite => [:Tag],
     :follow => [:User,:Investor], :dislike => [:User] }
   CONTEXT_RELATION = { :oppose => [:follow, :dislike], :contain => [:favorite, :focus] }
 

data/spec/models/acts_as_favor_spec.rb

@@ -17,6 +17,10 @@ describe OneTouch::ActsAsFavor do
     Favor.favorable_klasses.should include(:User,:Tag)
   end
 
+  it "find by three elements host, favorable and context" do
+    Favor.find_by_three_elements(foo, tag, :favorite).should eq(afavor)
+  end
+
   it "should check context against entity type when the context is invalid" do
     afavor.update_attributes context: "error_context"
     afavor.valid?.should be_false
@@ -45,13 +49,14 @@ describe OneTouch::ActsAsFavor do
 
   it "should add a focus to a tag " do
     fly_favor = Favor.add_focus foo,fly_tag
-    fly_favor.should be_true
+    # fly_favor.should be_true
+    fly_favor.errors.blank?.should be_true
     foo.favors.where(context: 'focus',favorable_id: fly_tag.id,favorable_type: 'Tag').first.should be_true
   end
 
   it " foo can not follow him self ,return an instance of Favor" do
     Favor.add_follow(foo,foo).class.should eq(Favor)
-    # lambda {Favor.add_follow(foo,foo)}.should raise_error(ActiveRecord::RecordInvalid)
+    lambda {Favor.add_follow!(foo,foo)}.should raise_error(ActiveRecord::RecordInvalid)
   end
 
   it " keys of context_match should belongs to context " do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: one_touch
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &12802700 !ruby/object:Gem::Requirement
+  requirement: &10068800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12802700
+  version_requirements: *10068800
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &10067760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: *10067760
 description: ! ' Make one click operation simple '
 email:
 - raykincoldxiao@gmail.com
@@ -36,6 +47,7 @@ files:
 - lib/one_touch/engine.rb
 - lib/one_touch/models/active_record_extension.rb
 - lib/one_touch/models/acts_as_favor.rb
+- lib/one_touch/models/after_as_favor.rb
 - lib/one_touch/models/array.rb
 - lib/one_touch/models/as_favor_host.rb
 - lib/one_touch/models/as_favorable.rb