simple_set 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ac5283b146313f3608674a583ccb44b71a94278
-  data.tar.gz: f823e20306eebae24a9fe94183afbf535b845b0f
+  metadata.gz: a27bd4248194e50184ad285ba8262e9a387736b9
+  data.tar.gz: 2ca6d88cf8768a74047770d076ea06b0a5290808
 SHA512:
-  metadata.gz: 2c7b61ab0020e2c6f688e3ac16370a3bdc71c192c7cf1116103cb2353a74ae1c43c9f1ffe396d8fc293d78c81576c157e2cc7a354844d75b1d71b92a83d41b63
-  data.tar.gz: 32a46d29080020a5e02d3724efb6a1d581d619802d4ca210cb6748655295695385bf9364849ca6babb2e242009407a4783f6cf8b390c742be733db899f0109c4
+  metadata.gz: be3ac07d3ca2b6814adb9a0654ec8320b9be02229beb668885c4185d5e8cdb831f2d3bd7fca53dede9228ca4949b5871487c36935b186e7617a2c3faa0e10ff7
+  data.tar.gz: 7871a706ad62f15b1d05839b76c9274070a60bd1b2e5700edb580b05cc57656ad0415a669b400e2e8e870035d518c11218c9bde59c9ddfdbd6bb6199c943d6dc

data/lib/simple_set.rb

@@ -109,7 +109,7 @@ module SimpleSet
       if options[:slim] != true then
         prefix = options[:prefix] && "#{options[:prefix] == true ? set_cd.to_s.singularize : options[:prefix]}_"
         values.each do |k,code|
-          sym = ::SimpleEnum::EnumHash.symbolize(k)
+          sym = k.to_sym
 
           define_method("#{prefix}#{sym}?") do
             current = send(options[:column]) || 0

data/lib/simple_set/set_hash.rb

@@ -1,26 +1,23 @@
-require 'simple_enum/enum_hash'
-
 module SimpleSet
   class SetHash < ::ActiveSupport::OrderedHash
-    def initialize(args = [], strings = false)
+    def initialize(args = [])
       super()
 
-      if args.is_a?(Hash) then
+      args = if args.is_a?(Hash) then
         args.each { |k,v| set_value_for_reverse_lookup(k, v) }
+      elsif args.is_a?(Array) && !args.first.is_a?(Array) then
+        args.each_with_index.map { |x,y| [x, 2**y] }
       else
-        ary = args.send(args.respond_to?(:enum_with_index) ? :enum_with_index : :each_with_index).map { |x,y| [ x, 2**y ] } unless args.first.respond_to?(:map)
-        ary = args.map { |e| [e, 2**e.id] } if args.first.respond_to?(:map) && !args.first.is_a?(Array)
-        ary ||= args
-        ary.each { |e| set_value_for_reverse_lookup(e[0], strings ? e[0].to_s : e[1]) }
+        raise Exception.new()
       end
+      args.each { |e| set_value_for_reverse_lookup(e[0], e[1]) }
 
       freeze
     end
 
   private
     def set_value_for_reverse_lookup(key, value)
-      sym = ::SimpleEnum::EnumHash.symbolize(key)
-      self[key] = value
+      self[key.to_sym] = value
     end
   end
 end

data/lib/simple_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleSet
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/simple_set.gemspec

@@ -17,11 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "simple_enum", "~> 1.6.8"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "activerecord", ">= 3.0.0"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_development_dependency 'rspec', '~> 3.0.0'
+  spec.add_development_dependency 'activerecord', '>= 3.0.0'
+  spec.add_development_dependency 'sqlite3', '~> 1.3'
 end

data/spec/simple_set_spec.rb

@@ -17,12 +17,12 @@ describe SimpleSet do
       as_set :values, [:a, :b, :c, :d, :e, :f]
     end
 
-    InitWithArrayOfSymbol.a.should == 1
-    InitWithArrayOfSymbol.b.should == 2
-    InitWithArrayOfSymbol.c.should == 4
-    InitWithArrayOfSymbol.d.should == 8
-    InitWithArrayOfSymbol.e.should == 16
-    InitWithArrayOfSymbol.f.should == 32
+    expect(InitWithArrayOfSymbol.a).to eq(1)
+    expect(InitWithArrayOfSymbol.b).to eq(2)
+    expect(InitWithArrayOfSymbol.c).to eq(4)
+    expect(InitWithArrayOfSymbol.d).to eq(8)
+    expect(InitWithArrayOfSymbol.e).to eq(16)
+    expect(InitWithArrayOfSymbol.f).to eq(32)
   end
 
   it 'should accept a hash' do
@@ -30,23 +30,23 @@ describe SimpleSet do
       as_set :values, { a: 1, b: 2, c: 4, d: 8, all: 15 }
     end
 
-    InitWithHash.a.should == 1
-    InitWithHash.b.should == 2
-    InitWithHash.c.should == 4
-    InitWithHash.d.should == 8
-    InitWithHash.all.should == 15
+    expect(InitWithHash.a).to eq(1)
+    expect(InitWithHash.b).to eq(2)
+    expect(InitWithHash.c).to eq(4)
+    expect(InitWithHash.d).to eq(8)
+    expect(InitWithHash.all).to eq(15)
 
     sample = InitWithHash.new
     sample.all = true
-    sample.a?.should be_true
-    sample.b?.should be_true
-    sample.c?.should be_true
-    sample.d?.should be_true
-    sample.all?.should be_true
+    expect(sample.a?).to be_truthy
+    expect(sample.b?).to be_truthy
+    expect(sample.c?).to be_truthy
+    expect(sample.d?).to be_truthy
+    expect(sample.all?).to be_truthy
     sample.b = false
-    sample.all?.should be_false
+    expect(sample.all?).to be_falsey
     sample.b = true
-    sample.all?.should be_true
+    expect(sample.all?).to be_truthy
   end
 
   it 'should distinguish nil from empty set' do
@@ -56,25 +56,25 @@ describe SimpleSet do
 
     sample = NilOrEmpty.new
 
-    sample.a?.should be_false
-    sample.b?.should be_false
-    sample.values_cd.should == nil
-    sample.values.should == nil
+    expect(sample.a?).to be_falsey
+    expect(sample.b?).to be_falsey
+    expect(sample.values_cd).to eq(nil)
+    expect(sample.values).to eq(nil)
 
     sample.values = [:a]
-    sample.values.should == [:a]
+    expect(sample.values).to eq([:a])
     sample.values = nil
-    sample.values.should == nil
+    expect(sample.values).to eq(nil)
 
     sample.a = true
-    sample.values.should == [:a]
+    expect(sample.values).to eq([:a])
     sample.a = false
-    sample.values.should == []
+    expect(sample.values).to eq([])
 
     sample.values = nil
-    sample.values.should == nil
+    expect(sample.values).to eq(nil)
     sample.a = false
-    sample.values.should == []
+    expect(sample.values).to eq([])
   end
 
   it 'should support fields with a default value' do
@@ -83,11 +83,11 @@ describe SimpleSet do
     end
 
     sample = FieldWithDefaultValue.new
-    sample.values_with_default_cd.should == 2
-    sample.values_with_default.should == [:y]
+    expect(sample.values_with_default_cd).to eq(2)
+    expect(sample.values_with_default).to eq([:y])
 
     sample.values_with_default = nil
-    sample.values_with_default.should == nil
+    expect(sample.values_with_default).to eq(nil)
   end
 
   it 'should work outside activerecord' do
@@ -99,7 +99,7 @@ describe SimpleSet do
 
     sample = FruitsEater.new
     sample.fruits_i_like = [:apples, :pinaple]
-    sample.fruits_i_like_cd.should == 5
+    expect(sample.fruits_i_like_cd).to eq(5)
   end
 
   it 'should return acceptable values' do
@@ -107,7 +107,7 @@ describe SimpleSet do
       as_set :spoken_languages, [:english, :french, :german, :japanese]
     end
 
-    AcceptableValues.spoken_languages.should == [:english, :french, :german, :japanese]
+    expect(AcceptableValues.spoken_languages).to eq([:english, :french, :german, :japanese])
   end
 
   it 'should support Rails assignment' do
@@ -117,7 +117,7 @@ describe SimpleSet do
 
     sample = User.new
     sample.values = ["foo_manager", "baz_manager", ""]
-    sample.values.should == [:foo_manager, :baz_manager]
+    expect(sample.values).to eq([:foo_manager, :baz_manager])
   end
 
   #   ___        _   _
@@ -143,11 +143,11 @@ describe SimpleSet do
 
         sample = TestOptionColumn1.new
         sample.languages = [:french, :german]
-        sample.english?.should be_false
-        sample.french?.should be_true
-        sample.german?.should be_true
-        sample.japanese?.should be_false
-        sample.custom_name.should == 6
+        expect(sample.english?).to be_falsey
+        expect(sample.french?).to be_truthy
+        expect(sample.german?).to be_truthy
+        expect(sample.japanese?).to be_falsey
+        expect(sample.custom_name).to eq(6)
       end
     end
 
@@ -164,22 +164,22 @@ describe SimpleSet do
         end
 
         sample = TestOptionPrefix1.new
-        sample.should respond_to(:spoken_language_english?)
-        sample.should respond_to(:spoken_language_french?)
-        sample.should respond_to(:spoken_language_german?)
-        sample.should respond_to(:spoken_language_japanese?)
-
-        sample.should respond_to(:spoken_language_english=)
-        sample.should respond_to(:spoken_language_french=)
-        sample.should respond_to(:spoken_language_german=)
-        sample.should respond_to(:spoken_language_japanese=)
-
-        TestOptionPrefix1.should respond_to(:spoken_language_english)
-        TestOptionPrefix1.should respond_to(:spoken_language_french)
-        TestOptionPrefix1.should respond_to(:spoken_language_german)
-        TestOptionPrefix1.should respond_to(:spoken_language_japanese)
-
-        sample.should_not respond_to(:japanese?)
+        expect(sample).to respond_to(:spoken_language_english?)
+        expect(sample).to respond_to(:spoken_language_french?)
+        expect(sample).to respond_to(:spoken_language_german?)
+        expect(sample).to respond_to(:spoken_language_japanese?)
+
+        expect(sample).to respond_to(:spoken_language_english=)
+        expect(sample).to respond_to(:spoken_language_french=)
+        expect(sample).to respond_to(:spoken_language_german=)
+        expect(sample).to respond_to(:spoken_language_japanese=)
+
+        expect(TestOptionPrefix1).to respond_to(:spoken_language_english)
+        expect(TestOptionPrefix1).to respond_to(:spoken_language_french)
+        expect(TestOptionPrefix1).to respond_to(:spoken_language_german)
+        expect(TestOptionPrefix1).to respond_to(:spoken_language_japanese)
+
+        expect(sample).to_not respond_to(:japanese?)
       end
 
       it "should support custom prefix in getters and setters" do
@@ -188,22 +188,22 @@ describe SimpleSet do
         end
 
         sample = TestOptionPrefix2.new
-        sample.should respond_to(:speaks_english?)
-        sample.should respond_to(:speaks_french?)
-        sample.should respond_to(:speaks_german?)
-        sample.should respond_to(:speaks_japanese?)
-
-        sample.should respond_to(:speaks_english=)
-        sample.should respond_to(:speaks_french=)
-        sample.should respond_to(:speaks_german=)
-        sample.should respond_to(:speaks_japanese=)
-
-        TestOptionPrefix2.should respond_to(:speaks_english)
-        TestOptionPrefix2.should respond_to(:speaks_french)
-        TestOptionPrefix2.should respond_to(:speaks_german)
-        TestOptionPrefix2.should respond_to(:speaks_japanese)
-
-        sample.should_not respond_to(:japanese?)
+        expect(sample).to respond_to(:speaks_english?)
+        expect(sample).to respond_to(:speaks_french?)
+        expect(sample).to respond_to(:speaks_german?)
+        expect(sample).to respond_to(:speaks_japanese?)
+
+        expect(sample).to respond_to(:speaks_english=)
+        expect(sample).to respond_to(:speaks_french=)
+        expect(sample).to respond_to(:speaks_german=)
+        expect(sample).to respond_to(:speaks_japanese=)
+
+        expect(TestOptionPrefix2).to respond_to(:speaks_english)
+        expect(TestOptionPrefix2).to respond_to(:speaks_french)
+        expect(TestOptionPrefix2).to respond_to(:speaks_german)
+        expect(TestOptionPrefix2).to respond_to(:speaks_japanese)
+
+        expect(sample).to_not respond_to(:japanese?)
       end
     end
 
@@ -219,21 +219,21 @@ describe SimpleSet do
           as_set :spoken_languages, [:english, :french, :german, :japanese], slim: true
         end
 
-        TestOptionSlim1.should_not respond_to(:english)
-        TestOptionSlim1.should_not respond_to(:french)
-        TestOptionSlim1.should_not respond_to(:german)
-        TestOptionSlim1.should_not respond_to(:japanese)
+        expect(TestOptionSlim1).to_not respond_to(:english)
+        expect(TestOptionSlim1).to_not respond_to(:french)
+        expect(TestOptionSlim1).to_not respond_to(:german)
+        expect(TestOptionSlim1).to_not respond_to(:japanese)
 
         sample = TestOptionSlim1.new
-        sample.should_not respond_to(:english?)
-        sample.should_not respond_to(:french?)
-        sample.should_not respond_to(:german?)
-        sample.should_not respond_to(:japanese?)
-
-        sample.should_not respond_to(:english=)
-        sample.should_not respond_to(:french=)
-        sample.should_not respond_to(:german=)
-        sample.should_not respond_to(:japanese=)
+        expect(sample).to_not respond_to(:english?)
+        expect(sample).to_not respond_to(:french?)
+        expect(sample).to_not respond_to(:german?)
+        expect(sample).to_not respond_to(:japanese?)
+
+        expect(sample).to_not respond_to(:english=)
+        expect(sample).to_not respond_to(:french=)
+        expect(sample).to_not respond_to(:german=)
+        expect(sample).to_not respond_to(:japanese=)
       end
 
       it 'should only generate instance members when :class is passed' do
@@ -241,21 +241,21 @@ describe SimpleSet do
           as_set :spoken_languages, [:english, :french, :german, :japanese], slim: :class
         end
 
-        TestOptionSlim2.should_not respond_to(:english)
-        TestOptionSlim2.should_not respond_to(:french)
-        TestOptionSlim2.should_not respond_to(:german)
-        TestOptionSlim2.should_not respond_to(:japanese)
+        expect(TestOptionSlim2).to_not respond_to(:english)
+        expect(TestOptionSlim2).to_not respond_to(:french)
+        expect(TestOptionSlim2).to_not respond_to(:german)
+        expect(TestOptionSlim2).to_not respond_to(:japanese)
 
         sample = TestOptionSlim2.new
-        sample.should respond_to(:english?)
-        sample.should respond_to(:french?)
-        sample.should respond_to(:german?)
-        sample.should respond_to(:japanese?)
-
-        sample.should respond_to(:english=)
-        sample.should respond_to(:french=)
-        sample.should respond_to(:german=)
-        sample.should respond_to(:japanese=)
+        expect(sample).to respond_to(:english?)
+        expect(sample).to respond_to(:french?)
+        expect(sample).to respond_to(:german?)
+        expect(sample).to respond_to(:japanese?)
+
+        expect(sample).to respond_to(:english=)
+        expect(sample).to respond_to(:french=)
+        expect(sample).to respond_to(:german=)
+        expect(sample).to respond_to(:japanese=)
       end
     end
 
@@ -273,7 +273,7 @@ describe SimpleSet do
 
         sample = TestOptionWhiny1.new
         expect { sample.spoken_languages = [:french, :italian, :japanese] }.to_not raise_error
-        sample.spoken_languages.should == [:french, :japanese]
+        expect(sample.spoken_languages).to eq([:french, :japanese])
       end
     end
   end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simple_set
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Romain Tartière
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: simple_enum
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +28,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +70,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: 
 email:
 - romain@blogreen.org