resonance 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7c4bdd752ddca3396d4f24024f08a59984ac57
-  data.tar.gz: 805b258f973929a7bb6c9140e43b82bfca6c8efd
+  metadata.gz: b9d54325b0019a5cea69f4f76ceb55217e55e86f
+  data.tar.gz: 866b1fd32593d8e279cc1f6a3b2e7bc6ff21d35c
 SHA512:
-  metadata.gz: 42f61b120a9f5d34c488589f05fcf12201e61662dc55fc200c754c9c42b69ec1addd9b1d46361002ce41e47982d0985f31bcb60d7f101a03ba2d0a30701cb784
-  data.tar.gz: ea456df88231423c5890c70d096a6f7b3c020ba47b65f2034f200d3235be0d231708e16cb867392f0835d98ed7b3fb530acdca27015a3c129d1ea77b5eacaa4e
+  metadata.gz: c2fdb2ffd19c860f8ad5e16c96b244d6868d6e7173268ac2bc6e82305d870d9da3196792501069b489d94c4d1ea17b71e91cb6dc7bb137c0e40a37868617695b
+  data.tar.gz: 8d696bccc8430b5d9e2ffc29c77c964e42f42890a8e7ac132aaa750505874e5fa12badff7f289f562aba5c0f5f04b0664cd559647b9c4b37716a0df4a26a3171

data/README.md

@@ -51,7 +51,7 @@ Then, define `Resonatable` module to `app/models/concerns/resonatable.rb`:
 module Resonatable
   include Resonance
 
-  resonate :user, with: :user, by: :follow
+  resonate :user, target: :user, action: :follow
 end
 ```
 
@@ -106,7 +106,7 @@ This case adds like feature to User and Post model.
 module Resonatable
   include Resonance
 
-  resonate :user, with: :post, by: :like
+  resonate :user, target: :post, action: :like
 end
 
 class User < ActiveRecord::Base
@@ -137,8 +137,8 @@ At the same time, some `resonate` methods are able to be defined:
 module Resonatable
   include Resonance
 
-  resonate :user, with: :user, by: :follow
-  resonate :user, with: :post, by: :like
+  resonate :user, target: :user, action: :follow
+  resonate :user, target: :post, action: :like
 end
 ```
 
@@ -147,7 +147,10 @@ end
 If you want to use other foreign key name, you can define it by `:foreign_key` option.
 
 ```ruby
-resonate :user, with: :post, by: :like, foreign_key: :post_id # Default is `:target_post_id`
+resonate :user,
+  target: :post,
+  action: :like,
+  foreign_key: { target: :post_id } # Default key is `:target_post_id`
 ```
 
 ## Contributing

data/lib/resonance.rb

@@ -11,12 +11,20 @@ module Resonance
   module ClassMethods
     include Resonance::Supports::Converter
 
-    def resonate(subject, with: nil, by: nil, **options)
-      @roles = { source: subject, target: with, action: by }
-      @options = options
+    def resonate(source, target: nil, action: nil, foreign_key: {})
+      [source, target, action].each do |role|
+        if role.nil?
+          raise Resonance::Errors::ArgumentError, 'Passed argument is not a valid'
+        end
+      end
+
+      source = source.to_s
+      target = target.to_s
+      action = action.to_s
 
-      if @roles.values.any?(&:nil?)
-        raise Resonance::Errors::ArgumentError, 'Passed argument is not a valid'
+      foreign_key.tap do |key|
+        key[:source] = :"#{source}_id"        if key[:source].nil?
+        key[:target] = :"target_#{target}_id" if key[:target].nil?
       end
 
       classify(source).class_eval <<-EOS
@@ -33,7 +41,7 @@ module Resonance
             return
           end
 
-          #{pluralize(action)}.create(#{foreign_key}: target.id)
+          #{pluralize(action)}.create(#{foreign_key[:target]}: target.id)
         end
 
         def un#{action}(target)
@@ -41,17 +49,17 @@ module Resonance
             return
           end
 
-          #{pluralize(action)}.find_by(#{foreign_key}: target.id).destroy
+          #{pluralize(action)}.find_by(#{foreign_key[:target]}: target.id).destroy
         end
 
         def #{progressize(action)}?(target)
-          #{pluralize(action)}.exists?(#{foreign_key}: target.id)
+          #{pluralize(action)}.exists?(#{foreign_key[:target]}: target.id)
         end
       EOS
 
       classify(target).class_eval <<-EOS
         has_many :#{pluralize(action)}_as_target,
-          foreign_key: :#{foreign_key},
+          foreign_key: :#{foreign_key[:target]},
           class_name: '#{classify(action)}',
           dependent: :destroy
 
@@ -60,7 +68,7 @@ module Resonance
           source: :#{source}
 
         def #{pastize(action)}_by?(source)
-          source.#{pluralize(action)}.exists?(#{foreign_key}: id)
+          source.#{pluralize(action)}.exists?(#{foreign_key[:target]}: id)
         end
       EOS
 
@@ -69,26 +77,8 @@ module Resonance
 
         belongs_to :target_#{target},
           class_name: '#{classify(target)}',
-          foreign_key: :#{foreign_key}
+          foreign_key: :#{foreign_key[:target]}
       EOS
     end
-
-    private
-
-    def source
-      @roles[:source].to_s
-    end
-
-    def target
-      @roles[:target].to_s
-    end
-
-    def action
-      @roles[:action].to_s
-    end
-
-    def foreign_key
-      @options[:foreign_key] || "target_#{target}_id"
-    end
   end
 end

data/lib/resonance/version.rb

@@ -1,3 +1,3 @@
 module Resonance
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

data/spec/dummy/application.rb

@@ -29,8 +29,8 @@ class Like   < ActiveRecord::Base; end
 module Resonatable
   include Resonance
 
-  resonate :user, with: :user, by: :follow
-  resonate :user, with: :post, by: :like, foreign_key: :post_id
+  resonate :user, target: :user, action: :follow
+  resonate :user, target: :post, action: :like, foreign_key: { target: :post_id }
 end
 
 class User

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resonance
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - kami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport