gamifier 1.0.3 → 1.0.4

data/examples/dev.rb

@@ -5,8 +5,8 @@ Gamifier.set :uri => "http://sandbox.v2.badgeville.com/api/berlin/", :key => ENV
 Gamifier.logger.level = Logger::DEBUG
 
 network = Gamifier.dsl do
-  site 'dev2.domain-test.crohr.me' do |site|
-    set :url, 'dev2.domain-test.crohr.me'
+  site 'dev.domain-test.crohr.me' do |site|
+    set :url, 'dev.domain-test.crohr.me'
 
     unit :karma do
       set :label, 'Karma'
@@ -58,7 +58,6 @@ network = Gamifier.dsl do
       set :bucket_drain_rate, bucket_max_capacity/1.5
 
       set :hide_in_widgets, false
-      set :icon, "http://s3.amazonaws.com/icons/icon1.png"
     end
 
     # behavior 'comment_databases' do
@@ -174,6 +173,7 @@ network = Gamifier.dsl do
     #     # the first player who performs at least twice the 'new_question' behaviour
     #     {:command => "count", :comparator => {"$gt" => 2}, :where => {:verb => 'new_question', :site_id => "%site_id"}}
     #   ]
+    #   set :conjunction, "and"
     #   set :adjustment, {
     #     :points => 5
     #   }

data/gamifier.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Gamifier::VERSION
 
-  gem.add_dependency "faraday", "~> 0.4.1"
+  gem.add_dependency "faraday", "~> 0.8"
   gem.add_dependency "json"
-  gem.add_dependency "rack"
+  gem.add_dependency "faraday_middleware", "~> 0.8"
 
   gem.add_development_dependency('rspec', '~> 2')
   gem.add_development_dependency('webmock')

data/lib/gamifier/collection.rb

@@ -22,5 +22,14 @@ module Gamifier
       instance.engine = engine
       instance
     end
+
+    def reset!(params = {})
+      unless params.has_key?(:site)
+        raise ArgumentError, "A :site parameter is required. Pass nil if you really want to delete all the objects of this kind, on all the sites."
+      end
+      all(params) do |entry|
+        entry.destroy
+      end
+    end
   end
 end

data/lib/gamifier/engine.rb

@@ -1,7 +1,6 @@
 require 'faraday'
+require 'faraday_middleware'
 require 'gamifier/collection'
-require 'json'
-require 'rack/utils'
 
 module Gamifier
   class Engine
@@ -13,8 +12,11 @@ module Gamifier
     def initialize(opts = {})
       opts.each{|k,v| config[k.to_sym] = v}
       raise ArgumentError, "Please configure a :uri and :key first." unless ok?
-      @connection = Faraday::Connection.new(:url => uri_to) do |builder|
+      @connection = Faraday.new(:url => uri_to) do |builder|
+        builder.use Faraday::Request::UrlEncoded  # convert request params as "www-form-urlencoded"
+        builder.use Faraday::Response::Logger, Gamifier.logger
         builder.use Faraday::Adapter::NetHttp     # make http requests with Net::HTTP
+        builder.use Faraday::Response::ParseJson, :content_type => /\bjson$/
       end
     end
 
@@ -39,28 +41,26 @@ module Gamifier
         (opts[:head] || {}).each do |k,v|
           req.headers[k] = v
         end
-        req.headers['Content-Type'] ||= 'application/x-www-form-urlencoded'
-        req.body = self.class.encode_www_form(opts[:body]) unless opts[:body].nil?
+        req.body = opts[:body] unless opts[:body].nil?
         Gamifier.logger.debug "#{method.to_s.upcase} #{req.inspect}"
       end
       Gamifier.logger.debug "#{res.inspect}"
-      body = JSON.parse(res.body) rescue res.body
       case res.status
       when 204
         true
       when 200...300
-        body
+        res.body
       when 404
         nil
       when 422
         # Badgeville returns 422 when an entry already exists or is not valid
         [:get, :head].include?(method) ? nil : false
       when 400...500
-        raise HTTPClientError, body
+        raise HTTPClientError, res.body
       when 500...600
-        raise HTTPServerError, body
+        raise HTTPServerError, res.body
       else
-        raise HTTPError, body
+        raise HTTPError, res.body
       end
     end
 
@@ -76,9 +76,5 @@ module Gamifier
         Collection.new(self, klass)
       end
     end
-    
-    def self.encode_www_form(enum)
-      Rack::Utils.build_nested_query(enum)
-    end
   end
-end
+end

data/lib/gamifier/model.rb

@@ -99,7 +99,7 @@ module Gamifier
         params[:per_page] ||= 50
         res = engine.transmit(:get, path, :query => params)
         if res.kind_of?(Hash)
-          entries = res['data'].map{|h| build(h)}
+          entries = map_to_models(res)
           if block
             # Lazy load all the pages
             entries.each{|entry| yield(entry)}
@@ -148,6 +148,10 @@ module Gamifier
           response
         end
       end
+      
+      def map_to_models(response)
+        response['data'].map{|h| build(h)}
+      end
     end
 
     module ClassMethods

data/lib/gamifier/version.rb

@@ -1,3 +1,3 @@
 module Gamifier
-  VERSION = "1.0.3" unless defined?(Gamifier::VERSION)
+  VERSION = "1.0.4" unless defined?(Gamifier::VERSION)
 end

data/spec/integration/collection_integration_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_integration_helper'
+
+describe "managing collections" do
+  before :all do
+    @site = ENGINE.sites.find("ibadgedyou.dev")
+    @site.should_not be_nil
+    ENGINE.activity_definitions.reset!(:site => "ibadgedyou.dev")
+  end
+
+  it "should list all players" do
+    3.times do |i|
+      behavior = ENGINE.activity_definitions.build({:selector => {:verb => "visit#{i}"}, :name => "visit#{i}", :site_id => @site._id}).save
+      behavior.should_not be_nil
+    end
+    ENGINE.activity_definitions.all(:site => "ibadgedyou.dev").length.should == 3
+    ENGINE.activity_definitions.reset!(:site => "ibadgedyou.dev")
+    ENGINE.activity_definitions.all(:site => "ibadgedyou.dev").length.should == 0
+  end
+
+end

data/spec/integration/player_integration_spec.rb

@@ -23,7 +23,7 @@ describe "managing players" do
     end
 
     it "should credit an activity for the player" do
-      activity = @player.credit("visit", :contents_attributes => [{:content_url => "http://somwhere.ltd", :content_type => "page", :title => "Test1"}])
+      activity = @player.credit("visit", :contents_attributes => [{:content_url => "http://dimelo.com", :content_type => "page", :title => "Test1"}])
       activity.should_not be_false
       activity.contents.first["title"].should == "Test1"
       activity.rewards.should be_empty
@@ -38,4 +38,4 @@ describe "managing players" do
     end
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -4,4 +4,4 @@ require 'webmock/rspec'
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require 'gamifier'
 
-WebMock.disable_net_connect!
+WebMock.disable_net_connect!

data/spec/spec_integration_helper.rb

@@ -11,8 +11,7 @@ RSpec.configure do |config|
   config.before :all do
     Gamifier.set :uri, ENV.fetch("BADGEVILLE_URI") { "http://sandbox.v2.badgeville.com/api/berlin/" }
     Gamifier.set :key, ENV.fetch("BADGEVILLE_KEY") { "1234" }
-    ENGINE = Gamifier.engine
-    Gamifier.logger.level = Logger::DEBUG
+    ENGINE = Gamifier.engine if !defined?(ENGINE)
   end
 
   def player_attributes

data/spec/unit/collection_spec.rb

@@ -18,4 +18,16 @@ describe Gamifier::Collection do
     object.key.should == "value"
   end
 
+  it "should raise an error if no site is given when calling #reset!" do
+    expect{
+      @collection.reset!
+    }.to raise_error(ArgumentError)
+  end
+  
+  it "should call destroy on each entry of the collection when calling #reset!" do
+    model = mock(Gamifier::Model)
+    model.should_receive(:destroy)
+    @collection.should_receive(:all).with(:site => "xyz").and_yield model
+    @collection.reset!(:site => "xyz")
+  end
 end

data/spec/unit/engine_spec.rb

@@ -62,10 +62,18 @@ describe Gamifier::Engine do
     @engine.connection.should be_a(Object)
   end
 
+  it "should output to the given logger" do
+    @logger.should_receive(:info).at_least(1).times
+
+    stub_request(:get, "http://somewhere.ltd/path/1234/resource.json").
+      with(:query => {"limit" => "5"})
+    @engine.transmit :get, "resource", :query => {"limit" => "5"}
+  end
+
   describe "#transmit" do
     it "transmits POST requests to the API" do
       stub_request(:post, "http://somewhere.ltd/path/1234/resource.json").
-        with(:body => Gamifier::Engine.encode_www_form({:a => "b", :c => ["d", "e"]}), :headers => { 'Content-Type' => 'application/x-www-form-urlencoded' })
+        with(:body => {:a => "b", :c => ["d", "e"]}, :headers => { 'Content-Type' => 'application/x-www-form-urlencoded' })
       @engine.transmit :post, "resource", :body => {"a" => "b", :c => ["d", "e"]}
     end
     it "transmits GET requests to the API" do

metadata

@@ -1,103 +1,104 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gamifier
-version: !ruby/object:Gem::Version
-  version: 1.0.3
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 4
+  version: 1.0.4
 platform: ruby
-authors:
+authors: 
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: faraday_middleware
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Gem for accessing game engine APIs
-email:
+email: 
 - cyril.rohr@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -125,6 +126,7 @@ files:
 - lib/gamifier/models/unit.rb
 - lib/gamifier/models/user.rb
 - lib/gamifier/version.rb
+- spec/integration/collection_integration_spec.rb
 - spec/integration/dsl_integration_spec.rb
 - spec/integration/player_integration_spec.rb
 - spec/integration/user_integration_spec.rb
@@ -138,31 +140,41 @@ files:
 - spec/unit/gamifier_spec.rb
 - spec/unit/model_spec.rb
 - spec/unit/models/player_spec.rb
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Currently supports Badgeville Core API
-test_files:
+test_files: 
+- spec/integration/collection_integration_spec.rb
 - spec/integration/dsl_integration_spec.rb
 - spec/integration/player_integration_spec.rb
 - spec/integration/user_integration_spec.rb
@@ -176,4 +188,3 @@ test_files:
 - spec/unit/gamifier_spec.rb
 - spec/unit/model_spec.rb
 - spec/unit/models/player_spec.rb
-has_rdoc: