need_for_type 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 639aa5cc56ee82cb00ffec60701a77825a32e443
-  data.tar.gz: 80df9d75de5fd5dfe59fcb45b4b8d540cc916142
+  metadata.gz: 3e9ac057bc5ffec238c4c19a18199453c10ee97e
+  data.tar.gz: 57f4b54ab2ac962fab3d459adbf23166a10db4d0
 SHA512:
-  metadata.gz: 8096e4b4bd1da4e34b5115f7516d886a807ec9a568035bdf9fcdc27334cc2e3d8372803d03211ddc22dfcc4524924247e3178e1058e986c8acd62746b5f6934c
-  data.tar.gz: b05f61d604f63a7bb15954c483203126d0e72aa9a521d13f777a9438f103928d96c26ad0a5a0c34faf13b21c544e7f58ccd51437d4d692e876a768a56549b896
+  metadata.gz: 400d012e3c798d9900471714fe1bd861994b96b25c1cbeb637ec2a1f66fe6713390dc6149de063d74811c59c4fa7261c97aa8d9579badba56cf199783d4c9537
+  data.tar.gz: e3b390ee4248032e478a91f00513fbd0fbb6d21c48ce20e129eb1b2d8577efa0305113dc1caac2e00055ef6d0ddabfe3ee342465c056d09fb309abb604e4b0bf

data/README.md

@@ -28,7 +28,7 @@ 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 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).
+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).
 
 
 ## Contributing

data/lib/need_for_type/api.rb

@@ -0,0 +1,23 @@
+require 'json'
+require 'httparty'
+
+module NeedForType::API
+  @@api_url = 'need-for-type.herokuapp.com'
+
+  def get_scores(text_id)
+    url = "https://#{@@api_url}/v1/scores?text_id=#{text_id}"
+    response = HTTParty.get(url)
+    JSON.parse(response.body)
+  end
+
+  def post_score(username, text_id, stats)
+    url = "https://#{@@api_url}/v1/scores"
+    headers = { 'Content-Type' => 'application/json' }
+    body = { score: { username: username,
+                      text_id: text_id,
+                      wpm: stats[:wpm],
+                      time: stats[:total_time], 
+                      accuracy: stats[:accuracy] } }
+    HTTParty.post(url, headers: headers, body: body.to_json)
+  end
+end

data/lib/need_for_type/display_window.rb

@@ -51,26 +51,52 @@ module NeedForType
       end
     end
 
-    def render_end(stats, selected_option)
+    def render_end(stats, scores, selected_option)
       self.render_box do
         self.render_with_color(GREEN) do
           self.set_render_pos(3, 4)
           self.addstr("Congratulations you crossed the finish line!")
 
-          render_stats(stats, 5, 4, :vertical)
+          self.set_render_pos(5, 4)
+          self.addstr("Your score:")
         end
+        render_stats(stats, 6, 4, :vertical)
 
-        self.set_render_pos(9, 4)
+        self.set_render_pos(10, 4)
+        self.render_text("Top scores:", GREEN, NORMAL)
+        render_scores(scores, 11, 4)
+
+        self.set_render_pos(17, 4)
         mode = standout_mode(0, selected_option)
-        self.render_text("1. Restart", WHITE, mode)
+        self.render_text("1. Submit Score", WHITE, mode)
 
-        self.set_render_pos(10, 4)
+        self.set_render_pos(18, 4)
         mode = standout_mode(1, selected_option)
-        self.render_text("2. Main Menu", WHITE, mode)
+        self.render_text("2. Restart", WHITE, mode)
 
-        self.set_render_pos(11, 4)
+        self.set_render_pos(19, 4)
         mode = standout_mode(2, selected_option)
-        self.render_text("3. Exit", WHITE, mode)
+        self.render_text("3. Main Menu", WHITE, mode)
+
+        self.set_render_pos(20, 4)
+        mode = standout_mode(3, selected_option)
+        self.render_text("4. Exit", WHITE, mode)
+      end
+    end
+    
+    def render_submit_score(username)
+      self.render_box do
+        self.set_render_pos(3, 4)
+        self.render_text("Submit your score !", GREEN, NORMAL)
+
+        self.set_render_pos(5, 4)
+        self.addstr("Type your username...")
+
+        self.set_render_pos(6, 4)
+        self.addstr(username)
+
+        self.set_render_pos(8, 4)
+        self.addstr("Click ENTER to submit")
       end
     end
 
@@ -87,8 +113,8 @@ module NeedForType
 
     def render_stats(stats, y, x, mode)
       stats_text = [
-        "Time: #{stats[:total_time].round(2)} sec",
         "WPM: #{stats[:wpm].round}",
+        "Time: #{stats[:total_time].round(2)} sec",
         "Accuracy: #{stats[:accuracy].round(2)} %"
       ]
 
@@ -104,5 +130,18 @@ module NeedForType
         end
       end
     end
+
+    def render_scores(scores, y, x)
+      if scores.empty?
+        self.set_render_pos(y + 1, x)
+        self.addstr("There are no score yet for this text.")
+      else
+        scores.each do |s|
+          self.set_render_pos(y, x)
+          self.addstr("#{s['wpm']} wpm #{s['username']}")
+          y += 1
+        end
+      end
+    end
   end
 end

data/lib/need_for_type/file_manager.rb

@@ -1,17 +1,15 @@
 module NeedForType
   class FileManager
-    attr_accessor :content
+    attr_accessor :text, :text_id
 
     def initialize()
       @path = "#{NeedForType::GEM_ROOT}/assets/texts/"
     end
 
-    # Reads random file from difficulty folder
-    def get_random_text
+    def read_random_text
       directory_count = Dir[File.join(@path, '**', '*')].count
-      random_file = rand(1..directory_count)
-
-      @content = File.read("#{@path}/text-#{random_file}.txt").strip
+      @text_id = rand(1..directory_count)
+      @text = File.read("#{@path}/text-#{@text_id}.txt").strip
     end
   end
 end

data/lib/need_for_type/states/end.rb

@@ -1,25 +1,30 @@
-require 'curses'
-
 require 'need_for_type/states'
+require 'need_for_type/api'
 
 module NeedForType::States
   class End < Menu
+    include NeedForType::API
 
-    def initialize(display_window, stats, difficulty)
+    def initialize(display_window, stats, difficulty, text_id)
       super(display_window)
-      @difficulty = difficulty
       @stats = stats
+      @difficulty = difficulty
+      @text_id = text_id
+
       @option = 0
+      @scores = get_scores(@text_id)
     end
 
     def update
-      @display_window.render_end(@stats, @option)
+      @display_window.render_end(@stats, @scores, @option)
 
-      input_worker(3) do
+      input_worker(4) do
         case @option
         when 0
-          return NeedForType::States::Game.new(@display_window, @difficulty)
+          return NeedForType::States::SubmitScore.new(@display_window, self, @text_id, @stats)
         when 1
+          return NeedForType::States::Game.new(@display_window, @difficulty)
+        when 2
           return NeedForType::States::Start.new(@display_window)
         end
       end

data/lib/need_for_type/states/game.rb

@@ -44,7 +44,10 @@ module NeedForType::States
 
     def handle_start_game
       file_manager = NeedForType::FileManager.new
-      @text = file_manager.get_random_text
+      file_manager.read_random_text
+      @text = file_manager.text
+      @text_id = file_manager.text_id
+
       @display_window.render_game_text(@text, @chars_completed, @stats)
       @start_time = Time.now
 
@@ -106,7 +109,7 @@ module NeedForType::States
     def handle_end_game
       calculate_stats
 
-      return NeedForType::States::End.new(@display_window, @stats, @difficulty)
+      return NeedForType::States::End.new(@display_window, @stats, @difficulty, @text_id)
     end
 
     def calculate_stats

data/lib/need_for_type/states/submit_score.rb

@@ -0,0 +1,36 @@
+require 'curses'
+
+require 'need_for_type/states'
+require 'need_for_type/api'
+
+module NeedForType::States
+  class SubmitScore < State 
+    include NeedForType::API
+
+    def initialize(display_window, end_state, text_id, stats)
+      super(display_window)
+      @end_state = end_state
+      @text_id = text_id
+      @stats = stats
+
+      @username = ''
+    end
+
+    def update
+      @display_window.render_submit_score(@username)
+
+      input = @display_window.get_input
+
+      if input == Curses::Key::ENTER || input == 10
+        post_score(@username, @text_id, @stats)
+        return @end_state
+      elsif input == Curses::Key::BACKSPACE  || input == 127
+        @username = @username.chop
+      elsif input.is_a? String
+        @username += input
+      end
+
+      return self
+    end
+  end
+end

data/lib/need_for_type/states.rb

@@ -3,6 +3,7 @@ require 'need_for_type/states/menu'
 require 'need_for_type/states/game'
 require 'need_for_type/states/start'
 require 'need_for_type/states/end'
+require 'need_for_type/states/submit_score'
 
 module NeedForType
   module States

data/lib/need_for_type/version.rb

@@ -1,3 +1,3 @@
 module NeedForType
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: need_for_type
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - tiagonbotelho
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: need-for-type is a terminal type racer inpired by Nitro Type
 email:
 - tiagonbotelho@gmail.com
@@ -773,6 +801,7 @@ files:
 - assets/texts/text-99.txt
 - bin/need_for_type
 - lib/need_for_type.rb
+- lib/need_for_type/api.rb
 - lib/need_for_type/display_window.rb
 - lib/need_for_type/file_manager.rb
 - lib/need_for_type/states.rb
@@ -781,6 +810,7 @@ files:
 - lib/need_for_type/states/menu.rb
 - lib/need_for_type/states/start.rb
 - lib/need_for_type/states/state.rb
+- lib/need_for_type/states/submit_score.rb
 - lib/need_for_type/typer.rb
 - lib/need_for_type/version.rb
 - lib/need_for_type/window.rb