need_for_type 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c771a98c74b2ca901fac1b42526e703c0bfebb
-  data.tar.gz: 7c2fd8fee3dcacc79e29dd80a247fc01287ac49b
+  metadata.gz: 630c7e4f50ccb4765104fa05235a4d8c68264e13
+  data.tar.gz: f436084b96f0c78466ad896407dfe031d4effde0
 SHA512:
-  metadata.gz: bd1c9b2edbfb33bf49dd81ff176083c82c329d3ca25ba0387b4260424f32cdfe4ebb0519a83085a7d9ed586f84c22ed362eefeebcdb1a401c4f6c7f564d0c035
-  data.tar.gz: 867f430be232a9718449fcc9e319d0b2d0078c5ea1d9842a73d0c5976e29b943c517328eab1a85b6d31f440dbd8a246765fe23a490b5a046e50f62a3d2b16135
+  metadata.gz: b1aedd33ddb4c2b7f236460b47757836e6d9fe979fb5f6ded0c963a5b24aa379fc85aec99be2dab37425f4061e9b516e05e851538237be19fc1f1c183abf00f8
+  data.tar.gz: a537744ace862c531de82facae1a09b686e5e533ac790b66bc914ffda7127d046c78546b46e726237fbb24fdc035713bd4b0c37c6a8a193f4fc6a60c6c844cd1

data/README.md

@@ -1,6 +1,6 @@
 # need-for-type 
 
-need-for-type is a terminal type racer inpired by [Nitro Type](https://www.nitrotype.com/).
+need-for-type is a terminal type racer inpired by [Nitro Type](https://www.nitrotype.com/) and [TypeRacer](http://play.typeracer.com/).
 
 ![screenshot](https://raw.githubusercontent.com/need-for-type/need-for-type/master/assets/screenshot.png)
 
@@ -12,7 +12,7 @@ Run the following command:
 $ gem install 'need_for_type'
 ```
 
-## Usage
+## How to play 
 
 On a new terminal window run the following command:
 
@@ -28,17 +28,23 @@ You can run `./bin/console` for an interactive prompt that will allow you to exp
 
 To install the development version of the gem onto your local machine, run `bundle exec rake install`.
 
-To release a new version, update the version number in `version.rb` and update the `CHANGELOG.md` accordingly, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+### How to release a new version
 
+To release a new version follow these steps:
+
+1. Update the version in `version.rb`
+2. Update changes for the corresponding version in `CHANGELOG.md`
+3. Commit both `version.rb` and `CHANGELOG.md`
+4. Run `bundle exec rake release` which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org)
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/jbernardo95/need-for-type. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/need-for-type/need-for-type. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## Credits 
 
-Texts used in need-for-type were all kindly provided to us by [TypeRacer](http://play.typeracer.com/)
+Texts used in need-for-type were all kindly provided to us by [TypeRacer](http://play.typeracer.com/).
 
 ## License
 

data/lib/need_for_type/api.rb

@@ -6,8 +6,13 @@ module NeedForType::API
 
   def get_scores(text_id)
     url = "https://#{@@api_url}/v1/scores?text_id=#{text_id}"
-    response = HTTParty.get(url)
-    JSON.parse(response.body)
+
+    begin
+      response = HTTParty.get(url)
+      JSON.parse(response.body)
+    rescue HTTParty::Error, StandardError
+      { error: "Ups! Something went wrong." }
+    end
   end
 
   def post_score(username, text_id, stats)
@@ -18,6 +23,9 @@ module NeedForType::API
                       wpm: stats[:wpm],
                       time: stats[:total_time], 
                       accuracy: stats[:accuracy] } }
-    HTTParty.post(url, headers: headers, body: body.to_json)
+    begin
+      HTTParty.post(url, headers: headers, body: body.to_json)
+    rescue HTTParty::Error, StandardError
+    end
   end
 end

data/lib/need_for_type/display_window.rb

@@ -132,9 +132,15 @@ module NeedForType
     end
 
     def render_scores(scores, y, x)
-      if scores.empty?
-        self.set_render_pos(y + 1, x)
+      if scores.nil?
+        self.set_render_pos(y, x)
+        self.addstr("Fetching scores...")
+      elsif scores.empty?
+        self.set_render_pos(y, x)
         self.addstr("There are no score yet for this text.")
+      elsif scores[:error]
+        self.set_render_pos(y + 1, x)
+        self.addstr(scores[:error])
       else
         scores.each do |s|
           self.set_render_pos(y, x)

data/lib/need_for_type/states/end.rb

@@ -14,12 +14,15 @@ module NeedForType::States
       @text_id = text_id
 
       @option = 0
-      @scores = get_scores(@text_id)
+      @scores = nil
+      fetch_and_render_scores_async 
     end
 
     def update
       @display_window.render_end(@stats, @scores, @option)
 
+      @fetch_and_render_scores_thread.join
+
       input_worker(4) do
         case @option
         when 0
@@ -33,5 +36,12 @@ module NeedForType::States
 
       return self
     end
+
+    def fetch_and_render_scores_async
+      @fetch_and_render_scores_thread = Thread.new do
+        @scores = get_scores(@text_id)
+        @display_window.render_end(@stats, @scores, @option)
+      end
+    end
   end
 end

data/lib/need_for_type/states/submit_score.rb

@@ -23,7 +23,7 @@ module NeedForType::States
 
       if input == Curses::Key::ENTER || input == 10
         post_score(@username, @text_id, @stats)
-        @end_state.scores = get_scores(@text_id)
+        @end_state.fetch_and_render_scores_async
         return @end_state
       elsif input == Curses::Key::BACKSPACE  || input == 127
         @username = @username.chop

data/lib/need_for_type/version.rb

@@ -1,3 +1,3 @@
 module NeedForType
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: need_for_type
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - tiagonbotelho
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: need-for-type is a terminal type racer inpired by Nitro Type
+description: need-for-type is a terminal type racer inpired by Nitro Type and TypeRacer
 email:
 - tiagonbotelho@gmail.com
 - jbamaro95@gmail.com
@@ -826,7 +826,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -834,7 +834,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: A terminal typeracer