marks 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 997ae105ecd828bf77166e9fe5c8944c68a12187
-  data.tar.gz: 1b96ae4a38fe0a4e0edefefc806f50eb3775a0be
+  metadata.gz: 1e86462ca450799da8d9cc00a1e189703a7e20ed
+  data.tar.gz: 3c4bf861b0d599b2f78e1c590aa3edcab2492bea
 SHA512:
-  metadata.gz: 638f84c0b05ae1d2746bab348e3dab5870c43efb99f179444c57e28adda4a4e4fa4a13b9296b7af44b354612fb3873b775fae021603afae637e72928f9507e38
-  data.tar.gz: 0ac089adb5ece388616f8f2a4be8facee2b878d53ef66b4952189329e7480e65a140e9fd4a9a2cbca9666d50ef99ddf4d3b66153382696b4c16230eaf111d7a0
+  metadata.gz: 2b1604676f45f4152e59d2e38f432eec222eafed0d3cedce2911d57f49f9eb5c967a0b8bce8517efa8ca444bec4e0e9c0dde437648166e32edfe5c5f201b0ca9
+  data.tar.gz: 4755d17d2d6c7537fff745b08b138ccd7377d285918739a18e58ee447f8b22e5b0da8995b299dd53eea4cf4755e2c909fc5444118a5b5cb76dcbb8a8e675ba9d

data/lib/marks/marker.rb

@@ -21,19 +21,29 @@ module Marks
           define_method :'marks?' do |markable, mark|
             classified_mark = mark.to_s.classify
             raise ArgumentError unless types.map { |t| t.to_s.classify }.include?(classified_mark)
-            outgoing_marks.where(mark_type: classified_mark, markable_type: markable.class.table_name.classify, markable_id: markable).any?
+            if markable.has_attribute?('type')
+              markable_type = markable.class.base_class.name
+            else
+              markable_type = markable.class.name
+            end
+            outgoing_marks.where(mark_type: classified_mark, markable_type: markable_type, markable_id: markable).any?
           end
 
           define_method :'unmarks' do |markable, mark|
             classified_mark = mark.to_s.classify
             raise ArgumentError unless types.map { |t| t.to_s.classify }.include?(classified_mark)
-            outgoing_marks.where(mark_type: classified_mark, markable_type: markable.class.table_name.classify, markable_id: markable).destroy_all
+            if markable.has_attribute?('type')
+              markable_type = markable.class.base_class.name
+            else
+              markable_type = markable.class.name
+            end
+            outgoing_marks.where(mark_type: classified_mark, markable_type: markable_type, markable_id: markable).destroy_all
           end
 
           define_method :'markings' do |markable_class, mark|
             classified_mark = mark.to_s.classify
             raise ArgumentError unless types.map { |t| t.to_s.classify }.include?(classified_mark)
-            outgoing_marks.where(mark_type: classified_mark, markable_type: markable_class.to_s.constantize.table_name.classify)
+            outgoing_marks.where(mark_type: classified_mark, markable_type: markable_class.name)
           end
         end
       end

data/lib/marks/version.rb

@@ -1,3 +1,3 @@
 module Marks
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marks
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Masahiro Ihara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: An engine that enable you to mark any ActiveRecord model as many as you like