remedy 0.0.3 → 0.0.4.pre

data/README.markdown

@@ -16,13 +16,13 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-  gem 'remedy'
+  gem 'remedy', '~> 0.0.4.pre'
 ```
 
 If you're only going to use part of Remedy, you can tell Bundler to not automatically require the whole thing:
 
 ```ruby
-  gem 'remedy', require: false
+  gem 'remedy', '~> 0.0.4.pre', require: false
 ```
 
 And then execute:
@@ -31,7 +31,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install remedy
+    $ gem install remedy --pre
 
 Usage
 -----

data/lib/remedy/content.rb

@@ -1,4 +1,4 @@
-require 'partial'
+require 'remedy/partial'
 
-class Content < Partial
+class Content < Remedy::Partial
 end

data/lib/remedy/footer.rb

@@ -1,7 +1,7 @@
 require 'remedy/partial'
 
 module Remedy
-  class Footer < Partial
+  class Footer < Remedy::Partial
   end
 end
 

data/lib/remedy/header.rb

@@ -1,7 +1,7 @@
 require 'remedy/partial'
 
 module Remedy
-  class Header < Partial
+  class Header < Remedy::Partial
   end
 end
 

data/lib/remedy/interaction.rb

@@ -1,65 +1,67 @@
 require 'remedy/keyboard'
 require 'remedy/ansi'
 
-class Interaction
-  def initialize message = nil
-    @message = message
-  end
+module Remedy
+  class Interaction
+    def initialize message = nil
+      @message = message
+    end
 
-  attr_accessor :message
+    attr_accessor :message
 
-  def confirm message = 'Confirm?'
-    ANSI.cursor.home!
-    ANSI.command.clear_line!
+    def confirm message = 'Confirm?'
+      ANSI.cursor.home!
+      ANSI.command.clear_line!
 
-    print message, ' y/n '
-    if Keyboard.get === :y then
-      yield if block_given?
-      true
-    else
-      false
+      print message, ' y/n '
+      if Keyboard.get === :y then
+        yield if block_given?
+        true
+      else
+        false
+      end
     end
-  end
 
-  def quit!
-    confirm 'Are you sure you want to quit? You will lose everything. :(' do
-      ANSI.cursor.home!
-      ANSI.command.clear_down!
-      ANSI.cursor.show!
+    def quit!
+      confirm 'Are you sure you want to quit? You will lose everything. :(' do
+        ANSI.cursor.home!
+        ANSI.command.clear_down!
+        ANSI.cursor.show!
+
+        puts " -- Bye!"
+        exit
+      end
+    end
 
-      puts " -- Bye!"
-      exit
+    def debug!
+      require 'pry'
+      binding.pry
     end
-  end
 
-  def debug!
-    require 'pry'
-    binding.pry
-  end
+    def display key
+      ANSI.command.clear_line!
+      print " -- You pressed: #{key.inspect}"
+    end
 
-  def display key
-    ANSI.command.clear_line!
-    print " -- You pressed: #{key.inspect}"
-  end
+    def loop
+      Keyboard.raise_on_control_c!
 
-  def loop
-    Keyboard.raise_on_control_c!
+      super do
+        print " -- #{message}" if message
 
-    super do
-      print " -- #{message}" if message
+        ANSI.cursor.hide!
+        key = Keyboard.get
 
-      ANSI.cursor.hide!
-      key = Keyboard.get
+        if key == ?\C-q then
+          display key
+          quit!
+        elsif key == ?\C-d and defined? Pry then
+          display key
+          debug!
+        end
 
-      if key == ?\C-q then
-        display key
-        quit!
-      elsif key == ?\C-d and defined? Pry then
-        display key
-        debug!
+        yield key
       end
-
-      yield key
     end
   end
 end

data/lib/remedy/keyboard.rb

@@ -1,66 +1,67 @@
 require 'remedy/console'
 require 'remedy/key'
 
-module Keyboard
-  module_function
+module Remedy
+  module Keyboard
+    module_function
 
-  def get
-    parse raw_get
-  end
+    def get
+      parse raw_get
+    end
 
-  def raw_get
-    Console.raw do
-      input = STDIN.getc.chr
+    def raw_get
+      Console.raw do
+        input = STDIN.getc.chr
 
-      if input == "\e" then
-        input << STDIN.read_nonblock(3) rescue nil
-        input << STDIN.read_nonblock(2) rescue nil
-      end
+        if input == "\e" then
+          input << STDIN.read_nonblock(3) rescue nil
+          input << STDIN.read_nonblock(2) rescue nil
+        end
 
-      input
+        input
+      end
     end
-  end
 
-  def parse sequence
-    key = Key.new sequence
-    $log.debug "Key read", key
+    def parse sequence
+      key = Key.new sequence
+      $log.debug "Key read", key
 
-    if raise_on_control_c? && key.control_c? then
-      raise ControlC, "User pressed Control-C"
-    elsif key.recognized? then
-      key
-    elsif raise_on_unrecognized_key? then
-      raise UnrecognizedInput, %Q{Unknown key or byte sequence: "#{sequence}" : #{key.inspect}}
-    else
-      key
+      if raise_on_control_c? && key.control_c? then
+        raise ControlC, "User pressed Control-C"
+      elsif key.recognized? then
+        key
+      elsif raise_on_unrecognized_key? then
+        raise UnrecognizedInput, %Q{Unknown key or byte sequence: "#{sequence}" : #{key.inspect}}
+      else
+        key
+      end
     end
-  end
 
-  def raise_on_unrecognized_key?
-    @raise_on_unrecognized_key
-  end
+    def raise_on_unrecognized_key?
+      @raise_on_unrecognized_key
+    end
 
-  def raise_on_unrecognized_key!
-    @raise_on_unrecognized_key = true
-  end
+    def raise_on_unrecognized_key!
+      @raise_on_unrecognized_key = true
+    end
 
-  def dont_raise_on_unrecognized_key!
-    @raise_on_unrecognized_key = false
-  end
+    def dont_raise_on_unrecognized_key!
+      @raise_on_unrecognized_key = false
+    end
 
-  def raise_on_control_c?
-    @raise_on_control_c
-  end
+    def raise_on_control_c?
+      @raise_on_control_c
+    end
 
-  def raise_on_control_c!
-    @raise_on_control_c = true
-  end
+    def raise_on_control_c!
+      @raise_on_control_c = true
+    end
 
-  def dont_raise_on_control_c!
-    @raise_on_control_c = false
-  end
+    def dont_raise_on_control_c!
+      @raise_on_control_c = false
+    end
 
-  class ControlC < Interrupt; end
-  class UnrecognizedInput < IOError; end
+    class ControlC < Interrupt; end
+    class UnrecognizedInput < IOError; end
+  end
 end
-

data/lib/remedy/size.rb

@@ -0,0 +1,102 @@
+module Remedy
+  class Size
+    def initialize *new_dimensions
+      new_dimensions.flatten!
+      if new_dimensions.first.is_a? Range then
+        new_dimensions.map! do |range|
+          range.to_a.length
+        end
+      end
+      @dimensions = new_dimensions
+    end
+    attr_accessor :dimensions
+
+    def - other_size
+      if other_size.respond_to? :length then
+        self.class.new subtract(other_size)
+      else
+        self.class.new deduct(other_size)
+      end
+    end
+
+    def / value
+      dimensions.map do |dimension|
+        dimension / value
+      end
+    end
+
+    def << value
+      self.dimensions << value
+    end
+
+
+    def fits_into? size_to_fit_into
+      other_size = Size(size_to_fit_into)
+      length.times.each do |index|
+        return false if self[index] > other_size[index]
+      end
+      true
+    end
+
+    def rows
+      dimensions.first
+    end
+
+    def cols
+      dimensions[1]
+    end
+
+    def [] index
+      dimensions[index]
+    end
+
+    def length
+      dimensions.length
+    end
+
+    def to_a
+      dimensions.dup
+    end
+
+    def to_ary
+      dimensions
+    end
+
+    def to_s
+      "(#{dimensions.join('x')})"
+    end
+
+    def inspect
+      "#<#{self.class}:#{to_s}>"
+    end
+
+    protected
+
+    def deduct amount
+      dimensions.map do |dimension|
+        dimension - amount
+      end
+    end
+
+    def subtract other_size
+      sizesame? other_size
+
+      length.times.inject Size.new do |difference, index|
+        difference << self[index] - other_size[index]
+      end
+    end
+
+    def sizesame? other_size
+      raise "Different numbers of dimensions!" unless length == other_size.length
+    end
+  end
+end
+
+def Size *sizeable
+  sizeable.flatten!
+  if sizeable.first.is_a? Remedy::Size then
+    sizeable
+  else
+    Remedy::Size.new sizeable
+  end
+end

data/lib/remedy/version.rb

@@ -1,3 +1,3 @@
 module Remedy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4.pre"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: remedy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Anthony M. Cook
@@ -36,6 +36,7 @@ files:
 - lib/remedy/key.rb
 - lib/remedy/keyboard.rb
 - lib/remedy/partial.rb
+- lib/remedy/size.rb
 - lib/remedy/version.rb
 - lib/remedy/view.rb
 - lib/remedy/viewport.rb
@@ -54,9 +55,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
   none: false
 requirements: []
 rubyforge_project: