range_math 0.2.0 → 0.3.0

data/.gitignore

@@ -0,0 +1,48 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/Rakefile

@@ -1,53 +1,24 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "range_math"
-  gem.homepage = "http://github.com/muflax/range_math"
-  gem.license = "MIT"
-  gem.summary = %Q{do math on ranges}
-  gem.description = %Q{use ranges in math expression}
-  gem.email = "mail@muflax.com"
-  gem.authors = ["muflax"]
-  # dependencies defined in Gemfile
+desc "open an irb session preloaded with this library"
+task :console do
+  sh "irb -Ilib -rrange_math"
 end
-Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+desc "build a gem from the gemspec"
+task :build do
+  sh "mkdir -p pkg"
+  sh "gem build range_math.gemspec"
+  sh "mv range_math-*.gem pkg/"
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
+desc "clean pkg"
+task :clean do
+  sh "rm -f pkg/*"
 end
 
-task :default => :test
 
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "range_math #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+desc "install a gem"
+task :install => [:clean, :build] do
+  sh "gem install --no-format-executable pkg/range_math-*.gem"
 end
+
+task :default => :install

data/lib/range_math.rb

@@ -5,43 +5,23 @@
 
 class Range
   def +(other)
-    if other.is_a? Range
-      (self.begin + other.begin)..(self.end + other.end)
-    elsif other.is_a?  Numeric
-      (self.begin + other)..(self.end + other)
-    else
-      raise NoMethodError
-    end
+    pair_or_num :+, other
   end
 
   def -(other)
-    if other.is_a? Range
-      (self.begin - other.begin)..(self.end - other.end)
-    elsif other.is_a?  Numeric
-      (self.begin - other)..(self.end - other)
-    else
-      raise NoMethodError
-    end
+    pair_or_num :-, other
   end
 
   def *(other)
-    if other.is_a? Range
-      (self.begin * other.begin)..(self.end * other.end)
-    elsif other.is_a?  Numeric
-      (self.begin * other)..(self.end * other)
-    else
-      raise NoMethodError
-    end
+    pair_or_num :*, other
   end
 
   def /(other)
-    if other.is_a? Range
-      (self.begin / other.begin.to_f)..(self.end / other.end.to_f)
-    elsif other.is_a?  Numeric
-      (self.begin / other.to_f)..(self.end / other.to_f)
-    else
-      raise NoMethodError
-    end
+    pair_or_num :/, other.to_f
+  end
+
+  def to_f
+    (self.begin.to_f..self.end.to_f)
   end
 
   def average
@@ -50,5 +30,29 @@ class Range
 
   def coerce(other)
     return self, other
-  end    
+  end
+
+  def pair_or_num operator, other
+    if other.is_a? Range
+      calc_pairs operator, other
+    elsif other.is_a? Numeric
+      calc_pairs operator, (other..other)
+    else
+      raise NoMethodError
+    end
+  end
+  
+  def calc_pairs operator, other
+    parts_x = [self.begin, self.end]
+    parts_y = [other.begin, other.end]
+    
+    results = []
+    parts_x.each do |x|
+      parts_y.each do |y|
+        results << x.send(operator, y)
+      end
+    end
+    
+    (results.min..results.max)
+  end
 end

data/range_math.gemspec

@@ -1,62 +1,17 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = "range_math"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["muflax"]
-  s.date = "2011-12-04"
   s.description = "use ranges in math expression"
   s.email = "mail@muflax.com"
   s.extra_rdoc_files = [
-    "LICENSE.txt",
     "README"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README",
-    "Rakefile",
-    "VERSION",
-    "lib/range_math.rb",
-    "range_math.gemspec",
-    "test/helper.rb",
-    "test/test_range_math.rb"
-  ]
+  s.files = `git ls-files`.split("\n")
   s.homepage = "http://github.com/muflax/range_math"
-  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
   s.summary = "do math on ranges"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: range_math
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,85 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &9490460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *9490460
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &9488420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *9488420
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &9485580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *9485580
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &9483160 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *9483160
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &9479460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *9479460
+date: 2012-04-29 00:00:00.000000000 Z
+dependencies: []
 description: use ranges in math expression
 email: mail@muflax.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
 - README
 files:
 - .document
-- Gemfile
-- Gemfile.lock
+- .gitignore
 - LICENSE.txt
 - README
 - Rakefile
-- VERSION
 - lib/range_math.rb
 - range_math.gemspec
 - test/helper.rb
 - test/test_range_math.rb
 homepage: http://github.com/muflax/range_math
-licenses:
-- MIT
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -98,9 +39,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3191188953004532935
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: do math on ranges

data/Gemfile

@@ -1,14 +0,0 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-  gem "rdoc", ">= 0"
-end

data/Gemfile.lock

@@ -1,24 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.6.3)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.11)
-      json (~> 1.4)
-    shoulda (2.11.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
-  rcov
-  rdoc
-  shoulda

data/VERSION

@@ -1 +0,0 @@
-0.2.0