riaction 1.2.7 → 1.3.0

data/.rspec

@@ -0,0 +1,3 @@
+--format doc
+--colour
+--profile

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG #
 
+## 1.3.0 ##
+
+* Added new feature to have a riaction profile class return the raw json from the IActionable API instead of the objects they get wrapped in by ruby-iactionable gem
+
 ## 1.2.7 ##
 
 * Fixed a bug where the event parameters on the instance of class defining multiple events raises an error when one of those events does not point to a valid profile. Now, that event will simply be missing from the returned event parameters.  Attempting to log an event that does not point to a valid profile will raise the appropriate error.

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    riaction (1.2.6)
+    riaction (1.2.7)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
       rake
       resque
-      ruby-iactionable (>= 0.0.2)
+      ruby-iactionable (>= 0.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.1)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
+    addressable (2.2.7)
     archive-tar-minitar (0.5.2)
-    arel (3.0.0)
+    arel (3.0.2)
     builder (3.0.0)
     columnize (0.3.6)
     diff-lcs (1.1.3)
@@ -37,8 +37,8 @@ GEM
     i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    multi_json (1.0.4)
-    multipart-post (1.1.4)
+    multi_json (1.1.0)
+    multipart-post (1.1.5)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
@@ -47,7 +47,7 @@ GEM
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
-    resque (1.19.0)
+    resque (1.20.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
@@ -68,7 +68,7 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby-iactionable (0.0.2)
+    ruby-iactionable (0.1.0)
       activesupport (>= 3.0.0)
       faraday
       faraday-stack
@@ -81,7 +81,7 @@ GEM
       tilt (~> 1.3, >= 1.3.3)
     sqlite3 (1.3.5)
     tilt (1.3.3)
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
     vegas (0.1.11)
       rack (>= 1.0.0)
     yard (0.7.5)

data/README.md

@@ -193,7 +193,7 @@ To process all of the models in your application that declare themselves as prof
 
 To run a specific event on all instances off a class that define that event:
 
-    rake riaction:rails:process:event['ClassName', :event_name]
+    rake riaction:rails:process:event[ClassName, event_name]
 
 ----------------
 

data/lib/riaction/riaction.rb

@@ -243,6 +243,11 @@ module Riaction
           raise RuntimeError.new("#{self.to_s} does not define a profile type #{riaction_use_profile}")
         end
         
+        def riaction_objectify_response_data(bool)
+          @riaction_objectify_response_data = !!bool
+          self
+        end
+        
         #################
         #  API wrappers #
         #################
@@ -250,7 +255,7 @@ module Riaction
         def riaction_profile_summary(achievement_count=nil)
           @iactionable_api ||= IActionable::Api.new
           keys = riaction_profile_keys.fetch(riaction_use_profile)
-          @iactionable_api.get_profile_summary(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, achievement_count)
+          @iactionable_api.set_object_wrapping(@riaction_objectify_response_data).get_profile_summary(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, achievement_count)
         rescue KeyError => e
           raise RuntimeError.new("#{self.to_s} does not define a profile type #{riaction_use_profile}")
         rescue IActionable::Error::BadRequest => e
@@ -260,7 +265,7 @@ module Riaction
         def riaction_profile_achievements(filter_type=nil)
           @iactionable_api ||= IActionable::Api.new
           keys = riaction_profile_keys.fetch(riaction_use_profile)
-          @iactionable_api.get_profile_achievements(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, filter_type)
+          @iactionable_api.set_object_wrapping(@riaction_objectify_response_data).get_profile_achievements(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, filter_type)
         rescue KeyError => e
           raise RuntimeError.new("#{self.to_s} does not define a profile type #{riaction_use_profile}")
         rescue IActionable::Error::BadRequest => e
@@ -270,7 +275,7 @@ module Riaction
         def riaction_profile_challenges(filter_type=nil)
           @iactionable_api ||= IActionable::Api.new
           keys = riaction_profile_keys.fetch(riaction_use_profile)
-          @iactionable_api.get_profile_challenges(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, filter_type)
+          @iactionable_api.set_object_wrapping(@riaction_objectify_response_data).get_profile_challenges(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, filter_type)
         rescue KeyError => e
           raise RuntimeError.new("#{self.to_s} does not define a profile type #{riaction_use_profile}")
         rescue IActionable::Error::BadRequest => e
@@ -280,7 +285,7 @@ module Riaction
         def riaction_profile_goals(filter_type=nil)
           @iactionable_api ||= IActionable::Api.new
           keys = riaction_profile_keys.fetch(riaction_use_profile)
-          @iactionable_api.get_profile_goals(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, filter_type)
+          @iactionable_api.set_object_wrapping(@riaction_objectify_response_data).get_profile_goals(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, filter_type)
         rescue KeyError => e
           raise RuntimeError.new("#{self.to_s} does not define a profile type #{riaction_use_profile}")
         rescue IActionable::Error::BadRequest => e
@@ -290,7 +295,7 @@ module Riaction
         def riaction_profile_notifications
           @iactionable_api ||= IActionable::Api.new
           keys = riaction_profile_keys.fetch(riaction_use_profile)
-          @iactionable_api.get_profile_notifications(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s)
+          @iactionable_api.set_object_wrapping(@riaction_objectify_response_data).get_profile_notifications(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s)
         rescue KeyError => e
           raise RuntimeError.new("#{self.to_s} does not define a profile type #{riaction_use_profile}")
         rescue IActionable::Error::BadRequest => e
@@ -300,7 +305,7 @@ module Riaction
         def riaction_profile_points(point_type)
           @iactionable_api ||= IActionable::Api.new
           keys = riaction_profile_keys.fetch(riaction_use_profile)
-          @iactionable_api.get_profile_points(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, point_type)
+          @iactionable_api.set_object_wrapping(@riaction_objectify_response_data).get_profile_points(riaction_use_profile.to_s, keys.first[0].to_s, keys.first[1].to_s, point_type)
         rescue KeyError => e
           raise RuntimeError.new("#{self.to_s} does not define a profile type #{riaction_use_profile}")
         rescue IActionable::Error::BadRequest => e

data/lib/riaction/version.rb

@@ -1,3 +1,3 @@
 module Riaction
-  VERSION = "1.2.7"
+  VERSION = "1.3.0"
 end

data/riaction.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "activerecord", ">= 3.0.0"
   s.add_runtime_dependency "activesupport", ">= 3.0.0"
   s.add_runtime_dependency "resque"
-  s.add_runtime_dependency "ruby-iactionable", ">= 0.0.2"
+  s.add_runtime_dependency "ruby-iactionable", ">= 0.1.0"
 end

data/spec/riaction_spec.rb

@@ -42,6 +42,7 @@ describe "Riaction" do
     ActiveRecord::Base.connection.begin_db_transaction
     
     @api = mock("mocked IActionable API")
+    @api.stub(:set_object_wrapping).and_return(@api)
     IActionable::Api.stub!(:new).and_return(@api)
     Resque.stub(:enqueue).and_return true
     
@@ -138,30 +139,77 @@ describe "Riaction" do
           @user = User.riactionless{ User.create(:name => 'zortnac') }
           @mock_response = mock("mock API response").as_null_object
         end
-
-        it "should load a profile through the API with the correct parameters" do
-          @api.should_receive(:get_profile_summary).once.with("player", "custom", @user.id.to_s, 10).and_return(@mock_response)
-          @user.riaction_profile_summary(10).should == @mock_response
-        end
         
-        it  "should load profile achievments through the API with the correct parameters" do
-          @api.should_receive(:get_profile_achievements).once.with("player", "custom", @user.id.to_s, nil).and_return(@mock_response)
-          @user.riaction_profile_achievements.should == @mock_response
-        end
-        
-        it  "should load profile challenges through the API with the correct parameters" do
-          @api.should_receive(:get_profile_challenges).once.with("player", "custom", @user.id.to_s, nil).and_return(@mock_response)
-          @user.riaction_profile_challenges.should == @mock_response
+        describe "when told to return raw JSON from the API" do
+          before do
+            @user.riaction_objectify_response_data(false)
+          end
+          
+          it "should load a profile through the API, set to not wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(false).and_return(@api)
+            @api.should_receive(:get_profile_summary).once.ordered.with("player", "custom", @user.id.to_s, 10).and_return(@mock_response)
+            @user.riaction_profile_summary(10).should == @mock_response
+          end
+
+          it  "should load profile achievments through the API, set to not wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(false).and_return(@api)
+            @api.should_receive(:get_profile_achievements).once.ordered.with("player", "custom", @user.id.to_s, nil).and_return(@mock_response)
+            @user.riaction_profile_achievements.should == @mock_response
+          end
+
+          it  "should load profile challenges through the API, set to not wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(false).and_return(@api)
+            @api.should_receive(:get_profile_challenges).once.ordered.with("player", "custom", @user.id.to_s, nil).and_return(@mock_response)
+            @user.riaction_profile_challenges.should == @mock_response
+          end
+
+          it  "should load profile goals through the API, set to not wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(false).and_return(@api)
+            @api.should_receive(:get_profile_goals).once.ordered.with("player", "custom", @user.id.to_s, nil).and_return(@mock_response)
+            @user.riaction_profile_goals.should == @mock_response
+          end
+
+          it "should load profile notifications through the API, set to not wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(false).and_return(@api)
+            @api.should_receive(:get_profile_notifications).once.ordered.with("player", "custom", @user.id.to_s).and_return(@mock_response)
+            @user.riaction_profile_notifications.should == @mock_response
+          end
         end
         
-        it  "should load profile goals through the API with the correct parameters" do
-          @api.should_receive(:get_profile_goals).once.with("player", "custom", @user.id.to_s, nil).and_return(@mock_response)
-          @user.riaction_profile_goals.should == @mock_response
-        end
+        describe "when told to return json from the API wrapped as objects" do
+          before do
+            @user.riaction_objectify_response_data(true)
+          end
+          
+          it "should load a profile through the API, set to wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(true).and_return(@api)
+            @api.should_receive(:get_profile_summary).once.ordered.with("player", "custom", @user.id.to_s, 10).and_return(@mock_response)
+            @user.riaction_profile_summary(10).should == @mock_response
+          end
 
-        it "should load profile notifications through the API with the correct parameters" do
-          @api.should_receive(:get_profile_notifications).once.with("player", "custom", @user.id.to_s).and_return(@mock_response)
-          @user.riaction_profile_notifications.should == @mock_response
+          it  "should load profile achievments through the API, set to wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(true).and_return(@api)
+            @api.should_receive(:get_profile_achievements).once.ordered.with("player", "custom", @user.id.to_s, nil).and_return(@mock_response)
+            @user.riaction_profile_achievements.should == @mock_response
+          end
+
+          it  "should load profile challenges through the API, set to wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(true).and_return(@api)
+            @api.should_receive(:get_profile_challenges).once.ordered.with("player", "custom", @user.id.to_s, nil).and_return(@mock_response)
+            @user.riaction_profile_challenges.should == @mock_response
+          end
+
+          it  "should load profile goals through the API, set to wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(true).and_return(@api)
+            @api.should_receive(:get_profile_goals).once.ordered.with("player", "custom", @user.id.to_s, nil).and_return(@mock_response)
+            @user.riaction_profile_goals.should == @mock_response
+          end
+
+          it "should load profile notifications through the API, set to wrap the response, with the correct parameters" do
+            @api.should_receive(:set_object_wrapping).once.ordered.with(true).and_return(@api)
+            @api.should_receive(:get_profile_notifications).once.ordered.with("player", "custom", @user.id.to_s).and_return(@mock_response)
+            @user.riaction_profile_notifications.should == @mock_response
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riaction
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000Z
+date: 2012-03-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153231060 !ruby/object:Gem::Requirement
+  requirement: &2156448140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *2153231060
+  version_requirements: *2156448140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153230620 !ruby/object:Gem::Requirement
+  requirement: &2156446940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153230620
+  version_requirements: *2156446940
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2153230160 !ruby/object:Gem::Requirement
+  requirement: &2156446200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153230160
+  version_requirements: *2156446200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153229740 !ruby/object:Gem::Requirement
+  requirement: &2156445320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153229740
+  version_requirements: *2156445320
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2153229320 !ruby/object:Gem::Requirement
+  requirement: &2156444300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153229320
+  version_requirements: *2156444300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153228860 !ruby/object:Gem::Requirement
+  requirement: &2156443200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153228860
+  version_requirements: *2156443200
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153228200 !ruby/object:Gem::Requirement
+  requirement: &2156441840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153228200
+  version_requirements: *2156441840
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153227560 !ruby/object:Gem::Requirement
+  requirement: &2156440980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153227560
+  version_requirements: *2156440980
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2153226980 !ruby/object:Gem::Requirement
+  requirement: &2156440340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,18 +111,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153226980
+  version_requirements: *2156440340
 - !ruby/object:Gem::Dependency
   name: ruby-iactionable
-  requirement: &2153226140 !ruby/object:Gem::Requirement
+  requirement: &2156439380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153226140
+  version_requirements: *2156439380
 description: Wrapper for IActionable's restful API and an "acts-as" style interface
   for models to behave as profiles and drive game events.
 email:
@@ -132,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .yardoc/checksums
 - .yardoc/objects/root.dat
 - .yardoc/proxy_types
@@ -141,7 +142,6 @@ files:
 - MIT-LICENSE.txt
 - README.md
 - Rakefile
-- db/riaction.db
 - doc/Riaction.html
 - doc/Riaction/ConfigurationError.html
 - doc/Riaction/Constants.html
@@ -227,3 +227,4 @@ test_files:
 - spec/profile_creation_spec.rb
 - spec/riaction_spec.rb
 - spec/spec_helper.rb
+has_rdoc: