riaction 1.2.2 → 1.2.3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG #
 
+## 1.2.3 ##
+
+* Fixing bug with default params for riaction events not being evaluated correctly as methods
+* Multiple calls to setting the default params will merge, and not replace one-another
+
 ## 1.2.2 ##
 
 * Fixed bug in event performer when perform() received event name as a string rather than a symbol

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riaction (1.2.1)
+    riaction (1.2.2)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
       rake

data/lib/riaction/riaction.rb

@@ -26,7 +26,14 @@ module Riaction
           add_or_update_riaction_event(opts.delete(:name), opts)
         elsif type == :option || type == :options
           opts.each_pair do |option, value|
-            riaction_options[option] = value if ::Riaction::Constants.riaction_options.has_key?(option)
+            if ::Riaction::Constants.riaction_options.has_key?(option)
+              # merge hashes, replace all else;
+              if riaction_options[option].is_a? Hash
+                riaction_options[option].merge! value
+              else
+                riaction_options[option] = value
+              end
+            end
           end
         end
       end
@@ -347,7 +354,7 @@ module Riaction
                 :id => profile_keys.first.last.first.last
               }
             end
-            resolved_hash[event_name][:params] = riaction_resolve_param(args[:params]).merge(self.class.riaction_options[:default_event_params])
+            resolved_hash[event_name][:params] = riaction_resolve_param(args[:params]).merge(riaction_resolve_param(self.class.riaction_options[:default_event_params]))
           end
           resolved_hash
         end

data/lib/riaction/version.rb

@@ -1,3 +1,3 @@
 module Riaction
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/riaction_spec.rb

@@ -903,6 +903,11 @@ describe "Riaction" do
         Comment.class_eval do
           riaction :event, :name => :make_a_comment, :trigger => :create, :profile => :user, :params => {:foo => 'bar'}
           riaction :option, :default_event_params => {:extra => 'params'}
+          riaction :option, :default_event_params => {:stars => :star_count}
+          
+          def star_count
+            'five'
+          end
         end
         @comment = Comment.riactionless{ Comment.create(:user_id => @user.id, :content => 'this is a comment') }
       end
@@ -915,7 +920,7 @@ describe "Riaction" do
               :id_type => :custom,
               :id => @user.id
             },
-            :params => {:foo => 'bar', :extra => 'params'} 
+            :params => {:foo => 'bar', :extra => 'params', :stars => 'five'} 
           }
         }).should == @comment.riaction_event_params
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riaction
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153265020 !ruby/object:Gem::Requirement
+  requirement: &2153284460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2153265020
+  version_requirements: *2153284460
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153264580 !ruby/object:Gem::Requirement
+  requirement: &2153284020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153264580
+  version_requirements: *2153284020
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2153264060 !ruby/object:Gem::Requirement
+  requirement: &2153283560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153264060
+  version_requirements: *2153283560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153263580 !ruby/object:Gem::Requirement
+  requirement: &2153283140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153263580
+  version_requirements: *2153283140
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153263060 !ruby/object:Gem::Requirement
+  requirement: &2153282640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153263060
+  version_requirements: *2153282640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153262560 !ruby/object:Gem::Requirement
+  requirement: &2153282140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153262560
+  version_requirements: *2153282140
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2153262180 !ruby/object:Gem::Requirement
+  requirement: &2153281760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153262180
+  version_requirements: *2153281760
 - !ruby/object:Gem::Dependency
   name: ruby-iactionable
-  requirement: &2153261600 !ruby/object:Gem::Requirement
+  requirement: &2153281220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153261600
+  version_requirements: *2153281220
 description: Wrapper for IActionable's restful API and an "acts-as" style interface
   for models to behave as profiles and drive game events.
 email: