solve 0.4.3 → 0.4.4

data/.travis.yml

@@ -4,3 +4,5 @@ bundler_args: --without development
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - jruby-19mode

data/lib/solve/constraint.rb

@@ -96,7 +96,7 @@ module Solve
       # @param [Solve::Version] target_version
       #
       # @return [Boolean]
-      def compare_aprox(constraint, target_version)
+      def compare_approx(constraint, target_version)
         min = constraint.version
         max = if constraint.patch.nil?
           Version.new([min.major + 1, 0, 0, 0])
@@ -115,17 +115,26 @@ module Solve
       end
     end
 
-    OPERATORS = {
-      "~>" => method(:compare_aprox),
-      ">=" => method(:compare_gte),
-      "<=" => method(:compare_lte),
-      "=" => method(:compare_equal),
-      "~" => method(:compare_aprox),
-      ">" => method(:compare_gt),
-      "<" => method(:compare_lt)
+    OPERATOR_TYPES = {
+      "~>" => :approx,
+      "~"  => :approx,
+      ">=" => :greater_than_equal,
+      "<=" => :less_than_equal,
+      "="  => :equal,
+      ">"  => :greater_than,
+      "<"  => :less_than,
     }.freeze
 
-    REGEXP = /^(#{OPERATORS.keys.join('|')})\s?(.+)$/
+    COMPARE_FUNS = {
+      approx: method(:compare_approx),
+      greater_than_equal: method(:compare_gte),
+      greater_than: method(:compare_gt),
+      less_than_equal: method(:compare_lte),
+      less_than: method(:compare_lt),
+      equal: method(:compare_equal)
+    }.freeze
+
+    REGEXP = /^(#{OPERATOR_TYPES.keys.join('|')})\s?(.+)$/
 
     attr_reader :operator
     attr_reader :major
@@ -141,7 +150,11 @@ module Solve
       end
 
       @operator, @major, @minor, @patch, @pre_release, @build = self.class.split(constraint)
-      @compare_fun = OPERATORS.fetch(self.operator)
+
+      unless operator_type == :approx
+        @minor ||= 0
+        @patch ||= 0
+      end
     end
 
     # Return the Solve::Version representation of the major, minor, and patch
@@ -160,6 +173,15 @@ module Solve
       )
     end
 
+    # @return [Symbol]
+    def operator_type
+      unless type = OPERATOR_TYPES.fetch(operator)
+        raise RuntimeError, "unknown operator type: #{operator}"
+      end
+
+      type
+    end
+
     # Returns true or false if the given version would be satisfied by
     # the version constraint.
     #
@@ -173,7 +195,7 @@ module Solve
         return false
       end
 
-      @compare_fun.call(self, target_version)
+      compare(target_version)
     end
 
     # @param [Object] other
@@ -187,11 +209,21 @@ module Solve
     alias_method :eql?, :==
 
     def to_s
-      str = operator
-      str += " #{major}.#{minor}.#{patch}"
+      str = "#{operator} #{major}"
+      str += ".#{minor}" if minor
+      str += ".#{patch}" if patch
       str += "-#{pre_release}" if pre_release
       str += "+#{build}" if build
       str
     end
+
+    private
+
+      # @param [Solve::Version] target
+      #
+      # @return [Boolean]
+      def compare(target)
+        COMPARE_FUNS.fetch(operator_type).call(self, target)
+      end
   end
 end

data/lib/solve/gem_version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/unit/solve/constraint_spec.rb

@@ -49,18 +49,34 @@ describe Solve::Constraint do
         end
       end
 
-      context "given a constraint that does not include a minor version" do
+      context "given a constraint that does not include a minor version (~>)" do
         it "has a nil value for minor" do
-          subject.new(">= 1").minor.should be_nil
+          expect(subject.new("~> 1").minor).to be_nil
+        end
+
+        it "has a nil value for patch" do
+          expect(subject.new("~> 1").patch).to be_nil
+        end
+      end
+
+      context "given a constraint that does not include a minor version (=)" do
+        it "has a 0 for minor" do
+          subject.new("= 1").minor.should eq(0)
         end
       end
 
-      context "given a constraint that does not include a patch version" do
+      context "given a constraint that does not include a patch version (~>)" do
         it "has a nil value for patch" do
           subject.new("~> 1.2").patch.should be_nil
         end
       end
 
+      context "given a constraint that does not include a patch version (=)" do
+        it "has a 0 for patch" do
+          subject.new("= 1.2").patch.should eq(0)
+        end
+      end
+
       context "given a constraint that does not include a build version" do
         it "has a nil value for build" do
           subject.new(">= 1.2.3-alpha").build.should be_nil
@@ -441,7 +457,6 @@ describe Solve::Constraint do
   end
 
   describe "#eql?" do
-
     subject { Solve::Constraint.new("= 1.0.0") }
 
     it "returns true if the other object is a Solve::Constraint with the same operator and version" do
@@ -464,4 +479,31 @@ describe Solve::Constraint do
       subject.should_not eql(other)
     end
   end
+
+  describe "#to_s" do
+    let(:constraint_string) { ">= 1.2.3-alpha+123" }
+    subject { described_class.new(constraint_string).to_s }
+
+    it { should eq(constraint_string) }
+
+    context "when the constraint does not contain a minor or patch value" do
+      let(:constraint_string) { "~> 1" }
+      it { should eq(constraint_string) }
+    end
+
+    context "when the constraint does not contain a patch value" do
+      let(:constraint_string) { "~> 1.2" }
+      it { should eq(constraint_string) }
+    end
+
+    context "when the constraint does not contain a build value" do
+      let(:constraint_string) { ">= 1.2.0-alpha"}
+      it { should eq(constraint_string) }
+    end
+
+    context "when the constraint contains a pre_release value" do
+      let(:constraint_string) { ">= 1.2.0+123"}
+      it { should eq(constraint_string) }
+    end
+  end
 end

data/spec/unit/solve/version_spec.rb

@@ -261,7 +261,7 @@ describe Solve::Version do
         end
 
         it "returns 0 as the second element" do
-          subject.split("1")[2].should eql(0)
+          subject.split("1")[1].should eql(0)
         end
 
         it "returns 0 as the third element" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -856939986988863331
+      hash: -3360162225470919551
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23