one_touch 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a98a57687f0a2ec6b1dcaac63bafdc44c16134c
-  data.tar.gz: 30dab1a2ccc18f7f79456a16fb7592602bcb49ca
+  metadata.gz: 34cb00212443af916d927fa834c4cd6e6b67fd46
+  data.tar.gz: 98a3670dd6b8fb6e2a617f4e4c9efdf254d6407a
 SHA512:
-  metadata.gz: 29f2f5752cb2a54d169552fdbf29e624f8b8f0dc58fbb88957a206b2b493fdc4de23c4fce90694f909e80a67a67dc7270fbff5f45a88926a18b3315c6b407403
-  data.tar.gz: 009567cdfd4e1b1ea37ddee259e90c4a164ba41cac5b8e5113679b8a1f9728ce56a9e1d346aa8d451962f5c758c08cdad4775fec401c4aab928f359c41ebf3ab
+  metadata.gz: e1f6abd1563021cdb01749dbef9cbcc19c0670e3c2113510d61755e8a2ff93d94ef72569f98d654ffe6f1a30eb8a2970ad13177708fbac3931e9a4e44349d5d8
+  data.tar.gz: da50c4fc6e74136788fca80ff866aac68c5fc7034f2d23b86f4313686252ed9419787f155a1b54386145d3fe2d325346f58be5da3c836562b4ed5e5542fe1f60

data/CHANGELOG

@@ -0,0 +1,4 @@
+Version 2.1.0
+Add loading sequence test and fix the bug of it.
+Version 2.0.0
+Refactor. But has a bug about loading sequence.

data/Rakefile

@@ -2,7 +2,8 @@ require 'bundler/gem_tasks'
 
 desc "Running Test"
 task :test do
-  # forgot how to include all spec files
-  system "bundle exec rspec spec/models/*spec.rb --debugger --backtrace --fail-fast"
   system "bundle exec rspec spec/core/*spec.rb --debugger --backtrace --fail-fast"
+  (0..5).each do |num|
+    system "OneTouchSeq=#{num} bundle exec rspec spec/models/*spec.rb --debugger --backtrace --fail-fast"
+  end
 end

data/lib/one_touch/core/bridge.rb

@@ -32,10 +32,12 @@ module OneTouch
     # add only one port, make sure pg is {portname: klassname}
     def add_new_port(pg)
       portname = pg.keys.first
-      if port_group.has_key? portname
-        self.port_group[portname].concat pg[portname]
-      else
-        self.port_group[portname] = pg[portname]
+      if portname # pg maybe equal {} and portname is nil
+        if port_group.has_key? portname
+          self.port_group[portname].concat pg[portname]
+        else
+          self.port_group[portname] = pg[portname]
+        end
       end
     end
 
@@ -75,9 +77,8 @@ module OneTouch
   module Bridge
 
     def self.included(base)
-      RelationRecorder.update_or_new(bridge_klass: base.name, bridge_class: base)
+      RelationRecorder.update_or_new(bridge_klass: base.name, bridge_class: base, port_group: {})
     end
 
-
   end # END Bridge
 end

data/lib/one_touch/core/bridge_context.rb

@@ -0,0 +1,16 @@
+# Bridge with Context style
+# The bridge class contains context attribute which defines the relation context between two ports
+module OneTouch
+  module BridgeContext
+
+    class DependencyError
+
+    end
+
+    def self.included(base)
+      raise DependencyError unless new.respond_to? :context
+    end
+
+
+  end # END BridgeContext
+end

data/lib/one_touch/models/active_record_extension.rb

@@ -9,10 +9,7 @@ module OneTouch
   module ActiveRecordExtension
     extend ActiveSupport::Concern
 
-    included do
-
-    end
-
+    # methods added here are added to ActiveRecord::Base, so make it as thin as possible
     module ClassMethods
 
       # Default is define two relations:
@@ -28,9 +25,8 @@ module OneTouch
       def acts_as_favor(opt={})
         include ::OneTouch::Bridge
         opt.reverse_merge!({:include_host_relation_module => true, :host_class_name => "User", :no_default_relations => false})
-        class_attribute :host_relation_type, :favorable_relation_type, :instance_writer => false
-
-        # method_name_of_host_klasses = "host_klasses_for_#{name.underscore}"
+        class_attribute :host_relation_type, :favorable_relation_type, :include_host_relation_module, :instance_writer => false
+        self.include_host_relation_module = opt[:include_host_relation_module]
 
         include ActsAsFavor
 
@@ -51,25 +47,10 @@ module OneTouch
           end
         end
 
+        # include Relation model and make favorable classes also include HostRelation if needed
+        # make sure the former loaded host class run method after_load_acts_as_favor
         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
-        # The following code should be in another file
-
-        if opt[:include_host_relation_module]
-          class_attribute :include_host_relation_module, :instance_writer => false
-          self.include_host_relation_module = true
-          add_host_relation_map(relation_recorder.port_group[:favorable], :be_favors, :host)
-        end
-
-        relation_recorder.port_group[:host].each do |klassname|
-          klass = klassname.to_s.constantize
-          klass.after_load_acts_as_favor if klass.respond_to? :after_load_acts_as_favor
-        end
-
       end
 
       # Used in host class
@@ -80,7 +61,6 @@ module OneTouch
         include ::OneTouch::PortBuild
         opt.reverse_merge!(bridge_klass: "Favor", no_default_relations: false, portname: :host)
         append_relation(opt)
-        # assign_cattr_in_favor_class(:host_klasses,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
@@ -95,25 +75,11 @@ module OneTouch
         include ::OneTouch::PortBuild
         opt.reverse_merge!(bridge_klass: "Favor", no_default_relations: false, portname: :favorable)
         append_relation(opt)
-        # assign_cattr_in_favor_class(:favorable_klasses,opt)
         unless opt[:no_default_relations]
           has_many :be_favors, :class_name => opt[:bridge_klass], :as => :favorable
         end
         include AsFavorable
-        include HostRelation if favor_class.respond_to? :include_host_relation_module and favor_class.include_host_relation_module = true
-      end
-
-      private
-
-      def add_host_relation_map(favorable_klasses, *two_connection_name)
-        include Relations
-        self.target_to_media = :be_favors
-        self.media_to_host = :host
-
-        favorable_klasses.each do |k|
-          klass = k.to_s.constantize
-          klass.send :include, HostRelation  # host_relation model was added to favorable klass
-        end
+        include HostRelation if favor_class.respond_to? :include_host_relation_module and favor_class.include_host_relation_module
       end
 
     end # End ClassMethods

data/lib/one_touch/models/after_as_favor.rb

@@ -17,7 +17,23 @@ module OneTouch
         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
+      if include_host_relation_module
+        include Relations
+        self.target_to_media = :be_favors
+        self.media_to_host = :host
+        (relation_recorder.port_group[:favorable] || []).each do |k|
+          klass = k.to_s.constantize
+          klass.send :include, HostRelation  # host_relation model was added to favorable klass
+        end
+
+      end
+
+      (relation_recorder.port_group[:host] || []).each do |klassname|
+        klass = klassname.to_s.constantize
+        klass.after_load_acts_as_favor if klass.respond_to? :after_load_acts_as_favor
+      end
+
+    end # END class_eval
 
     module ClassMethods
 

data/lib/one_touch/models/as_favorable.rb

@@ -1,4 +1,5 @@
 module OneTouch
+  # Following are all queries # we should list dependency about these queries
   module AsFavorable
     extend ActiveSupport::Concern
 

data/lib/one_touch/version.rb

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

data/readme.md

@@ -1,3 +1,5 @@
+### 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.
 ### Intro
 In webapp, many data is generated by just one click like focus someone, dislike some post.This gem make it easy.
 

data/spec/core/relation_recorder_spec.rb

@@ -1,22 +1,12 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'one_touch'
 
-class Bridge; end
-
 class Favor; end
 
-class User
-  include OneTouch::PortBuild
-end
+class User;  include OneTouch::PortBuild; end
 
 class Admin; include OneTouch::PortBuild; end
 
-class Post; end
-
-class Comment; end
-
-class Port; end
-
 User.append_relation(bridge_klass: 'Favor', portname: :host)
 Admin.append_relation(bridge_klass: 'Favor', portname: :host)
 

data/spec/models/as_favorable_spec.rb

@@ -38,7 +38,8 @@ 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.first.first.should eq(["favorite", Tag.first]) # means first key
+        Favor.build_relations.keys.should include(["favorite", Tag.first]) # means first key
       end
 
     end

data/spec/spec_helper.rb

@@ -7,24 +7,71 @@ require File.join(File.dirname(__FILE__), 'fake_app')
 require 'rspec/rails'
 require 'models/load_test_data'
 
+def puts_marks
+  puts ""
+  puts "#####################"
+end
+
+# The three different model type loading sequence
+def loading_sequence
+
+  case ENV['OneTouchSeq'].to_i
+  when 0
+    puts_marks
+    puts "Loading Sequence 0: favorable -> host -> favor"
+    Tag.as_favorable
+    User.as_favor_host
+    User.as_favorable
+    Favor.acts_as_favor :host_class_name => nil
+  when 1
+    puts_marks
+    puts "Loading Sequence 1: favorable -> favor -> host"
+    Tag.as_favorable
+    Favor.acts_as_favor :host_class_name => nil
+    User.as_favor_host
+    User.as_favorable
+  when 2
+    puts_marks
+    puts "Loading Sequence 2: host -> favorable -> favor"
+    User.as_favor_host
+    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
+    Favor.acts_as_favor :host_class_name => nil
+    Tag.as_favorable
+    User.as_favorable
+  when 4
+    puts_marks
+    puts "Loading Sequence 4: favor -> host -> favorable"
+    Favor.acts_as_favor :host_class_name => nil
+    User.as_favor_host
+    User.as_favorable
+    Tag.as_favorable
+  when 5
+    puts_marks
+    puts "Loading Sequence 5: favor -> favorable -> host"
+    Favor.acts_as_favor :host_class_name => nil
+    User.as_favorable
+    User.as_favor_host
+    Tag.as_favorable
+  end
+end
+
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
 
   config.before :all do
     #CreateAllTables.down if ActiveRecord::Base.connection.table_exists? 'favors'
-    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'favors'
-
-    Tag.as_favorable
+    unless ActiveRecord::Base.connection.table_exists? 'favors'
+      CreateAllTables.up
+      loading_sequence
+    end
+    # we has at least three type of loading sequence
 
-    User.as_favor_host
-
-    User.as_favorable
-    Favor.acts_as_favor :host_class_name => nil
-    # TestingFoo.acts_as_favor
-    # Tag.as_favorable :be_tagging_favors, :klass => "Tagging"
-    # Ask.as_favor_host :tagging_favors, :klass => "Tagging"
-    # Tagging.acts_as_favor :host_class_name => nil, :favorable_klass_name => :Tag, :include_favor_relations_module => true
-    # relation should be in another module
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: one_touch
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - raykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -46,10 +46,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG
 - Gemfile
 - Rakefile
 - lib/one_touch.rb
 - lib/one_touch/core/bridge.rb
+- lib/one_touch/core/bridge_context.rb
 - lib/one_touch/engine.rb
 - lib/one_touch/models/active_record_extension.rb
 - lib/one_touch/models/acts_as_favor.rb