one_touch 1.0.1 → 1.1.1

data/.gitignore

@@ -3,4 +3,5 @@ rails/*
 .bundle
 Gemfile.lock
 pkg/*
-.rbenv-version
+.rbenv-version
+log/*

data/Gemfile

@@ -8,7 +8,6 @@ gem 'rake'
 gem 'rspec'
 gem 'rspec-rails'
 gem 'ruby-debug19'
-gem 'rails', '3.0.10'
-gem 'meta_where', '~> 1.0.0'
-# gem 'squeel' # add another version to support it and Rails3.1
+gem 'rails'
+gem 'squeel'
 gem 'sqlite3', '~> 1.3.0', :group => :test

data/lib/one_touch/models/active_record_extension.rb

@@ -36,25 +36,37 @@ module OneTouch
         unless opt[:no_default_relations]
           if opt[:host_class_name].nil?
             belongs_to :host, :polymorphic => true
-            host_relation_type = :polymorphic
-            if respond_to? method_name_of_host_klasses
-              send(method_name_of_host_klasses).each do |k|
-                k.to_s.constantize.rewrite_join_favors  if k.to_s.constantize.respond_to? :rewrite_join_favors
-              end
-            end
+            self.host_relation_type = :polymorphic
           else
             belongs_to :host, :class_name => opt[:host_class_name]
-            host_relation_type = :single
+            self.host_relation_type = :single
           end
           if opt[:favorable_class_name].nil?
             belongs_to :favorable, :polymorphic => true
-            favorable_relation_type = :polymorphic
+            self.favorable_relation_type = :polymorphic
           else
             belongs_to :favorable, :class_name => opt[:favorable_class_name]
-            favorable_relation_type = :single
+            self.favorable_relation_type = :single
           end
         end
 
+        # 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)}
+        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) }
+        end
+
         if opt[:include_host_relation_module]
           class_attribute :include_host_relation_module, :instance_writer => false
           self.include_host_relation_module = true
@@ -68,6 +80,7 @@ module OneTouch
         end
       end
 
+
       # Used in host class
       # Ex:
       #   as_favor_host :klass => "OtherClass"
@@ -113,7 +126,7 @@ module OneTouch
 
         favorable_klasses.each do |k|
           klass = k.to_s.constantize
-          klass.send :include, HostRelation  # host_relation model is added to favorable klass
+          klass.send :include, HostRelation  # host_relation model was added to favorable klass
         end
       end
 
@@ -126,8 +139,6 @@ module OneTouch
         self.favor_klass = opt[:klass]
         self.favor_class = favor_klass.constantize
 
-        # favor_class.acts_as_favor :just_define_host_klasses => true unless favor_class.respond_to? :host_klasses
-        # favor.class.acts_as_favor
         cattr_name = "#{cattr_name}_for_#{opt[:klass].underscore}".to_sym
         unless ::ActiveRecord::Base.respond_to? cattr_name
           ::ActiveRecord::Base.class_attribute cattr_name, :instance_writer => false

data/lib/one_touch/models/acts_as_favor.rb

@@ -20,7 +20,7 @@ module OneTouch
       validate :context_should_match_favorable_type
       validate :host_should_differ_favorable
 
-      scope :context_as, lambda { |context| where( { :context => context } ) if context.present? }
+      scope :context_as, lambda { |con| where(:context => con) }
 
       # Generate build or destroy methods like:
       #   Favor.add_focus, Favor.del_focus
@@ -98,7 +98,7 @@ module OneTouch
         end
       end
 
-      # seems just used for relations module
+      # seems just used for OneTouch::Relations module
       def host_klasses
         attr = "host_klasses_for_#{name.underscore}".to_sym
         respond_to?(attr) ? send(attr) : []
@@ -133,7 +133,7 @@ module OneTouch
       end
     end
 
-    # how to reslove two or more hook
+    # TODO: how to reslove two or more hook
     def context_relation_hook
       context_relation.each do |key,contexts|
         if contexts.include? context.to_sym
@@ -145,7 +145,7 @@ module OneTouch
 
     def relation_oppose_hook(other_context)
       oppose_context = other_context
-      oppose_favor= Favor.where(:host => host, :context => oppose_context, :favorable => favorable)
+      oppose_favor= self.class.host_as(host).favorable_as(favorable).context_as(oppose_context)
       oppose_favor.first.destroy if oppose_favor.presence
     end
 

data/lib/one_touch/models/as_favor_host.rb

@@ -6,17 +6,9 @@ module OneTouch
 
       class_attribute :default_context_in_host, :instance_writer => false
 
-      if favor_class.respond_to? :host_relation_type and favor_class.host_relation_type == :polymorphic
-        scope :join_favors, joins(:favors.type(self))
-      else
-        scope :join_favors, joins(:favors)
-      end
-
-      scope :favorable_is, lambda { |sth| where(:favors => { :favorable => sth } ) }
-
       # One module may not only host but also favorable, ex: User model
-      # when User as favorable, defined a method called context_as, so here define another method to distinct the former
-      scope :host_context_as, lambda { |context| where(:favors => { :context => context } ) }
+      # when User as favorable, defined a method called favorable_context_as, here define another method to distinct the former
+      scope :host_context_as, lambda { |context| joins(:favors).where(favor_class.table_name.to_sym => { :context => context } ) }
 
       if favor_class.respond_to? :host_relation_type # means favor class has load acts_as_favor
         build_context_klass_methods
@@ -25,14 +17,8 @@ module OneTouch
 
     module ClassMethods
 
-      # if favor_class.host_relation_type == :polymorphic, then this will be automated executed
-      def rewrite_join_favors
-        scope :join_favors, joins(:favors.type(self))
-      end
-
       def favor_to(favorable,context=default_context_in_host)
-        join_favors.host_context_as(context).
-          favorable_is(favorable)
+        host_context_as(context) & Favor.favorable_as(favorable)
       end
 
       def after_load_acts_as_favor
@@ -44,7 +30,7 @@ module OneTouch
           klasses.each do |klass|
             method_name = "#{context}_#{klass.to_s.underscore.pluralize}".to_sym
             define_method method_name do
-              klass.to_s.constantize.favored_by(self,context)
+              klass.to_s.constantize.favored_by(self,context) # TODO: here would cause problem, If klass did not respond_to favored_by? Need a test to prove it
             end
           end
         end
@@ -55,7 +41,7 @@ module OneTouch
     # find the favor to target with specific context
     # return ARelation object
     def find_favor(target,context)
-      favors.where(context: context,favorable: target)
+      favors & Favor.context_as(context).favorable_as(target)
     end
 
     # check favor exist or not

data/lib/one_touch/models/as_favorable.rb

@@ -5,33 +5,28 @@ module OneTouch
     included do
       class_attribute :default_context_in_favorable, :instance_writer => false
 
-      scope :join_be_favors, joins(:be_favors.type(self))
-
-      scope :host_is, lambda { |someone|  where(:be_favors => { :host =>  someone } ) }
-      scope :context_as, lambda { |context| where(:be_favors => { :context => context } ) if context.present? }
+      scope :favorable_context_as, lambda { |context| joins(:be_favors).where(favor_class.table_name.to_sym => { :context => context } ) } # if in the system there are two favor_klass, how to deal with
       scope :group_by_favorable, group("#{favor_klass.downcase.pluralize}.favorable_id")
-      # scope :includes_favors_and_hosts, includes(:be_favors => :host)
 
-    end # included
+    end # End included
 
     module ClassMethods
 
       def allstars(context=default_context_in_favorable)
-        join_be_favors.context_as(context).group_by_favorable.
+        favorable_context_as(context).group_by_favorable.
           select("count(*) as counter, #{self.table_name}.*").order("counter desc")
       end
 
       def favored_by(user,context = default_context_in_favorable)
-        join_be_favors.context_as(context).
-          host_is(user)
+        favorable_context_as(context) & Favor.host_as(user)
       end
 
       def unfavored_by(user,context = default_context_in_favorable)
         favored_by_ids = favored_by(user,context).map(&:id).presence || [0]
-        where(:id.not_in => favored_by_ids)
+        where("#{table_name}.id not in (?)", favored_by_ids)
       end
 
-    end # ClassMethods
+    end # End ClassMethods
 
     def favors_count(cont=default_context_in_favorable)
       be_favors.context_as(cont).count
@@ -44,7 +39,7 @@ module OneTouch
     end
 
     def favored_by?(ahost, context= default_context_in_favorable)
-      be_favors.where(:host => ahost, :context => context).present?
+      (be_favors & Favor.host_as(ahost).context_as(context)).present?
     end
 
     private

data/lib/one_touch/version.rb

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

data/readme.md

@@ -1,11 +1,10 @@
 ### Intro
 In webapp, many data is generated by just one click like focus someone, dislike some post.This gem make it easy.
 
-These one click data most are relation data and managed in one single model in this gem. So we can analyze the relation data easily.
+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
-version ~> 1 support Rails3.0 and need meta_where
-version ~> 2 will support Rails3.1 and need squeel
+Rails > 3.0
 
 ## Usage
     gem install one_touch
@@ -17,16 +16,17 @@ Then we define:
     class User; as_favor_host; as_favorable; end;
     class Post; as_favorable; end;
     class Tag; as_favorable; end;
-Make sure Favor has defined constants CONTEXT and CONTEXT_MATCH before acts_as_favor
-The Favor columns depend on the relations you defined
-In this case, it would be id, user_id, favorable_id, favorable_type, context.
-Don't forget context column.
     class Favor
       CONTEXT = Set.new(%w[focus favorite follow agree oppose buy subscribe])
       CONTEXT_MATCH = { :focus => [:Tag, :Post], :follow => [:User] }
-
       acts_as_favor
     end
+
+Make sure Favor has defined constants CONTEXT and CONTEXT_MATCH before acts_as_favor.
+The columns of table favors depend on the relations you defined.
+In this case, it would be id, user_id, favorable_id, favorable_type and context.
+Don't forget context column.
+
 The generated relations between them are:
     User has_many :favors, :class_name => "Favor", :as => :host
     Post has_many :be_favors, :class_name => "Favor", :as => :favorable
@@ -40,6 +40,7 @@ You can define the relation by yourself.
       belongs_to :favorable, :polymorphic => true
       acts_as_favor :no_default_relations => true
     end
+
 Make sure the relation name are host and favorable, they can not be changed
 
 Or you want Favor model to be another name, Bridge.
@@ -106,10 +107,13 @@ 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
-  Change the dependency meta_where to squeel and make it support Rails3.1
-  Add cache to favored_by, favor_to
+  Change the dependency meta_where to squeel and make it support Rails3.1.
+
+  Add cache to favored_by, favor_to.
+
   Add a generator to make install faster.
-  Add another gem to supply view and controller template
+
+  Add another gem to supply view and controller template.
 
 ### Abstract Requirement
   Connect any two resource in one model.

data/spec/fake_app.rb

@@ -53,6 +53,7 @@ end
 class Tagging < ActiveRecord::Base
 end
 
+
 #migrations
 class CreateAllTables < ActiveRecord::Migration
   def self.up

data/spec/models/as_favorable_spec.rb

@@ -9,13 +9,8 @@ describe OneTouch::AsFavorable do
       Tag.should respond_to(:allstars)
     end
 
-    it "when context is nil, return all" do
-      all_tags = Tag.all
-      Tag.context_as(nil).should eq(all_tags)
-    end
-
     it "first tag favors count should be 1" do
-      Tag.first.favors_count.should eq(1)
+      Tag.first.favors_count(:favorite).should eq(1)
     end
 
   end

data/spec/spec_helper.rb

@@ -2,9 +2,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rails'
 require 'one_touch'
+
 require File.join(File.dirname(__FILE__), 'fake_app')
-require 'meta_where'
-#require 'squeel'
+# require 'squeel'
 require 'rspec/rails'
 require 'models/load_test_data'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: one_touch
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000Z
+date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &25054060 !ruby/object:Gem::Requirement
+  requirement: &14408360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *25054060
+  version_requirements: *14408360
 description: ! ' Make one click operation simple '
 email:
 - raykincoldxiao@gmail.com
@@ -43,7 +43,6 @@ files:
 - lib/one_touch/models/relations.rb
 - lib/one_touch/railtie.rb
 - lib/one_touch/version.rb
-- log/development.log
 - one_touch.gemspec
 - readme.md
 - spec/fake_app.rb