degu 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d11ad3d30e696815259b126d84c4b22fcc34972
-  data.tar.gz: 429c99d88ae9bd7d151064ff80a031846fc4ca61
+  metadata.gz: 02a36ad5dbf090d463a5bcb6663647276524efbb
+  data.tar.gz: a708d7d3b15edb9fb5d91b7efebf17598467ad1e
 SHA512:
-  metadata.gz: 49a820e95b6e154a83ba14c35bac7121ed83cba626fecd7e704c8b34ad21b80fa521b134a4b6c349ecfedc2c53524d1940fb715f2bd70c806d95abf038678c71
-  data.tar.gz: c0bf803c5398e823312fd83996ff4b51d4f396e41c6a0831e1922abcdc868a929bdfcef38c01e183d616aa8303112de7c055ed54c8a4339841e298d6965d3cac
+  metadata.gz: 3ab2d609d9206f6b59125c371b21121edaa394f39abc20356bb8b762e55c214c0453b4a82170e90ba080b4b870f04eb43162a4a29037239d3ddd72d3fae306fa
+  data.tar.gz: 6490e1a508f3b904cc429f37e268a3658f5021aa80b61678530f4eb4f7ceb2e4255726dfeec9f692bfb3c7e07b720f4df0111212154681f6d8d59c4d419aa7a9

data/.travis.yml

@@ -3,9 +3,9 @@ bundler_args: --binstubs
 
 # Specify which ruby versions you wish to run your tests on, each version will be used
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
   - rbx-19mode
   - jruby-19mode
   - ruby-head

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/degu.gemspec

@@ -1,21 +1,21 @@
 # -*- encoding: utf-8 -*-
-# stub: degu 0.5.0 ruby lib
+# stub: degu 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "degu"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2014-06-10"
+  s.date = "2015-04-24"
   s.description = "Library that includes enums, and rails support for enums and bitfield sets."
   s.email = "dev@pkw.de"
   s.extra_rdoc_files = ["README.md", "lib/degu.rb", "lib/degu/has_enum.rb", "lib/degu/has_set.rb", "lib/degu/polite.rb", "lib/degu/renum.rb", "lib/degu/renum/enumerated_value.rb", "lib/degu/renum/enumerated_value_type_factory.rb", "lib/degu/rude.rb", "lib/degu/version.rb"]
   s.files = [".gitignore", ".travis.yml", "COPYING", "Gemfile", "README.md", "Rakefile", "VERSION", "degu.gemspec", "lib/degu.rb", "lib/degu/has_enum.rb", "lib/degu/has_set.rb", "lib/degu/polite.rb", "lib/degu/renum.rb", "lib/degu/renum/enumerated_value.rb", "lib/degu/renum/enumerated_value_type_factory.rb", "lib/degu/rude.rb", "lib/degu/version.rb", "spec/renum_spec.rb", "spec/spec_helper.rb", "test/has_enum_test.rb", "test/has_set_test.rb", "test/test_helper.rb", "test_helper.rb"]
   s.homepage = "https://github.com/tuskenraiders/degu"
   s.rdoc_options = ["--title", "Degu - Library for enums and bitfield sets.", "--main", "README.md"]
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "2.4.6"
   s.summary = "Library for enums and bitfield sets."
   s.test_files = ["test/has_enum_test.rb", "test/has_set_test.rb"]
 
@@ -23,14 +23,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 1.2.0"])
       s.add_development_dependency(%q<test-unit>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, ["< 5.0", ">= 3.0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 1.0.0"])
+      s.add_dependency(%q<gem_hadar>, ["~> 1.2.0"])
       s.add_dependency(%q<test-unit>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord>, ["< 5.0", ">= 3.0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 1.0.0"])
+    s.add_dependency(%q<gem_hadar>, ["~> 1.2.0"])
     s.add_dependency(%q<test-unit>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

data/lib/degu/renum/enumerated_value.rb

@@ -212,7 +212,11 @@ module Degu
 
       # Sorts enumerated values into the order in which they're declared.
       def <=> other
-        index <=> other.index
+        if self.class === other
+          index <=> other.index
+        elsif other_value = self.class[other]
+          self <=> other_value
+        end
       end
 
       # Returns a marshalled string for this enum instance.

data/lib/degu/version.rb

@@ -1,6 +1,6 @@
 module Degu
   # Degu version
-  VERSION         = '0.5.0'
+  VERSION         = '0.6.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spec/renum_spec.rb

@@ -49,7 +49,6 @@ describe "basic enum" do
     expect(Color::GREEN.id).to eq 1
   end
 
-
   it "provides name lookup on values" do
     expect(Status.with_name('IN_PROGRESS')).to eq Status::IN_PROGRESS
     expect(Color.with_name('GREEN')).to eq Color::GREEN
@@ -317,3 +316,36 @@ describe "definition extensions included as models and block to use inside of th
     expect(Foo3::Bang.set_per_extension).to eq 'c_set_via_extension'
   end
 end
+
+
+enum :LogLevel, %i[ DEBUG INFO WARN ERROR FATAL UNKNOWN ]
+
+enum :Nix, %i[ FOO BAR ]
+
+describe 'comparing renums' do
+  it 'can compare to other enums of the same type' do
+    expect(LogLevel::WARN).to be < LogLevel::ERROR
+    expect(LogLevel::WARN).not_to be < LogLevel::WARN
+  end
+
+  it 'cannot compare to enums of other types' do
+    expect(LogLevel::DEBUG <=> Nix::BAR).to be_nil
+  end
+
+  it 'can compare to indexes' do
+    expect(LogLevel::WARN).to be < 3
+  end
+
+  it 'cannot compare to unknown indexes' do
+    expect(LogLevel::DEBUG <=> 666).to be_nil
+  end
+
+  it 'can compare to names' do
+    expect(LogLevel::WARN).to be < :ERROR
+    expect(LogLevel::WARN).not_to be < :WARN
+  end
+
+  it 'cannot compare to unknown names' do
+    expect(LogLevel::DEBUG <=> :foo).to be_nil
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: degu
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Library for enums and bitfield sets.