sugar-high 0.7.0 → 0.7.1

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+script: "rake"
+gemfile:
+  - Gemfile

data/README.textile

@@ -2,6 +2,8 @@ h1. Sugar high!
 
 Inspired by the 'zucker' project.
 
+!https://secure.travis-ci.org/kristianmandrup/sugar-high.png(Build Status)!:http://travis-ci.org/kristianmandrup/sugar-high
+
 h2. Install
 
 <code>gem install sugar-high</code>
@@ -53,7 +55,7 @@ h3. Arguments
 h3. Array
 
 * pick_one! - pick one random item
-* pink (n) - pick n random item
+* pick (n) - pick n random item
 * to_symbols
 * to_symbols_uniq
 * to_strings

data/Rakefile

@@ -9,8 +9,12 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
+
 require 'rake'
 
+$:.unshift File.expand_path('lib', File.dirname(__FILE__))
+require 'sugar-high/version'
+
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "sugar-high"
@@ -20,18 +24,19 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/kristianmandrup/sugar-high"
   gem.email = "kmandrup@gmail.com"
   gem.authors = ["Kristian Mandrup"]
+  gem.version = SugarHigh::VERSION
   # dependencies defined in Gemfile
 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
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :test
+task :default => :spec
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/lib/sugar-high/range.rb

@@ -0,0 +1,12 @@
+class Range  
+  def intersect(other)  
+    raise ArgumentError, 'value must be a Range' unless other.kind_of?(Range)  
+
+    new_min = self.cover?(other.min) ? other.min : other.cover?(min) ? min : nil  
+    new_max = self.cover?(other.max) ? other.max : other.cover?(max) ? max : nil  
+
+    new_min && new_max ? new_min..new_max : nil  
+  end  
+  alias_method :intersection, :intersect
+  alias_method :&, :intersection  
+end

data/lib/sugar-high/version.rb

@@ -0,0 +1,3 @@
+module SugarHigh
+  VERSION = '0.7.1'
+end

data/spec/sugar-high/range_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'sugar-high/range'
+
+describe Range do 
+  describe '#intersection' do
+    context 'inclusive range' do
+      
+      # Test an inclusive range
+      subject { 5..10 } 
+
+      let(:tests) do 
+        {
+        1..4   => nil,     # before
+        11..15 => nil,     # after
+        1..6   => 5..6,    # overlap_begin
+        9..15  => 9..10,   # overlap_end
+        1..5   => 5..5,    # overlap_begin_edge
+        10..15 => 10..10,  # overlap_end_edge
+        5..10  => 5..10,   # overlap_all
+        6..9   => 6..9,    # overlap_inner
+
+        1...5  => nil,     # before             (exclusive range)
+        1...7  => 5..6,    # overlap_begin      (exclusive range)
+        1...6  => 5..5,    # overlap_begin_edge (exclusive range)
+        5...11 => 5..10,   # overlap_all        (exclusive range)
+        6...10 => 6..9,    # overlap_inner      (exclusive range)
+        }
+      end
+
+      it 'should intersect correctly' do
+        tests.each do |other, expected|
+          subject.intersect(other).should == expected
+        end
+      end
+    end 
+
+    context 'exclusive range' do 
+      # Test an exclusive range
+      # This covers a bug found by Montgomery Kosma in the original code
+      subject { 1...10 } 
+  
+      let(:tests)  do 
+        #overlap_end
+        { 5..15 => 5..9}
+      end
+  
+      it 'should intersect correctly' do
+        tests.each do |other, expected|
+          subject.intersect(other).should == expected
+        end
+      end
+    end
+  end
+end

data/sugar-high.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sugar-high"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-06-28"
+  s.date = "2012-09-25"
   s.description = "More Ruby sugar - inspired by the 'zuker' project"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "CHANGELOG.md",
     "Gemfile",
     "LICENSE",
     "README.textile",
     "Rakefile",
-    "VERSION",
     "lib/sugar-high.rb",
     "lib/sugar-high/alias.rb",
     "lib/sugar-high/arguments.rb",
@@ -49,10 +49,12 @@ Gem::Specification.new do |s|
     "lib/sugar-high/path.rb",
     "lib/sugar-high/properties.rb",
     "lib/sugar-high/rails/concerns.rb",
+    "lib/sugar-high/range.rb",
     "lib/sugar-high/regexp.rb",
     "lib/sugar-high/rspec/configure.rb",
     "lib/sugar-high/rspec/matchers/have_aliases.rb",
     "lib/sugar-high/string.rb",
+    "lib/sugar-high/version.rb",
     "spec/fixtures/empty.txt",
     "spec/fixtures/non-empty.txt",
     "spec/fixtures/search_file.txt",
@@ -77,6 +79,7 @@ Gem::Specification.new do |s|
     "spec/sugar-high/rails/fixture_user/validations.rb",
     "spec/sugar-high/rails/shared/associations.rb",
     "spec/sugar-high/rails/shared/caching.rb",
+    "spec/sugar-high/range_spec.rb",
     "spec/sugar-high/regexp_spec.rb",
     "spec/sugar-high/string_spec.rb",
     "sugar-high.gemspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugar-high
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -101,12 +101,12 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.textile
 - Rakefile
-- VERSION
 - lib/sugar-high.rb
 - lib/sugar-high/alias.rb
 - lib/sugar-high/arguments.rb
@@ -131,10 +131,12 @@ files:
 - lib/sugar-high/path.rb
 - lib/sugar-high/properties.rb
 - lib/sugar-high/rails/concerns.rb
+- lib/sugar-high/range.rb
 - lib/sugar-high/regexp.rb
 - lib/sugar-high/rspec/configure.rb
 - lib/sugar-high/rspec/matchers/have_aliases.rb
 - lib/sugar-high/string.rb
+- lib/sugar-high/version.rb
 - spec/fixtures/empty.txt
 - spec/fixtures/non-empty.txt
 - spec/fixtures/search_file.txt
@@ -159,6 +161,7 @@ files:
 - spec/sugar-high/rails/fixture_user/validations.rb
 - spec/sugar-high/rails/shared/associations.rb
 - spec/sugar-high/rails/shared/caching.rb
+- spec/sugar-high/range_spec.rb
 - spec/sugar-high/regexp_spec.rb
 - spec/sugar-high/string_spec.rb
 - sugar-high.gemspec
@@ -176,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2519562301567009285
+      hash: -379630514327345161
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/VERSION

@@ -1 +0,0 @@
-0.7.0